express_admin 1.1.0 → 1.2.0

data/app/components/express_admin/v_box.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), 'layout_component')
+module ExpressAdmin
+  class VBox < LayoutComponent
+
+    emits -> {
+      div(dom_id, class: classes) {
+        _yield
+      }
+    }
+
+    def classes
+      super + ' container'
+    end
+
+  end
+end

data/app/components/express_admin/widget_box.rb

@@ -1,8 +1,8 @@
 module ExpressAdmin
   class WidgetBox < ExpressTemplates::Components::Column
     emits -> {
-      div._widget_box._form_container {
-        h2._widget_header(box_title)
+      div._widget_box(id: "#{my[:id].to_s.dasherize}-box") {
+        header.title(box_title)
         div._widget_body {
           _yield
         }

data/app/helpers/express_admin/admin_helper.rb

@@ -15,7 +15,7 @@ module ExpressAdmin
     def sign_in_or_sign_out
       if self.respond_to?(:user_signed_in?)
         if user_signed_in?
-          link_to 'Sign out', main_app.destroy_user_session_path, method: :delete
+          link_to 'Logout', main_app.destroy_user_session_path, method: :delete
         else
           link_to 'Sign in', main_app.user_session_path
         end
@@ -43,7 +43,7 @@ module ExpressAdmin
     end
 
     def current_user_gravatar
-      if defined?(current_user) && !current_user.nil?
+      if defined?(current_user) && !current_user.nil? && !current_user.email.match(/example.com/)
         gravatar_image_tag current_user.email
       end
     end
@@ -58,26 +58,31 @@ module ExpressAdmin
 
     def admin_javascript_and_css_includes
       current_module_path = current_module.to_s.underscore
+      admin_path = current_module_path.eql?('admin') ? "admin" : "#{current_module_path}/admin"
       a = []
-      a << stylesheet_link_tag("#{current_module_path}/admin/application")
+      a << stylesheet_link_tag("#{admin_path}/application")
       a << stylesheet_link_tag("app_express/admin/application") if defined?(AppExpress)
       a << javascript_include_tag("express_admin", 'data-turbolinks-track' => true)
-      a << javascript_include_tag("#{current_module_path}/admin/application", 'data-turbolinks-track' => true)
+      a << javascript_include_tag("#{admin_path}/application", 'data-turbolinks-track' => true)
       a.join()
     end
 
     def admin_menus
-      addons = ExpressAdmin::Engine.all_addons.map do |engine|
+      menus = ExpressAdmin::Engine.all_addons.map do |engine|
         ExpressAdmin::Menu[engine.addon_name.to_s] rescue nil
       end.compact
 
-      addons.sort do |addonA, addonB|
-        if addonA.position == addonB.position
-          addonA.title <=> addonB.title
+      menus.sort do |menuA, menuB|
+        if menuA.position == menuB.position
+          menuA.title <=> menuB.title
         else
-          addonA.position <=> addonB.position
+          menuA.position <=> menuB.position
         end
       end
+
+      application_menu = ExpressAdmin::Menu['admin'] rescue nil
+      menus.unshift application_menu if application_menu
+      menus
     end
 
     def menu_item(name, path)

data/app/views/layouts/express_admin/admin.html.et

@@ -4,24 +4,20 @@ html {
     title { title_content }
     meta(name: "description", content: "{{description_meta_content}}")
     meta(name: "viewport", content: "width=device-width, initial-scale=1.0")
-    # Modernizr is required for Zurb Foundation
-    javascript_include_tag 'vendor/modernizr'
     admin_javascript_and_css_includes
     yield(:page_css)
     csrf_meta_tags
   }
   body {
-    header {
+    main(role: 'main')._main_container {
       render('shared/express_admin/navigation_bar')
-    }
-    main(role: "main")._main_container {
-      addon_sidebar_component
-      div._content_body {
-        flash_message_component
-        div.row._page_header {
-          page_header_component
+      div._main_page {
+        div._page_sidebar {
+          addon_sidebar_component
         }
-        div.row._page_body {
+        div._page_body {
+          #     page_header_component
+          #   flash_message_component
           yield
         }
       }

data/app/views/shared/express_admin/_navigation_bar.html.et

@@ -1,20 +1,24 @@
-# navigation styled for Zurb Foundation 5
-# the syntax for data-topbar may need to change for Zurb Foundation 5
-nav._top_bar(data: {topbar: true, options: "is_hover:false"}) {
-  title_partial_or_express_admin
-  div._top_bar_section {
-    ul {
-      li.divider
-      mega_menu_component
+nav._top_bar {
+  div._main_menu {
+    ul._menu_items {
+      li {
+        a(href: '#') {
+          image_tag 'express_admin/appexpress_logo_dark.png', class: 'nav-logo'
+        }
+      }
+      li { link_to 'Manage', '#' }
+      li { link_to 'View Site', '/' }
     }
   }
-  section._top_bar_section {
-    ul.left {
-      li.divider
+  div._secondary_menu {
+    ul._menu_items {
       li {
-        a(href: '/') { "View Site" }
+        a {
+          current_user_gravatar
+            span {'Profile' }
+        }
+        sign_in_or_sign_out
       }
     }
-    render partial: 'shared/express_admin/navigation_bar_profile'
   }
 }

data/app/views/shared/express_admin/_navigation_bar_profile.html.et

@@ -1,8 +1,6 @@
-ul.right {
   li.gravatar {
     current_user_gravatar
   } 
   li {
     sign_in_or_sign_out
   }
-}

data/app/views/shared/express_admin/_title.html.et

@@ -1,8 +1,6 @@
-ul(class: 'title-area') {
-  li.name {
-    a("ExpressAdmin", href: '#', disabled: true)
-  }
-  li(class:"toggle-topbar menu-icon") {
-    a(href: "#") { span { menu } }
-  }
-}
+li.name {
+  a("ExpressAdmin", href: '#', disabled: true)
+}
+# li(class:"toggle-topbar menu-icon") {
+#   a(href: "#") { span { 'menu' } }
+# }

data/lib/express_admin/engine.rb

@@ -2,7 +2,7 @@ require "express_admin/menu"
 require "express_admin/version"
 require "express_templates"
 require "jquery-rails"
-require "foundation-rails"
+require "foundation_apps_styles"
 require "bourbon"
 require "gravatar_image_tag"
 require "kaminari"

data/lib/express_admin/menu.rb

@@ -26,8 +26,13 @@ module ExpressAdmin
     def self.[](addon_name)
       @menus ||= {}
       @menus[addon_name.to_sym] ||= begin
-        addon_path = Gem.loaded_specs[addon_name].full_gem_path if addon_name.to_s.match(/^\w+$/)
-        menu_yml_path = File.join(addon_path, 'config', 'menu.yml')
+        menu_yml_path =
+          if addon_name.eql?('admin')
+            File.join(Rails.root, 'config', 'menu.yml')
+          else
+            addon_path = Gem.loaded_specs[addon_name].full_gem_path if addon_name.to_s.match(/^\w+$/)
+            File.join(addon_path, 'config', 'menu.yml')
+          end
         from(menu_yml_path)
       end
     end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/generators/express_admin/install/install_generator.rb

@@ -44,7 +44,7 @@ module ExpressAdmin
       def insert_mount_point
         @project_class = @project_name.camelize
 
-        if open(engine_path).any?
+        if File.exists?(engine_path)
           inject_into_file engine_path,
             "    #{@project_class}::Engine.config.#{@project_name}_mount_point = '/'\n",
             after: "class Engine < ::Rails::Engine\n"
@@ -54,7 +54,7 @@ module ExpressAdmin
       def require_express_admin
         @project_class = @project_name.camelize
 
-        if open(engine_path).any?
+        if File.exists?(engine_path)
           inject_into_file engine_path, "require 'express_admin'\n",
             before: "module #{@project_class}"
         end
@@ -65,7 +65,7 @@ module ExpressAdmin
       end
 
       def add_express_admin_menu
-        if open(engine_path).any?
+        if File.exists?(engine_path)
           inject_into_file engine_path, "    include ::ExpressAdmin::Menu::Loader\n",
             after: "class Engine < ::Rails::Engine\n"
         end
@@ -82,7 +82,7 @@ module ExpressAdmin
       Rails.application.config.assets.precompile += all_assets
     end
 EOD
-        if open(engine_path).any?
+        if File.exists?(engine_path)
           inject_into_file engine_path, assets, after: "class Engine < ::Rails::Engine\n"
         end
       end

data/lib/generators/express_admin/install/templates/controllers/admin_controller.rb.erb

@@ -1,4 +1,4 @@
-require_dependency "<%= project_name %>/application_controller"
+require_dependency "application_controller"
 
 module <%= project_class %>
   module Admin

data/lib/generators/express_admin/scaffold/scaffold_generator.rb

@@ -7,6 +7,7 @@ module ExpressAdmin
       attr_reader :view_path, :resource_class
 
       remove_hook_for :scaffold_controller
+      remove_hook_for :assets
 
       def create_root_folder
         empty_directory admin_view_path
@@ -29,7 +30,9 @@ module ExpressAdmin
           inject_into_file 'config/routes.rb', "        resources :#{controller_file_name}\n",
             after: "scope '#{project_path}' do\n"
         else
-          if module_name
+          # this whole thing needs reworking for admin controllers
+          # in applications
+          if module_name # <-- should be namespaced?
             admin_route = <<-EOD
   namespace :admin do
     scope '#{module_name}' do
@@ -50,10 +53,15 @@ EOD
       end
 
       def add_menu_item
+        path = if namespaced?
+          "#{namespaced?.to_s.underscore}.#{project_name}_admin_#{controller_file_name}_path"
+        else
+          "admin_#{controller_file_name}_path"
+        end
 menu_entry = %Q(
   -
     title: '#{controller_file_name.titleize}'
-    path: '#{namespaced?.to_s.underscore}.#{project_name}_admin_#{controller_file_name}_path'
+    path: '#{path}'
 )
         menu_path = Rails.root ? "#{Rails.root}/config/menu.yml": "config/menu.yml"
         if File.exists?(menu_path)

data/lib/generators/express_admin/scaffold/templates/index.html.et.erb

@@ -3,7 +3,7 @@ row {
     smart_table(:<%= plural_table_name %>, show_on_click: true)
   }
   sidebar_region {
-    widget_box(:new_<%= singular_table_name %>) {
+    widget_box(:<%= singular_table_name %>) {
       smart_form(:<%= singular_table_name %>)
     }
   }

data/test/dummy/app/controllers/admin/categories_controller.rb

@@ -0,0 +1,12 @@
+module Admin
+  class CategoriesController < AdminController
+
+    defaults resource_class: Category
+
+    private
+
+      def category_params
+        params.require(:category).permit!
+      end
+  end
+end

data/test/dummy/app/controllers/admin/widgets_controller.rb

@@ -0,0 +1,12 @@
+module Admin
+  class WidgetsController < AdminController
+
+    defaults resource_class: Widget
+
+    private
+
+      def widget_params
+        params.require(:widget).permit!
+      end
+  end
+end

data/test/dummy/app/models/category.rb

@@ -0,0 +1,3 @@
+class Category < ActiveRecord::Base
+  has_many :widgets
+end

data/test/dummy/app/models/tag.rb

@@ -0,0 +1,4 @@
+class Tag < ActiveRecord::Base
+  has_many :widget_tags, inverse_of: :tags
+  has_many :widgets, through: :widget_tags
+end

data/test/dummy/app/models/widget.rb

@@ -0,0 +1,7 @@
+class Widget < ActiveRecord::Base
+  belongs_to :category
+
+  has_many :widget_tags, inverse_of: :widget
+  has_many :tags, through: :widget_tags
+
+end

data/test/dummy/app/models/widget_tag.rb

@@ -0,0 +1,4 @@
+class WidgetTag < ActiveRecord::Base
+  belongs_to :widget, inverse_of: :widget_tags
+  belongs_to :tag
+end

data/test/dummy/app/views/admin/categories/index.html.et

@@ -0,0 +1,10 @@
+row {
+  main_region {
+    smart_table(:categories, show_on_click: true)
+  }
+  sidebar_region {
+    widget_box(:category) {
+      smart_form(:category)
+    }
+  }
+}

data/test/dummy/app/views/admin/widgets/index.html.et

@@ -0,0 +1,10 @@
+row {
+  main_region {
+    smart_table(:widgets, show_on_click: true)
+  }
+  sidebar_region {
+    widget_box(:widget) {
+      smart_form(:widget)
+    }
+  }
+}

data/test/dummy/config/routes.rb

@@ -1,5 +1,10 @@
 Rails.application.routes.draw do
 
+  namespace :admin do
+    resources :categories
+    resources :widgets
+  end
+
   get 'demo/show'
   get 'demo/sign_in'
 

data/test/dummy/db/migrate/20150525221206_create_widgets.rb

@@ -0,0 +1,15 @@
+class CreateWidgets < ActiveRecord::Migration
+  def change
+    create_table :widgets do |t|
+      t.integer :category_id
+      t.string :column2
+      t.text :column3
+      t.datetime :column4
+      t.boolean :column5
+      t.string :column6
+      t.integer :column7
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20150525221228_create_categories.rb

@@ -0,0 +1,9 @@
+class CreateCategories < ActiveRecord::Migration
+  def change
+    create_table :categories do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20150610081108_create_tags.rb

@@ -0,0 +1,7 @@
+class CreateTags < ActiveRecord::Migration
+  def change
+    create_table :tags do |t|
+      t.string :name
+    end
+  end
+end

data/test/dummy/db/migrate/20150610081204_create_widget_tags.rb

@@ -0,0 +1,8 @@
+class CreateWidgetTags < ActiveRecord::Migration
+  def change
+    create_table :widget_tags do |t|
+      t.integer :widget_id
+      t.integer :tag_id
+    end
+  end
+end