diff --git a/aleksis/core/static/public/style.scss b/aleksis/core/static/public/style.scss index 618b846dc956af8ed62db357f2867a9988b58846..09ecb9c1a67fea08a303b1919a3b19df74ae5ac5 100644 --- a/aleksis/core/static/public/style.scss +++ b/aleksis/core/static/public/style.scss @@ -64,6 +64,10 @@ header, main, footer { margin-left: 300px; } +.without-menu header, .without-menu main, .without-menu footer { + margin-left: 0; +} + @media only screen and (max-width: 992px) { header, main, footer { margin-left: 0; diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html index 06aebc4533369e9b7af39051dcb80713193f50d5..7fd4e38f8449b0a649fcd01e08051a2332070a15 100644 --- a/aleksis/core/templates/core/base.html +++ b/aleksis/core/templates/core/base.html @@ -58,7 +58,7 @@ {% block extra_head %}{% endblock %} </head> -<body> +<body {% if no_menu %}class="without-menu"{% endif %}> <header> <!-- Menu button (sidenav) --> @@ -88,32 +88,36 @@ </nav> <!-- Main nav (sidenav) --> - <ul id="slide-out" class="sidenav sidenav-fixed"> - <li class="logo"> - {% static "img/aleksis-banner.svg" as aleksis_banner %} - <a id="logo-container" href="/" class="brand-logo"> - <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" - alt="{{ request.site.preferences.general__title }} – Logo"> - </a> - </li> - {% has_perm 'core.search_rule' user as search %} - {% if search %} - <li class="search"> - <form method="get" action="{% url "haystack_search" %}" id="search-form" class="autocomplete"> - <div class="search-wrapper"> - <input id="search" name="q" type="search" enterkeyhint="search" placeholder="{% trans "Search" %}"> - <button class="btn btn-flat search-button" type="submit" aria-label="{% trans "Search" %}"> - <i class="material-icons">search</i> - </button> - <div class="progress" id="search-loader"><div class="indeterminate"></div></div> - </div> - </form> + {% if not no_menu %} + <ul id="slide-out" class="sidenav sidenav-fixed"> + <li class="logo"> + {% static "img/aleksis-banner.svg" as aleksis_banner %} + <a id="logo-container" href="/" class="brand-logo"> + <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" + alt="{{ request.site.preferences.general__title }} – Logo"> + </a> </li> - {% endif %} - <li class="no-padding"> - {% include "core/partials/sidenav.html" %} - </li> - </ul> + {% has_perm 'core.search_rule' user as search %} + {% if search %} + <li class="search"> + <form method="get" action="{% url "haystack_search" %}" id="search-form" class="autocomplete"> + <div class="search-wrapper"> + <input id="search" name="q" type="search" enterkeyhint="search" placeholder="{% trans "Search" %}"> + <button class="btn btn-flat search-button" type="submit" aria-label="{% trans "Search" %}"> + <i class="material-icons">search</i> + </button> + <div class="progress" id="search-loader"> + <div class="indeterminate"></div> + </div> + </div> + </form> + </li> + {% endif %} + <li class="no-padding"> + {% include "core/partials/sidenav.html" %} + </li> + </ul> + {% endif %} </header>