rademade_admin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccaea2ae3050d33085373d84cb715b1cb037ad85
-  data.tar.gz: c8510ac4aae7b02c5afcb3c56e57e815dbeac39f
+  metadata.gz: 506cc86834c33f984bbdf61e71dec4fa7a50e1e2
+  data.tar.gz: ea1cc018f8994d3757f7647ee0897c75aec5cb5f
 SHA512:
-  metadata.gz: 842600c6b68c316e3aee92811e46523dd632262599691dfb51bd1d8a775a8044ed8d58713a798973af6c0b0adacc2670b6c2a541495bc9e485568b25af2c365e
-  data.tar.gz: c7164d86d919e0c207a71c7c0ab7ce367b7f7d5a4897cf8923f06c110ab2d8487727d464992183d3b638c2798d18f4222b1027e66b2ebe9471c5cff7f5594ac5
+  metadata.gz: c0802b51d1350071bebd1c4ae8cde902a18627f13a14aef041575e32ed52c3be0a2d903a5f6c729d46512cf2357337b3d866a41105ce1aa6c2ab40cef5166080
+  data.tar.gz: 23254105027ffe82e06ecd9b0a61d61c1f0c96b520d43acb951fe62df286a38af1a8232989131bf1738c108e6e5aa1f4bfa14bda80d2971ad738537f5a72e784

data/app/assets/stylesheets/rademade_admin.sass.erb

@@ -80,6 +80,8 @@
 @import rademade_admin/blocks/form/map
 @import rademade_admin/blocks/gallery/main
 
+@import rademade_admin/blocks/filter/main
+
 
 /******************/
 /**    modules   **/

data/app/assets/stylesheets/rademade_admin/blocks/buttons/main.sass

@@ -1,129 +1,139 @@
+button
+  margin: 0
+  padding: 0
+  outline: none
+  border: 0
+  +box-sizing(content-box)
+
 .btn
-    display: inline-block
-    margin: 0
-    padding: 6px 12px
-    font-size: 14px
-    font-weight: 400
-    color: #fff
-    text-align: center
-    cursor: pointer
-    border: 1px solid transparent
-    +border-radius(4px)
-    +user-select
+  display: inline-block
+  margin: 0
+  padding: 0 12px
+  height: 32px
+  line-height: 30px
+  font-size: 14px
+  font-weight: 400
+  color: #fff
+  text-align: center
+  cursor: pointer
+  border: 1px solid transparent
+  +border-radius(4px)
+  +box-sizing(border-box)
+  +user-select
 
 .blue-btn
-    background-color: #428bca
-    border-color: #357ebd
-    &:hover
-        background-color: #3071a9
-        border-color: #285e8e
+  background-color: #428bca
+  border-color: #357ebd
+  &:hover
+    background-color: #3071a9
+    border-color: #285e8e
 
 .green-btn
-    background-color: #5cb85c
-    border-color: #4cae4c
-    &:hover
-        background-color: #449d44
-        border-color: #398439
+  background-color: #5cb85c
+  border-color: #4cae4c
+  &:hover
+    background-color: #449d44
+    border-color: #398439
 
 .l-blue-btn
-    background-color: #5bc0de
-    border-color: #46b8da
-    &:hover
-        background-color: #31b0d5
-        border-color: #269abc
+  background-color: #5bc0de
+  border-color: #46b8da
+  &:hover
+    background-color: #31b0d5
+    border-color: #269abc
 
 .yellow-btn
-    background-color: #f0ad4e
-    border-color: #eea236
-    &:hover
-        background-color: #ec971f
-        border-color: #d58512
+  background-color: #f0ad4e
+  border-color: #eea236
+  &:hover
+    background-color: #ec971f
+    border-color: #d58512
 
 .red-btn
+  background-color: #c9302c
+  border-color: #ac2925
+  &:hover
     background-color: #c9302c
     border-color: #ac2925
-    &:hover
-        background-color: #c9302c
-        border-color: #ac2925
 
 .r-margin
-    margin-right: 20px
+  margin-right: 20px
 
 .btn-sep
