admix 0.23.1 → 0.24.0

data/lib/admix.rb

@@ -6,14 +6,12 @@ require 'admix/navigation/navbar'
 require 'will_paginate'
 require 'will_paginate-bootstrap'
 require 'will_paginate/array'
-require 'datagrid'
-require 'admix/table-actions'
 require 'simple-navigation'
 require 'simple-navigation-bootstrap'
 require 'inherited_resources'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-
+require 'wice_grid'
 require 'mix-rails-auth'
 
 

data/lib/admix/engine.rb

@@ -1,4 +1,32 @@
 module Admix
   class Engine < ::Rails::Engine
+
+    initializer "admix.setup_menu" do
+      
+      ActiveMenu::create('admix-nav') do |nav|        
+        
+        nav.child :dashboard do |dashboard|
+          dashboard.text Proc.new { t('dashboard.dashboard') }
+          dashboard.href Proc.new { admix_root_url }
+          dashboard.option :icon, 'icon-flag'
+        end
+
+        nav.child :general do |general|
+          general.text Proc.new { t('general.general') }
+          general.option :icon, 'icon-flag'
+          general.href 'javascript:;'
+          general.visible Proc.new {current_user.has_role?(:admin)}
+        end
+
+        nav.child :content do |content|
+          content.text Proc.new { t('content.content') }
+          content.href 'javascript:;'
+          content.option :icon, 'icon-flag'
+        end
+
+      end
+
+    end
+
   end
 end

data/lib/admix/version.rb

@@ -1,8 +1,8 @@
 module Admix
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admix
 version: !ruby/object:Gem::Version
-  version: 0.23.1
-  prerelease: 
+  version: 0.24.0
 platform: ruby
 authors:
 - Sadjow Leão
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,145 +28,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mix-rails-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: mix-rails-auth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: mix-rails-settings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: datagrid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Admix administrive area for mix-rails
@@ -180,12 +145,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/admix/registrations_controller.rb
+- app/controllers/admix/rest_controller.rb
 - app/controllers/admix/inherited_controller.rb
 - app/controllers/admix/sessions_controller.rb
 - app/controllers/admix/dashboard_controller.rb
 - app/controllers/admix/admix_controller.rb
 - app/controllers/admix/passwords_controller.rb
 - app/assets/stylesheets/admix/application.css
+- app/assets/stylesheets/admix/wice_grid.css.scss
 - app/assets/stylesheets/admix/admix_bootstrap.scss
 - app/assets/stylesheets/admix/style.css
 - app/assets/bootstrap/img/glyphicons-halflings.png
@@ -1212,32 +1180,51 @@ files:
 - app/assets/javascripts/admix/application.js.coffee
 - app/assets/nicedit/nicEditorIcons.gif
 - app/assets/nicedit/nicEdit.js
+- app/helpers/admix/tab.rb
 - app/helpers/admix_helper.rb
 - app/mailers/admix_mailer.rb
 - app/views/admix/dashboard/index.html.haml
+- app/views/admix/rest/_empty_grid.haml
+- app/views/admix/rest/_column_actions.haml
+- app/views/admix/rest/new.html.haml
+- app/views/admix/rest/_grid.haml
+- app/views/admix/rest/_grid_actions.haml
+- app/views/admix/rest/form.html.haml
+- app/views/admix/rest/edit.html.haml
+- app/views/admix/rest/index.html.haml
+- app/views/admix/rest/_actions.haml
+- app/views/admix/rest/show.html.haml
+- app/views/admix/rest/_grid_columns.haml
+- app/views/admix/rest/_form_config.haml
+- app/views/admix/inherited/_empty_grid.haml
+- app/views/admix/inherited/_column_actions.haml
 - app/views/admix/inherited/new.html.haml
-- app/views/admix/inherited/_table_actions.html.haml
+- app/views/admix/inherited/_grid.haml
+- app/views/admix/inherited/_grid_actions.haml
+- app/views/admix/inherited/form.html.haml
 - app/views/admix/inherited/edit.html.haml
-- app/views/admix/inherited/_form.html.haml
 - app/views/admix/inherited/index.html.haml
+- app/views/admix/inherited/_actions.haml
 - app/views/admix/inherited/show.html.haml
-- app/views/layouts/admix/admix.html.haml
-- app/views/layouts/admix/login.html.haml
+- app/views/admix/inherited/_grid_columns.haml
+- app/views/admix/inherited/_form_config.haml
+- app/views/layouts/admix/login.haml
+- app/views/layouts/admix/admix.haml
 - app/views/devise/sessions/new.html.haml
 - config/locales/simple_form.en.yml
 - config/locales/admix.pt-BR.yml
+- config/locales/wice_grid.yml
 - config/locales/en_crud.yml
 - config/locales/admix.en.yml
 - config/locales/simple_form.pt-BR.yml
 - config/locales/devise.en.yml
 - config/initializers/simple_form.rb
-- config/initializers/locale.rb
 - config/initializers/admix.rb
 - config/initializers/simple_form_bootstrap.rb
+- config/initializers/wice_grid_config.rb
 - config/routes.rb
 - config/admix_navigation.rb
 - config/application.rb
-- lib/admix/table-actions.rb
 - lib/admix/version.rb
 - lib/admix/engine.rb
 - lib/admix/navigation/navbar.rb
@@ -1251,32 +1238,25 @@ files:
 - README.rdoc
 homepage: https://github.com/mixinternet/mix-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4523074345877799582
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4523074345877799582
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Admix administrive area for mix-rails
 test_files: []

data/app/views/admix/inherited/_form.html.haml

@@ -1,14 +0,0 @@
-
-- array_of_resources = [:admix]
-- if defined? parent_type
-  - array_of_resources << parent_type
-- array_of_resources << resource
-
-= simple_form_for array_of_resources, :html => { :class => 'form-admix' }, wrapper: :bootstrap  do |f|
-  
-  = f.error_notification
-
-  = render partial: "form_fields", locals: {f: f}
-
-  .form-actions
-    = f.button :submit, class: 'btn-primary'

data/app/views/admix/inherited/_table_actions.html.haml

@@ -1,3 +0,0 @@
-= link_to image_tag('admix/zoom.png'), resource_url(resource), class: 'btn', title:'Visualizar registro'
-= link_to image_tag('admix/page_edit.png'), edit_resource_url(resource), class: 'btn', title:'Editar registro'
-= link_to image_tag('admix/cancel.png'), resource_url(resource), method: :delete, data: { confirm: t('admix.crud.destroy_confirm') }, class: 'btn', title:'Deletar registro'

data/config/initializers/locale.rb

@@ -1 +0,0 @@
-I18n.default_locale = I18n.locale = 'pt-BR'

data/lib/admix/table-actions.rb

@@ -1,17 +0,0 @@
-module Admix
-  module TableActions
-    extend ActiveSupport::Concern
-
-    included do
-      column(
-        :actions,
-        header: I18n.t('admix.crud.actions'),
-        html: true
-      ) do |resource|
-        render :partial => "table_actions", :locals => {:resource => resource}
-      end
-    end
-
-  end
-end
-