express_admin 1.2.1 → 1.3.0

data/app/assets/stylesheets/express_admin/plugins/_tinymce.sass

@@ -0,0 +1,2 @@
+.mce-tinymce.mce-container
+  margin-bottom: 1rem

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

@@ -18,6 +18,7 @@
 @import 'components/module_sidebar'
 @import 'components/widget_box'
 @import 'components/pane'
+@import 'components/definition'
 
 @import 'shared/media_object'
 @import 'shared/breadcrumbs'
@@ -33,10 +34,11 @@
 @import 'shared/reveal'
 
 @import 'components/empty_state'
-@import 'components/megadropdown'
 
 @import 'plugins/dataTables'
 @import 'plugins/select2'
+@import 'plugins/tinymce'
+@import '../ionicons/ionicons'
 
 .generate-subdomain
   cursor: pointer
@@ -45,6 +47,9 @@
   margin:
     bottom: 30px
 
+.hidden
+  display: none
+
 #app_subdomain
 
   &:read-only

data/app/assets/stylesheets/express_admin/sections/_header.sass

@@ -1,6 +1,7 @@
 .top-bar
   @extend .menu-group
   @include menu-bar-style($dark-color, $autocolor: true)
+  flex-shrink: 0
 
   .nav-logo
     width: 150px

data/app/assets/stylesheets/express_admin/sections/_main_content.sass

@@ -1,5 +1,9 @@
 .main-container
-  @include grid_frame($orientation: vertical)
+  @include grid-frame($orientation: vertical)
 
   > .main-page
-    @include grid_block
+    @include grid-block
+    @include breakpoint(small)
+      @include grid-orient(vertical)
+    @include breakpoint(medium)
+      @include grid-orient(horizontal)

data/app/assets/stylesheets/express_admin/sections/_main_region.sass

@@ -1,9 +1,12 @@
 .main-region
-  // @include breakpoint(small)
-  //   @include grid_block
-  // @include breakpoint(medium)
-  //   @include grid_block(8)
-  // @include breakpoint(large)
-  //   @include grid_block(9)
-  @include grid_content
+  @include grid-content
+  @include breakpoint(small)
+    @include grid-size(12)
+  @include breakpoint(medium)
+    @include grid-size(8)
+  @include breakpoint(large)
+    @include grid-size(9)
+
+  border:
+    right: 1px solid $border-color
 

data/app/assets/stylesheets/express_admin/sections/_page_body.sass

@@ -1,6 +1,9 @@
 .page-body
+  @include grid-block
   @include breakpoint(small)
-    @include grid_block
-
+    @include grid-orient(vertical)
   @include breakpoint(medium)
-    @include grid_block(11)
+    @include grid-orient(horizontal)
+    @include grid-size(10)
+  @include breakpoint(xlarge)
+    @include grid-size(11)

data/app/assets/stylesheets/express_admin/sections/_page_sidebar.sass

@@ -1,5 +1,9 @@
 .page-sidebar
+  @include grid-block
+  @include breakpoint(small)
+    @include grid-size(12)
   @include breakpoint(medium)
-    @include grid-block(1)
+    @include grid-size(2)
+  @include breakpoint(xlarge)
+    @include grid-size(1)
   border-right: #dedede 1px solid
-

data/app/assets/stylesheets/express_admin/sections/_sidebar_region.sass

@@ -1,7 +1,8 @@
 .sidebar-region
+  @include grid-block($orientation: vertical)
   @include breakpoint(small)
-    @include grid_block
+    @include grid-size(12)
   @include breakpoint(medium)
-    @include grid_block(4)
+    @include grid-size(4)
   @include breakpoint(large)
-    @include grid_block(3)
+    @include grid-size(3)

data/app/assets/stylesheets/express_admin/shared/_buttons.sass

@@ -1,4 +1,3 @@
 .button
   margin-bottom: 0
   background: $dark-blue
-

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -1,8 +1,20 @@
 form
-  padding: 1rem 0
+  margin:
+    bottom: 1rem
 
   textarea
-    height: 12rem
+    resize: none
 
   select[multiple]
     height: 6rem
