Fix layout for install and login pages

This commit is contained in:
Dmitriy Simushev 2015-05-21 13:58:54 +00:00
parent 5d13afd8f6
commit bc024c3253
5 changed files with 4 additions and 5 deletions

View File

@ -54,7 +54,7 @@ class UsersController extends AbstractController
$page = array_merge($page, prepare_menu($operator)); $page = array_merge($page, prepare_menu($operator));
$page['showMenu'] = !$request->query->has('nomenu'); $page['hideMenu'] = (bool)$request->query->has('nomenu');
// Attach files of the client side application and start it // Attach files of the client side application and start it
$this->getAssetManager()->attachJs('js/compiled/users_app.js'); $this->getAssetManager()->attachJs('js/compiled/users_app.js');

View File

@ -686,7 +686,6 @@ function prepare_menu($operator, $has_right = true)
{ {
$result = array(); $result = array();
$result['showMenu'] = true;
$result['operator'] = get_operator_name($operator); $result['operator'] = get_operator_name($operator);
if ($has_right) { if ($has_right) {
$result['showban'] = Settings::get('enableban') == "1"; $result['showban'] = Settings::get('enableban') == "1";

View File

@ -62,7 +62,7 @@
<div class="content-div"> <div class="content-div">
{{#ifOverridden "menu"}} {{#ifOverridden "menu"}}
<div id="content" class="{{#if showMenu}}content-inner{{else}}content-no-menu{{/if}}"> <div id="content" class="{{#if hideMenu}}content-no-menu{{else}}content-inner{{/if}}">
{{else}} {{else}}
<div id="content" class="content-no-menu"> <div id="content" class="content-no-menu">
{{/ifOverridden}} {{/ifOverridden}}

View File

@ -1,4 +1,4 @@
<div id="sidebar"{{#unless showMenu}} class="sidebar-hidden"{{/unless}}> <div id="sidebar"{{#if hideMenu}} class="sidebar-hidden"{{/if}}>
<ul> <ul>
{{#if warnOffline}} {{#if warnOffline}}
{{#unless isOnline}} {{#unless isOnline}}

View File

@ -8,7 +8,7 @@
{{#override "content"}} {{#override "content"}}
<div> <div>
<div id="toggle-menu"> <div id="toggle-menu">
<a href="#">{{#if showMenu}}{{l10n "Hide menu"}}{{else}}{{l10n "Show menu"}}{{/if}}</a> <a href="#">{{#if hideMenu}}{{l10n "Show menu"}}{{else}}{{l10n "Hide menu"}}{{/if}}</a>
</div> </div>
<div> <div>
{{l10n "This page displays a list of visitors who are waiting."}} {{l10n "This page displays a list of visitors who are waiting."}}