diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index ed70f70d1..ff3eb04f7 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -96,7 +96,6 @@ html, body @extend h3 h3:not(.modal-title), .panel-heading border: none - //height: 30px padding: 0 5px margin: -16px -16px 15px -16px color: contrasted($bg-panel-heading-color) @@ -487,7 +486,7 @@ tr.filter .fixed-width-xxl 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 @extend .form-control fieldset > .row @@ -505,15 +504,15 @@ textarea color: white @include border-radius(3px) i - @include border-radius(3px) float: left - color: white - font-size: 35px height: 64px width: 64px + margin-right: 10px + color: white + font-size: 35px text-align: center line-height: 64px - margin-right: 10px + @include border-radius(3px) .title color: #666 display: block @@ -571,8 +570,6 @@ tr.highlighted td background-color: $brand-primary!important color: white - - .hook_panel @extend .well @include box-shadow(rgba(white,0.9) 0 0 0 1px inset) @@ -758,7 +755,6 @@ li.sortable-placeholder +border-radius(5px) - @import "nav" @import "toggle-switch" @import "carrier-wizard" diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index f4b321eab..231831b5f 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -28,17 +28,17 @@ var label_errors = '{l s='errors'}'; var label_error = '{l s='error'}'; +
-
{if isset($errors)} -

{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}

-
    - {foreach from=$errors item="error"} -
  1. {$error}
    2. - {/foreach} -
+

{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}

+
    + {foreach from=$errors item="error"} +
  1. {$error}
    2. + {/foreach} +
{/if}
{if isset($warningSslMessage)} @@ -47,98 +47,102 @@

{$shop_name}

{if !isset($wrong_folder_name) && !isset($wrong_install_name)} -
-
-
- -
- - -
-
-
- -
- - -
-
-
-
- -
+ +

{l s='Log in'}

+
+ +
+ +
-
-
-

- - - {l s='Lost password?'} - -

-
+
+
+ +
+ +
- -
-
-
-
-

{l s='Forgot your password?'}

-

- {l s='In order to receive your access code by email, please enter the address you provided during the registration process.'} -

-
- -
- - -
+
+
+ + +
+ + + +
+

{l s='Forgot your password?'}

+

{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'} +

+
+ +
+ +
-
-
- -
-
-
-
-

- -

-
-
-
+
+
+ + +
{else}

{l s='For security reasons, you cannot connect to the Back Office until after you have:'}

    - {if isset($wrong_install_name) && $wrong_install_name == true}
  • {l s='deleted the /install folder'}
    • {/if} - {if isset($wrong_folder_name) && $wrong_folder_name == true}
  • {l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}
    • {/if} + {if isset($wrong_install_name) && $wrong_install_name == true} +
  • {l s='deleted the /install folder'}
    • + {/if} + {if isset($wrong_folder_name) && $wrong_folder_name == true} +
  • {l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}
    • + {/if}

- {l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl} + + {l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl} +

{/if}
-

- - © 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved. - -

- + +

+ + © 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved. + +

\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/login/header.tpl b/admin-dev/themes/default/template/controllers/login/header.tpl index d5bc2ce6b..d63071bf9 100644 --- a/admin-dev/themes/default/template/controllers/login/header.tpl +++ b/admin-dev/themes/default/template/controllers/login/header.tpl @@ -46,6 +46,6 @@ - -
+ +
\ No newline at end of file diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 35f464df6..a7c460eb5 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1343,16 +1343,9 @@ class AdminControllerCore extends Controller $template_dirs = $this->context->smarty->getTemplateDir(); // Check if header/footer have been overriden - $header_tpl = 'header.tpl'; - $footer_tpl = 'footer.tpl'; - foreach ($template_dirs as $template_dir) - { - 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'; - } - + $dir = $this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.trim($this->override_folder, '\\/').DIRECTORY_SEPARATOR; + $header_tpl = file_exists($dir.'header.tpl') ? $dir.'header.tpl' : 'header.tpl'; + $footer_tpl = file_exists($dir.'footer.tpl') ? $dir.'footer.tpl' : 'footer.tpl'; $tpl_action = $this->tpl_folder.$this->display.'.tpl'; // 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)) 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); }