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 committed 2013-10-09 18:59:32 +02:00
2 parents 0e4cb5bcd5 719e5f4faf
commit a5d1816336
4 files changed
+101 -108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/css/admin-theme.sass
+5 -9
View File
@@ -96,7 +96,6 @@ html, body
@extend h3 @extend h3
h3:not(.modal-title), .panel-heading h3:not(.modal-title), .panel-heading
border: none border: none
//height: 30px
padding: 0 5px padding: 0 5px
margin: -16px -16px 15px -16px margin: -16px -16px 15px -16px
color: contrasted($bg-panel-heading-color) color: contrasted($bg-panel-heading-color)
@@ -487,7 +486,7 @@ tr.filter
.fixed-width-xxl .fixed-width-xxl
width: 250px!important width: 250px!important
// temp fix for latest bootstrap //todo: remove temp fix for bootstrap RC1 -> final
input[type="text"],input[type="search"],input[type="password"], textarea, select input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control @extend .form-control
fieldset > .row fieldset > .row
@@ -505,15 +504,15 @@ textarea
color: white color: white
@include border-radius(3px) @include border-radius(3px)
i i
@include border-radius(3px)
float: left float: left
color: white
font-size: 35px
height: 64px height: 64px
width: 64px width: 64px
margin-right: 10px
color: white
font-size: 35px
text-align: center text-align: center
line-height: 64px line-height: 64px
margin-right: 10px @include border-radius(3px)
.title .title
color: #666 color: #666
display: block display: block
@@ -571,8 +570,6 @@ tr.highlighted td
background-color: $brand-primary!important background-color: $brand-primary!important
color: white color: white
.hook_panel .hook_panel
@extend .well @extend .well
@include box-shadow(rgba(white,0.9) 0 0 0 1px inset) @include box-shadow(rgba(white,0.9) 0 0 0 1px inset)
@@ -758,7 +755,6 @@ li.sortable-placeholder
+border-radius(5px) +border-radius(5px)
@import "nav" @import "nav"
@import "toggle-switch" @import "toggle-switch"
@import "carrier-wizard" @import "carrier-wizard"
admin-dev/themes/default/template/controllers/login/content.tpl
+90 -86
View File
@@ -28,17 +28,17 @@
var label_errors = '{l s='errors'}'; var label_errors = '{l s='errors'}';
var label_error = '{l s='error'}'; var label_error = '{l s='error'}';
</script> </script>
<div id="container"> <div id="container">
<fieldset>
<div class="row"> <div class="row">
<div id="error" class="hide col-lg-12 alert alert-danger"> <div id="error" class="hide col-lg-12 alert alert-danger">
{if isset($errors)} {if isset($errors)}
<p>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</p> <p>{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}</p>
<ol> <ol>
{foreach from=$errors item="error"} {foreach from=$errors item="error"}
<li>{$error}</li> <li>{$error}</li>
{/foreach} {/foreach}
</ol> </ol>
{/if} {/if}
</div> </div>
{if isset($warningSslMessage)} {if isset($warningSslMessage)}
@@ -47,98 +47,102 @@
<div id="login" class="col-lg-12"> <div id="login" class="col-lg-12">
<h1>{$shop_name}</h1> <h1>{$shop_name}</h1>
{if !isset($wrong_folder_name) && !isset($wrong_install_name)} {if !isset($wrong_folder_name) && !isset($wrong_install_name)}
<form action="#" id="login_form" method="post" class="form-horizontal"> <form action="#" id="login_form" class="panel" method="post">
<fieldset> <h3>{l s='Log in'}</h3>
<div class="form-group"> <div class="form-group">
<label for="email" class="control-label col-lg-3"> <label for="email">{l s='Email address:'}</label>
{l s='Email address:'} <div class="input-group">
</label> <span class="input-group-addon"><i class="icon-envelope"></i></span>
<div class="input-group col-lg-5"> <input
<span class="input-group-addon"><i class="icon-envelope"></i></span> name="email"
<input autofocus="autofocus" type="text" id="email" name="email" class="input email_field" value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}" /> type="text"
</div> id="email"
</div> class="email_field form-control"
<div class="form-group"> value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}"
<label for="passwd" class="control-label col-lg-3"> autofocus="autofocus"
{l s='Password:'} placeholder="test@example.com" />
</label>
<div class="input-group col-lg-5">
<span class="input-group-addon"><i class="icon-key"></i></span>
<input id="passwd" type="password" name="passwd" class="input password_field" value="{if isset($password)}{$password}{/if}"/>
</div>
</div>
<div class="form-group">
<div class="col-lg-9 col-lg-offset-3">
<button class="btn btn-default" name="submitLogin" type="submit">
{l s='Log in'}
</button>
</div>
</div> </div>
<div class="form-group"> </div>
<div class="col-lg-9 col-lg-offset-3"> <div class="form-group">
<p> <label for="passwd">{l s='Password:'}</label>
<a href="#" class="show-forgot-password"> <div class="input-group">
<i class="icon-question-sign"></i> <span class="input-group-addon"><i class="icon-key"></i></span>
{l s='Lost password?'} <input
</a> name="passwd"
</p> type="password"
</div> id="passwd"
class="password_field form-control"
value="{if isset($password)}{$password}{/if}"
placeholder="{l s='Password'}" />
</div> </div>
<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/> </div>
</fieldset> <div class="form-group">
</form> <button class="btn btn-default" name="submitLogin" type="submit">
<form action="#" id="forgot_password_form" method="post" class="hide form-horizontal"> <i class="icon-ok text-success"></i>
<fieldset> {l s='Log in'}
<h2>{l s='Forgot your password?'}</h2> </button>
<p> <button class="btn btn-link show-forgot-password" type="button">
<strong>{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}</strong> <i class="icon-question-sign"></i>
</p> {l s='Lost password?'}
<div class="form-group"> </button>
<label class="control-label col-lg-3"> </div>
{l s='Email address:'} <input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
</label> </form>
<div class="input-group col-lg-5">
<span class="input-group-addon"><i class="icon-envelope"></i></span> <form action="#" id="forgot_password_form" method="post" class="hide form-horizontal panel">
<input autofocus="autofocus" type="text" name="email_forgot" id="email_forgot" class="input email_field" /> <h3>{l s='Forgot your password?'}</h3>
</div> <p class="alert alert-info">{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}
</p>
<div class="form-group">
<label for="email_forgot">
{l s='Email address:'}
</label>
<div class="input-group">
<span class="input-group-addon"><i class="icon-envelope"></i></span>
<input
type="text"
name="email_forgot"
id="email_forgot"
class="input email_field form-control"
autofocus="autofocus"
placeholder="test@example.com" />
</div> </div>
<div class="form-group"> </div>
<div class="col-lg-9 col-lg-offset-3"> <div class="form-group">
<button class="btn btn-default" name="submitLogin" type="submit"> <button href="#" class="btn btn-default show-login-form">
{l s='Send'} <i class="icon-caret-left text-danger"></i>
</button> {l s='Back to login'}
</div> </button>
</div> <button class="btn btn-default" name="submitLogin" type="submit">
<div class="form-group"> <i class="icon-ok text-success"></i>
<div class="col-lg-9 col-lg-offset-3"> {l s='Send'}
<p> </button>
<a href="#" class="show-login-form"> </div>
<i class="icon-angle-left"></i>
{l s='Back to login'}
</a>
</p>
</div>
</div>
</fieldset>
</form> </form>
{else} {else}
<div class="col-lg-12"> <div class="col-lg-12">
<p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p> <p>{l s='For security reasons, you cannot connect to the Back Office until after you have:'}</p>
<ul> <ul>
{if isset($wrong_install_name) && $wrong_install_name == true}<li>{l s='deleted the /install folder'}</li>{/if} {if isset($wrong_install_name) && $wrong_install_name == true}
{if isset($wrong_folder_name) && $wrong_folder_name == true}<li>{l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}</li>{/if} <li>{l s='deleted the /install folder'}</li>
{/if}
{if isset($wrong_folder_name) && $wrong_folder_name == true}
<li>{l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}</li>
{/if}
</ul> </ul>
<p> <p>
<a href="{$adminUrl|escape:'htmlall':'UTF-8'}">{l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}</a> <a href="{$adminUrl|escape:'htmlall':'UTF-8'}">
{l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}
</a>
</p> </p>
</div> </div>
{/if} {/if}
</div> </div>
<p class="text-center">
<a href="http://www.prestashop.com">
&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.
</a>
</p>
</div> </div>
</fieldset>
<p class="text-center text-muted">
<a href="http://www.prestashop.com">
&copy; 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.
</a>
</p>
</div> </div>
admin-dev/themes/default/template/controllers/login/header.tpl
+2 -2
View File
@@ -46,6 +46,6 @@
<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" /> <link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
<![endif]--> <![endif]-->
</head> </head>
<body> <body class="page-topbar">
<div id="main"> <div id="login">
<div id="content" class="page-content"> <div id="content" class="page-content">
classes/controller/AdminController.php
+4 -11
View File
@@ -1343,16 +1343,9 @@ class AdminControllerCore extends Controller
$template_dirs = $this->context->smarty->getTemplateDir(); $template_dirs = $this->context->smarty->getTemplateDir();
// Check if header/footer have been overriden // Check if header/footer have been overriden
$header_tpl = 'header.tpl'; $dir = $this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.trim($this->override_folder, '\\/').DIRECTORY_SEPARATOR;
$footer_tpl = 'footer.tpl'; $header_tpl = file_exists($dir.'header.tpl') ? $dir.'header.tpl' : 'header.tpl';
foreach ($template_dirs as $template_dir) $footer_tpl = file_exists($dir.'footer.tpl') ? $dir.'footer.tpl' : 'footer.tpl';
{
if (file_exists($template_dir.DIRECTORY_SEPARATOR.'header.tpl'))
$header_tpl = $template_dir.DIRECTORY_SEPARATOR.'header.tpl';
if (file_exists($template_dir.DIRECTORY_SEPARATOR.'footer.tpl'))
$footer_tpl = $template_dir.DIRECTORY_SEPARATOR.'footer.tpl';
}
$tpl_action = $this->tpl_folder.$this->display.'.tpl'; $tpl_action = $this->tpl_folder.$this->display.'.tpl';
// Check if action template has been overriden // Check if action template has been overriden
@@ -3035,7 +3028,7 @@ class AdminControllerCore extends Controller
{ {
if (file_exists($this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name)) if (file_exists($this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name))
return $this->context->smarty->createTemplate($this->override_folder.$tpl_name, $this->context->smarty); return $this->context->smarty->createTemplate($this->override_folder.$tpl_name, $this->context->smarty);
else if (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name)) elseif (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name))
return $this->context->smarty->createTemplate('controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name, $this->context->smarty); return $this->context->smarty->createTemplate('controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$tpl_name, $this->context->smarty);
} }