cleanup referrer stats

4 files changed, 17 insertions, 17 deletions

diff --git a/templates/menu_stats.tpl b/templates/menu_stats.tpl
index 976f6c4..cf7d6d3 100644
--- a/templates/menu_stats.tpl
+++ b/templates/menu_stats.tpl
@@ -8,7 +8,7 @@
 		{/if}
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'stats_referers' ) and $gBitUser->hasPermission( 'p_stats_view_referer' )}
-		<li><a class="item" href="{$smarty.const.STATS_PKG_URL}referer.php">{booticon iname="icon-bullhorn" iexplain="Referer Stats" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.STATS_PKG_URL}referrers.php">{booticon iname="icon-bullhorn" iexplain="Referer Stats" ilocation=menu}</a></li>
 	{/if}
 </ul>
 {/strip}
diff --git a/templates/menu_stats_admin.tpl b/templates/menu_stats_admin.tpl
index 6db21d0..375df13 100644
--- a/templates/menu_stats_admin.tpl
+++ b/templates/menu_stats_admin.tpl
@@ -7,7 +7,7 @@
 		<li><a class="item" href="{$smarty.const.STATS_PKG_URL}users.php">{tr}User Stats{/tr}</a></li>
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'stats_referers' ) and $gBitUser->hasPermission( 'p_stats_view_referer' )}
-		<li><a class="item" href="{$smarty.const.STATS_PKG_URL}referer.php">{tr}Referer Stats{/tr}</a></li>
+		<li><a class="item" href="{$smarty.const.STATS_PKG_URL}referrers.php">{tr}Referer Stats{/tr}</a></li>
 	{/if}
 </ul>
 {/strip}
diff --git a/templates/referer_stats.tpl b/templates/referrer_stats.tpl
index d33831f..1ce7ca0 100644
--- a/templates/referer_stats.tpl
+++ b/templates/referrer_stats.tpl
@@ -53,6 +53,7 @@
 										<a class="collapsed" data-toggle="collapse" data-parent="#accordion-{$hostHash}" href="#collapse-{$hostHash}-{$paramKey}" aria-expanded="false" aria-controls="collapse-{$hostHash}-{$paramKey}">{$paramKey}</a>
 									</h4>
 								</div>
+{if $paramValues.values}
 								<div id="collapse-{$hostHash}-{$paramKey}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{$smarty.foreach.agstat.iter}">
 									<div class="panel-body">
 										<div class="panel-group" id="accordion-{$hostHash}-{$paramKey}" role="tablist" aria-multiselectable="true">
@@ -90,6 +91,7 @@
 										</div>
 									</div>
 								</div>
+{/if}
 							</div>
 						{/foreach}
 							{assign var=paramKey value="Everything"}
@@ -104,6 +106,7 @@
 										<a class="collapsed" data-toggle="collapse" data-parent="#accordion-{$hostHash}" href="#collapse-{$hostHash}-{$paramKey}" aria-expanded="false" aria-controls="collapse-{$hostHash}-{$paramKey}">{$paramKey}</a>
 									</h4>
 								</div>
+								{if $reg}
 								<div id="collapse-{$hostHash}-{$paramKey}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{$smarty.foreach.agstat.iter}">
 									<div class="panel-body">
 										<div class="panel-group" id="accordion-{$hostHash}-{$paramKey}" role="tablist" aria-multiselectable="true">
@@ -118,20 +121,19 @@
 											</thead>
 											<tbody>
 											{foreach from=$reg key=userId item=user}
-												<tr class="{cycle values='odd,even'}">
-													<td class="date">{$user.registration_date|bit_date_format}</td>
-													<td>
-														<strong style="font-size:larger">{displayname hash=$user}</strong>{if $user.referer_url}<br/><a href="{$user.referer_url|escape}">{$user.referer_url|stats_referer_display_short}</a>{/if}
-													</td>
-	<td class="text-right">{if $user.revenue.total_orders}{$user.revenue.total_orders}{/if}</td>
-	<td class="text-right">{if $user.revenue.total_revenue}{$gCommerceCurrencies->format($user.revenue.total_revenue)}{/if}</td>
-												</tr>
+											<tr class="{cycle values='odd,even'}">
+												<td class="date">{$user.registration_date|bit_date_format}</td>
+												<td><strong style="font-size:larger">{displayname hash=$user}</strong>{if $user.referer_url}<br/><a href="{$user.referer_url|escape}">{$user.referer_url|stats_referer_display_short}</a>{/if}</td>
+												<td class="text-right">{if $user.revenue.total_orders}{$user.revenue.total_orders}{/if}</td>
+												<td class="text-right">{if $user.revenue.total_revenue}{$gCommerceCurrencies->format($user.revenue.total_revenue)}{/if}</td>
+											</tr>
 											{/foreach}
 											</tbody>
 											</table>
 										</div>
 									</div>
 								</div>
+								{/if}
 							</div>
 						</div>
 					</td></tr>
diff --git a/templates/user_stats.tpl b/templates/user_stats.tpl
index ef88bcf..f5abda1 100644
--- a/templates/user_stats.tpl
+++ b/templates/user_stats.tpl
@@ -5,12 +5,10 @@
 	</div>
 
 	<div class="body">
-		<ul class="list-inline navbar inline">
-			<li><a href="{$smarty.const.STATS_PKG_URL}users.php?period=day">{tr}Daily{/tr}</a></li>
-			<li><a href="{$smarty.const.STATS_PKG_URL}users.php?period=week">{tr}Weekly{/tr}</a></li>
-			<li><a href="{$smarty.const.STATS_PKG_URL}users.php?period=month">{tr}Monthly{/tr}</a></li>
-			<li><a href="{$smarty.const.STATS_PKG_URL}users.php?period=quarter">{tr}Quarterly{/tr}</a></li>
-			<li><a href="{$smarty.const.STATS_PKG_URL}users.php?period=year">{tr}Yearly{/tr}</a></li>
+		<ul class="nav nav-pills">
+			{foreach from=$periodHash item=periodName key=periodKey}
+			<li role="presentation" class="{if $smarty.request.period==$periodKey} active{/if}"><a href="{$smarty.const.STATS_PKG_URL}users.php?period={$periodKey}">{tr}{$periodName}{/tr}</a></li>
+			{/foreach}
 		</ul>
 
 		<table class="clear data">
@@ -23,7 +21,7 @@
 				<tr class="{cycle values="even,odd"}">
 					<td><a href="{$smarty.const.STATS_PKG_URL}users.php?period={$smarty.request.period}&amp;timeframe={$timeframe|urlencode}">{$timeframe}</td>
 					<td>
-						[<a href="{$smarty.const.STATS_PKG_URL}referers.php?period={$smarty.request.period}&amp;timeframe={$timeframe|urlencode}">Referrers</a>]
+						[<a href="{$smarty.const.STATS_PKG_URL}referrers.php?period={$smarty.request.period}&amp;timeframe={$timeframe|urlencode}">Referrers</a>]
 					</td>
 					<td><div style="width:{math equation="round( ( r / m ) * 100 )" r=$reg m=$userStats.max}%; background:#ff9;padding:0 0 0 5px;"><a href="{$smarty.const.USERS_PKG_URL}admin/index.php?period={$smarty.request.period}&amp;timeframe={$timeframe|urlencode}">{$reg}</a></div></td>
 				</tr>