compendium 1.1.3.1 → 1.1.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI1MWYzOThlY2VlYjJiYjUwMGE2N2YzNWRhM2FkNjRjOTM4MTVlMQ==
+    OTRmYjc0MzRiODE5OWFjNGJmM2M4MWEzOTBkNTFkZTNhYWE3N2NjYw==
   data.tar.gz: !binary |-
-    ZjRkNmNhOTA5MDM5MzU0Yzc2Zjg0MjQxNTBjMjE5ZTZjNmE3NGJhZQ==
+    NGJjNTc5NjFkMjhmNTIyZTgxYjkwYTY1ZTM1NjQzZTI5MTkyYTUzYw==
 SHA512:
   metadata.gz: !binary |-
-    ZWY2ZjM3ZDY4ZDE1NjUyZjQ1YWVmMDkxMzY0OTBiNzYzYTg2MmYyOGU5MGQw
-    NmU0ZmJlYzhmYzM4ODhlYmY0ZmJiYThlZDQwOWY5OTc2MWQxY2E2YTM0NmJl
-    ZWU0NjlhMTU4OWRmYTRmM2ExMDI5ZjNkMGM1ZjczZjI0MGVhOWQ=
+    ZmEyZmZmOTEwYTBhODAwYTczODRmOTYxYmUwZjMxNDFmNGU5N2YyZmVmOGFi
+    MzE4NWVjZGFjOGQwOWNkMDlkZTVjY2VlZTYzMjM4ZDc1ZWUzMDA4YzVmZWQ4
+    M2JjYzg0MGFiN2RhOWQwOGUxODUwNjI0OTdlOWVmZjFhZGIxODM=
   data.tar.gz: !binary |-
-    NzI5ZDA2YjhiYzdiOGU0ZGM4MDIxNWY4YjIwNzAzNzY3ZTY0NzNkYjljN2Ix
-    NWQ3M2IzMTVhMzljMTExZGIyZWI4MDdhYzA4YTdhZDQxYzIzYTlkZmVmMDBi
-    ZmRhMjEyMGZhYjJkYzViODAyN2I1NDkxODE5MDk5YzcwZTY2YTA=
+    NjI2OWI0NDc1N2I4ODdiMzdhNWQwYTQ1MGJiMTlkNGE1ZmY5NWY2YmZhZmM1
+    Y2RhMGVmZDhlZDI0MTI0Yjg3MmNjNjY1MmFmNmUyYjcyMWVmMTVkYTc3OTlh
+    NjcxYjc4MmVmYjNiMzJlOTc3MjU0ZWZmMDllMjRjZDAwMTk5NGI=

data/app/assets/stylesheets/compendium/options.css.scss

@@ -1,14 +1,24 @@
 .option
 {
-  .option-label
+  @mixin label-font
   {
-    margin: 0px 0px 0px 0px;
     font-family: "Arial";
     font-size: 14px;
     font-weight: bold;
     color: #575757;
   }
 
+  .label
+  {
+    @include label-font;
+  }
+
+  .option-label
+  {
+    margin: 0px 0px 0px 0px;
+    @include label-font;
+  }
+
   .option-note
   {
     font-style: italic;

data/app/classes/compendium/presenters/option.rb

@@ -9,30 +9,29 @@ module Compendium::Presenters
     end
 
     def label(form)
-      label = case option.type.to_sym
-        when :boolean, :radio
-          name
-
-        else
-          form.label option.name, name
-      end
-
-      out = ActiveSupport::SafeBuffer.new
-      out << content_tag(:span, label, class: 'option-label')
-
       if option.note?
         key = option.note == true ? :"#{option.name}_note" : option.note
         note = t("options.#{key}", cascade: { offset: 2 })
+      end
+
+      if option.note? && defined?(AccessibleTooltip)
         title = t("options.#{option.name}_note_title", default: '', cascade: { offset: 2 })
+        tooltip = accessible_tooltip(:help, label: name, title: title) { note }
+        return form.label option.name, tooltip
+      else
+        label = case option.type.to_sym
+          when :boolean, :radio
+            name
 
-        if defined?(AccessibleTooltip)
-          return accessible_tooltip(:help, label: out, title: title) { note }
-        else
-          out << content_tag(:div, note, class: 'option-note')
+          else
+            form.label option.name, name
         end
-      end
 
-      out
+        out = ActiveSupport::SafeBuffer.new
+        out << content_tag(:span, label, class: 'option-label')
+        out << content_tag(:div, note, class: 'option-note') if option.note?
+        out
+      end
     end
 
     def note

data/lib/compendium/version.rb

@@ -1,3 +1,3 @@
 module Compendium
-  VERSION = "1.1.3.1"
+  VERSION = "1.1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compendium
 version: !ruby/object:Gem::Version
-  version: 1.1.3.1
+  version: 1.1.3.2
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime