express_admin 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08a300847280a336c1ee0753d701955851c44c8e
-  data.tar.gz: e818d3b36531e5c2caf75b09da27b70dd5100eda
+  metadata.gz: 0a190e90573d9c12ff7c11bcc7b76cefd69dba9a
+  data.tar.gz: 35a76a7c344eed3eb01c36effc0cfc688c8f985e
 SHA512:
-  metadata.gz: 92f0c5c5d554682c2059a8d2b3e5f548625680dcd21e4ee8bd053ac7481517170cced4f65e20c834deecb970d517c1bf510dfa9fca052bf89f0fc6826263ab09
-  data.tar.gz: c05c929de0d91d51cb7e4b49184501f6ceb3f35f3564612f92d245f97ba943262fa49d27725e8564bc44e56498c968c165e01e6382041261c7fd08902e290914
+  metadata.gz: f4148a027c4f50991fa88831e8d7dc236511482b80c3e9e625170a2a5e6cddb2503fb1f8acdd06923ac2775fdbbfa4bd03297af85028f52ea04b96e8d52584a0
+  data.tar.gz: 8a065074bf4b8ade0a4436b1e506a46df9b238482afa1989d606299944f0182cdb011d04977db5e58ca17dc5737d7a794f36b107e2c6b7256d5a6725a98f6def

data/app/assets/stylesheets/express_admin/components/_definition.sass

@@ -1,4 +1,4 @@
-table.definitions
+table.definitions-table
   margin: 1em
 
   th

data/app/assets/stylesheets/express_admin/components/_h_box.sass

@@ -1,2 +1,2 @@
-.h_box
+.h-box
   @include grid-block

data/app/assets/stylesheets/express_admin/components/_live_edit.sass

@@ -0,0 +1,3 @@
+.live-edit
+  &:hover
+    background-color: rgba(255,0,0,0.2)

data/app/assets/stylesheets/express_admin/components/_v_box.sass

@@ -1,2 +1,2 @@
-.v_box
+.v-box
   @include grid-block($orientation: vertical)

data/app/assets/stylesheets/express_admin/screen.sass

@@ -14,6 +14,7 @@
 @import 'sections/sidebar_region'
 
 @import 'components/main_menu'
+@import 'components/live_edit'
 @import 'components/sub_menu'
 @import 'components/module_sidebar'
 @import 'components/widget_box'

data/app/components/express_admin/definition_list.rb

@@ -2,19 +2,27 @@ module ExpressAdmin
   class DefinitionList < ExpressTemplates::Components::Configurable
     include ExpressTemplates::Components::Capabilities::Resourceful
 