+
+.help
+  color: $gray
+  font:
+    style: italic
+
+.login-box
+  background: #fff
+  border: 1px solid #ddd
+  margin: 100px 0
+  padding: 40px 20px 0 20px

data/app/assets/stylesheets/express_admin/shared/_trees.sass

@@ -19,9 +19,13 @@
 
   ul
     li
-      a
-        padding:
-          left: 3rem
       &:last-child
         border:
           bottom: 0
+      a::before
+        content: "– "
+      > ul li
+        a::before
+          content: "– – "
+        > ul li a::before
+          content: "– – – "

data/app/components/express_admin/addon_sidebar_component.rb

@@ -1,42 +1,31 @@
 module ExpressAdmin
+  # renders a sidebar partial if one is available
+  # otherwise uses menu.yml
   class AddonSidebarComponent < ExpressTemplates::Components::Base
-  # Replaces:
-  #
-  # .sidebar-wrapper
-  #   %aside.sidebar
-  #     %h5.title= <addon>::Engine.express_admin_menu.name
-  #     %ul.side-nav
-  #       - <addon>::Engine.express_admin_menu.items.each do |item|
-  #         %li
-  #           = link_to item.name, eval(item.path)
 
-    helper :menu_name, &-> { current_menu_name }
+    emits -> {
+      begin
+        render("shared/#{helpers.current_module_path_name}/sidebar")
+      rescue Exception => e
+        section(class: 'module-sidebar') {
+          ul(class: 'menu-items') {
+            li(class: 'title') { current_menu_name }
+            menu_list(helpers.current_menu.items)
+          }
+        }
+      end
+    }
 
-    emits menu_item:    -> {
-                             li {
-                               link_to "{{item.title}}", "{{eval(item.path)}}"
-                             }
-                           },
-
-          menu_wrapper: -> {
-                             section._module_sidebar {
-                               ul._menu_items {
-                                 li.title { menu_name }
-                                 _yield
-                               }
-                             }
-                           }
-
-    for_each -> { current_menu.items || [] }, as: :item, emit: :menu_item
-
-    wrap_with :menu_wrapper
+    def menu_list(list)
+      list.each do |item|
+        menu_list_item(item)
+      end
+    end
 
-    def compile
-      %Q(begin
-        render(partial: "shared/\#\{current_module_path_name\}/sidebar")
-      rescue => e
-        #{super}
-      end)
+    def menu_list_item(item)
+      li {
+        link_to item.title.html_safe, helpers.instance_eval(item.path)
+      }
     end
 
   end

data/app/components/express_admin/definition_list.rb

@@ -0,0 +1,38 @@
+module ExpressAdmin
+  class DefinitionList < ExpressTemplates::Components::Configurable
+    include ExpressTemplates::Components::Capabilities::Resourceful
+
+    emits -> {
+      dl {
+        definitions.each do |label, content|
+          dt { label }
+          dd { content }
+        end
+      }
+    }
+
+    def definitions
+      if @args.first.kind_of?(Array)
+        definitions_from_array(@args.first)
+      elsif @args.first.kind_of?(Hash)
+        definitions_from_hash(@args.first)
+      end
+    end
+
+    def definitions_from_hash(hash)
+      processed = hash.map do |k,v|
+        if v.kind_of? Symbol
+          [k, resource.send(v)]
+        else
+          [k, v]
+        end
+      end
+      Hash[processed]
+    end
+
+    def definitions_from_array(fields)
+      Hash[fields.map {|field| ["#{field.to_s.titleize}:", resource.send(field)]}]
+    end
+
+  end
+end

data/app/components/express_admin/definition_table.rb

@@ -0,0 +1,51 @@
+module ExpressAdmin
+  class DefinitionTable < ExpressTemplates::Components::Configurable
+    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
+
+    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/flash_message_component.rb

@@ -1,19 +1,13 @@
 module ExpressAdmin
   class FlashMessageComponent < ExpressTemplates::Components::Base
 
