govuk_admin_template 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfa85b6555d0e44bd630b9653127e1dec903315
-  data.tar.gz: baa018f4f29f150d5251d58661300a0ebc6c20f0
+  metadata.gz: 05b446a77b5540fe25898d6d3d4ddb8d1d019e98
+  data.tar.gz: 41e69f7e09148dd7127e1eaea2a5aff923d8530f
 SHA512:
-  metadata.gz: 26dc516c73da55fc2036e5e29b7c91b65aaf78679d9a066b88853d7558a1d2ca84b2c873f36d0d0150fa644f43f79a9afa42a1a047407d015fbf0ff01ef667a4
-  data.tar.gz: 35fcdc4700f92ed3c3cf899c76f2426ef9c1fcd57888ec78bf9a1e199203adfde394e3a9daeb8f7ecc25ec00d83e12555777503a589e04a2614e9f701d8bc063
+  metadata.gz: 5b18bfbc9babd4668e0e83f5809b126a1a0a4088534bfb8e21ecc85fea7bf8779c142510620f8a5cd71f65c71c478ebc318582662b8c9fab5dc98c31706af105
+  data.tar.gz: b2b2d9ed13c2a77ae1f728f437f65de8084b711f29ca0f61cd97654431d918adf0fe357d4dac48147cc5632c1250470b03bbfcd17d0851c059be99973f8e6190

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.4.0
+
+* Add a table filter partial for re-use in apps
+
 # 2.3.4
 
 * Improve Bootstrap 3 in IE7

data/app/views/govuk_admin_template/_table_filter.html.erb

@@ -0,0 +1,13 @@
+<%
+  placeholder ||= "Filter table"
+  colspan ||= 100
+  filter_id ||= SecureRandom.uuid
+%>
+<tr class="if-no-js-hide table-header-secondary">
+  <td colspan="<%= colspan %>">
+    <form>
+      <label for="<%= filter_id %>" class="rm"><%= placeholder %></label>
+      <input id="<%= filter_id %>" type="text" class="form-control normal js-filter-table-input" placeholder="<%= placeholder %>">
+    </form>
+  </td>
+</tr>

data/app/views/govuk_admin_template/style_guide/index.html.erb

@@ -184,7 +184,8 @@
 <h2>Tables</h2>
 <div class="row">
   <div class="col-md-6 lead">
-    <p>When using a table with two layers of headings, usually for interacting with table content, <code>table-header</code> and <code>table-header-secondary</code> classes are used.</p>
+    <p>Tables should use the Bootstrap 3 classes <code>table table-bordered</code>. The row of table headings should have the admin template class <code>table-headers</code>.</p>
+    <p>When using a table with two layers of headings, <code>table-header</code> and <code>table-header-secondary</code> classes can be used.</p>
   </div>
   <div class="col-md-6">
     <table class="table table-bordered table-hover">
@@ -207,9 +208,23 @@
     </table>
   </div>
 </div>
+<h3>Filterable tables</h3>
 <div class="row">
   <div class="col-md-6 lead">
-    <p>Using the <code>filterable-table</code> <a href="https://github.com/alphagov/govuk_admin_template/blob/master/app/assets/javascripts/govuk-admin-template/modules/filterable_table.js">module</a> table rows can be filtered. The module performs a simple match against the content of each row, if there’s no match the row is hidden.</p>
+    <p>Using the <a href="https://github.com/alphagov/govuk_admin_template/blob/master/app/assets/javascripts/govuk-admin-template/modules/filterable_table.js">filterable-table module</a> and the <a href="https://github.com/alphagov/govuk_admin_template/tree/master/app/views/govuk_admin_template/_table_filter.html.erb">table_filter partial</a> any table can be filtered. The module performs a simple match against the content of each row, if there’s no match the row is hidden.</p>
+    <p>If the class <code>js-open-on-submit</code> is added to a link within a row, then the first link visible with that class will be opened when the user hits <code>ENTER</code>.</p>
+    <pre class="add-top-margin">&lt;table class="table table-bordered" data-module="filterable-table"&gt;
+  &lt;thead&gt;
+    &lt;tr class="table-header"&gt;
+      &lt;th&gt;
+        Heading
+      &lt;/th&gt;
+    &lt;/tr&gt;
+    &lt;%= render partial: "govuk_admin_template/table_filter",
+      locals: {placeholder: "Filter items"} %&gt;
+  &lt;/thead&gt;
+  …
+&lt;/table&gt;</pre>
   </div>
   <div class="col-md-6">
     <table class="table table-bordered table-hover" data-module="filterable-table">
@@ -218,14 +233,7 @@
           <th>Primary header</th>
           <th style="width: 80px">Number</th>
         </tr>
-        <tr class="if-no-js-hide table-header-secondary">
-          <td colspan="2">
-            <form>
-              <label for="table-filter" class="rm">Filter organisations</label>
-              <input id="table-filter" type="text" class="form-control normal js-filter-table-input" placeholder="Filter table">
-            </form>
-          </td>
-        </tr>
+        <%= render partial: 'govuk_admin_template/table_filter', locals: {placeholder: 'Filter fruity things'} %>
       </thead>
       <tbody>
         <tr>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "2.3.4"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,6 +166,7 @@ files:
 - app/assets/stylesheets/govuk_admin_template/bootstrap-ie7.scss
 - app/controllers/govuk_admin_template/application_controller.rb
 - app/controllers/govuk_admin_template/style_guide_controller.rb
+- app/views/govuk_admin_template/_table_filter.html.erb
 - app/views/govuk_admin_template/style_guide/index.html.erb
 - app/views/layouts/govuk_admin_template.html.erb
 - config/routes.rb