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

// Add label attributes for, refacto browse file

Browse Source
This commit is contained in:
Kevin Granger committed 2013-08-02 18:46:37 +02:00
1 parent 94a43f2991
commit 9f11ecfd78
7 files changed
+81 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.css
+16
View File
@@ -5502,6 +5502,18 @@ hr {
.table tbody > tr:hover > td { .table tbody > tr:hover > td {
cursor: pointer; cursor: pointer;
background-color: #c4e0ba; background-color: #c4e0ba;
-webkit-transition-property: background-color;
-moz-transition-property: background-color;
-o-transition-property: background-color;
transition-property: background-color;
-webkit-transition-duration: 0.4s;
-moz-transition-duration: 0.4s;
-o-transition-duration: 0.4s;
transition-duration: 0.4s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
-webkit-box-shadow: rgba(151, 200, 133, 0.8) 0 2px 0; -webkit-box-shadow: rgba(151, 200, 133, 0.8) 0 2px 0;
box-shadow: rgba(151, 200, 133, 0.8) 0 2px 0; } box-shadow: rgba(151, 200, 133, 0.8) 0 2px 0; }
.table td.center, .table th.center { .table td.center, .table th.center {
@@ -5516,6 +5528,10 @@ hr {
border-bottom-right-radius: 3px; } border-bottom-right-radius: 3px; }
.table .btn-group { .table .btn-group {
float: right; } float: right; }
.table .btn-group .btn, .table .btn-group .toolbar_btn {
float: left; }
.table .btn, .table .toolbar_btn {
float: right; }
tr.filter { tr.filter {
background-color: rgba(163, 159, 149, 0.5); } background-color: rgba(163, 159, 149, 0.5); }
admin-dev/themes/default/css/admin-theme.sass
+7
View File
@@ -496,6 +496,9 @@ hr
tbody > tr:hover > td tbody > tr:hover > td
cursor: pointer cursor: pointer
background-color: lighten($bg-head-color,15%) background-color: lighten($bg-head-color,15%)
@include transition-property(background-color)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
@include box-shadow(rgba($bg-head-color,0.80) 0 2px 0) @include box-shadow(rgba($bg-head-color,0.80) 0 2px 0)
td.center, th.center td.center, th.center
text-align: center text-align: center
@@ -509,6 +512,10 @@ hr
border-bottom-right-radius: 3px border-bottom-right-radius: 3px
.btn-group .btn-group
float: right float: right
.btn
float: left
.btn
float: right
//filter table //filter table
tr.filter tr.filter
admin-dev/themes/default/template/controllers/products/attachments.tpl
+1 -1
View File
@@ -73,7 +73,7 @@
<input id="attachement_filename" type="text" class="disabled" name="filename" readonly /> <input id="attachement_filename" type="text" class="disabled" name="filename" readonly />
<span class="input-group-btn"> <span class="input-group-btn">
<button id="attachement_fileselectbutton" type="button" name="submitAddAttachments" class="btn btn-default"> <button id="attachement_fileselectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
{l s='Choose a file'} <i class="icon-folder-open"></i> {l s='Choose a file'}
</button> </button>
</span> </span>
</div> </div>
admin-dev/themes/default/template/controllers/products/images.tpl
+4 -4
View File
@@ -76,9 +76,9 @@
<table id="lineType" style="display:none;"> <table id="lineType" style="display:none;">
<tr id="image_id"> <tr id="image_id">
<td style="padding: 4px;"> <td>
<a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox"> <a href="{$smarty.const._THEME_PROD_DIR_}image_path.jpg" class="fancybox">
<img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-default-small_default.jpg" alt="image_id" title="image_id" /> <img src="{$smarty.const._THEME_PROD_DIR_}{$iso_lang}-path-small_default.jpg" alt="image_id" title="image_id" />
</a> </a>
</td> </td>
<td id="td_image_id" class="pointer dragHandle center positionImage"> <td id="td_image_id" class="pointer dragHandle center positionImage">
@@ -199,7 +199,7 @@
onSubmit: function(id, filename) onSubmit: function(id, filename)
{ {
$("#imageTable").show(); $("#imageTable").show();
$("#listImage").append("<li id='img"+id+"'><div class=\"float\" >" + filename + "</div></div><a style=\"margin-left:10px\"href=\"javascript:delQueue(" + id +");\"><img src=\"../img/admin/disabled.gif\" alt=\"\" border=\"0\"></a><p class=\"errorImg\"></p></li>"); $("#listImage").append("<li id='img"+id+"'><div>" + filename + "</div></div><a href=\"javascript:delQueue(" + id +");\"><img src=\"../img/admin/disabled.gif\" ></a><p class=\"errorImg\"></p></li>");
} }
}); });
@@ -309,7 +309,7 @@
{ {
line = $("#lineType").html(); line = $("#lineType").html();
line = line.replace(/image_id/g, id); line = line.replace(/image_id/g, id);
line = line.replace(/[a-z]{2}-default/g, path); line = line.replace(/[a-z]{2}-path/g, path);
line = line.replace(/image_path/g, path); line = line.replace(/image_path/g, path);
line = line.replace(/image_position/g, position); line = line.replace(/image_position/g, position);
line = line.replace(/icon-check-empty/g, cover); line = line.replace(/icon-check-empty/g, cover);
admin-dev/themes/default/template/helpers/form/form.tpl
+49 -16
View File
@@ -29,6 +29,7 @@
{/if} {/if}
{if isset($fields.title)}<h3>{$fields.title}</h3>{/if} {if isset($fields.title)}<h3>{$fields.title}</h3>{/if}
{block name="defaultForm"} {block name="defaultForm"}
<form id="{$table}_form" class="form-horizontal defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}> <form id="{$table}_form" class="form-horizontal defaultForm {$name_controller}" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id} {if $form_id}
@@ -57,7 +58,7 @@
{/if} {/if}
{block name="label"} {block name="label"}
{if isset($input.label)} {if isset($input.label)}
<label for="" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}"> <label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$language.id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
{if isset($input.hint)} {if isset($input.hint)}
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title=" title="
@@ -89,7 +90,7 @@
<div class="row"> <div class="row">
{foreach $languages as $language} {foreach $languages as $language}
{assign var='value_text' value=$fields_value[$input.name][$language.id_lang]} {assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" style="{if $language.id_lang != $defaultFormLanguage}display:none{/if}"> <div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
{if $input.type == 'tags'} {if $input.type == 'tags'}
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
@@ -104,9 +105,9 @@
{/literal} {/literal}
{/if} {/if}
<input type="text" <input type="text"
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
name="{$input.name}_{$language.id_lang}" name="{$input.name}_{$language.id_lang}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}" class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}" value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();" onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
{if isset($input.size)}size="{$input.size}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
@@ -146,16 +147,16 @@
{/if} {/if}
{assign var='value_text' value=$fields_value[$input.name]} {assign var='value_text' value=$fields_value[$input.name]}
<input type="text" <input type="text"
name="{$input.name}" name="{$input.name}"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}" value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}" class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
{if isset($input.size)}size="{$input.size}"{/if} {if isset($input.size)}size="{$input.size}"{/if}
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if} {if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
{if isset($input.class)}class="{$input.class}"{/if} {if isset($input.class)}class="{$input.class}"{/if}
{if isset($input.readonly) && $input.readonly}readonly="readonly"{/if} {if isset($input.readonly) && $input.readonly}readonly="readonly"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} {if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} /> {if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
{if isset($input.suffix)}{$input.suffix}{/if} {if isset($input.suffix)}{$input.suffix}{/if}
{if !empty($input.desc)}<div class="alert alert-info">{$input.desc}</div>{/if} {if !empty($input.desc)}<div class="alert alert-info">{$input.desc}</div>{/if}
{/if} {/if}
@@ -338,9 +339,40 @@
</div> </div>
{/if} {/if}
{/if} {/if}
<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
<div class="col-lg-7">
<div class="row">
<div class="col-lg-8">
<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>
</div>
</div>
</div>
<script>
$(document).ready(function(){
$('#{$input.name}-selectbutton').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>
{elseif $input.type == 'password'} {elseif $input.type == 'password'}
<input type="password" <input type="password"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
name="{$input.name}" name="{$input.name}"
class="{if isset($input.class)}{$input.class}{/if}" class="{if isset($input.class)}{$input.class}{/if}"
value="" value=""
@@ -400,7 +432,9 @@
{elseif $input.type == 'date'} {elseif $input.type == 'date'}
<div class="row"> <div class="row">
<div class="input-group col-lg-4"> <div class="input-group col-lg-4">
<input type="text" <input
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
type="text"
data-hex="true" data-hex="true"
{if isset($input.class)}class="{$input.class}" {if isset($input.class)}class="{$input.class}"
{else}class="datepicker"{/if} {else}class="datepicker"{/if}
@@ -415,7 +449,6 @@
{elseif $input.type == 'free'} {elseif $input.type == 'free'}
{$fields_value[$input.name]} {$fields_value[$input.name]}
{/if} {/if}
<!-- {if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if} -->
{/block}{* end block input *} {/block}{* end block input *}
{block name="description"} {block name="description"}
{if isset($input.desc) && !empty($input.desc)} {if isset($input.desc) && !empty($input.desc)}
controllers/admin/AdminGendersController.php
+2 -2
View File
@@ -97,7 +97,7 @@ class AdminGendersControllerCore extends AdminController
'label' => $this->l('Name:'), 'label' => $this->l('Name:'),
'name' => 'name', 'name' => 'name',
'lang' => true, 'lang' => true,
'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:', 'hint' => $this->l('Invalid characters:').' 0-9!&lt;&gt;,;?=+()@#"�{}_$%:',
'required' => true 'required' => true
), ),
array( array(
@@ -145,7 +145,7 @@ class AdminGendersControllerCore extends AdminController
), ),
'submit' => array( 'submit' => array(
'title' => $this->l('Save'), 'title' => $this->l('Save'),
'class' => 'button' 'class' => 'btn btn-primary'
) )
); );
controllers/admin/AdminImagesController.php
+2 -2
View File
@@ -43,8 +43,8 @@ class AdminImagesControllerCore extends AdminController
$this->fields_list = array( $this->fields_list = array(
'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center'), 'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center'),
'name' => array('title' => $this->l('Name'), 'width' => 'auto'), 'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px'), 'width' => array('title' => $this->l('Width'), 'suffix' => ' px'),
'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px'), 'height' => array('title' => $this->l('Height'), 'suffix' => ' px'),
'products' => array('title' => $this->l('Products'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false), 'products' => array('title' => $this->l('Products'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'categories' => array('title' => $this->l('Categories'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false), 'categories' => array('title' => $this->l('Categories'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'manufacturers' => array('title' => $this->l('Manufacturers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false), 'manufacturers' => array('title' => $this->l('Manufacturers'), 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),