hide non js required elements on render

ckan · Jul 20, 2012 · f601e7e · aron · Jul 20, 2012 · aron
1 parent d83a376
commit f601e7e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/ckan/public/base/javascript/modules/select-switch.js b/ckan/public/base/javascript/modules/select-switch.js
@@ -19,7 +19,6 @@ this.ckan.module('select-switch', {
 
   options: {
     target: 'select',
-    button: '[type=submit]'
   },
 
   initialize: function () {
@@ -28,9 +27,5 @@ this.ckan.module('select-switch', {
     this.el.on('change', this.options.target, function () {
       _this.el.submit();
     });
-
-    if (this.options.button) {
-      this.$(this.options.button).hide();
-    }
   }
 });
diff --git a/ckan/public/base/less/forms.less b/ckan/public/base/less/forms.less
@@ -1,3 +1,7 @@
+html.js .js-hide {
+    display:none;
+}
+
 .btn,
 label {
   font-weight: bold;

diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
@@ -9,7 +9,7 @@
 {% block primary_content %}
   <section class="module">
     <div class="module-content">
-      <form id="dataset-search" class="dataset-search clearfix" method="get" data-module="select-switch" data-module-button="#submit-order-by">
+      <form id="dataset-search" class="dataset-search clearfix" method="get" data-module="select-switch">
         <span class="control-group search-giant">
           <input type="text" class="search" name="q" value="{{ c.q }}" autocomplete="off" results="0" placeholder="{{ _('Search...') }}" />
           <button type="submit" value="{{ _('Search') }}">Submit</button>

diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
@@ -9,5 +9,5 @@
       </option>
     {% endfor %}
   </select>
-  <button class="btn" type="submit">{{ _('Go') }}</button>
+  <button class="btn js-hide" type="submit">{{ _('Go') }}</button>
 </form>
diff --git a/ckan/templates/snippets/sort_by.html b/ckan/templates/snippets/sort_by.html
@@ -7,5 +7,5 @@
     <option value="metadata_modified desc"{% if sort=='metadata_modified desc' %} selected="selected"{% endif %}>{{ _('Last Modified') }}</option>
     <option value="views_recent desc"{% if sort=='views_recent desc' %} selected="selected"{% endif %}>{{ _('Popular') }}</option>
   </select>
-  <button id="submit-order-by" class="btn" type="submit">Go</button>
+  <button class="btn js-hide" type="submit">Go</button>
 </span>