diff options
Diffstat (limited to 'site/app/views/statistics/addon.thtml')
-rw-r--r-- | site/app/views/statistics/addon.thtml | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/site/app/views/statistics/addon.thtml b/site/app/views/statistics/addon.thtml index f05abad..b22702d 100644 --- a/site/app/views/statistics/addon.thtml +++ b/site/app/views/statistics/addon.thtml @@ -44,25 +44,25 @@ echo '<div id="content">'; echo '<div class="notice-updated">'._('statistics_notice_settings_updated').'</div>'; } ?> - <div class="article"> + <div class="bluebox-tr"><div class="bluebox-tl"> - <div id="statistics-header"> - <div id="statistics-controls"> + <div style="min-height: 32px; padding: 10px;"> + <div style="text-align: right; float: right;"> <?php if (!empty($all_addons)) { echo _('statistics_addon_switch').':'; echo $html->selectTag('Addon/id', $all_addons, $addon_id, array('onChange' => 'changeAddon(this);'), null, false).'<br>'; } ?> - <span id="statistics-links"> + <span style="font-size: 10px;"> <?=$html->link(_('statistics_addon_developertools_link'), '/developers')?> | <?=$html->link(_('statistics_addon_dashboard_link'), '/statistics')?> | <a href="#" onclick="$('#helpbox').toggle(); return false;"><?=_('statistics_help_link')?></a> </span> </div> <div> - <img id="addon-icon" src="<?=$addonIcon?>" alt="<?=$addon_name?> Icon"> - <h3 id="addon-title"><?=sprintf(_('statistics_title_addon_stats'), $addon_name)?></h3> + <img id="addon-icon" src="<?=$addonIcon?>" alt="<?=$addon_name?> Icon" style="padding-right: 5px; float: left;"> + <h3 style="line-height: 2;"><?=sprintf(_('statistics_title_addon_stats'), $addon_name)?></h3> </div> </div> @@ -138,9 +138,9 @@ echo '<div id="content">'; <?php endif; ?> <div class="bluebox-br"><div class="bluebox-bl"></div></div> - </div></div></div> + </div></div> -<br /> +<br> <?php if (!$this->controller->Config->getValue('stats_disabled') || $this->controller->SimpleAcl->actionAllowed('*', '*', $this->controller->Session->read('User'))): ?> <div class="greenbox-tr"><div class="greenbox-tl"> @@ -151,7 +151,7 @@ echo '<div id="content">'; <?=_('statistics_summary_downloads_total')?> <div class="date"><?=sprintf(_('statistics_summary_downloads_total_sincedate'), strftime(_('statistics_date_shortmonthwithyear'), strtotime($addon['Addon']['created'])))?></div> </td> - <td class="bigvalue" style="width: 19%;"><?=$statistics->number_format($stats, 'totaldownloads')?></td> + <td class="bigvalue" style="width: 19%;"><?=(!empty($stats['totaldownloads']) ? $html->number_format($stats['totaldownloads'], 0) : 0)?></td> <td class="spacer" style="width: 2%;"></td> <td class="biglabel" valign="middle" style="width: 30%;"> <?=_('statistics_summary_updatepings_total')?> @@ -164,14 +164,14 @@ echo '<div id="content">'; ?> </div> </td> - <td class="bigvalue" style="width: 19%;"><?=$statistics->number_format($stats, 'last_updatepings')?></td> + <td class="bigvalue" style="width: 19%;"><?=(!empty($stats['last_updatepings']) ? $html->number_format($stats['last_updatepings'], 0) : 0)?></td> </tr> <tr> <td class="label"> <?=_('statistics_summary_downloads_lastcount')?> <div class="date"><?=(!empty($stats['last_downloads_date']) ? strftime(_('statistics_date_weekdayshortmonth'), strtotime($stats['last_downloads_date'])) : '')?></div> </td> - <td class="value"><?=$statistics->number_format($stats, 'last_downloads')?></td> + <td class="value"><?=(!empty($stats['last_downloads']) ? $html->number_format($stats['last_downloads'], 0) : 0)?></td> <td class="spacer"></td> <td class="label"> <?=_('statistics_summary_updatepings_changefromprevious')?> @@ -185,31 +185,33 @@ echo '<div id="content">'; </div> </td> <td class="value"> - <?=$statistics->colored_percentage($stats, 'updateping_change')?> + <?php + if (!empty($stats['updateping_change'])) { + if ($stats['updateping_change'] > 0) + echo '<span style="color: green;">+'; + elseif ($stats['updateping_change'] < 0) + echo '<span style="color: red;">'; + else + echo '<span style="color: blue;">'; + echo round($stats['updateping_change'], 2).'%</span>'; + } + else + echo '0'; + ?> </td> </tr> <tr> <td class="label"><?=_('statistics_summary_downloads_average')?></td> - <td class="value"><?=$statistics->number_format($stats, 'avg_downloads')?></td> + <td class="value"><?=(!empty($stats['avg_downloads']) ? $html->number_format($stats['avg_downloads'], 0) : 0)?></td> <td class="spacer"></td> <td class="label"><?=_('statistics_summary_updatepings_average')?></td> - <td class="value"><?=$statistics->number_format($stats, 'avg_updatepings')?></td> + <td class="value"><?=(!empty($stats['avg_updatepings']) ? $html->number_format($stats['avg_updatepings'], 0) : 0)?></td> </tr> <tr> <td class="label"><?=_('statistics_summary_downloads_lastweek')?></td> - <td class="value"><?=$statistics->number_format($stats, 'weeklydownloads')?></td> + <td class="value"><?=(!empty($stats['weeklydownloads']) ? $html->number_format($stats['weeklydownloads'], 0) : 0)?></td> <td class="spacer"></td> - <td class="label"> - <?=___('statistics_summary_updatepings_weekly_average')?> - <div class="date"> - <?=sprintf(___('statistics_summary_updatepings_weekly_change'), - $statistics->colored_percentage($stats, 'weekly_updatepings_change')) - ?> - </div> - </td> - <td class="value"> - <?=$statistics->number_format($stats, 'weekly_updatepings')?> - </td> + <td colspan="2" style="text-align: right; vertical-align: baseline;"><?=$html->link($html->image('stats/rss16x16.png'), "/statistics/addon/{$addon['Addon']['id']}/format:rss{$key}", array('title' => _('statistics_rss_icon_title')))?></td> </tr> </table> </div> |