-    margin: 0 10px
-    font-size: 12px
-    line-height: 34px
+  margin: 0 10px
+  font-size: 12px
+  line-height: 34px
 
 .cancel-btn
-    line-height: 34px
-    font-size: 14px
-    color: #46b8da
-    border-bottom: 1px solid transparentize(#46b8da, 0.6)
-    &:hover
-        border-bottom: 1px solid transparent
+  line-height: 34px
+  font-size: 14px
+  color: #46b8da
+  border-bottom: 1px solid transparentize(#46b8da, 0.6)
+  &:hover
+    border-bottom: 1px solid transparent
 
 .related-link
-    line-height: 30px
-    font-size: 14px
-    color: #46b8da
-    border-bottom: 1px solid transparentize(#46b8da, 0.6)
-    &:hover
-        border-bottom: 1px solid transparent
+  line-height: 30px
+  font-size: 14px
+  color: #46b8da
+  border-bottom: 1px solid transparentize(#46b8da, 0.6)
+  &:hover
+    border-bottom: 1px solid transparent
 
 .login-btn
-    padding: 9px 12px
-    width: 100%
-    font-size: 18px
+  padding: 9px 12px
+  width: 100%
+  font-size: 18px
 
 .select-btn
-    padding: 4px 12px
+  padding: 4px 12px
 
 .lang-btn
-    position: relative
-    display: inline-block
-    margin: 0
-    padding: 6px 12px
-    font-size: 13px
-    font-weight: 400
-    color: #fff
-    text-align: center
-    cursor: pointer
-    border: 1px solid #397bc1
-    background-color: #428bca
-    +border-radius(5px)
-    +user-select
+  position: relative
+  display: inline-block
+  margin: 0
+  padding: 6px 12px
+  font-size: 13px
+  font-weight: 400
+  color: #fff
+  text-align: center
+  cursor: pointer
+  border: 1px solid #397bc1
+  background-color: #428bca
+  +border-radius(5px)
+  +user-select
+
+  a
+    width: auto !important
+    padding: 0 10px
+
+  &:hover
+    background-color: #3071a9
+    border-color: #285e8e
 
+  &.ui-state-active
+    border: 1px solid #abc993
+    background-color: #eaf7de
     a
-        width: auto !important
-        padding: 0 10px
-
-    &:hover
-        background-color: #3071a9
-        border-color: #285e8e
-
-    &.ui-state-active
-        border: 1px solid #abc993
-        background-color: #eaf7de
-        a
-            position: relative
-            color: #70ab3c !important
-            &:after,
-            &:before
-                top: 100%
-                left: 50%
-                border: solid transparent
-                content: " "
-                height: 0
-                width: 0
-                position: absolute
-                pointer-events: none
-            &:after
-                border-color: rgba(234, 247, 222, 0)
-                border-top-color: #eaf7de
-                border-width: 4px
-                margin-left: -4px
-            &:before
-                border-color: rgba(171, 201, 147, 0)
-                border-top-color: #abc993
-                border-width: 5px
-                margin-left: -5px
+      position: relative
+      color: #70ab3c !important
+      &:after,
+      &:before
+        top: 100%
+        left: 50%
+        border: solid transparent
+        content: " "
+        height: 0
+        width: 0
+        position: absolute
+        pointer-events: none
+      &:after
+        border-color: rgba(234, 247, 222, 0)
+        border-top-color: #eaf7de
+        border-width: 4px
+        margin-left: -4px
+      &:before
+        border-color: rgba(171, 201, 147, 0)
+        border-top-color: #abc993
+        border-width: 5px
+        margin-left: -5px

data/app/assets/stylesheets/rademade_admin/blocks/filter/_main.sass

@@ -0,0 +1,10 @@
+.filter-block
+  float: left
+  margin-right: 10px
+
+.form-box
+  &.search
+    float: left
+    .btn
+      float: left
+      margin-right: 10px

data/app/assets/stylesheets/rademade_admin/blocks/gallery/_main.sass

@@ -41,16 +41,58 @@
     position: absolute
     top: 2px
     right: 5px
-    font-size: 13px
+    width: 16px
+    height: 16px
+    padding: 1px
     cursor: pointer
-    padding: 1px 5px
     border-radius: 3px
-    background-color: #FFF
+    color: #333
     font-weight: bold
+    overflow: hidden
+    font-size: 16px
+    text-indent: 100%
+    background-color: #fff
+    &:before
+      position: absolute
+      top: 2px
+      left: 1px
+      width: 16px
+      height: 16px
+      text-indent: 0
+      @extend .glyphicon
+    @extend .glyphicon-remove
+    &:hover
+      +opacity(0.9)
 
   .crop-btn
     position: absolute
-    bottom: 5px
+    top: 2px
+    right: 26px
+    width: 16px
+    height: 16px
+    padding: 1px
+    cursor: pointer
+    border-radius: 3px
+    color: #333
+    font-weight: bold
+    overflow: hidden
+    font-size: 14px
+    text-indent: 100%
+    background-color: #fff
+    border: 0
+    +box-sizing(content-box)
+    &:before
+      position: absolute
+      top: 2px
+      left: 1px
+      width: 16px
+      height: 16px
+      text-indent: 0
+      @extend .glyphicon
+    @extend .glyphicon-fullscreen
+    &:hover
+      +opacity(0.9)
+
 
   .gallery-images-container
     float: left

data/app/controllers/rademade_admin/abstract_controller.rb

@@ -18,7 +18,7 @@ module RademadeAdmin
     protected
 
     def require_login
-      redirect_to :controller => 'dashboard', :action => 'login' unless admin_logged_in?
+      redirect_to login_url unless admin_logged_in?
     end
 
     def init_user

data/app/controllers/rademade_admin/file_controller.rb

@@ -41,7 +41,11 @@ class RademadeAdmin::FileController < RademadeAdmin::AbstractController
 
   def model
     model_class = RademadeAdmin::LoaderService.const_get(params[:model])
-    params[:id].present? ? model_class.find(params[:id]) : model_class.new
+    model_object = nil
+    if params[:id].present?
+      model_object = model_class.find(params[:id]) rescue nil
+    end
+    model_object || model_class.new
   end
 
 end

data/app/helpers/rademade_admin/field_helper.rb

@@ -31,7 +31,7 @@ module RademadeAdmin::FieldHelper
 
     selected = number == request.query_parameters[name.to_sym].to_i
     url_params = request.path_parameters.merge(hash_params)
-    content_tag(:option, number.to_s, :selected => selected, :value => admin_url_for(url_params, true))
+    content_tag(:option, number.to_s, :selected => selected, :value => admin_url_for(url_params))
   end
 
   def input_attr(attrs = {})

data/app/helpers/rademade_admin/uri_helper.rb

@@ -2,7 +2,12 @@
 module RademadeAdmin::UriHelper
 
   def root_uri
-    admin_url_for(controller: 'dashboard')
+    rademade_admin_route(:root_url)
+  end
+
+  def rademade_admin_route(route_url, opts = {})
+    opts[:only_path] = true
+    RademadeAdmin::Engine.routes.url_helpers.send(route_url, opts)
   end
 
   def admin_list_uri(model)
@@ -74,14 +79,14 @@ module RademadeAdmin::UriHelper
   end
 
   def admin_model_url_for(model, opts = {})
+    model_info = _real_model_info(model)
     admin_url_for(opts.merge({
-      :controller => _real_model_info(model).controller
+      :controller => "#{model_info.module_name}/#{model_info.controller}"
     }))
   end
 
-  def admin_url_for(opts, is_admin_controller = false)
+  def admin_url_for(opts)
     opts[:only_path] = true
-    opts[:controller] = "rademade_admin/#{opts[:controller]}" unless is_admin_controller
     Rails.application.routes.url_helpers.url_for(opts)
   rescue
     RademadeAdmin::Engine.routes.url_helpers.url_for(opts) rescue nil

data/app/inputs/rademade_admin/file_input.rb

@@ -36,7 +36,7 @@ module RademadeAdmin
         :name => uploader.mounted_as,
         :data => {
           :saved => object.new_record? ? 0 : 1,
-          :url => admin_url_for(:controller => 'file', :action => 'upload')
+          :url => rademade_admin_route(:file_upload_url)
         }.merge(uploader_params)
       })
     end
@@ -68,9 +68,9 @@ module RademadeAdmin
       template.content_tag(:a, I18n.t('rademade_admin.download_file'), {
         :class => 'btn blue-btn download-btn',
         :href => admin_url_for({
-          :controller => 'file',
+          :controller => 'rademade_admin/file',
           :action => 'download'
-        }.merge(uploader_params))
+        }.merge(uploader_params)) #todo use route name and resources
       }) unless uploader.file.nil?
     end
 
