From ffda9dbae1c0a47d611d011bce4867ee0f5a6275 Mon Sep 17 00:00:00 2001 From: xisi Date: Mon, 20 Jan 2014 04:53:00 -0500 Subject: [PATCH] rebase + fix bug in overview tpl that could throw a notice --- public/templates/mpos/dashboard/overview.tpl | 2 +- public/templates/mpos/global/header.tpl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/templates/mpos/dashboard/overview.tpl b/public/templates/mpos/dashboard/overview.tpl index 0aae5c56..6fb42246 100644 --- a/public/templates/mpos/dashboard/overview.tpl +++ b/public/templates/mpos/dashboard/overview.tpl @@ -1,5 +1,5 @@
-

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"}{/if} / Pool Workers: {$GLOBAL.workers}

+

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if} / Pool Workers: {$GLOBAL.workers}

diff --git a/public/templates/mpos/global/header.tpl b/public/templates/mpos/global/header.tpl index 4d5d7345..135b7ec5 100644 --- a/public/templates/mpos/global/header.tpl +++ b/public/templates/mpos/global/header.tpl @@ -1,5 +1,4 @@

{$GLOBAL.website.name|default:"Unknown Pool"}

{if $smarty.request.action|escape|default:""}{$smarty.request.action|escape|capitalize}{else}{$smarty.request.page|escape|default:"home"|capitalize}{/if}

-
- {if $GLOBAL.config.recaptcha_enabled|default:"0" != 1 || $GLOBAL.config.recaptcha_enabled_logins|default:"0" != 1}{nocache}{include file="login/small.tpl"}{/nocache}{/if} + \ No newline at end of file