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

// fix Update the call of JavaScript and CSS files in the class of HelperForm and controller templates (PSFV-94)

Browse Source
This commit is contained in:
lLefevre
2011-11-14 14:21:26 +00:00
parent 74ef17ca79
commit 5bde977d1f
7 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/helper/form/form.tpl
+22 -30
View File
@@ -65,7 +65,6 @@
});
{block name="script"}{/block}
</script>
<script type="text/javascript" src="../js/form.js"></script>
{/if}
{if $show_toolbar}
@@ -244,7 +243,7 @@
</div><br />
{/if}
{/if}
<input type="file" name="{$input.name}" />
<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
{elseif $input.type == 'password'}
<input type="password"
name="{$input.name}"
@@ -275,7 +274,6 @@
{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
{$asso_shop}
{elseif $input.type == 'color'}
<script type="text/javascript" src="../js/jquery/jquery-colorpicker.js"></script>
<input type="color"
size="{$input.size}"
data-hex="true"
@@ -284,7 +282,6 @@
name="{$input.name}"
value="{$fields_value[$input.name]}" />
{elseif $input.type == 'date'}
<script type="text/javascript" src="../js/jquery/jquery-colorpicker.js"></script>
<input type="text"
size="{$input.size}"
data-hex="true"
@@ -347,15 +344,6 @@
{if $required_fields}
<div class="small"><sup>*</sup> {l s ='Required field'}</div>
{/if}
{if isset($fields.tinymce) && $fields.tinymce}
<script type="text/javascript">
var iso = '{$iso}';
var pathCSS = '{$path_css}';
var ad = '{$ad}';
</script>
<script type="text/javascript" src="../js/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="../js/tinymce.inc.js"></script>
{/if}
</fieldset>
{block name="other_fieldsets"}{/block}
{if isset($fields[$f+1])}<br class="clear" />{/if}
@@ -364,23 +352,27 @@
{/block}
<script type="text/javascript">
$(document).ready(function(){
$(document).ready(function(){
tinySetup();
});
{block name="autoload_tinyMCE"}
$(".autoload_rte").click(function(e){
tinySetup({
mode :"exact",
editor_selector :"autoload_rte",
elements : $(this).attr("id"),
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull|cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,undo,redo",
theme_advanced_buttons2 : "link,unlink,anchor,image,cleanup,code,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,charmap,media,|,ltr,rtl,|,fullscreen",
theme_advanced_buttons3 : "",
theme_advanced_buttons4 : "",
});
})
{/block}
var iso = '{$iso}';
var pathCSS = '{$path_css}';
var ad = '{$ad}';
$(document).ready(function(){
tinySetup();
{block name="autoload_tinyMCE"}
$(".autoload_rte").click(function(e){
tinySetup({
mode :"exact",
editor_selector :"autoload_rte",
elements : $(this).attr("id"),
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull|cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,undo,redo",
theme_advanced_buttons2 : "link,unlink,anchor,image,cleanup,code,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,charmap,media,|,ltr,rtl,|,fullscreen",
theme_advanced_buttons3 : "",
theme_advanced_buttons4 : "",
});
})
{/block}
});
</script>
admin-dev/themes/template/helper/form/form_category.tpl
-6
View File
@@ -24,11 +24,6 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{if count($categories) && isset($categories)}
<script src="../js/jquery/plugins/treeview/jquery.treeview.js" type="text/javascript"></script>
<script src="../js/jquery/plugins/treeview/jquery.treeview.async.js" type="text/javascript"></script>
<script src="../js/jquery/plugins/treeview/jquery.treeview.edit.js" type="text/javascript"></script>
<script src="../js/admin-categories-tree.js" type="text/javascript"></script>
{if isset($categories.use_search) && $categories.use_search}<script src="../js/jquery/plugins/autocomplete/jquery.autocomplete.js" type="text/javascript"></script>{/if}
<script type="text/javascript">
var inputName = '{$categories.input_name}';
var use_radio = {if $categories.use_radio}1{else}0{/if};
@@ -37,7 +32,6 @@
var home = '{$categories.trads.Home}';
var use_radio = {if $categories.use_radio}1{else}0{/if};
</script>
<link type="text/css" rel="stylesheet" href="../css/jquery.treeview.css" />
<div style="background-color:#F4E6C9; width:99%;padding:5px 0 5px 5px;">
<a href="#" id="collapse_all" >{$categories.trads['Collapse All']}</a>
admin-dev/themes/template/import/view.tpl
-1
View File
@@ -27,7 +27,6 @@
{extends file="helper/view/view.tpl"}
{block name="override_tpl"}
<script src="../js/adminImport.js"></script>
<script type="text/javascript">
var errorEmpty = "{l s='Please enter a name to save.'}"
</script>