@@ -79,7 +79,7 @@ module RademadeAdmin
         :class => 'btn red-btn upload-btn',
         :data => {
           :crop => true,
-          :url => admin_url_for(:controller => 'file', :action => 'crop')
+          :url => rademade_admin_route(:file_crop_url)
         }
       })
     end

data/app/inputs/rademade_admin/gallery_input.rb

@@ -20,7 +20,7 @@ module RademadeAdmin
         :type => 'file',
         :multiple => true,
         :data => {
-          :url => admin_url_for(:controller => 'gallery', :action => 'upload'),
+          :url => rademade_admin_route(:gallery_upload_url),
           :class_name => gallery_class.to_s
         }
       })
@@ -31,7 +31,7 @@ module RademadeAdmin
       template.content_tag(:div, HtmlBuffer.new([images_html]), {
         :class => 'gallery-images-container',
         :data => {
-          :sortable_url => is_sortable ? admin_url_for(:controller => 'gallery', :action => 'sort') : ''
+          :sortable_url => is_sortable ? rademade_admin_route(:gallery_sort_url) : ''
         }
       })
     end

data/app/services/upload/gallery_preview_service.rb

@@ -25,7 +25,7 @@ module RademadeAdmin
           :class => 'btn red-btn crop-btn',
           :data => {
             :crop => true,
-            :url => admin_url_for(:controller => 'gallery', :action => 'crop'),
+            :url => rademade_admin_route(:gallery_crop_url),
             :full_url => uploader.url,
             :original_dimensions => uploader.original_dimensions.join(',')
           }
