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

// breaking things

Browse Source
This commit is contained in:
Kevin Granger
2013-08-20 16:38:31 +02:00
parent f73f84dbf2
commit 44655ecdef
18 changed files with 3561 additions and 2936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/modules/favorites.tpl
+2 -2
View File
@@ -2,11 +2,11 @@
<div class="row">
<div class="col-lg-12">
<div class="btn-group pull-right">
<a class="btn btn-default btn-small{if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default btn-small{if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<a class="btn btn-default {if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
admin-dev/themes/default/template/controllers/modules/list.tpl
+2 -2
View File
@@ -32,11 +32,11 @@
</th>
<th colspan="3">
<div class="btn-group pull-right">
<a class="btn btn-default btn-small{if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<a class="btn btn-default {if !isset($smarty.get.select)} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}">
<i class="icon-list"></i>
{l s='Normal view'}
</a>
<a class="btn btn-default btn-small{if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<a class="btn btn-default {if $smarty.get.select == 'favorites'} active{/if}" href="index.php?controller={$smarty.get.controller|htmlentities}&token={$smarty.get.token|htmlentities}&select=favorites">
<i class="icon-star"></i>
{l s='Favorites view'}
</a>
admin-dev/themes/default/template/controllers/modules/login_addons.tpl
+3 -3
View File
@@ -24,7 +24,7 @@
*}
{if $add_permission eq '1'}
<div class="panel">
<div class="panel">
{if isset($logged_on_addons)}
<!--start addons login-->
<div class="panel-heading">
@@ -57,14 +57,14 @@
<label class="control-label col-lg-3">{l s='Addons Login'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-user"></i></span>
<input type="text" value="" id="username_addons" autocomplete="off" class="ac_input">
<input type="text" value="" id="username_addons" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
<label class="control-label col-lg-3">{l s= 'Password Addons'} :</label>
<div class="input-group col-lg-4">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input type="password" value="" id="password_addons" autocomplete="off" class="ac_input">
<input type="password" value="" id="password_addons" autocomplete="off" class="form-control ac_input">
</div>
</div>
<div class="row">
admin-dev/themes/default/template/controllers/modules/page.tpl
-3
View File
@@ -39,8 +39,6 @@
</ul>
</div>
{/if}
<div class="panel">
<div class="panel-heading">
<i class="icon-list-ul"></i>
@@ -49,7 +47,6 @@
{include file='controllers/modules/filters.tpl'}
<!--start sidebar module-->
<div class="row">
<div class="categorieTitle col col-lg-3">
<div class="list-group">
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+3 -3
View File
@@ -149,8 +149,8 @@
</td>
<td>
<div class="btn-group btn-group-action">
<span class="btn btn-default btn-small">{l s='Choose an action'}</span>
<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
<span class="btn btn-default">{l s='Choose an action'}</span>
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>&nbsp;
</button>
<ul class="dropdown-menu">
@@ -199,7 +199,7 @@
<p>{l s='You have to select a shop to use LiveEdit'}</p>
{else}
<p>{l s='Click here to be redirected to the Front Office of your shop where you can move and delete modules directly.'}</p>
<a class="btn btn-default btn-small pull-right" href="{$url_live_edit}" target="_blank">
<a class="btn btn-default pull-right" href="{$url_live_edit}" target="_blank">
<i class="icon-edit"></i>
{l s='Run LiveEdit'}
</a>
admin-dev/themes/default/template/controllers/orders/form.tpl
+13 -13
View File
@@ -569,7 +569,7 @@
stock[id_product] = new Array();
if (this.customizable == '1')
{
customization_html += '<fieldset class="width3"><legend>{l s='Customization'}</legend><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
customization_html += '<fieldset class="width3"><h3>{l s='Customization'}</h3><form id="customization_'+id_product+'" class="id_customization" method="post" enctype="multipart/form-data" action="'+admin_cart_link+'" style="display:none;">';
customization_html += '<input type="hidden" name="id_product" value="'+id_product+'" />';
customization_html += '<input type="hidden" name="id_cart" value="'+id_cart+'" />';
customization_html += '<input type="hidden" name="action" value="updateCustomizationFields" />';
@@ -983,10 +983,10 @@
<form action="" method="" class="form-horizontal">
<fieldset id="customer_part">
<legend>
<h3>
<i class="icon-user"></i>
{l s='Customer'}
</legend>
</h3>
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
@@ -1010,10 +1010,10 @@
</form>
<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<fieldset id="products_part" style="display:none;">
<legend>
<h3>
<i class="icon-folder-close"></i>
{l s='Cart'}
</legend>
</h3>
<div class="row">
<label class="control-label col-lg-3">
<span title="" data-toggle="tooltip" class="label-tooltip" data-original-title="{l s='Search a product by tapping the first letters of his/her name.'}">
@@ -1189,10 +1189,10 @@
</div>
</fieldset>
<fieldset id="vouchers_part" style="display:none;">
<legend>
<h3>
<i class="icon-table"></i>
{l s='Vouchers'}
</legend>
</h3>
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
@@ -1225,10 +1225,10 @@
<div id="vouchers_err" class="alert alert-block" style="display:none;"></div>
</fieldset>
<fieldset id="address_part" style="display:none;">
<legend>
<h3>
<i class="icon-envelope"></i>
{l s='Addresses'}
</legend>
</h3>
<div id="addresses_err" class="alert alert-block" style="display:none;"></div>
<div class="row">
@@ -1261,10 +1261,10 @@
</div>
</fieldset>
<fieldset id="carriers_part" style="display:none;">
<legend>
<h3>
<i class="icon-truck"></i>
{l s='Shipping'}
</legend>
</h3>
<div id="carriers_err" style="display:none;" class="alert alert-block"></div>
<div id="carrier_form">
<div class="row">
@@ -1304,10 +1304,10 @@
</div>
</fieldset>
<fieldset id="summary_part" style="display:none;">
<legend>
<h3>
<i class="icon-align-justify"></i>
{l s='Summary'}
</legend>
</h3>
<div class="row">
<div id="send_email_feedback" class="col-lg-12"></div>
</div>