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

2013-10-02 17:39:03 +02:00
parent f168dd7c50 dc06ef9c6d
commit 19af1cfda5
12 changed files with 283 additions and 138 deletions
@@ -72,6 +72,10 @@
 									<button class="btn btn-default" name="submitLogin" type="submit">
 										{l s='Log in'}
 									</button>
+								</div>
+							</div>
+							<div class="form-group">
+								<div class="col-lg-9 col-lg-offset-3">
 									<p>		
 										<a href="#" class="show-forgot-password">
 											<i class="icon-question-sign"></i>
@@ -103,6 +107,10 @@
 									<button class="btn btn-default" name="submitLogin" type="submit">
 										{l s='Send'}
 									</button>
+								</div>
+							</div>
+							<div class="form-group">
+								<div class="col-lg-9 col-lg-offset-3">
 									<p>		
 										<a href="#" class="show-login-form">
 											<i class="icon-angle-left"></i>
@@ -0,0 +1,51 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 lt-ie6 " lang="en"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8 ie7" lang="en"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js lt-ie9 ie8" lang="en"> <![endif]-->
+<!--[if gt IE 8]> <html lang="fr" class="no-js ie9" lang="en"> <![endif]-->
+<html lang="{$iso}">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="robots" content="NOFOLLOW, NOINDEX">
+	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)</title>
+	{foreach from=$css_files key=css_uri item=media}
+		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
+	{/foreach}
+	{foreach from=$js_files item=js_uri}
+		<script type="text/javascript" src="{$js_uri}"></script>
+	{/foreach}
+	<link rel="icon" type="image/vnd.microsoft.icon" href="{$img_dir}favicon.ico" />
+	<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
+	<!--[if IE]>
+	<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
+	<![endif]-->
+</head>
+<body>
+	<div id="main">
+		<div id="content" class="page-content">
@@ -24,6 +24,7 @@
 *}
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
+{if isset($show_filter) && $show_filter}
 <fieldset>
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock">
@@ -34,7 +35,7 @@
 			<div id="stock_instant_state_form_warehouse" class="form-group">
 				<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
 				<div class="col-lg-9">
-					<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
+					<select name="id_warehouse" onChange="$('#stock_instant_state').submit();">
 						{foreach from=$stock_instant_state_warehouses key=k item=i}
 							<option {if $i.id_warehouse == $stock_instant_state_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
 						{/foreach}
@@ -45,4 +46,5 @@
 		</form>
 	</div>
 </fieldset>
+{/if}
 {/block}
@@ -28,13 +28,13 @@
 <fieldset>
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock">
-			<form type="get" class="form-horizontal">
+			<form type="get" id="stock-movement-filter" class="form-horizontal">
 				<input type="hidden" name="controller" value="AdminStockMvt" />
 				<input type="hidden" name="token" value="{$token}" />
 				<div class="form-group">
 					<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter movements by warehouse:'}</label>
 					<div class="col-lg-9">					
-						<select name="id_warehouse" onChange="$(this).parent().submit();">
+						<select name="id_warehouse" onChange="$('#stock-movement-filter').submit();">
 							{foreach $list_warehouses as $warehouse}
 								<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
 							{/foreach}
@@ -33,7 +33,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="robots" content="NOFOLLOW, NOINDEX">
-	<title>{$shop_name} {if $meta_title != ''}{$navigationPipe|escape:'htmlall':'UTF-8'} {$meta_title}{/if} (PrestaShop&trade;)</title>
+	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)</title>
 	{if $display_header}
 	<script type="text/javascript">
 		var help_class_name = '{$controller_name}';
@@ -102,9 +102,9 @@
 	{/if}
 </head>

-<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if}">
-
 {if $display_header}
+	<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if}">
+
 {* begin  HEADER *}
 	<header id="header">
 		<nav id="header_infos" role="navigation">
@@ -280,23 +280,28 @@
 		</nav>{* end header_infos*}
 	</header>

-{* end header*}	
-{/if}

 	<div id="main">
 		{include file='nav.tpl'}

 		<div id="content" class="page-content">
-{if $display_header && $install_dir_exists}
+{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 $display_header && $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
+{if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
 			<fieldset class="multishop_toolbar">
 				<div class="col-lg-12 form-horizontal">
 					<label class="control-label col-lg-3"><i class="icon-sitemap"></i> {l s='Multistore configuration for'}</label>
 					<div class="col-lg-9">{$shop_list}</div>
 				</div>
 			</fieldset>
+{/if}
+
+{* end display_header*}	
+{else}
+	<body>
+		<div id="main">
+			<div id="content" class="page-content">
 {/if}
@@ -89,6 +89,8 @@
 		<input type="hidden" name="token" value="{$token}" />
 	</fieldset>
 </form>
+{else}
+	</fieldset>
 {/if}

 {hook h='displayAdminListAfter'}
@@ -252,6 +252,10 @@
 		</script>
 		{/if}
 		</div>
+{/if}
+{if $simple_header}
+<fieldset class="col-lg-12">
+	<h3>{if is_array($title)}{$title|end}{else}{$title}{/if}</h3>
 {/if}
 	<div class="table-responsive clearfix">
 		<table
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{include file='header.tpl'}
+
 {if isset($conf)}
 	<div class="alert alert-success">
 		{$conf}
@@ -91,5 +91,3 @@
 {if !$bootstrap}<div id="nobootstrap">{/if}
 {$page}
 {if !$bootstrap}</div>{/if}
-
-{include file='footer.tpl'}