diff options
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/oscar/about.html | 1 | ||||
| -rw-r--r-- | searx/templates/oscar/base.html | 7 | ||||
| -rw-r--r-- | searx/templates/oscar/categories.html | 1 | ||||
| -rw-r--r-- | searx/templates/oscar/messages/js_disabled.html | 4 | ||||
| -rw-r--r-- | searx/templates/oscar/navbar.html | 40 | ||||
| -rw-r--r-- | searx/templates/oscar/preferences.html | 5 |
6 files changed, 7 insertions, 51 deletions
diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html index 743d48074..673738172 100644 --- a/searx/templates/oscar/about.html +++ b/searx/templates/oscar/about.html @@ -1,5 +1,4 @@ {% extends "oscar/base.html" %} -{% block site_alert_warning_nojs %} {% endblock %} {% block title %}{{ _('about') }} - {% endblock %} {% block content %} <div{% if rtl %} dir="ltr"{% endif %}> diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index d3170d622..81d4febcf 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -59,13 +59,6 @@ {% endblock %} {% block site_alert_warning %} {% endblock %} - {% block site_alert_warning_nojs %} - <noscript> - <div class="visible-xs-block"> - {% include 'oscar/messages/js_disabled.html' %} - </div> - </noscript> - {% endblock %} {% block site_alert_info %} {% endblock %} {% block site_alert_success %} diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html index 241d262ea..1ace10f16 100644 --- a/searx/templates/oscar/categories.html +++ b/searx/templates/oscar/categories.html @@ -3,7 +3,6 @@ {% for category in categories | reverse %} <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /> <label for="checkbox_{{ category|replace(' ', '_') }}">{{ _(category) }}</label> - </label> {% endfor %} {% else %} {% for category in categories %} diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html deleted file mode 100644 index 8baaf1e4c..000000000 --- a/searx/templates/oscar/messages/js_disabled.html +++ /dev/null @@ -1,4 +0,0 @@ -<div class="alert alert-warning" role="alert"> - <strong class="lead">{{ _('Warning!') }}</strong> - {{ _('Please enable JavaScript to use full functionality of this site.') }} -</div> diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html index c59bcda3d..d12de7dab 100644 --- a/searx/templates/oscar/navbar.html +++ b/searx/templates/oscar/navbar.html @@ -1,40 +1,14 @@ <!-- Static navbar --> <div class="navbar navbar-default" role="navigation"> <div class="container-fluid"> - {% if rtl %} - <div class="navbar-collapse collapse navbar-left"> - <ul class="nav navbar-nav navbar-left"> <!-- results.html --> - <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li> - <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li> - <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li> - </ul> - </div> - <div class="navbar-header navbar-right"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="sr-only">{{ _('Toggle navigation') }}</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a> - </div> - {% else %} - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="sr-only">{{ _('Toggle navigation') }}</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> + <div class="navbar-header{% if rtl %} navbar-right{% endif %}"> <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a> </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> <!-- results.html --> - <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li> - <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li> - <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li> - </ul> - </div><!--/.nav-collapse --> - {% endif %} </div><!--/.container-fluid --> </div> +<div class="menu menu-{% if rtl %}left{% else %}right{% endif %}"> + <ul> <!-- results.html --> + <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li> + <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li> + </ul> +</div><!--/.nav-collapse --> diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index 85e90d17d..ed790c56a 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -1,11 +1,6 @@ {% from 'oscar/macros.html' import preferences_item_header, preferences_item_header_rtl, preferences_item_footer, preferences_item_footer_rtl, checkbox_toggle %} {% extends "oscar/base.html" %} {% block title %}{{ _('preferences') }} - {% endblock %} -{% block site_alert_warning_nojs %} -<noscript> - {% include 'oscar/messages/js_disabled.html' %} -</noscript> -{% endblock %} {% block content %} <div> |