@@ -50,11 +50,12 @@ module RademadeAdmin
         content_tag(:span, 'x', {
           :class => 'remove-ico',
           :data => {
-            :url => admin_url_for(
-              :controller => 'gallery',
+            #todo use route name and resources
+            :url => admin_url_for({
+              :controller => 'rademade_admin/gallery',
               :action => 'remove',
               :id => uploader.model.id.to_s
-            )
+            })
           }
         })
       end

data/app/views/rademade_admin/_blocks/_sort_reset.html.erb

@@ -1,5 +1,5 @@
 <%
 if @sortable_service.can_reset?
-    %><a href="<%= admin_url_for(request.path_parameters, true) %>"><%= t('rademade_admin.reset_sort') %></a><%
+    %><a href="<%= admin_url_for(request.path_parameters) %>"><%= t('rademade_admin.reset_sort') %></a><%
 end
 %>

data/app/views/rademade_admin/_blocks/button/_hide.html.erb

@@ -1,7 +1,13 @@
 <%
 if @model_info.hideable? && can?(:edit, @model)
     element_id = "hide_#{item.id}"
-    toggle_url = admin_url_for(:controller => :status, :action => :toggle, :model => @model, :id => item.id)
+    toggle_url = admin_url_for(
+        :controller => :status,
+        :action => :toggle,
+        :model => @model,
+        :id => item.id
+    ) #todo via native method. Add route resourse
+
     %><div class="view-option">
         <input id="<%=element_id%>" data-toggle-url="<%= toggle_url %>" type="checkbox"<%
             if item.shown?

data/app/views/rademade_admin/abstract/index.html.erb

@@ -10,8 +10,8 @@
 end %>
 
 <% content_for :content do %><%
-    concat render @template_service.on_page_select_block
     concat render @template_service.search_block