-    helper(:safe_message) {|message| message[1] }
-    helper(:classes) {|message| "flash nav-alert alert-box " }
-
     emits -> {
-      div {
-        div(class: ExpressAdmin::FlashMessageComponent.classes('{{flash_message}}'), data: {alert: ''}) {
-          safe_message('{{flash_message}}')
-          a.close(:href => "#") { "&times;" }
+      helpers.flash.each do |flash_message|
+        div(class:"flash nav-alert alert-box ", data: {alert: ''}) {
+          span flash_message[1]
+          a(class: 'close', href: "#") { "&times;".html_safe }
         }
-      }
+      end
     }
-
-    for_each -> { flash }, as: :flash_message
-
   end
 end

data/app/components/express_admin/layout_component.rb

@@ -1,14 +1,7 @@
 module ExpressAdmin
-  class LayoutComponent < ExpressTemplates::Components::Base
-    include ExpressTemplates::Components::Capabilities::Configurable
-    include ExpressTemplates::Components::Capabilities::Parenting
-
+  class LayoutComponent < ExpressTemplates::Components::Configurable
     def dom_id
-      @config.try(:[], :id)
-    end
-
-    def classes
-      ([macro_name] + (@config.try(:[], :class)||[])).join(" ")
+      config.try(:[], :id)
     end
   end
 end

data/app/components/express_admin/main_region.rb

@@ -1,8 +1,8 @@
 module ExpressAdmin
-  class MainRegion < ExpressTemplates::Components::Container
-    emits -> {
-      div._main_region {
-        _yield
+  class MainRegion < ExpressTemplates::Components::Configurable
+    emits -> (block) {
+      div(class: 'main-region') {
+        block.call(self) if block
       }
     }
   end

data/app/components/express_admin/mega_menu_component.rb

@@ -18,44 +18,50 @@ module ExpressAdmin
     #         %span.icon.ion-plus
     #           Add Module
 
-    helper(:extra_menu) {
-      render(partial: 'shared/express_admin/express_admin_extra_menu') rescue nil
+    emits -> {
+      menu_wrapper {
+        if helpers.admin_menus.any?
+          helpers.admin_menus.each do |menu|
+            menu_item(menu)
+          end
+        else
+          para(class: 'lead text-muted') {
+            "No modules added yet."
+          }
+        end
+      }
     }
 
-    fragments menu_item: -> {
-                        li {
-                          a(href: "{{eval(menu.path)}}") {
-                            i.icon(class: "icon-express_{{menu.title.downcase}}")
-                            span "{{menu.title}}"
-                          }
-                        }
-                      },
-
-              empty_state: -> {
-                p.lead._text_muted "No modules added yet."
-              },
-
-              menu_wrapper: -> {
-                li._has_sub_menu {
-                  a._sub_menu_expander(href: '#', onClick: 'return false;') {
-                    span.item { 'Manage' }
-                    i._ion_arrow_down_b
-                  }
-                  div._sub_menu.hidden {
-                    ul._sub_menu_items {
-                      li.title { 'Modules' }
-                      _yield
-                    }
-                    ul._sub_menu_items {
-                      extra_menu
-                    }
-                  }
-                }
-              }
+    def extra_menu
+      render(partial: 'shared/express_admin/express_admin_extra_menu') rescue nil
+    end
 
-    for_each -> {admin_menus}, as: 'menu', emit: :menu_item, empty: :empty_state
+    def menu_item(menu)
+      li {
+        a(href: helpers.instance_eval(menu.path)) {
+          i(class: "icon icon-express_#{menu.title.gsub(/\s+/, '').underscore}")
+          span menu.title
+        }
+      }
+    end
 
-    wrap_with :menu_wrapper, dont_wrap_if: -> { admin_menus.empty? }
+    def menu_wrapper
+      li(class: "has-sub-menu") {
+        a(class: "sub-menu-expander", href: '#', onClick: 'return false;') {
+          span(class: 'item') {'Manage' }
+          i(class: "ion-arrow-down-b")
+        }
+        div(class: 'sub-menu hidden') {
+          ul(class: 'sub-menu-items') {
+            li(class: 'title') { 'Modules' }
+            yield
+          }
+          ul(class: 'sub-menu-items') {
+            extra_menu
+          }
+        }
+      }
+    end
 
   end
 end