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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
This commit is contained in:
Damien Metzger
2013-10-25 15:22:01 +02:00
parent e8d5dc8a62 a49cc68b72
commit aa322e4777
38 changed files with 3854 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
+4 -45
View File
@@ -24,51 +24,6 @@
*}
{extends file="helpers/form/form.tpl"}
{block name="input"}
{if $input.type == 'file'}
<input id="{$input.name}" type="file" name="{$input.name}" class="hide" />
<div class="dummyfile input-group">
<span class="input-group-addon"><i class="icon-file"></i></span>
<input id="{$input.name}-name" type="text" class="disabled" name="filename" readonly />
<span class="input-group-btn">
<button id="{$input.name}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> {l s='Choose a file'}
</button>
</span>
</div>
{if isset($input.desc)}<p>{$input.desc}</p>{/if}
{if isset($fields_value.image) && $fields_value.image}
<div class="clearfix">&nbsp;</div>
<div id="image" class="thumbnail">
{$fields_value.image}
<div class="text-center">
<p>{l s='File size'} {$fields_value.size}kb</p>
<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
<i class="icon-remove text-danger"></i> {l s='Delete'}
</a>
</div>
</div>
{/if}
<script>
$(document).ready(function(){
$('#{$input.name}-selectbutton').click(function(e){
$('#{$input.name}').trigger('click');
});
$('#{$input.name}-name').click(function(e){
$('#{$input.name}').trigger('click');
});
$('#{$input.name}').change(function(e){
var val = $(this).val();
var file = val.split(/[\\/]/);
$('#{$input.name}-name').val(file[file.length-1]);
});
});
</script>
{$displayBackOfficeCategory}
{else}
{$smarty.block.parent}
{/if}
{/block}
{block name="input"}
{if $input.name == "link_rewrite"}
<script type="text/javascript">
@@ -82,6 +37,10 @@
{else}
{$smarty.block.parent}
{/if}
{if $input.name == 'image'}
{$displayBackOfficeCategory}
{/if}
{/block}
{block name="description"}
{$smarty.block.parent}
admin-dev/themes/default/template/controllers/login/content.tpl
+4 -4
View File
@@ -79,7 +79,7 @@
</div>
<div class="form-group">
<a href="#" class="show-forgot-password pull-right" >
{l s='Lost password'}&hellip;
{l s='Lost password'}
</a>
<label class="control-label" for="passwd">
{l s='Password'}
@@ -138,16 +138,16 @@
id="email_forgot"
class="form-control"
autofocus="autofocus"
tabindex="1"
tabindex="5"
placeholder="test@example.com" />
</div>
</div>
<div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="3">
<button href="#" class="btn btn-default show-login-form" tabindex="7">
<i class="icon-caret-left"></i>
{l s='Back to login'}
</button>
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="2">
<button class="btn btn-default pull-right" name="submitLogin" type="submit" tabindex="6">
<i class="icon-ok text-success"></i>
{l s='Send'}
</button>
admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+1 -48
View File
@@ -61,53 +61,7 @@
{/block}
{block name="other_input"}
{if $key == 'rightCols'}
{foreach $field as $input}
{if $input.type == 'file'}
<div class="form-group">
<label class="control-label col-lg-3">{$input.label} </label>
<div class="col-lg-7">
<input id="{$input.name}" type="file" name="{$input.name}" class="hide" />
<div class="dummyfile input-group">
<span class="input-group-addon"><i class="icon-file"></i></span>
<input id="{$input.name}-name" type="text" class="disabled" name="filename" readonly />
<span class="input-group-btn">
<button id="{$input.name}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
<i class="icon-folder-open"></i> {l s='Choose a file'}
</button>
</span>
</div>
{if isset($input.desc)}<p>{$input.desc}</p>{/if}
{if isset($fields_value.image) && $fields_value.image}
<div class="clearfix">&nbsp;</div>
<div id="image" class="img-thumbnail">
{$fields_value.image}
<div class="text-center">
<p>{l s='File size'} {$fields_value.size}kb</p>
<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</div>
</div>
{/if}
<script>
$(document).ready(function(){
$('#{$input.name}-selectbutton').click(function(e){
$('#{$input.name}').trigger('click');
});
$('#{$input.name}-name').click(function(e){
$('#{$input.name}').trigger('click');
});
$('#{$input.name}').change(function(e){
var val = $(this).val();
var file = val.split(/[\\/]/);
$('#{$input.name}-name').val(file[file.length-1]);
});
});
</script>
</div>
</div>
{/if}
{if $key == 'hours'}
<div class="form-group">
<label class="control-label col-lg-3">{l s='Hours:'}</label>
<div class="col-lg-9"><p class="form-control-static">{l s='e.g. 10:00AM - 9:30PM'}</p></div>
@@ -118,6 +72,5 @@
<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /></div>
</div>
{/foreach}
{/foreach}
{/if}
{/block}