govuk_elements_rails 0.3.0 → 1.1.2

data/vendor/assets/stylesheets/elements/_panels.scss

@@ -1,29 +1,36 @@
 // Panels
 // ==========================================================================
-// GOV.UK front end toolkit dependencies
-@import "helpers";
 
-
-// Indented panels with a grey left hand border
-.panel-indent {
+.panel {
   @extend %contain-floats;
   clear: both;
-  border-left: 4px solid $border-colour;
+  border-left-style: solid;
+  border-color: $border-colour;
 
-  padding: 10px 0 10px $gutter-half;
-  margin: ($gutter $gutter-half $gutter*1.5 0);
+  padding: em(15,19);
+  margin-bottom: em(15,19);
 
-  legend {
+  :first-child {
     margin-top: 0;
   }
-  
-  // Remove bottom margin on last paragraph
-  p:only-child,
-  p:last-child {
-    margin-bottom: 0;
-  }
-  
-  .form-group:last-child {
+
+  :only-child,
+  :last-child {
     margin-bottom: 0;
   }
 }
+
+.panel-border-wide {
+  border-left-width: 10px;
+}
+
+// Used to show the left edge of "toggled" content
+.panel-border-narrow {
+  border-left-width: 5px;
+}
+
+// Panels within form groups
+// Remove the bottom padding as .form-group sets a bottom margin
+.form-group .panel-border-narrow {
+  padding-bottom: 0;
+}

data/vendor/assets/stylesheets/elements/_phase-banner.scss

@@ -0,0 +1,10 @@
+// Phase banners
+// ==========================================================================
+
+.phase-banner-alpha {
+  @include phase-banner($state: alpha);
+}
+
+.phase-banner-beta {
+  @include phase-banner($state: beta);
+}

data/vendor/assets/stylesheets/elements/_tables.scss

@@ -1,9 +1,5 @@
 // Tables
 // ==========================================================================
-// GOV.UK front end toolkit dependencies
-@import "typography";
-@import "colours";
-
 
 table {
   border-collapse: collapse;
@@ -25,7 +21,7 @@ table {
     // Right align headings for numeric content
     &.numeric {
       text-align: right;
-    } 
+    }
   }
 
   // Use tabular numbers for numeric table cells

data/vendor/assets/stylesheets/elements/forms/_form-block-labels.scss

@@ -1,11 +1,6 @@
 // Large hit area
 // Radio buttons & checkboxes
 
-@import "colours";
-@import "measurements";
-@import "conditionals";
-
-
 // By default, block labels stack vertically
 .block-label {
 
@@ -16,7 +11,7 @@
 
   background: $panel-colour;
   border: 1px solid $panel-colour;
-  padding: (18px $gutter $gutter-half $gutter*1.5);
+  padding: (18px $gutter $gutter-half $gutter*1.8);
 
   margin-bottom: 10px;
   cursor: pointer; // Encourage clicking on block labels
@@ -29,9 +24,15 @@
   // Absolutely position inputs within label, to allow text to wrap
   input {
     position: absolute;
-    top: 18px;
+    top: 15px;
     left: $gutter-half;
     cursor: pointer;
+    margin: 0;
+    width: 29px;
+    height: 29px;
+    @include ie(8) {
+      top: 12px;
+    }
   }
 
   // Change border on hover

data/vendor/assets/stylesheets/elements/forms/_form-validation.scss

@@ -1,9 +1,6 @@
 // Form validation
 // ==========================================================================
 
-// Update the error colour in the govuk frontend toolkit
-$error-colour: #b10e1e;
-
 // Using the classname .error as it's shorter than .validation and easier to type!
 .error {
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_elements_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Rob McKinnon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,55 +50,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-description: A gem wrapper around SHA 281fb6b9e14129a6c3f982c46c43970e3f2f7f78 govuk_elements
-  (heads/master) that pulls stylesheet and javascript files into a Rails app.
+- !ruby/object:Gem::Dependency
+  name: govuk_frontend_toolkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.1
+description: |-
+  A gem wrapper around govuk_elements v1.1.2
+   that pulls stylesheet and javascript files into a Rails app. Changelog: https://github.com/alphagov/govuk_elements/blob/c19cf54ebf507b7e22b8a5e4df030b4f480f765d
+  /CHANGELOG.md
 email: rob.mckinnon ~@nospam@~ digital.justice.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- LICENCE
+- LICENSE
 - README.md
-- app/builders/govuk_elements_form_builder.rb
-- app/builders/labelling_form_builder.rb
 - lib/govuk_elements_rails.rb
 - lib/govuk_elements_rails/engine.rb
-- lib/govuk_elements_rails/version.rb
-- vendor/assets/images/icons/accordian-arrow-2x.png
-- vendor/assets/images/icons/accordian-arrow.png
-- vendor/assets/images/icons/arrow-sprite.png
-- vendor/assets/images/icons/icon-calendar-2x.png
-- vendor/assets/images/icons/icon-calendar.png
-- vendor/assets/images/icons/icon-file-download-2x.png
-- vendor/assets/images/icons/icon-file-download.png
-- vendor/assets/images/icons/icon-important-2x.png
-- vendor/assets/images/icons/icon-important.png
-- vendor/assets/images/icons/icon-information-2x.png
-- vendor/assets/images/icons/icon-information.png
-- vendor/assets/images/icons/icon-locator-2x.png
-- vendor/assets/images/icons/icon-locator.png
-- vendor/assets/images/icons/icon-pointer-2x.png
-- vendor/assets/images/icons/icon-pointer-black-2x.png
-- vendor/assets/images/icons/icon-pointer-black.png
-- vendor/assets/images/icons/icon-pointer-indexed.png
-- vendor/assets/images/icons/icon-pointer.png
-- vendor/assets/images/icons/icon-search-2x.png
-- vendor/assets/images/icons/icon-search.png
-- vendor/assets/images/icons/player-icon-forward.png
-- vendor/assets/images/icons/player-icon-pause.png
-- vendor/assets/images/icons/player-icon-play.png
-- vendor/assets/images/icons/player-icon-rewind.png
-- vendor/assets/images/icons/player-icon-volume.png
-- vendor/assets/javascripts/application.js
-- vendor/assets/javascripts/bind.js
 - vendor/assets/javascripts/details.polyfill.js
-- vendor/assets/javascripts/selection-buttons.js
-- vendor/assets/stylesheets/elements-page-ie6.scss
-- vendor/assets/stylesheets/elements-page-ie7.scss
-- vendor/assets/stylesheets/elements-page-ie8.scss
-- vendor/assets/stylesheets/elements-page.scss
+- vendor/assets/stylesheets/_govuk-elements.scss
+- vendor/assets/stylesheets/elements/_base.scss
+- vendor/assets/stylesheets/elements/_breadcrumbs.scss
 - vendor/assets/stylesheets/elements/_buttons.scss
+- vendor/assets/stylesheets/elements/_components.scss
 - vendor/assets/stylesheets/elements/_details.scss
 - vendor/assets/stylesheets/elements/_elements-typography.scss
 - vendor/assets/stylesheets/elements/_forms.scss
@@ -107,19 +98,12 @@ files:
 - vendor/assets/stylesheets/elements/_layout.scss
 - vendor/assets/stylesheets/elements/_lists.scss
 - vendor/assets/stylesheets/elements/_panels.scss
+- vendor/assets/stylesheets/elements/_phase-banner.scss
 - vendor/assets/stylesheets/elements/_reset.scss
 - vendor/assets/stylesheets/elements/_tables.scss
 - vendor/assets/stylesheets/elements/forms/_form-block-labels.scss
 - vendor/assets/stylesheets/elements/forms/_form-date.scss
 - vendor/assets/stylesheets/elements/forms/_form-validation.scss
-- vendor/assets/stylesheets/main-ie6.scss
-- vendor/assets/stylesheets/main-ie7.scss
-- vendor/assets/stylesheets/main-ie8.scss
-- vendor/assets/stylesheets/main.scss
-- vendor/assets/stylesheets/prism.scss
-- vendor/assets/stylesheets/service-design-manual/helpers/_breadcrumbs.scss
-- vendor/assets/stylesheets/service-design-manual/helpers/_page-header.scss
-- vendor/assets/stylesheets/service-design-manual/styleguide/_colours.scss
 homepage: https://github.com/ministryofjustice/govuk_elements_rails
 licenses: []
 metadata: {}
@@ -142,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem wrapper around http://github.com/alphagov/govuk_elements that pulls

data/LICENCE

@@ -1,20 +0,0 @@
-Copyright (c) 2014 HM Government
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/builders/govuk_elements_form_builder.rb

@@ -1,77 +0,0 @@
-class GovukElementsFormBuilder < ActionView::Helpers::FormBuilder
-  attr_reader :template, :object_name
-
-  def text_area(method, **options)
-    with_label(method) {
-      super(method, add_class(options, 'text form-control'))
-    }
-  end
-
-  def bold_label(method, text: nil, **options)
-    label(method, text, add_class(options, 'form-label'))
-  end
-
-  def radio_buttons(method, values, labeler: labeler, **options)
-    radio_button_fieldset(method, options) {
-      with_label(method) {
-        values.map { |value|
-          label(method, value: value, class: 'block-label') {
-            radio_button(method, value) + labeler.call(value)
-          }
-        }.join.html_safe
-      }
-    }
-  end
-
-  def text_field(method, **options)
-    with_label(method) {
-      super(method, add_class(options, 'form-control'))
-    }
-  end
-
-  def password_field(method, **options)
-    with_label(method) {
-      super(method, add_class(options, 'form-control'))
-    }
-  end
-
-  def file_field(method, **options)
-    with_label(method) {
-      super(method, add_class(options, 'form-control'))
-    }
-  end
-
-  def collection_select(method, values, valuer: nil, labeler: nil, **options)
-    valuer ||= ->(a) { a.respond_to?(:to_param) ? a.to_param : a }
-    labeler ||= ->(a) { a }
-    with_label(method) {
-      super(
-        method, values, valuer, labeler, options,
-        class: 'select form-control'
-      )
-    }
-  end
-
-  def button(value = nil, **options)
-    super(value, add_class(options, 'button'))
-  end
-
-  def with_label(method, &content)
-    error_messages = object.errors[method].map { |error|
-      template.content_tag(:p, class: 'error') { error }
-    }.join.html_safe
-    bold_label(method) + content.call + error_messages
-  end
-
-  def add_class(options, klass)
-    options.merge(class: [options[:class], klass].compact.join(' '))
-  end
-
-private
-
-  def radio_button_fieldset(method, options, &blk)
-    id = [object_name, method].join('_')
-    klass = options[:inline] ? 'inline' : ''
-    template.content_tag(:fieldset, id: id, class: klass, &blk)
-  end
-end

data/app/builders/labelling_form_builder.rb

@@ -1,316 +0,0 @@
-
-class LabellingFormBuilder < ActionView::Helpers::FormBuilder
-
-  include ActionView::Helpers::CaptureHelper
-  include ActionView::Helpers::TagHelper
-  include ActionView::Context
-
-  def text_field_row(attribute, options={})
-    row_input attribute, :text_field, options
-  end
-
-  def text_area_row(attribute, options={})
-    row_input attribute, :text_area, options
-  end
-
-  def moj_date_fieldset attribute, legend, options = {}, example_date = Date.today, explanatory_text = nil
-    df = MojDateFieldset.new(self, attribute, legend, options, example_date, explanatory_text)
-    df.emit
-  end
-
-  # produces an postcode picker widget - this will produce an address/street and postcode attributes for the given object type
-  # @param [String] attribute: the name of the attribute on Claim which is to have the street and postcode attributes (e.g. property, defendant_1)
-  # @param [Hash] options: options to control the way in which the potcode picker is displayed, and what html is generated in the form:
-  #  :prefix - the prefix to be applied to each element in the form
-  #  :postcode_attr - the name of the postcode attribute if not 'postcode'
-  #  :address_attr - the name of the address attribute if not 'street'
-  #  :name - the prefix of the name given to the street and postcode attributes if not 'claim['xxxx'] where xxxx is the attribute
-  #  :street_hint -  and html which is to be inserted as a hint above the street textarea
-  #  :vc - list of valid countries: postcodes that return a country not in the supplied list will be marked as invalid.
-  #        If not supplied or blank, all countries are valid.  Countries should be joined by '+' and spaces in country names should be replaced
-  #        by underscores, e.g "england+wales+channel_islands+isle_of_man"
-  #  :button_label - the text to use on the Find UK Address button if not 'Find Uk Address'
-  #
-  def moj_postcode_picker attribute, options = {}
-    default_options = {
-      :prefix        => "claim_#{attribute}",
-      :postcode_attr => :postcode,
-      :address_attr  => :street,
-      :name          => "claim[#{attribute}]"
-    }
-    options = default_options.merge(options)
-    mpp = MojPostcodePicker.new(self, options)
-    mpp.emit
-  end
-
-  # Defaults to "Yes" "No" labels on radio inputs
-  def radio_button_fieldset attribute, legend, options={}
-    translation_key = translation_key(attribute)
-    raise "TBD: #{translation_key} #{options[:choice]}" if options[:choice].is_a?(Hash)
-
-    virtual_pageview = options[:data] ? options[:data].delete('virtual-pageview') : nil
-    input_class = options.delete(:input_class)
-
-    set_class_and_id attribute, options
-
-    options[:choice] ||= [ 'Yes', 'No' ]
-
-    options_class = options[:class][/inline/] ? 'inline' : 'options'
-
-    data_reverse = options.delete(:toggle_fieldset) ? ' data-reverse="true"' : ''
-
-    fieldset_tag attribute, legend, options do
-      @template.surround("<div class='#{options_class}'#{data_reverse}>".html_safe, "</div>".html_safe) do
-        options[:choice].map do |choice|
-          radio_button_row(attribute, choice, virtual_pageview, input_class)
-        end.join("\n")
-      end
-    end
-  end
-
-  def row attribute, options={}
-    @template.haml_tag haml_tag_text('div option', attribute, options) do
-      yield
-    end
-  end
-
-  def error_for? attribute
-    # if @object.is_a?(Claim)
-      # subkey = "claim_#{attribute}_error"
-      # base_errors = error_message_for(:base)
-      # base_errors && base_errors.to_h.key?(subkey) && !base_errors.to_h[subkey].empty?
-    # else
-      attribute_errors = error_message_for(attribute)
-      attribute_errors && !attribute_errors.empty?
-    # end
-  end
-
-  def error_span attribute, options={}
-    @template.surround(error_span_open_tag(options), "</span>".html_safe) do
-      error_span_message(attribute)
-    end
-  end
-
-  # Creates key for lookup of translation text.
-  # E.g. translation_key(hearing, {:choice=>"No"}) when in possession form
-  #      returns "claim.possession.hearing.no"
-  def translation_key attribute, options={}
-    key = "#{ parent_id.gsub('_','.') }.#{attribute}".squeeze('.')
-    key.gsub!(/\.\d+\./, '.')
-    if choice = options[:choice]
-      choice = 'na' if choice == ''
-      key += ".#{choice.downcase}"
-    end
-    key
-  end
-
-  def error_id_for attribute
-    field_id = "#{parent_id}_#{attribute}".squeeze('_')
-    "#{field_id}_error"
-  end
-
-  def parent_id
-    @object_name.to_s.tr('[]','_').squeeze('_')
-  end
-
-  def labelled_check_box attribute, label, yes='Yes', no='No', options={}
-    set_class_and_id attribute, options
-    hidden_input = check_box_input_hidden attribute, options, yes, no
-
-    labeled_input = label(attribute) do
-      check_box_input(attribute, options, yes, no) + label
-    end
-
-    list = [hidden_input]
-
-    if error_for?(attribute)
-      id = error_id_for(attribute)
-      labeled_input.sub!(%Q[id="#{id}"], %Q[id="#{id.sub('_error','')}"])
-      list << hidden_fullstop(options)
-      list << error_span(attribute)
-    end
-
-    list << labeled_input
-
-    list.join("\n").html_safe
-  end
-
-  def set_class_and_id attribute, options
-    options[:class] = css_for(attribute, options)
-    options[:id] = id_for(attribute) unless id_for(attribute).blank?
-  end
-
-  def fieldset_tag(attribute, legend_text, options = {}, &block)
-    fieldset = tag(:fieldset, options_for_fieldset(options), true)
-
-    fieldset.safe_concat legend_for(attribute, legend_text, options) unless legend_text.blank?
-
-    fieldset.concat(capture(&block)) if block_given?
-    fieldset.safe_concat("</fieldset>")
-  end
-
-  private
-
-  def fieldset attribute, options={}
-    options.delete(:id) unless options[:id].present?
-    @template.haml_tag haml_tag_text('fieldset', attribute, options) do
-      yield
-    end
-  end
-
-  def id_for attribute, default=nil
-    error_for?(attribute) ? error_id_for(attribute) : (default || '')
-  end
-
-  def label_content_for attribute, label, options={}
-    label ||= attribute.to_s.humanize
-    label = ["#{label}"]
-    hint = hint_span(options)
-    label << hint if hint
-    if error_for?(attribute)
-      last = label.pop
-      label << ( ends_with_punctuation?(last) ? last : (last + hidden_fullstop(options)) )
-      label << error_span(attribute, options)
-    end
-    label.join(" ").html_safe
-  end
-
-  def hint_span options
-    options[:hint] ? "<span class='hint block'>#{options[:hint]}</span>".html_safe : nil
-  end
-
-  def ends_with_punctuation? span
-    span[/\?<\/span/] || span[/\.<\/span>/] || span[/\.|\?$/]
-  end
-
-  def legend_for attribute, legend_text, options
-    label = label_content_for(attribute, legend_text, hint: options[:hint])
-    content_tag(:legend, label)
-  end
-
-  def hidden_fullstop options
-    '<span class="visuallyhidden">.</span>'.html_safe
-  end
-
-  def error_span_message attribute
-    if @object.is_a? Claim
-      error_message_for(:base).to_h["claim_#{attribute}_error"]
-    else
-      error_message_for(attribute)[0]
-    end
-  end
-
-  def error_span_open_tag options
-    " <span class='error#{error_classes(options)}'#{error_span_id(options)}>".html_safe
-  end
-
-  def error_span_id options
-    options.has_key?(:id)? " id='#{options[:id]}'" : nil
-  end
-
-  def error_classes options
-    ' visuallyhidden' if options[:hidden]
-  end
-
-  def options_for_fieldset options
-    options.delete(:class) if options[:class].blank?
-    options = {}.merge(options)
-    options.delete(:hint)
-    options.delete(:choice)
-    options.delete(:date_select_options)
-    options
-  end
-
-  def error_message_for symbol
-    @object.errors.messages[symbol]
-  end
-
-  def check_box_input attribute, options, yes, no
-    html = check_box(attribute, options, yes, no)
-    html.gsub!(/<[^<]*type="hidden"[^>]*>/,'')
-    html.html_safe
-  end
-
-  def check_box_input_hidden attribute, options, yes, no
-    html = check_box(attribute, options, yes, no)
-    html.gsub!(/.*(<[^<]*type="hidden"[^>]*>).*/, '\1')
-    html.html_safe
-  end
-
-  def radio_button_row attribute, choice, virtual_pageview, input_class
-    translation_key = translation_key(attribute, choice: choice)
-
-    translation = I18n.t(translation_key)
-    raise "translation missing: #{translation_key}" if translation[/translation missing/]
-    label = translation unless translation[/translation missing/]
-
-    options = {}
-    options.merge!(class: input_class) if input_class
-    options.merge!(data: { 'virtual_pageview' => virtual_pageview }) if virtual_pageview
-
-    input = radio_button(attribute, choice, options)
-
-    id = input[/id="([^"]+)"/,1]
-
-    @template.surround("<div class='option'>".html_safe, "</div>".html_safe) do
-      @template.surround("<label for='#{id}'>".html_safe, "</label>".html_safe) do
-        # errors = error_span(attribute, {hidden: true}) if error_for?(attribute)
-        [
-          # errors,
-          input,
-          label
-        ].compact.join("\n")
-      end
-    end
-  end
-
-  def css_for attribute, options
-    css = ''
-    css += " #{options[:class]}" if options[:class].present?
-    css += ' error' if error_for?(attribute)
-    css.strip
-  end
-
-  def haml_tag_text tag, attribute, options
-    tag += " #{css_for(attribute, options)}"
-    haml_tag_text = tag.squeeze(' ').strip.gsub(' ','.')
-  end
-
-  def row_input attribute, input_type, options
-    virtual_pageview = options[:data] ? options[:data].delete('virtual-pageview') : nil
-    css = "form-group #{css_for(attribute, options)}".strip
-    id = id_for(attribute).blank? ? '' : "id='#{id_for(attribute)}' "
-
-    @template.surround("<div #{id}class='#{css}'>".html_safe, "</div>".html_safe) do
-      input_options = options.merge(class: "form-control #{options[:input_class]}".strip)
-      input_options.merge!(data: {'virtual_pageview' => virtual_pageview}) if virtual_pageview
-      input_options.delete(:label)
-      input_options.delete(:input_class)
-
-      labelled_input attribute, input_type, input_options, options[:label]
-    end
-  end
-
-  def labelled_input attribute, input_type, input_options, label=nil
-    label = label(attribute, label_content_for(attribute, label), class: 'form-label')
-
-    if max_length = max_length(attribute)
-      input_options.merge!(maxlength: max_length)
-    end
-
-    value = send(input_type, attribute, input_options)
-
-    [ label, value ].join("\n").html_safe
-  end
-
-  def max_length attribute
-    if validator = validators(attribute).detect{|x| x.is_a?(ActiveModel::Validations::LengthValidator)}
-      validator.options[:maximum]
-    end
-  end
-
-  def validators attribute
-    @object.class.validators_on(attribute)
-  end
-
-end