Merge pull request #848 from djfm/bootstrap

// correct use of translation functions
This commit is contained in:
Gregory Roussac
2013-10-17 06:36:20 -07:00
@@ -24,7 +24,7 @@
*} *}
<section id="dashactivity" class="panel widget{if $allow_push} allow_push{/if}"> <section id="dashactivity" class="panel widget{if $allow_push} allow_push{/if}">
<div class="panel-heading"> <div class="panel-heading">
<i class="icon-time"></i> {l s="Activity overview" mod="dashactivity"} <i class="icon-time"></i> {l s='Activity overview' mod='dashactivity'}
<span class="panel-heading-action"> <span class="panel-heading-action">
<a class="list-toolbar-btn" href="#" onclick="toggleDashConfig('dashactivity'); return false;" title="configure"> <a class="list-toolbar-btn" href="#" onclick="toggleDashConfig('dashactivity'); return false;" title="configure">
<i class="process-icon-configure"></i> <i class="process-icon-configure"></i>
@@ -35,16 +35,16 @@
</span> </span>
</div> </div>
<section id="dashactivity_config" class="dash_config hide"> <section id="dashactivity_config" class="dash_config hide">
<header><i class="icon-wrench"></i> {l s='Configuration'}</header> <header><i class="icon-wrench"></i> {l s='Configuration' mod='dashactivity'}</header>
{$dashactivity_config_form} {$dashactivity_config_form}
</section> </section>
<section id="dash_live" class="loading"> <section id="dash_live" class="loading">
<ul class="data_list_large"> <ul class="data_list_large">
<li> <li>
<span class="data_label size_l"> <span class="data_label size_l">
{l s='Online Visitor'} {l s='Online Visitor' mod='dashactivity'}
<small class="text-muted"><br/> <small class="text-muted"><br/>
{l s='In the last 30 minutes'} {l s='In the last 30 minutes' mod='dashactivity'}
</small> </small>
</span> </span>
<span class="data_value size_xxl"> <span class="data_value size_xxl">
@@ -53,9 +53,9 @@
</li> </li>
<li> <li>
<span class="data_label size_l"> <span class="data_label size_l">
{l s='Active Shopping Carts'} {l s='Active Shopping Carts' mod='dashactivity'}
<small class="text-muted"><br/> <small class="text-muted"><br/>
{l s='In the last 30 minutes'} {l s='In the last 30 minutes' mod='dashactivity'}
</small> </small>
</span> </span>
<span class="data_value size_xxl"> <span class="data_value size_xxl">
@@ -66,31 +66,31 @@
</section> </section>
{if $DASHACTIVITY_SHOW_PENDING} {if $DASHACTIVITY_SHOW_PENDING}
<section id="dash_pending" class="loading"> <section id="dash_pending" class="loading">
<header><i class="icon-time"></i> {l s='Currently Pending'}</header> <header><i class="icon-time"></i> {l s='Currently Pending' mod='dashactivity'}</header>
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='Orders'}</span> <span class="data_label">{l s='Orders' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="pending_orders"></span> <span id="pending_orders"></span>
</span> </span>
</li> </li>
{if $DASHACTIVITY_SHOW_RETURNS} {if $DASHACTIVITY_SHOW_RETURNS}
<li> <li>
<span class="data_label">{l s='Return/Exchanges'}</span> <span class="data_label">{l s='Return/Exchanges' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="return_exchanges"></span> <span id="return_exchanges"></span>
</span> </span>
</li> </li>
{/if} {/if}
<li> <li>
<span class="data_label">{l s='Abandoned Carts'}</span> <span class="data_label">{l s='Abandoned Carts' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="abandoned_cart"></span> <span id="abandoned_cart"></span>
</span> </span>
</li> </li>
{if $DASHACTIVITY_SHOW_STOCK} {if $DASHACTIVITY_SHOW_STOCK}
<li> <li>
<span class="data_label">{l s='Products Out of Stock'}</span> <span class="data_label">{l s='Products Out of Stock' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="products_out_of_stock"></span> <span id="products_out_of_stock"></span>
</span> </span>
@@ -101,22 +101,22 @@
{/if} {/if}
{if $DASHACTIVITY_SHOW_NOTIFICATION} {if $DASHACTIVITY_SHOW_NOTIFICATION}
<section id="dash_notifications" class="loading"> <section id="dash_notifications" class="loading">
<header><i class="icon-exclamation-sign"></i> {l s='Notifications'}</header> <header><i class="icon-exclamation-sign"></i> {l s='Notifications' mod='dashactivity'}</header>
<ul class="data_list_vertical"> <ul class="data_list_vertical">
<li> <li>
<span class="data_label">{l s='New Messages'}</span> <span class="data_label">{l s='New Messages' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="new_messages"></span> <span id="new_messages"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='Order Inquiries'}</span> <span class="data_label">{l s='Order Inquiries' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="order_inquires"></span> <span id="order_inquires"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='Product Reviews'}</span> <span class="data_label">{l s='Product Reviews' mod='dashactivity'}</span>
<span class="data_value size_l"> <span class="data_value size_l">
<span id="product_reviews"></span> <span id="product_reviews"></span>
</span> </span>
@@ -126,22 +126,22 @@
{/if} {/if}
{if $DASHACTIVITY_SHOW_CUSTOMERS} {if $DASHACTIVITY_SHOW_CUSTOMERS}
<section id="dash_customers" class="loading"> <section id="dash_customers" class="loading">
<header><i class="icon-user"></i> {l s='Customers & Newsletters'}</header> <header><i class="icon-user"></i> {l s='Customers & Newsletters' mod='dashactivity'}</header>
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='New Customers'}</span> <span class="data_label">{l s='New Customers' mod='dashactivity'}</span>
<span class="data_value size_md"> <span class="data_value size_md">
<span id="new_customers"></span> <span id="new_customers"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='New Subscriptions'}</span> <span class="data_label">{l s='New Subscriptions' mod='dashactivity'}</span>
<span class="data_value size_md"> <span class="data_value size_md">
<span id="new_registrations"></span> <span id="new_registrations"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='Total Subscribers'}</span> <span class="data_label">{l s='Total Subscribers' mod='dashactivity'}</span>
<span class="data_value size_md"> <span class="data_value size_md">
<span id="total_suscribers"></span> <span id="total_suscribers"></span>
</span> </span>
@@ -151,22 +151,22 @@
{/if} {/if}
{if $DASHACTIVITY_SHOW_TRAFFIC} {if $DASHACTIVITY_SHOW_TRAFFIC}
<section id="dash_traffic" class="loading"> <section id="dash_traffic" class="loading">
<header><i class="icon-globe"></i> {l s='Traffic'}</header> <header><i class="icon-globe"></i> {l s='Traffic' mod='dashactivity'}</header>
<ul class="data_list"> <ul class="data_list">
<li> <li>
<span class="data_label">{l s='Visits'}</span> <span class="data_label">{l s='Visits' mod='dashactivity'}</span>
<span class="data_value size_md"> <span class="data_value size_md">
<span id="visits"></span> <span id="visits"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='Unique Visitors'}</span> <span class="data_label">{l s='Unique Visitors' mod='dashactivity'}</span>
<span class="data_value size_md"> <span class="data_value size_md">
<span id="unique_visitors"></span> <span id="unique_visitors"></span>
</span> </span>
</li> </li>
<li> <li>
<span class="data_label">{l s='Traffic Sources'}</span> <span class="data_label">{l s='Traffic Sources' mod='dashactivity'}</span>
<ul class="data_list_small" id="dash_traffic_source"> <ul class="data_list_small" id="dash_traffic_source">
</ul> </ul>
<div id="dash_traffic_chart2" class='chart with-transitions'> <div id="dash_traffic_chart2" class='chart with-transitions'>