diff options
| -rw-r--r-- | core/SmartyPlugins/function.ajaxLoadingDiv.php | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/datatable.css | 12 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/datatable.js | 30 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/datatable_footer.tpl | 10 | ||||
| -rw-r--r-- | plugins/Live/templates/visitorLog.tpl | 2 | ||||
| -rw-r--r-- | plugins/VisitorGenerator/Generator.php | 2 | ||||
| -rw-r--r-- | plugins/VisitsSummary/templates/index.tpl | 13 | ||||
| -rw-r--r-- | themes/default/common.css | 4 |
8 files changed, 32 insertions, 43 deletions
diff --git a/core/SmartyPlugins/function.ajaxLoadingDiv.php b/core/SmartyPlugins/function.ajaxLoadingDiv.php index 86b624f7f6..34ee021426 100644 --- a/core/SmartyPlugins/function.ajaxLoadingDiv.php +++ b/core/SmartyPlugins/function.ajaxLoadingDiv.php @@ -27,7 +27,7 @@ function smarty_function_ajaxLoadingDiv($params, &$smarty) $id = $params['id']; } return '<div id="'.$id.'" style="display:none">'. - '<div id="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> '. + '<div class="loadingPiwik"><img src="themes/default/images/loading-blue.gif" alt="" /> '. Piwik_Translate('General_LoadingData') . ' </div>'. '</div>'; diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index a0730f92e3..1a0443236e 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -316,11 +316,13 @@ table thead div { text-align: right; } -.dataTableNext,.dataTablePrevious,.dataTableSearchPattern,.pk-loadingDataTable +.dataTableNext,.dataTablePrevious,.dataTableSearchPattern { display: none; } - +.dataTableFeatures .loadingPiwik { + font-size:0.9em; +} .subDataTable .dataTableFooterIcons { height: 0px; } @@ -411,12 +413,6 @@ table thead div { clear: both; } -.pk-loadingDataTable { - float: left; - color: #193B6C; - padding: 0 0.5em; -} - /* Actions table */ table.dataTableActions tr td.labelodd { background-image: none; diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js index 84bda08791..d04f5682f5 100644 --- a/plugins/CoreHome/templates/datatable.js +++ b/plugins/CoreHome/templates/datatable.js @@ -136,7 +136,7 @@ dataTable.prototype = // Function called to trigger the AJAX request // The ajax request contains the function callback to trigger if the request is successful or failed - // displayLoading = false When we don't want to display the Loading... DIV .pk-loadingDataTable + // displayLoading = false When we don't want to display the Loading... DIV .loadingPiwik // for example when the script add a Loading... it self and doesn't want to display the generic Loading reloadAjaxDataTable: function(displayLoading, callbackSuccess) { @@ -153,7 +153,7 @@ dataTable.prototype = if(displayLoading) { - $('#'+self.workingDivId+' .pk-loadingDataTable').last().css('display','block'); + $('#'+self.workingDivId+' .loadingPiwik').last().css('display','block'); } $.ajax(self.buildAjaxRequest(callbackSuccess)); @@ -696,24 +696,16 @@ dataTable.prototype = if(typeof truncationOffset == 'undefined') { truncationOffset = 0; } - var truncationLimit = 30; - // in a subtable - if(typeof self.param.idSubtable != 'undefined') - { - truncationLimit = 25; - } + var truncationLimit = 50; +/* Different truncation limit for different datatable types? + // in a subtable + if(typeof self.param.idSubtable != 'undefined') {} // when showing all columns if(typeof self.param.idSubtable == 'undefined' - && self.param.viewDataTable == 'tableAllColumns') - { - truncationLimit = 17; - } + && self.param.viewDataTable == 'tableAllColumns') {} // when showing all columns in a subtable, space is restricted - else if(self.param.viewDataTable == 'tableAllColumns') - { - truncationLimit = 10; - } - + else if(self.param.viewDataTable == 'tableAllColumns') {} +*/ truncationLimit += truncationOffset; $(domElemToTruncate).truncate(truncationLimit); @@ -760,7 +752,7 @@ dataTable.prototype = '<tr>'+ '<td colspan="'+numberOfColumns+'" class="cellSubDataTable">'+ '<div id="'+divIdToReplaceWithSubTable+'">'+ - '<span class="pk-loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" />'+ _pk_translate('General_Loading_js') +'</span>'+ + '<span class="loadingPiwik" style="display:inline"><img src="themes/default/images/loading-blue.gif" />'+ _pk_translate('General_Loading_js') +'</span>'+ '</div>'+ '</td>'+ '</tr>' @@ -964,7 +956,7 @@ actionDataTable.prototype = $(domElem).after( '\ <tr id="'+divIdToReplaceWithSubTable+'" class="cellSubDataTable">\ <td colspan="'+numberOfColumns+'">\ - <span class="pk-loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>\ + <span class="loadingPiwik" style="display:inline"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>\ </td>\ </tr>\ '); diff --git a/plugins/CoreHome/templates/datatable_footer.tpl b/plugins/CoreHome/templates/datatable_footer.tpl index 95b22146dc..bb9270a3e8 100644 --- a/plugins/CoreHome/templates/datatable_footer.tpl +++ b/plugins/CoreHome/templates/datatable_footer.tpl @@ -6,16 +6,16 @@ {if $properties.show_offset_information} -<div> +<span> <span class="dataTablePages"></span> -</div> +</span> {/if} {if $properties.show_pagination_control} -<div> +<span> <span class="dataTablePrevious">‹ {'General_Previous'|translate}</span> <span class="dataTableNext">{'General_Next'|translate} ›</span> -</div> +</span> {/if} {if $properties.show_search} @@ -86,7 +86,7 @@ </div> {/if} -<span class="pk-loadingDataTable"><img src="themes/default/images/loading-blue.gif" /> {'General_LoadingData'|translate}</span> +<span class="loadingPiwik" style='display:none'><img src="themes/default/images/loading-blue.gif" /> {'General_LoadingData'|translate}</span> </div> <div class="dataTableSpacer" /> diff --git a/plugins/Live/templates/visitorLog.tpl b/plugins/Live/templates/visitorLog.tpl index 4aedc49068..5cc377c377 100644 --- a/plugins/Live/templates/visitorLog.tpl +++ b/plugins/Live/templates/visitorLog.tpl @@ -96,7 +96,7 @@ <td class="column" style="width:55%" width="55%"> <strong> {$visitor.columns.actionDetails|@count} - {if $visitor.columns.actionDetails|@count eq 1} + {if $visitor.columns.actionDetails|@count <= 1} {'Live_Action'|translate} {else} {'Live_Actions'|translate} diff --git a/plugins/VisitorGenerator/Generator.php b/plugins/VisitorGenerator/Generator.php index c981e20308..fc16933d3e 100644 --- a/plugins/VisitorGenerator/Generator.php +++ b/plugins/VisitorGenerator/Generator.php @@ -453,7 +453,7 @@ class Piwik_VisitorGenerator_Generator $this->setCurrentRequest( 'url' ,$url); // setup the title of the page - $this->setCurrentRequest( 'action_name',$this->getRandomString(15,5)); + $this->setCurrentRequest( 'action_name',$this->getRandomString(100,5)); } /** diff --git a/plugins/VisitsSummary/templates/index.tpl b/plugins/VisitsSummary/templates/index.tpl index 38ab07d212..f2f9f8ce58 100644 --- a/plugins/VisitsSummary/templates/index.tpl +++ b/plugins/VisitsSummary/templates/index.tpl @@ -5,9 +5,10 @@ <h2>{'General_Report'|translate}</h2> {include file=VisitsSummary/templates/sparklines.tpl} - -<br /><br /><br /> -<p style='color:lightgrey; size:0.8em;'> -{'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries} -{if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if} -</p> +{* +Time page generation + <p style='color:lightgrey; size:0.8em;'> + {'VisitsSummary_GenerateTime'|translate:$totalTimeGeneration:$totalNumberOfQueries} + {if $totalNumberOfQueries != 0}, {'VisitsSummary_GenerateQueries'|translate:$totalNumberOfQueries}{/if} + </p> +*}
\ No newline at end of file diff --git a/themes/default/common.css b/themes/default/common.css index e14d79a79d..147d64c9a8 100644 --- a/themes/default/common.css +++ b/themes/default/common.css @@ -61,12 +61,12 @@ a { } -#loadingPiwik { +.loadingPiwik { font-size: 1.1em; color: #29251C; padding: 0.5em; } -#loadingPiwik img { +.loadingPiwik img { margin-right:5px; } #loadingError { |