diff --git a/system/lan/english.json b/system/lan/english.json index a545f759..bfad1304 100644 --- a/system/lan/english.json +++ b/system/lan/english.json @@ -577,5 +577,7 @@ "Extend_Days": "Extend Days", "Confirmation_Message": "Confirmation Message", "You_are_already_logged_in": "You are already logged in", - "Extend": "Extend" + "Extend": "Extend", + "Created___Expires": "Created \/ Expires", + "Created___Expired": "Created \/ Expired" } \ No newline at end of file diff --git a/ui/ui/dashboard.tpl b/ui/ui/dashboard.tpl index e46ba209..69550bb2 100644 --- a/ui/ui/dashboard.tpl +++ b/ui/ui/dashboard.tpl @@ -74,8 +74,7 @@
- +
@@ -96,8 +95,7 @@
- +
@@ -146,18 +144,24 @@ {Lang::T('Username')} - {Lang::T('Created On')} - {Lang::T('Expires On')} + {Lang::T('Created / Expired')} + {Lang::T('Internet Plan')} + {Lang::T('Location')} {foreach $expire as $expired} + {assign var="rem_exp" value="{$expired['expiration']} {$expired['time']}"} + {assign var="rem_started" value="{$expired['recharged_on']} {$expired['recharged_time']}"} {$expired['username']} - {Lang::dateAndTimeFormat($expired['recharged_on'],$expired['recharged_time'])} - - {Lang::dateAndTimeFormat($expired['expiration'],$expired['time'])} + {Lang::timeElapsed($rem_started)} / + {Lang::timeElapsed($rem_exp)} + {$expired['namebp']} + {$expired['routers']} {/foreach} diff --git a/ui/ui/sections/footer.tpl b/ui/ui/sections/footer.tpl index 9805486e..88f63118 100644 --- a/ui/ui/sections/footer.tpl +++ b/ui/ui/sections/footer.tpl @@ -86,6 +86,10 @@ } return null; } + + $(function() { + $('[data-toggle="tooltip"]').tooltip() + }) {/literal}