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

// Slip and Statuses bootstrap design

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-09-26 17:30:34 +02:00
1 parent a1c7dd3ee9
commit 9ea723d07e
3 files changed
+51 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+38 -8
View File
@@ -33,9 +33,12 @@
{block name="input"} {block name="input"}
{if $input.type == "select_template"} {if $input.type == "select_template"}
<div class="translatable"> <div class="col-lg-9">
{foreach $languages as $language} <div class="row">
<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if}; float: left;"> {foreach $languages as $language}
{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
<div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
<div class="col-lg-8">
<select name="{$input.name}_{$language.id_lang}" <select name="{$input.name}_{$language.id_lang}"
id="{$input.name}_select_{$language.id_lang}" id="{$input.name}_select_{$language.id_lang}"
{if isset($input.multiple)}multiple="multiple" {/if} {if isset($input.multiple)}multiple="multiple" {/if}
@@ -52,13 +55,40 @@
{/if} {/if}
>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option> >{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
{/foreach} {/foreach}
</select> </select>
{if isset($input.hint)}<span class="alert alert-info" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
<img onclick="viewTemplates('#template_select_{$language.id_lang}', '../mails/{$language.iso_code}/', '.html');"
src="../img/t/AdminFeatures.gif" class="pointer" alt="{l s='Preview'}" title="{l s='Preview'}" />
</div> </div>
{/foreach} <div class="col-lg-4">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
{$language.iso_code}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$languages item=language_flag}
<li><a href="javascript:hideOtherLanguage({$language_flag.id_lang});" tabindex="-1"><img src="{$base_url}/img/l/{$language_flag.id_lang|intval}.jpg" alt=""> {$language_flag.name}</a></li>
{/foreach}
</ul>
<button type="button" class="btn btn-default" onclick="viewTemplates('#template_select_{$language.id_lang}', '../mails/{$language.iso_code}/', '.html');"><i class="icon-eye-open"></i> {l s='Preview'}</button>
</div>
</div>
{/foreach}
{if isset($input.hint)}
<div class="clearfix">&nbsp;</div>
<div class="col-lg-9">
<div class="alert alert-info">
{if is_array($input.hint)}
{foreach from=$input.hint item=hint}
{$hint}<br/>
{/foreach}
{else}
{$input.hint}
{/if}
</div>
</div>
{/if}
</div> </div>
</div>
{else} {else}
{$smarty.block.parent} {$smarty.block.parent}
{/if} {/if}
admin-dev/themes/default/template/helpers/form/form.tpl
+10 -12
View File
@@ -414,18 +414,16 @@
{elseif $input.type == 'checkbox'} {elseif $input.type == 'checkbox'}
{foreach $input.values.query as $value} {foreach $input.values.query as $value}
{assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]} {assign var=id_checkbox value=$input.name|cat:'_'|cat:$value[$input.values.id]}
<div class="row"> <div class="checkbox col-lg-9 col-lg-push-4">
<div class="checkbox col-lg-9 col-lg-push-4"> <label for="{$id_checkbox}">
<label for="{$id_checkbox}"> <input type="checkbox"
<input type="checkbox" name="{$id_checkbox}"
name="{$id_checkbox}" id="{$id_checkbox}"
id="{$id_checkbox}" class="{if isset($input.class)}{$input.class}{/if}"
class="{if isset($input.class)}{$input.class}{/if}" {if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if}
{if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if} {if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} /> {$value[$input.values.name]}
{$value[$input.values.name]} </label>
</label>
</div>
</div> </div>
{/foreach} {/foreach}
{elseif $input.type == 'file'} {elseif $input.type == 'file'}
controllers/admin/AdminSlipController.php
+3 -1
View File
@@ -35,10 +35,12 @@ class AdminSlipControllerCore extends AdminController
'id_order_slip' => array( 'id_order_slip' => array(
'title' => $this->l('ID'), 'title' => $this->l('ID'),
'align' => 'center', 'align' => 'center',
'class' => 'fixed-width-xs'
), ),
'id_order' => array( 'id_order' => array(
'title' => $this->l('ID Order'), 'title' => $this->l('ID Order'),
'align' => 'left' 'align' => 'left',
'class' => 'fixed-width-md'
), ),
'date_add' => array( 'date_add' => array(
'title' => $this->l('Date issued'), 'title' => $this->l('Date issued'),