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

// Fix some bootstrap design

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-13 15:36:27 +02:00
parent b58dddf521
commit 7b532d77fd
2 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/associations.tpl
+17 -25
View File
@@ -29,7 +29,7 @@
<div id="no_default_category" class="alert alert-info">
{l s='Please select a default category.'}
</div>
<div class="row">
<div class="form-group">
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
<div class="col-lg-9">
@@ -41,7 +41,7 @@
</a>
</div>
</div>
<div class="row">
<div class="form-group">
{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
<label class="control-label col-lg-3" for="id_category_default">
<span class="label-tooltip" data-toggle="tooltip"
@@ -57,7 +57,7 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="product_autocomplete_input">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
@@ -67,12 +67,8 @@
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<input type="text" value="" id="product_autocomplete_input" />
<div class="help-block">
</div>
</div>
<div id="divAccessories">
{* @todo : donot use 3 foreach, but assign var *}
@@ -85,25 +81,21 @@
</div>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
<div class="col-lg-9">
<div class="row">
<div class="col-lg-7">
<select name="id_manufacturer" id="id_manufacturer">
<option value="0">-- {l s='Choose (optional)'} --</option>
{if $product->id_manufacturer}
<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
{/if}
<option disabled="disabled">----------</option>
</select>
</div>
<div class="col-lg-5">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
</a>
</div>
</div>
<div class="col-lg-5">
<select name="id_manufacturer" id="id_manufacturer">
<option value="0">-- {l s='Choose (optional)'} --</option>
{if $product->id_manufacturer}
<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
{/if}
<option disabled="disabled">----------</option>
</select>
</div>
<div class="col-lg-4">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
</a>
</div>
</div>
</fieldset>
admin-dev/themes/default/template/controllers/products/images.tpl
+7 -6
View File
@@ -61,14 +61,14 @@
<thead>
<tr class="nodrag nodrop">
<th>{l s='Image'}</th>
<th>{l s='Position'}</th>
<th class="center">{l s='Position'}</th>
{if $shops}
{foreach from=$shops item=shop}
<th>{$shop.name}</th>
{/foreach}
{/if}
<th>{l s='Cover'}</th>
<th>{l s='Action'}</th>
<th class="center">{l s='Cover'}</th>
<th></th>
</tr>
</thead>
<tbody id="imageList">
@@ -96,7 +96,7 @@
<i class="covered icon-check-empty"></i>
</td>
<td class="center">
<a href="#" class="btn btn-default delete_product_image" >
<a href="#" class="btn btn-default delete_product_image pull-right" >
<i class="icon-trash"></i> {l s='Delete this image'}
</a>
</td>
@@ -309,8 +309,9 @@
function imageLine(id, path, position, cover, shops)
{
line = $("#lineType").html();
line = line.replace(/image_id/g, id);
line = line.replace(/[a-z]{2}-default/g, path);
line = line.replace(/image_id/g, id);
line = line.replace(/[a-z]{2}-default-small_default/g, path+'-small_default');
console.log(line);
line = line.replace(/image_path/g, path);
line = line.replace(/image_position/g, position);
line = line.replace(/icon-check-empty/g, cover);