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/template/controllers/modules/configure.tpl
This commit is contained in:
Kevin Granger
2013-11-18 10:23:23 +01:00
parent a0f73d20e5 68c8e9da57
commit 73ec191fb0
140 changed files with 3166 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/js/calendar.js
+7 -2
View File
@@ -378,8 +378,13 @@ $( document ).ready(function() {
}
$('#datepickerExpand').on('click',function() {
$('#datepicker').removeClass('hide');
$('#date-start').focus();
if ($('#datepicker').hasClass('hide'))
{
$('#datepicker').removeClass('hide');
$('#date-start').focus();
}
else
$('#datepicker').addClass('hide');
});
$('.submitDateDay').on('click',function(e){
admin-dev/themes/default/js/tree.js
+12
View File
@@ -11,6 +11,8 @@ Tree.prototype =
init: function ()
{
var that = $(this);
this.$element.find("label.tree-toggler").click(
function ()
{
@@ -19,12 +21,16 @@ Tree.prototype =
$(this).parent().children(".icon-folder-open")
.removeClass("icon-folder-open")
.addClass("icon-folder-close");
that.trigger('collapse');
}
else
{
$(this).parent().children(".icon-folder-close")
.removeClass("icon-folder-close")
.addClass("icon-folder-open");
that.trigger('expand');
}
$(this).parent().parent().children("ul.tree").toggle(300);
}
@@ -36,6 +42,8 @@ Tree.prototype =
$('li input:checked').parent().addClass("tree-selected");
}
);
return $(this);
},
collapseAll : function($speed)
@@ -49,6 +57,8 @@ Tree.prototype =
$(this).parent().parent().children("ul.tree").hide($speed);
}
);
return $(this);
},
expandAll : function($speed)
@@ -62,6 +72,8 @@ Tree.prototype =
$(this).parent().parent().children("ul.tree").show($speed);
}
);
return $(this);
},
};
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+16
View File
@@ -128,6 +128,22 @@
<dd><a href="http://www.prestashop.com/en/contact-us?utm_source=backoffice_dashboard" target="_blank">{l s="Go to prestashop.com"}</a></dd>
</dl>
</section>
<section class="dash_simulation panel">
<h3><i class="icon-link"></i> {l s="Simulation Mode"}</h3>
<span class="switch prestashop-switch">
<input id="PS_DASHBOARD_SIMULATION_on" class="ps_dashboard_simulation" type="radio" checked="checked" value="1" name="PS_DASHBOARD_SIMULATION">
<label class="radioCheck" for="PS_DASHBOARD_SIMULATION_on">
<i class="icon-check-sign color_success"></i> {l s='Yes'}
</label>
<input id="PS_DASHBOARD_SIMULATION_off" class="ps_dashboard_simulation" type="radio" value="0" name="PS_DASHBOARD_SIMULATION">
<label class="radioCheck" for="PS_DASHBOARD_SIMULATION_off">
<i class="icon-ban-circle color_danger"></i> {l s='No'}
</label>
<span class="slide-button btn btn-default"></span>
</span>
</section>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/login/content.tpl
+1 -1
View File
@@ -177,7 +177,7 @@
</div>
<div id="login-footer" class="animated fadeIn">
<p class="text-center text-muted">
<a href="http://www.prestashop.com/">
<a href="http://www.prestashop.com/" onclick="return !window.open(this.href);">
&copy; PrestaShop&#8482; 2005-{$smarty.now|date_format:"%Y"} - All rights reserved
</a>
</p>
admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+1 -1
View File
@@ -32,7 +32,7 @@
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$tradlink}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
admin-dev/themes/default/template/controllers/modules/configure.tpl
+21 -3
View File
@@ -25,19 +25,37 @@
<div class="bootstrap">
<div class="page-head">
<h2 class="page-title">
{l s='Configure'} : {$module_name}
{l s='Configure:'} {$module_display_name} ({$module_name})
</h2>
<div class="page-bar toolbarBox">
<div class="btn-toolbar">
<ul class="cc_button nav nav-pills pull-right">
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hooklink}" title="{l s='Manage hooks'}">
<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
<i class="process-icon-off"></i>
<div>{l s='Disable'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
<i class="process-icon-minus-sign-alt"></i>
<div>{l s='Uninstall'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
<i class="process-icon-share-alt"></i>
<div>{l s='Reset'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
<i class="process-icon-anchor"></i>
<div>{l s='Manage hooks'}</div>
</a>
</li>
<li>
<a id="desc-module-back" class="toolbar_btn" href="{$backlink}" title="{l s='Back'}">
<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+1 -1
View File
@@ -155,7 +155,7 @@
</div>
<div class="col-lg-3">
<div class="panel">
<h3><i class="icon-eye-open"></i> {l s='LiveEdit'}</h3>
<h3><i class="icon-eye-open"></i> {l s='Live Edit'}</h3>
{if $live_edit}
<p>{l s='You have to select a shop to use LiveEdit'}</p>
{else}
admin-dev/themes/default/template/controllers/products/helpers/tree/tree_categories.tpl
+11 -1
View File
@@ -80,7 +80,17 @@
});
{/if}
$(document).ready(function () {
$("#{$id}").tree("collapseAll");
var tree = $("#{$id}").tree("collapseAll");
tree.on('collapse', function() {
$('#expand-all-{$id}').show();
});
tree.on('expand', function() {
$('#collapse-all-{$id}').show();
});
$('#collapse-all-{$id}').hide();
$("#{$id}").find(":input[type=radio]").click(
function()
{
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_form.tpl
+1 -1
View File
@@ -61,7 +61,7 @@
<input type="hidden" name="lang" value="{$lang}" />
<input type="hidden" name="type" value="{$type}" />
<input type="hidden" name="theme" value="{$theme}" />
<input type="submit" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" value="{l s='Update translations'}" class="btn btn-default" />
<button type="button" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" class="btn btn-default">{l s='Update translations'}</button>
<script type="text/javascript">
$(document).ready(function(){
admin-dev/themes/default/template/controllers/translations/helpers/view/translation_modules.tpl
+2 -2
View File
@@ -87,13 +87,13 @@
<input type="hidden" name="lang" value="{$lang}" />
<input type="hidden" name="type" value="{$type}" />
<input type="hidden" name="theme" value="{$theme}" />
<input type="submit" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" value="{l s='Update translations'}" class="button" />
<button type="submit" id="{$table}_form_submit_btn" name="submitTranslations{$type|ucfirst}" class="btn btn-default">{l s='Update translations'}</button>
<br />
{foreach $modules_translations as $theme_name => $theme}
{if $theme_name}<h2>&gt;{l s='Theme:'} <a name="{$theme_name}">{$theme_name}</h2>{/if}
{foreach $theme as $module_name => $module}
<h3>{l s='Module:'} <a name="{$module_name}">{$module_name}</a></h3>
<h2>{l s='Module:'} <a name="{$module_name}">{$module_name}</a></h2>
{foreach $module as $template_name => $newLang}
{if !empty($newLang)}
{assign var=occurrences value=0}
admin-dev/themes/default/template/helpers/help_access/button.tpl
+1 -1
View File
@@ -1,4 +1,4 @@
<li class="help-context-{$label|escape:'htmlall':'UTF-8'}" style="display:none">
<li class="help-context-{$label|escape:'htmlall':'UTF-8'}">
<a id="desc-{$label|escape:'htmlall':'UTF-8'}-help"
class="toolbar_btn"
href="#"
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -74,7 +74,7 @@
<div class="alert alert-warning" id="{$list_id}-empty-filters-alert" style="display:none;">{l s='Please fill at least one field to perform a search in this list.'}</div>
{block name="startForm"}
<form method="post" action="{$action}" class="form-horizontal clearfix">
<form method="post" action="{$action}" class="form-horizontal clearfix" id="{$list_id}">
{/block}
{if !$simple_header}
<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>