dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//Porting more components to bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-06-21 17:47:05 +02:00
parent 40f03d0ba1
commit aa8d6d5872
21 changed files with 1491 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/backup/helpers/view/view.tpl
+1 -1
View File
@@ -27,7 +27,7 @@
{block name="override_tpl"}
<div class="conf">{l s='Beginning the download ...'}</div>
<div class="alert">{l s='Beginning the download ...'}</div>
<p>{l s='Backup files should automatically download.'}</p>
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+32 -13
View File
@@ -1,14 +1,23 @@
<div class="control-group">
<label class="control-label">{l s='Limit to a single customer'}</label>
<label class="control-label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Optional: The cart rule will be available to everyone if you leave this field blank.'}">
{l s='Limit to a single customer'}
</span>
</label>
<div class="controls">
<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
<input type="text" id="customerFilter" class="input-large" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" />
<span class="help-block">{l s='Optional: The cart rule will be available to everyone if you leave this field blank.'}</span>
<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" />
</div>
</div>
<div class="control-group">
<label class="control-label">{l s='Valid'}</label>
<label class="control-label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='The default period is one month.'}">
{l s='Valid'}
</span>
</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on">{l s='From'}</span>
@@ -20,12 +29,16 @@
<input type="text" class="datepicker input-medium" name="date_to"
value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
</div>
<span class="help-block">{l s='The default period is one month.'}</span>
</div>
</div>
<div class="control-group">
<label class="control-label">{l s='Minimum amount'}</label>
<label class="control-label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='You can choose a minimum amount for the cart either with or without the taxes and shipping.'}">
{l s='Minimum amount'}
</span>
</label>
<div class="controls">
<input type="text" class="input-mini" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
<select name="minimum_amount_currency" class="input-small">
@@ -40,7 +53,7 @@
</option>
{/foreach}
</select>
<select name="minimum_amount_tax" class="input-medium">
<select name="minimum_amount_tax" class="input-small">
<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
</select>
@@ -48,29 +61,35 @@
<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
</select>
<span class="help-block">{l s='You can choose a minimum amount for the cart either with or without the taxes and shipping.'}</span>
</div>
</div>
<div class="control-group">
<label class="control-label">{l s='Total available'}</label>
<label class="control-label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='The cart rule will be applied to the first "X" customers only.'}">
{l s='Total available'}
</span>
</label>
<div class="controls">
<input type="text" class="input-mini" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
<span class="help-inline">{l s='The cart rule will be applied to the first "X" customers only.'}</span>
</div>
</div>
<div class="control-group">
<label class="control-label">{l s='Total available for each user.'}</label>
<label class="control-label">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='A customer will only be able to use the cart rule "X" time(s).'}">
{l s='Total available for each user.'}
</span>
</label>
<div class="controls">
<input type="text" class="input-mini" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
<span class="help-inline">{l s='A customer will only be able to use the cart rule "X" time(s).'}</span>
</div>
</div>
<div class="control-group">
{if $countries.unselected|@count + $countries.selected|@count > 1}
<div class="controls well">
<label class="checkbox">
admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+4 -2
View File
@@ -52,8 +52,10 @@
</span>
</label>
<div class="controls">
<input class="input-medium" type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')|escape}" />
<a href="javascript:gencode(8);" class="btn"><i class="icon-random"></i> {l s='Generate random code'}</a>
<div class="input-append">
<input class="input-medium" type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')|escape}" />
<a href="javascript:gencode(8);" class="btn"><i class="icon-random"></i> {l s='Generate'}</a>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/customer_threads/helpers/options/options.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
<p>{l s='Click to synchronize mail automatically'}</p>
<div id="ajax_loader"></div>
<div class="error" style="display:none" id="ajax_error"></div>
<div class="conf" style="display:none" id="ajax_conf"></div>
<div class="alert" style="display:none" id="ajax_conf"></div>
</div>
</fieldset><br/>
<script type="text/javascript">
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+1 -1
View File
@@ -48,7 +48,7 @@
if (json.missing.length || json.updated.length)
$('#changedFiles').html('<div class="alert alert-block">{l s='Changed/missing files have been detected.'}</div>');
else
$('#changedFiles').html('<div class="conf">{l s='No change has been detected in your files'}</div>');
$('#changedFiles').html('<div class="alert">{l s='No change has been detected in your files'}</div>');
$.each(tab, function(key, lang)
{
admin-dev/themes/default/template/controllers/modules/list.tpl
+1 -1
View File
@@ -77,7 +77,7 @@
</dl>
</div>
<p class="desc">{if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else}&nbsp;{/if}</p>
{if isset($module->message)}<div class="conf">{$module->message}</div>{/if}
{if isset($module->message)}<div class="alert">{$module->message}</div>{/if}
<div class="row-actions-module">
{if !isset($module->not_on_disk)}
{$module->optionsHtml}
admin-dev/themes/default/template/controllers/products/quantities.tpl
+1 -1
View File
@@ -44,7 +44,7 @@
{if $show_quantities == true}
<div class="alert alert-block" id="available_quantity_ajax_msg" style="display: none;"></div>
<div class="error" id="available_quantity_ajax_error_msg" style="display: none;"></div>
<div class="conf" id="available_quantity_ajax_success_msg" style="display: none;"></div>
<div class="alert" id="available_quantity_ajax_success_msg" style="display: none;"></div>
<table cellpadding="5" style="width:100%">
<tbody>
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+1 -1
View File
@@ -158,7 +158,7 @@
{if $up_filename}
<input type="hidden" id="virtual_product_filename" name="virtual_product_filename" value="{$up_filename}" />
{/if}
<div class="conf">
<div class="alert">
<script>
delete_this_file = '{l s='Delete this file'}';
</script>
admin-dev/themes/default/template/header.tpl
+6 -2
View File
@@ -101,14 +101,18 @@
<body class="fixed-top">
{if $display_header}
<div id="ajax_running"><img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}</div>
{* begin HEADER *}
<div id="header" class="navbar navbar-fixed-top" >
<div id="header" class="navbar navbar-fixed-top navbar-inverse" >
<div class="navbar-inner">
<div class="container-fluid">
<div id="header_infos">
<a id="header_shopname" class="brand" href="{$link->getAdminLink('AdminHome')|escape:'htmlall':'UTF-8'}">{$shop_name}</a>
<span id="ajax_running">
<img src="../img/admin/ajax-loader-yellow.gif" alt="" /> {l s='Loading...'}
</span>
<ul id="notifs_icon_wrapper" class="nav nav-pills">
{if {$show_new_orders} == 1}
<li id="orders_notif" class="notifs dropdown" >
admin-dev/themes/default/template/layout-ajax.tpl
+6 -8
View File
@@ -34,14 +34,14 @@
{else}
{if isset($conf)}
<div class="conf">
<div class="alert">
{$conf}
</div>
{/if}
{if count($errors)} {* @todo what is ??? AND $this->_includeContainer *}
<div class="error">
<span style="float:right"><a id="hideError" href=""><img alt="X" src="../img/admin/close.png" /></a></span>
<div class="alert alert-error">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($errors) == 1}
{$errors[0]}
{else}
@@ -65,7 +65,7 @@
{/if}
{if isset($confirmations) && count($confirmations) && $confirmations}
<div class="conf" style="display:block;">
<div class="alert" style="display:block;">
{foreach $confirmations as $confirm}
{$confirm}<br />
{/foreach}
@@ -73,10 +73,8 @@
{/if}
{if count($warnings)}
<div class="warning">
<span style="float:right">
<a id="hideWarn" href=""><img alt="X" src="../img/admin/close.png" /></a>
</span>
<div class="alert alert-block">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($warnings) > 1}
{l s='There are %d warnings.' sprintf=count($warnings)}
<span style="margin-left:20px;" id="labelSeeMore">
admin-dev/themes/default/template/layout.tpl
+7 -9
View File
@@ -24,15 +24,13 @@
*}
{include file='header.tpl'}
{if isset($conf)}
<div class="conf">
<div class="alert">
{$conf}
</div>
{/if}
{if count($errors) && (!isset($disableDefaultErrorOutPut) || $disableDefaultErrorOutPut == false)}
<div class="error">
<span style="float:right">
<a id="hideError" href="#"><img alt="X" src="../img/admin/close.png" /></a>
</span>
<div class="alert alert-error">
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($errors) == 1}
{$errors[0]}
@@ -48,7 +46,7 @@
</div>
{/if}
{if isset($informations) && count($informations) && $informations}
<div class="alert alert-info" style="display:block;">
<div class="alert alert-info">
<span id="see_more_infos">
<b><a href="#" style="color:#00529B;" onclick="$('#see_more_infos').hide(); $('#infos_block').show();return false;">{l s='Click here to see more informations'}</a></b>
</span>
@@ -60,7 +58,7 @@
</div><br />
{/if}
{if isset($confirmations) && count($confirmations) && $confirmations}
<div class="conf" style="display:block;">
<div class="alert" style="display:block;">
{foreach $confirmations as $conf}
{$conf}<br />
{/foreach}
@@ -71,7 +69,7 @@
<button type="button" class="close" data-dismiss="alert">&times;</button>
{if count($warnings) > 1}
{l s='There are %d warnings.' sprintf=count($warnings)}
<span style="margin-left:20px;" id="labelSeeMore">
<span id="labelSeeMore">
<a id="linkSeeMore" href="#" style="text-decoration:underline">{l s='Click here to see more'}</a>
<a id="linkHide" href="#" style="text-decoration:underline;display:none">{l s='Hide warning'}</a>
</span>
@@ -81,7 +79,7 @@
{/foreach}
</ul>
{else}
<ul style="margin-top: 3px">
<ul >
{foreach $warnings as $warning}
<li>{$warning}</li>
{/foreach}
admin-dev/themes/default/template/toolbar.tpl
+36 -34
View File
@@ -24,53 +24,35 @@
*}
<div class="toolbarBox {if $toolbar_scroll}toolbarHead{/if} ">
<div class="row-fluid page-head">
{block name=pageTitle}
<ul class="breadcrumb">
<li>
{if $title}
{foreach $title as $key => $item name=title}
{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
<span class="item-{$key} ">{$item|strip_tags}
{if !$smarty.foreach.title.last}
<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
{/if}
</span>
{/foreach}
{else}
&nbsp;
{/if}
</li>
</ul>
<div class="page-header">
<h1>{if is_array($title)}{$title|end}{else}{$title}{/if}</h1>
</div>
<h2 class="page-title">
{if is_array($title)}{$title|end}{else}{$title}{/if}
</h2>
{/block}
{block name=toolbarBox}
<div class="well">
<ul class="cc_button nav nav-pills">
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
{block name=toolbarBox}
<ul class="cc_button nav nav-pills pull-right">
{foreach from=$toolbar_btn item=btn key=k}
<li>
<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
<span class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></span>
<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="toolbar_btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
<i class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></i>
<div {if isset($btn.force_desc) && $btn.force_desc == true } class="locked" {/if}>{$btn.desc}</div>
</a>
{if $k == 'modules-list'}
<div id="modules_list_container" style="display:none">
<div style="float:right;margin:5px">
<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
</div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
<div id="modules_list_container_tab" style="display:none;"></div>
<div style="float:right;margin:5px">
<a href="#" onclick="$('#modules_list_container').slideUp();return false;"><img alt="X" src="../img/admin/close.png"></a>
</div>
<div id="modules_list_loader"><img src="../img/loader.gif" alt="" border="0"></div>
<div id="modules_list_container_tab" style="display:none;"></div>
</div>
{/if}
</li>
{/foreach}
</ul>
</div>
<script language="javascript" type="text/javascript">
//<![CDATA[
@@ -188,6 +170,26 @@
//]]>
</script>
{/block}
</div>
</div>
</div>
</div>
{block name=pageBreadcrumb}
<ul class="breadcrumb hide">
<li>
{if $title}
{foreach $title as $key => $item name=title}
{* Use strip_tags because if the string already has been through htmlentities using escape will break it *}
<span class="item-{$key} ">{$item|strip_tags}
{if !$smarty.foreach.title.last}
<img alt="&gt;" style="margin-right:5px" src="../img/admin/separator_breadcrumb.png" />
{/if}
</span>
{/foreach}
{else}
&nbsp;
{/if}
</li>
</ul>
{/block}