-    emits -> {
-      dl {
-        definitions.each do |label, content|
-          dt { label }
-          dd { content }
-        end
-      }
+    tag :dl
+
+    list_types = {}
+    list_types[:array] = {description: "List of fields on the current resource",
+                          options: -> {resource.columns.map(&:name)}}
+    list_types[:hash] = {description: "List of terms and definitions."}
+
+    has_argument :list, "A list of things to define, presented as <label>: <definition>.",
+                        as: :list, type: list_types
+
+    contains -> {
+      definitions.each do |label, content|
+        dt { label }
+        dd { content }
+      end
     }
 
     def definitions
-      if @args.first.kind_of?(Array)
+      if config[:list].kind_of?(Array)
         definitions_from_array(@args.first)
-      elsif @args.first.kind_of?(Hash)
+      elsif config[:list].kind_of?(Hash)
         definitions_from_hash(@args.first)
       end
     end
@@ -22,17 +30,26 @@ module ExpressAdmin
     def definitions_from_hash(hash)
       processed = hash.map do |k,v|
         if v.kind_of? Symbol
-          [k, resource.send(v)]
+          [promptify(k), resource.send(v)]
         else
-          [k, v]
+          [promptify(k), helpers.instance_eval("(#{v.source}).call(resource).to_s").html_safe]
         end
       end
       Hash[processed]
     end
 
     def definitions_from_array(fields)
-      Hash[fields.map {|field| ["#{field.to_s.titleize}:", resource.send(field)]}]
+      Hash[fields.map {|field| ["#{field.to_s.titleize}:", "{{resource.#{field}}}"]}]
     end
 
+    private
+      def promptify(k)
+        if k.kind_of?(Symbol)
+          k.to_s.promptify
+        else
+          k.to_s
+        end
+      end
+
   end
 end

data/app/components/express_admin/definition_table.rb

@@ -1,51 +1,19 @@
 module ExpressAdmin
-  class DefinitionTable < ExpressTemplates::Components::Configurable
+  class DefinitionTable < DefinitionList
     include ExpressTemplates::Components::Capabilities::Resourceful
 
-    emits -> {
-      table(class: 'definitions') {
-        tbody {
-          definitions.each do |label, content|
-            tr {
-              th(align: "right") { label }
-              td { content }
-            }
-          end
-        }
-      }
-    }
-
-    def definitions
-      if @args.nil?
-        definitions_from_hash(config)
-      elsif @args.first.try(:kind_of?, Array)
-        definitions_from_array(@args.first)
-      end
-    end
-
-    def definitions_from_hash(hash)
-      processed = hash.map do |k,v|
-        if v.kind_of? Symbol
-          [promptify(k), resource.send(v)]
-        else
-          [promptify(k), helpers.instance_eval("(#{v.source}).call(resource).to_s").html_safe]
-        end
-      end
-      Hash[processed]
-    end
-
-    def definitions_from_array(fields)
-      Hash[fields.map {|field| ["#{field.to_s.titleize}:", "{{resource.#{field}}}"]}]
-    end
+    tag :table
 
-    private
-      def promptify(k)
-        if k.kind_of?(Symbol)
-          k.to_s.promptify
-        else
-          k.to_s
+    contains -> {
+      tbody {
+        definitions.each do |label, content|
+          tr {
+            th(align: "right") { label }
+            td { content }
+          }
         end
-      end
+      }
+    }
 
   end
 end

data/app/components/express_admin/{flash_message_component.rb → flash_messages.rb}

@@ -1,7 +1,7 @@
 module ExpressAdmin
-  class FlashMessageComponent < ExpressTemplates::Components::Base
+  class Flash < ExpressTemplates::Components::Base
 
-    emits -> {
+    contains -> {
       helpers.flash.each do |flash_message|
         div(class:"flash nav-alert alert-box ", data: {alert: ''}) {
           span flash_message[1]
@@ -9,5 +9,6 @@ module ExpressAdmin
         }
       end
     }
+
   end
 end

data/app/components/express_admin/icon.rb

@@ -1,7 +1,14 @@
 module ExpressAdmin
   class Icon < ExpressTemplates::Components::Configurable
-    emits -> {
-      i(class: "icon ion-#{config[:id]}")
+
+    tag :i
+
+    has_argument :id, "The name of the ionic icon withouth the ion- prefix. See http://ionicons.com/cheatsheet.html",
+                 as: :name,
+                 type: [:symbol, :string]
+
+    before_build {
+      add_class("ion-#{config[:name]}")
     }
   end
 end

data/app/components/express_admin/icon_link.rb

@@ -1,34 +1,41 @@
 module ExpressAdmin
   class IconLink < ExpressTemplates::Components::Configurable
 
-    emits -> {
+    tag :a
+
+    has_argument :id, "The name of the ionic icon withouth the ion- prefix. See http://ionicons.com/cheatsheet.html",
+                     as: :icon_name,
+                     type: [:symbol, :string]
+
+    has_option :text,    "Link text to accompany the icon."
+
+    has_option :right,   "Aligns the icon to the right of the text.",
+                         default: false
+    has_option :href,    "Link path, URL or anchor.",
+                         required: true, attribute: true
+    has_option :title,   "Title text for accessibility; appears on mouse hover.",
+                         attribute: true
+    has_option :confirm, "Should trigger a confirm message.",
+                         type: :boolean
+    has_option :delete,  "Should perform a delete action.",
+                         type: :boolean
+    has_option :target,  "The link target attribute. Set to open in a new window or tab.",
+                         attribute: true
+
+    before_build -> {
+      set_attribute 'data-delete', config[:delete] if config[:delete]
+      set_attribute 'data-confirm', config[:confirm] if config[:confirm]
+    }
+
+    contains -> {
       if config[:right]
-        a(anchor_args) {
-          text_node config[:text]
-          icon(config[:icon_name].to_sym)
-        }
+        text_node config[:text]
+        icon(config[:icon_name].to_sym)
       else
-        a(anchor_args) {
-          icon(config[:icon_name].to_sym)
-          text_node config[:text]
-        }
+        icon(config[:icon_name].to_sym)
+        text_node config[:text]
       end
     }
 
-    def anchor_args
-      args = {class: class_list, 
-              href:  config[:href]}
-      args[:id] = config[:id] if config[:id]
-      args[:target] = config[:target] if config[:target]
-      args['data-delete'] = config[:delete] if config[:delete]
-      args['data-confirm'] = config[:confirm] if config[:confirm]
-      args[:title] = config[:title] if config[:title]
-      args
-    end
-
-    def icon_options
-      [:icon_name, :text, :right]
-    end
-
   end
-end
+end

data/app/components/express_admin/layout_component.rb

@@ -1,44 +1,14 @@
 module ExpressAdmin
   class LayoutComponent < ExpressTemplates::Components::Configurable
 
-    def dom_id
-      config.try(:[], :id)
-    end
-
-    def component_options
-      [:id, :class, :style] + supported_style_options
-    end
-
-    def component_classes
-      add_class config[:id].to_s
-      add_class config[:class]
-      class_names
-    end
-
-    def supported_style_options
-      [:height, :width]
-    end
-
-    def provided_style_attributes
-      config.select {|k,v| supported_style_options.include?(k) }
-    end
+    has_option :style, 'Add inline styles to the element'
 
     def style_attributes
       attribs = config[:style] || {}
-      attribs.merge(provided_style_attributes).map do |k, v|
+      attribs.map do |k, v|
         "#{k}: #{v}"
       end.join('; ')
     end
 
-    def pass_along_attributes
-      config.reject {|k,v| component_options.include?(k) }
-    end
-
-    def container_div_attributes
-      pass_along_attributes
-        .merge(id: dom_id, class: component_classes)
-        .merge(style: style_attributes)
-    end
-
   end
 end

data/app/components/express_admin/layout_components/h_box.rb

@@ -1,10 +1,7 @@
 module ExpressAdmin
   class HBox < LayoutComponent
-
-    emits -> (contents) {
-      div(container_div_attributes) {
-        contents.call(self) if contents
-      }
+    contains -> (&block) {
+      block.call(self) if block
     }
   end
-end
+end

data/app/components/express_admin/layout_components/pane.rb

@@ -1,11 +1,12 @@
 module ExpressAdmin
   class Pane < LayoutComponent
 
-    emits -> (block) {
-      div(container_div_attributes) {
-        heading if title || status
-        block.call(self) if block
-      }
+    has_option :title, 'The title of the pane', default: ''
+    has_option :status, 'Status of the pane'
+
+    contains -> (&block) {
+      heading if title || status
+      block.call(self) if block
     }
 
     def heading
@@ -17,21 +18,12 @@ module ExpressAdmin
       }
     end
 
-    def dom_id
-      nil
-    end
-
     def title
-      config[:title] || ''
+      config[:title]
     end
 
     def status
-      config[:status] || nil
-    end
-
-    def component_options
-      super +
-        [:title, :status]
+      config[:status]
     end
 
   end

data/app/components/express_admin/layout_components/sidebar_region.rb

@@ -1,11 +1,7 @@
 module ExpressAdmin
   class SidebarRegion < LayoutComponent
-    emits -> (block) {
-      add_class('sidebar-region')
-      add_class(config.try(:[], :class))
-      div(id: dom_id, class: class_names) {
-        block.call(self) if block
-      }
+    contains -> (&block) {
+      block.call(self) if block
     }
   end
 end

data/app/components/express_admin/layout_components/v_box.rb

@@ -1,10 +1,7 @@
 module ExpressAdmin
   class VBox < LayoutComponent
-
-    emits -> (contents) {
-      div(container_div_attributes) {
-        contents.call(self) if contents
-      }
+    contains -> (&block) {
+      block.call(self) if block
     }
   end
-end
+end

data/app/components/express_admin/main_region.rb

@@ -1,9 +1,7 @@
 module ExpressAdmin
   class MainRegion < ExpressTemplates::Components::Configurable
-    emits -> (block) {
-      div(class: 'main-region') {
-        block.call(self) if block
-      }
+    contains -> (&block) {
+      block.call(self) if block
     }
   end
 end

data/app/components/express_admin/{mega_menu_component.rb → mega_menu.rb}

@@ -1,24 +1,12 @@
 module ExpressAdmin
-  class MegaMenuComponent < ExpressTemplates::Components::Base
-    # %h1 "Modules"
+  class MegaMenu < ExpressTemplates::Components::Base
+    tag :li
 
-    # - if admin_menus.any?
-    #   %nav
-    #     %ul
-    #       - admin_menus.each do |menu|
-    #         %li
-    #           = link_to eval(menu.main.path) do
-    #             %i.icon{class: "icon-express_#{menu.main.title.downcase}"}
-    #             %span= menu.main.title
-    # - else
-    #   .empty-state-wrapper
-    #     %p.lead.text-muted No modules added yet.
-    #     %p
-    #       = link_to app_express.addons_path, class: 'button success radius' do
-    #         %span.icon.ion-plus
-    #           Add Module
+    before_build -> {
+      add_class('has-sub-menu')
+    }
 
-    emits -> {
+    contains -> {
       menu_wrapper {
         if helpers.admin_menus.any?
           helpers.admin_menus.each do |menu|
@@ -62,6 +50,5 @@ module ExpressAdmin
         }
       }
     end
-
   end
 end