+    concat render @template_service.on_page_select_block
     concat render @template_service.sort_reset_block
     %><table class="table-box"><%
         concat render @template_service.table_head_block, {

data/config/routes.rb

@@ -5,10 +5,12 @@ RademadeAdmin::Engine.routes.draw do
 
   root 'dashboard#index'
 
+  #todo via resources :file
   match 'file-upload' => 'file#upload', :via => [:post, :patch]
   match 'file-download/:model/:id/:uploader/:column' => 'file#download', :via => [:get]
   match 'file-crop' => 'file#crop', :via => [:post, :patch]
 
+  #todo via resources :gallery
   match 'gallery-upload' => 'gallery#upload', :via => [:post, :patch]
   match 'gallery-crop' => 'gallery#crop', :via => [:post, :patch]
   match 'gallery-sort' => 'gallery#sort', :via => [:post, :patch]

data/lib/rademade_admin/model/configuration.rb

@@ -50,7 +50,7 @@ module RademadeAdmin
       end
 
       def model(model_name)
-        @model_name = model_name
+        @model_name = model_name.to_s
       end
 
       def menu_count(&block)

data/lib/rademade_admin/model/graph.rb

@@ -4,15 +4,15 @@ module RademadeAdmin
     class Graph
       include Singleton
 
-      def add_pair(controller_name, inner)
+      def add_pair(module_name, controller_name, inner)
         # Controller includes configuration for mapping model
-        controller = LoaderService.const_get("rademade_admin/#{controller_name}_controller")
+        controller = LoaderService.const_get("#{module_name}/#{controller_name}_controller")
         controller.configuration.model(controller_name.classify) unless controller.model_name
 
         model = controller.model_class
 
         unless @model_infos[model.to_s]
-          model_reflection = RademadeAdmin::Model::Reflection.new(model, controller_name)
+          model_reflection = RademadeAdmin::Model::Reflection.new(model, controller_name, module_name)
           model_info = RademadeAdmin::Model::Info.new(model_reflection, controller.configuration, inner)
           @model_infos[model.to_s] = model_info
         end

data/lib/rademade_admin/model/info.rb

@@ -37,6 +37,10 @@ module RademadeAdmin
         model_reflection.controller
       end
 
+      def module_name
+        model_reflection.module_name
+      end
+
       def nested?
         @nested
       end

data/lib/rademade_admin/model/reflection.rb

@@ -3,15 +3,15 @@ module RademadeAdmin
   module Model
     class Reflection
 
-      attr_reader :model, :controller
-
-      def initialize(model, controller)
-        @model, @controller = model, controller
-      end
-
       ORM_TYPE_ACTIVERECORD = 'ActiveRecord'
       ORM_TYPE_MONGOID = 'Mongoid'
 
+      attr_reader :model, :controller, :module_name
+
+      def initialize(model, controller, module_name)
+        @model, @controller, @module_name = model, controller, module_name
+      end
+
       # Load data adapter for current model
       #
       # @return [RademadeAdmin::Model::Adapter::Data]

data/lib/rademade_admin/routing/mapper.rb

@@ -35,7 +35,7 @@ module RademadeAdmin
 
             end
 
-            Model::Graph.instance.add_pair(@scope[:controller], self.shallow?)
+            Model::Graph.instance.add_pair(@scope[:module], @scope[:controller], self.shallow?)
 
           end
         end

data/lib/rademade_admin/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RademadeAdmin
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rademade_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Vladislav Melanitskiy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -447,6 +447,7 @@ files:
 - app/assets/stylesheets/rademade_admin.sass.erb
 - app/assets/stylesheets/rademade_admin/base/main.sass
 - app/assets/stylesheets/rademade_admin/blocks/buttons/main.sass
+- app/assets/stylesheets/rademade_admin/blocks/filter/_main.sass
 - app/assets/stylesheets/rademade_admin/blocks/form/checkbox.sass
 - app/assets/stylesheets/rademade_admin/blocks/form/input.sass
 - app/assets/stylesheets/rademade_admin/blocks/form/label.sass