From 892ca5f85fcd7acc24a63339b77f26be49624d72 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Feb 2014 23:29:07 -0700 Subject: [PATCH] Some updates --- public/site_assets/bootstrap/js/custom.js | 55 ------------------- .../bootstrap/dashboard/account_data.tpl | 4 +- .../bootstrap/dashboard/js_static.tpl | 0 .../bootstrap/dashboard/round_data.tpl | 3 +- .../bootstrap/dashboard/system_stats.tpl | 9 +-- public/templates/bootstrap/master.tpl | 21 +------ 6 files changed, 6 insertions(+), 86 deletions(-) mode change 100644 => 100755 public/site_assets/bootstrap/js/custom.js mode change 100644 => 100755 public/templates/bootstrap/dashboard/js_static.tpl mode change 100644 => 100755 public/templates/bootstrap/master.tpl diff --git a/public/site_assets/bootstrap/js/custom.js b/public/site_assets/bootstrap/js/custom.js old mode 100644 new mode 100755 index 8f7fa587..e69de29b --- a/public/site_assets/bootstrap/js/custom.js +++ b/public/site_assets/bootstrap/js/custom.js @@ -1,55 +0,0 @@ -$(document).ready(function() { - $(".tablesorter").tablesorter(); - $(".tablesorterpager").tablesorter().tablesorterPager({positionFixed: false, container: $("#pager"), cssNext: ".icon-forward", cssPrev: ".icon-backward", cssFirst: ".icon-fast-backward", cssLast: ".icon-fast-forward"}); - $(".tab_content").hide(); //Hide all content - $("ul.tabs li:first").addClass("active").show(); //Activate first tab - $(".tab_content:first").show(); //Show first tab content - $("ul.tabs li").click(function() { - $("ul.tabs li").removeClass("active"); //Remove any "active" class - $(this).addClass("active"); //Add "active" class to selected tab - $(".tab_content").hide(); //Hide all tab content - var activeTab = $(this).find("a").attr("href"); //Find the href attribute value to identify the active tab + content - $(activeTab).fadeIn(); //Fade in the active ID content - $(activeTab).find('.visualize').trigger('visualizeRefresh'); - return false; - }); - $('table.visualize').each(function () { - if ($(this).attr('rel')) { - var statsType = $(this).attr('rel'); - } else { - var statsType = 'area'; - } - - // hack to statically set width as something is broken with div width calculation - anni - var chart_width = $(document).width() - 500; - - if (statsType == 'line' || statsType == 'pie') { - $(this).hide().visualize({ - type: statsType, - // 'bar', 'area', 'pie', 'line' - width: chart_width, - height: '240px', - colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c'], - lineDots: 'double', - interaction: true, - multiHover: 5, - tooltip: true, - tooltiphtml: function (data) { - var html = ''; - for (var i = 0; i < data.point.length; i++) { - html += '

' + data.point[i].value + ' ' + data.point[i].yLabels[0] + '

'; - } - return html; - } - }); - } else { - $(this).hide().visualize({ - // 'bar', 'area', 'pie', 'line' - width: chart_width, - type: statsType, - height: '240px', - colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c'] - }); - } - }); -}); diff --git a/public/templates/bootstrap/dashboard/account_data.tpl b/public/templates/bootstrap/dashboard/account_data.tpl index bd1d5eae..1ee39bdd 100755 --- a/public/templates/bootstrap/dashboard/account_data.tpl +++ b/public/templates/bootstrap/dashboard/account_data.tpl @@ -4,7 +4,7 @@

Account Information

- +
{if $GLOBAL.userdata.no_fees} @@ -22,7 +22,7 @@
- +
diff --git a/public/templates/bootstrap/dashboard/js_static.tpl b/public/templates/bootstrap/dashboard/js_static.tpl old mode 100644 new mode 100755 diff --git a/public/templates/bootstrap/dashboard/round_data.tpl b/public/templates/bootstrap/dashboard/round_data.tpl index ea39dcc4..62a2d8fd 100755 --- a/public/templates/bootstrap/dashboard/round_data.tpl +++ b/public/templates/bootstrap/dashboard/round_data.tpl @@ -4,7 +4,8 @@

Round Information

- +
+
\ No newline at end of file diff --git a/public/templates/bootstrap/dashboard/system_stats.tpl b/public/templates/bootstrap/dashboard/system_stats.tpl index f6ffdc62..c14d4874 100755 --- a/public/templates/bootstrap/dashboard/system_stats.tpl +++ b/public/templates/bootstrap/dashboard/system_stats.tpl @@ -4,7 +4,7 @@

{$GLOBAL.config.payout_system|capitalize} Stats

-
{$GLOBAL.config.currency} Account Balance
+
{if $GLOBAL.config.payout_system == 'pplns'} @@ -29,18 +29,11 @@ {/if} - {include file="dashboard/round_shares.tpl"} - {include file="dashboard/payout_estimates.tpl"} - {include file="dashboard/network_info.tpl"} -
{$GLOBAL.userdata.sharedifficulty|number_format:"2"}
 
 
 
 
-
- Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes. -
\ No newline at end of file diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl old mode 100644 new mode 100755 index 39472b60..60bcc559 --- a/public/templates/bootstrap/master.tpl +++ b/public/templates/bootstrap/master.tpl @@ -37,16 +37,10 @@ {if $GLOBAL.statistics.analytics.enabled} {$GLOBAL.statistics.analytics.code nofilter} {/if} - - - - - - @@ -73,32 +67,19 @@ {/if} {/if} - - - - - - - - - - - - - - +