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
This commit is contained in:
Jerome Nadaud
2013-11-20 17:29:46 +01:00
parent 12f3a150a7 9e2dac8ece
commit 5b6cfa3cdb
207 changed files with 3200 additions and 4213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/login/header.tpl
+2 -2
View File
@@ -46,5 +46,5 @@
<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
</head>
<body class="page-topbar">
<div id="login">
<div id="content" class="page-content">
<div id="login" class="bootstrap">
<div id="content">
admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+15 -18
View File
@@ -22,26 +22,23 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="panel">
<div class="bootstrap">
<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
<div class="row">
<div class="input-group">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
{l s='Manage translations'}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
<div class="input-group">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<i class="icon-flag"></i>
{l s='Manage translations'}
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
{foreach from=$module_languages item=language}
<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
{/foreach}
</ul>
</div>
{if isset($display_multishop_checkbox) && $display_multishop_checkbox}
<div class="row">
<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if}
onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
{l s='Activate module for '}{$shop_context}
</div>
<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if}
onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
{l s='Activate module for '}{$shop_context}
{/if}
</div>
admin-dev/themes/default/template/controllers/modules/configure.tpl
+48 -46
View File
@@ -22,52 +22,54 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="page-head">
<h2 class="page-title">
{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_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>
{if isset($module_update_link)}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
<i class="process-icon-refresh"></i>
<div>{l s='Update'}</div>
</a>
</li>
{/if}
<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="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>
</li>
</ul>
<div class="bootstrap">
<div class="page-head">
<h2 class="page-title">
{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_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-uninstall"></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-reset"></i>
<div>{l s='Reset'}</div>
</a>
</li>
{if isset($module_update_link)}
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
<i class="process-icon-refresh"></i>
<div>{l s='Update'}</div>
</a>
</li>
{/if}
<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="{$back_link}" title="{l s='Back'}">
<i class="process-icon-back" ></i>
<div>{l s='Back'}</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+15 -25
View File
@@ -26,7 +26,6 @@
<div class="leadin">{block name="leadin"}{/block}</div>
<form action="{$url_submit}" id="{$table}_form" method="post" class="form-horizontal">
{if $display_key}
<input type="hidden" name="show_modules" value="{$display_key}" />
{/if}
@@ -35,9 +34,9 @@
<i class="icon-paste"></i>
{l s='Transplant a module'}
</h3>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Module:'}</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_module" {if $edit_graft} disabled="disabled"{/if}>
{foreach $modules as $module}
<option value="{$module->id}" {if $id_module == $module->id || (!$id_module && $show_modules == $module->id)}selected="selected"{/if}>{$module->displayName|stripslashes}</option>
@@ -45,9 +44,9 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Hook into'} :</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_hook" {if $edit_graft} disabled="disabled"{/if}>
{foreach $hooks as $hook}
<option value="{$hook['id_hook']}" {if $id_hook == $hook['id_hook']} selected="selected"{/if}>{$hook['name']}{if $hook['name'] != $hook['title']} ({$hook['title']}){/if}</option>
@@ -55,10 +54,10 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3">{l s='Exceptions'} :</label>
<div class="col-lg-6">
<div class="alert alert-warning">
<div class="col-lg-9">
<div class="well">
<p>
{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
{l s='Please input each filename, separated by a comma.'}<br />
@@ -73,22 +72,18 @@
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
{if $edit_graft}
<input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" />
{/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div>
<div class="panel-footer">
{if $edit_graft}
<input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" />
{/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div>
</div>
</form>
<script type="text/javascript">
//<![CDATA
function position_exception_textchange()
{
function position_exception_textchange() {
// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
@@ -100,21 +95,16 @@
for (var i = 0; i < len; i++)
list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
}
function position_exception_listchange()
{
function position_exception_listchange() {
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
var str = obj.val().join(', ');
obj.closest('form').find('#em_text_' + shopID).val(str);
}
$(document).ready(function(){
$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
$(this).change(position_exception_textchange).change();
});
$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
$(this).change(position_exception_listchange);
});
admin-dev/themes/default/template/footer.tpl
+16 -5
View File
@@ -27,7 +27,7 @@
</div>
{if $display_footer}
{hook h="displayBackOfficeFooter"}
<div id="footer">
<div id="footer" class="bootstrap">
<div class="col-sm-5 hidden-xs">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a> - <span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div>
@@ -47,10 +47,21 @@
</div>
<div class="col-sm-5">
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Contact'}
</a>
|&nbsp;
<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Bug Tracker'}
</a>
|&nbsp;
<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Forum'}
</a>
|&nbsp;
<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Addons'}
</a>
{if $iso_is_fr}
<p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong>
admin-dev/themes/default/template/header.tpl
+9 -6
View File
@@ -102,11 +102,11 @@
{/if}
</head>
{if $display_header}
<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if} {$smarty.get.controller|escape|strtolower}">
{* begin HEADER *}
<header id="header">
{* begin HEADER *}
<header id="header" class="bootstrap">
<nav id="header_infos" role="navigation">
<div class="navbar-header">
<button id="header_nav_toggle" type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-primary">
@@ -341,12 +341,15 @@
<div id="main">
{include file='nav.tpl'}
<div id="content" class="page-content">
<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
{if $install_dir_exists}
<div class="alert alert-warning">
{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
</div>
{/if}
{if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
<div class="panel multishop_toolbar">
<div class="col-lg-12 form-horizontal">
@@ -355,10 +358,10 @@
</div>
</div>
{/if}
{* end display_header*}
{* end display_header*}
{else}
<body{if isset($lite_display) && $lite_display} class="display-modal"{/if}>
<div id="main">
<div id="content" class="page-content">
<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
{/if}
admin-dev/themes/default/template/layout.tpl
-3
View File
@@ -87,8 +87,5 @@
{/if}
</div>
{/if}
{if !$bootstrap}<div id="nobootstrap">{/if}
{$page}
{if !$bootstrap}</div>{/if}
{$footer}
admin-dev/themes/default/template/nav.tpl
+1 -1
View File
@@ -1,4 +1,4 @@
<nav id="nav-sidebar" role="navigation">
<nav id="nav-sidebar" class="bootstrap" role="navigation">
{if !$tab}
<div class="mainsubtablist" style="display:none"></div>
{/if}