free
/
searx
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 11 Wiki Activity
Browse Source

Merge pull request #6 from pointhi/template_oscar 

[enh] add no-js support
Thomas Pointhuber 10 years ago
parent
46dd502592 25312c53e1
commit
a9b4f458e9
3 changed files with 19 additions and 5 deletions
Unified View Show Diff Stats
  1. 6
    0
      searx/templates/oscar/base.html
  2. 12
    4
      searx/templates/oscar/preferences.html
  3. 1
    1
      searx/templates/oscar/result_templates/images.html

+ 6
- 0
searx/templates/oscar/base.html View File

32 
         searx.method = "{{ method or 'POST' }}";
 32 
         searx.method = "{{ method or 'POST' }}";
33 
         searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
 33 
         searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
34 
     </script>
 34 
     </script>
35 
+    <noscript>
36 
+        <style type="text/css">
37 
+            .tab-content > .active_if_nojs {display: block;}
38 
+            .hide_if_nojs {display: none !important;overflow:none !important;}
39 
+        </style>
40 
+    </noscript>
35 
 </head>
 41 
 </head>
36 
 <body>
 42 
 <body>
37 
     <div class="container">
 43 
     <div class="container">

+ 12
- 4
searx/templates/oscar/preferences.html View File

7 
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 7 
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
8
8
9 
     <!-- Nav tabs -->
 9 
     <!-- Nav tabs -->
10 
-    <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
10 
+    <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
11 
       <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
 11 
       <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
12 
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
 12 
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
13 
     </ul>
 13 
     </ul>
14
14
15 
     <!-- Tab panes -->
 15 
     <!-- Tab panes -->
16 
+    <noscript>
17 
+        <h3>{{ _('General') }}</h3>
18 
+    </noscript>
16 
     <div class="tab-content">
 19 
     <div class="tab-content">
17 
         <div class="tab-pane active" id="tab_general">
 20 
         <div class="tab-pane active" id="tab_general">
18 
             <fieldset>
 21 
             <fieldset>
83 
             </div>
 86 
             </div>
84 
             </fieldset>
 87 
             </fieldset>
85 
         </div>
 88 
         </div>
86 
-        <div class="tab-pane" id="tab_engine">
89 
+        <div class="tab-pane active_if_nojs" id="tab_engine">
87
90
88 
             <!-- Nav tabs -->
 91 
             <!-- Nav tabs -->
89 
-            <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
92 
+            <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
90 
                 {% for (categ,search_engines) in categs %}
 93 
                 {% for (categ,search_engines) in categs %}
91 
                 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
 94 
                 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
92 
                 {% endfor %}
 95 
                 {% endfor %}
93 
             </ul>
 96 
             </ul>
94
97
98 
+            <noscript>
99 
+                <h3>{{ _('Engines') }}</h3>
100 
+            </noscript>
95
101
96 
             <!-- Tab panes -->
 102 
             <!-- Tab panes -->
97 
             <div class="tab-content">
 103 
             <div class="tab-content">
98 
                 {% for (categ,search_engines) in categs %}
 104 
                 {% for (categ,search_engines) in categs %}
99 
-                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '_') }}">
105 
+                <noscript><label>{{ _(categ) }}</label>
106 
+                </noscript>
107 
+                <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
100 
                     <div class="container-fluid">
 108 
                     <div class="container-fluid">
101 
                     <fieldset>
 109 
                     <fieldset>
102 
                     {% for search_engine in search_engines %}
 110 
                     {% for search_engine in search_engines %}

+ 1
- 1
searx/templates/oscar/result_templates/images.html View File

1 
-<a href="#" data-toggle="modal" data-target="#modal-{{ index }}">
1 
+<a href="{{ result.img_src }}" data-toggle="modal" data-target="#modal-{{ index }}">
2 
     <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
2 
     <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
3 
 </a>
3 
 </a>
4
4