'; print_r($activity_last_weeks); echo ''; + +foreach($activity_last_weeks as $week => $i) +{ + foreach($i as $day => $j) + { + if ($j['number'] > 0) + { + $temp_data[] = array('x' => $j['number'], 'd'=>$day, 'w'=>$week); + } + } } // Algorithm to sort days in circle size : @@ -249,7 +265,8 @@ SELECT * //Function to sort days by number of activity function cmp_day($a, $b) { - if ($a['x'] == $b['x']) { + if ($a['x'] == $b['x']) + { return 0; } return ($a['x'] < $b['x']) ? -1 : 1; @@ -267,15 +284,18 @@ for ($i=1; $i < count($temp_data); $i++) $split = 0; //Split (split represented by -1) -while (max($diff_x) > 120) { +while (max($diff_x) > 120) +{ $diff_x[array_search(max($diff_x), $diff_x)] = -1; $split++; } //Fill empty chart data for the template $chart_data = array(); -for ($i=0; $i < $number_week; $i++) { - for ($j=1; $j <= 7; $j++) { +for ($i=0; $i < $nb_weeks; $i++) +{ + for ($j=1; $j <= 7; $j++) + { $chart_data[$i][$j] = 0; } } @@ -283,18 +303,21 @@ for ($i=0; $i < $number_week; $i++) { $size = 1; $chart_data[$temp_data[0]['w']][$temp_data[0]['d']] = $size; //Set sizes in chart data -for ($i=1; $i < count($temp_data); $i++) { - if ($diff_x[$i-1] == -1) {$size++;} +for ($i=1; $i < count($temp_data); $i++) +{ + if ($diff_x[$i-1] == -1) + { + $size++; + } $chart_data[$temp_data[$i]['w']][$temp_data[$i]['d']] = $size; } //Assign data for the template -$template->assign('ACTIVITY_MONDAYS_DATE',array_reverse($mondays_date)); -$template->assign('ACTIVITY_LAST_WEEKS', array_reverse($activity_last_weeks)); -$template->assign('ACTIVITY_CHART_DATA',array_reverse($chart_data)); +$template->assign('ACTIVITY_WEEK_NUMBER',$week_number); +$template->assign('ACTIVITY_LAST_WEEKS', $activity_last_weeks); +$template->assign('ACTIVITY_CHART_DATA',$chart_data); $template->assign('ACTIVITY_CHART_NUMBER_SIZES',$size); - // +-----------------------------------------------------------------------+ // | get storage data | // +-----------------------------------------------------------------------+ @@ -350,7 +373,7 @@ $result = query2array($query); if (isset($result[0]['SUM(filesize)'])) { - $data_storage['Format'] = $result[0]['SUM(filesize)']; + $data_storage['Formats'] = $result[0]['SUM(filesize)']; } //If the host is not windows, get the cache size @@ -371,14 +394,8 @@ foreach ($data_storage as $value) $total_storage += $value; } -//Get percentage of the total storage -foreach ($data_storage as $key=>$value) -{ - $data_storage[$key] = $value/$total_storage*100; -} - //Pass data to HTML -$template->assign('STORAGE_TOTAL',$total_storage/1000); +$template->assign('STORAGE_TOTAL',$total_storage); $template->assign('STORAGE_CHART_DATA',$data_storage); // +-----------------------------------------------------------------------+ // | sending html code | diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl index 10602ff0a..2c53a6b5b 100644 --- a/admin/themes/default/template/intro.tpl +++ b/admin/themes/default/template/intro.tpl @@ -46,6 +46,25 @@ var ext_need_update_msg = '{'Some u } }); }); + +//Tooltip for the storage chart +$('.storage-chart span').each(function () { + let tooltip = $('.storage-tooltips #'+$(this).data('type')); + let left = $(this).position().left + $(this).width()/2 - tooltip.innerWidth()/2; + tooltip.css('left', left+"px") + $(this).hover(function() { + tooltip.toggle(); + }); +}); + +$(window).on('resize', function(){ + $('.storage-chart span').each(function () { + let tooltip = $('.storage-tooltips #'+$(this).data('type')); + let left = $(this).position().left + $(this).width()/2 - tooltip.innerWidth()/2; + tooltip.css('left', left+"px") + }); +}); + {/literal} {/footer_script} @@ -144,18 +163,41 @@ var ext_need_update_msg = '{'Some u
- {"%s Activities"|@translate:$ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["number"]} + {assign var='SIZE_IN_UNIT' value=$SIZE/$ACTIVITY_CHART_NUMBER_SIZES * 5 + 1} + {assign var='OPACITY_IN_UNIT' value=$SIZE/$ACTIVITY_CHART_NUMBER_SIZES * 0.6 + 0.2} +
+ {if $ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["number"] != 0} +
+
+ {if $ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["number"] > 1}{"%s Activities"|@translate:$ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["number"]}{else}{"%s Activity"|@translate:$ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["number"]}{/if}
+ {$ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["date"]}
+
+
{foreach from=$ACTIVITY_LAST_WEEKS[$WEEK_NUMBER][$DAY_NUMBER]["details"] item=actions key=cat}
-
{$cat} : {foreach from=$actions item=number key=action} ({$action}) {$number} {/foreach}
+
+ {if $cat == "Group"} {$cat|@translate}
+ {elseif $cat == "User"} {$cat|@translate}
+ {elseif $cat == "Album"} {$cat|@translate}
+ {elseif $cat == "Photo"} {$cat|@translate}
+ {elseif $cat == "Tag"}
+ {else} {$cat|@translate} {/if}
+
+ {foreach from=$actions item=number key=action}
+ {if $action == "Edit"} {$number}
+ {elseif $action == "Add"} {$number}
+ {elseif $action == "Delete"} {$number}
+ {elseif $action == "Login"} {$number}
+ {elseif $action == "Logout"} {$number}
+ {else} ({$action|@translate}) {$number}
+ {/if}
+ {/foreach}
+
{/foreach}
{round($value)}%
+ {foreach from=$STORAGE_CHART_DATA key=type item=value} + +{round($value/$STORAGE_TOTAL*100)}%
+ + {/foreach} +{$type} : {$value/1000} MB
{/foreach}