master

Bowerfile

@@ -11,7 +11,7 @@ asset 'leaflet'
 asset 'data-tables', :github => 'DataTables/DataTables'
 asset 'flot', :github => 'flot/flot'
 asset 'knob', :github => 'aterrien/jQuery-Knob'
-asset 'uniform', :github => 'AudithSoftworks/Uniform', :ref => 'v2.2.0'
+asset 'uniform', :github => 'AudithSoftworks/Uniform'
 asset 'jquery-ui', :github => 'jquery/jquery-ui#1.11.4'
 asset 'jquery-filthypillow', :github => 'Rademade/jquery.filthypillow#master'
 asset 'magnific-popup', :github => 'dimsemenov/Magnific-Popup'
@@ -31,3 +31,6 @@ asset 'jquery-form', :github => 'malsup/form'
 asset 'jquery-serialize', :github => 'macek/jquery-serialize-object'
 asset 'jquery-formrestrict', :github => 'treyhunner/jquery-formrestrict'
 asset 'jquery-validation', :github => 'jzaefferer/jquery-validation#v1.13.1'
+
+#Thead
+asset 'floatThead', :github => 'mkoryak/floatThead'

README.md

@@ -16,89 +16,25 @@ rademade_admin
 
 **Best rails admin panel!**
 
-
-How to use it
+Live demo
 --------------
+1. [http://admin.rademade.com/login](http://admin.rademade.com/login)
+2. Login: mrtom@rademade.com
+3. Password: 123456
 
-1) Add `gem 'rademade_admin'` to Gemfile
-
-2) Update `config/initializers/assets.rb` with line:
-```ruby
-config.assets.precompile += %w(rademade_admin.css rademade_admin.js)
-```
-
-3) Mount rails engine at routing.rb `mount RademadeAdmin::Engine => '/admin'`
-
-4) Create `User` model and other needed models
-```ruby
-class User < ActiveRecord::Base
-  include RademadeAdmin::UserModule
-
-  has_secure_password
-
-  validates :password, length: { minimum: 8 }, allow_nil: true
-
-  def self.get_by_email(email)
-    where(email: email).first
-  end
-
-  alias valid_password? authenticate
-
-  def to_s
-    email
-  end
-
-end
-```
-
-
-5) Add rademade_admin initializer `initializers/rademade_admin.rb`
-```ruby
-RademadeAdmin.configure do |config|
-  config.admin_class = User
-end
-
-```
-
-6) Create admin controller. Example `app/controllers/rademade_admin/users_controller.rb`
-```ruby
-class RademadeAdmin::UsersController < RademadeAdmin::ModelController
-
-  # You can leave controller absolutely empty!
-
-  options do
-    list do
-      email
-    end
-    form do
-      first_name
-      email
-      password :hint => 'Or leave it empty'
-    end
-  end
-
-end
-```
-
-7) Add `admin_resources` to `routers.rb`
-```ruby
-namespace :rademade_admin, :path => 'admin' do
-  admin_resources :users
-end
-```
-
-8) Install assets with bower `rake rademade_admin:bower:install`
-
-9) Start rails `rails s`
-
-**Good luck :)**
+How to install
+--------------
+[https://github.com/Rademade/rademade_admin/wiki/install](https://github.com/Rademade/rademade_admin/wiki/install)
 
 
 Supported options
 --------------
 ```ruby
 options do
   model 'ModelName'
+
+  # Fixed table head if need
+  fixed_thead true
 
   # Navigation menu settings
   parent_menu 'ModelName'

app/assets/javascripts/app/common/uploader.coffee

@@ -23,7 +23,7 @@ class @Uploader extends Backbone.View
   updateUploader : (result) =>
     @$el.find('[data-preview-item]').replaceWith(result.html)
     @$el.find('.upload-holder.hide').removeClass('hide')
-    @$hidden.val(result.file[@$uploader.data('column')].url)
+    @$hidden.val(result.file.url)
     ImagePreview.initPlugin()
 
   showLoader : () ->

app/assets/javascripts/app/select2/related/collection-view.coffee

@@ -24,6 +24,8 @@ class @Select2Input.RelatedCollectionView extends Backbone.View
     views = []
     collection = new Select2Input.RelatedCollection
     collection.setSortable $list.data('sortable')
+    collection.setDeletable $list.data('deletable')
+
     $list.find('li').each () ->
       relatedView = Select2Input.RelatedView.init $(this)
       views.push relatedView

app/assets/javascripts/app/select2/related/collection.coffee

@@ -16,9 +16,15 @@ class @Select2Input.RelatedCollection extends Backbone.Collection
   setSortable : (sortable) ->
     @sortable = sortable
 
+  setDeletable : (deletable) ->
+    @deletable = deletable
+
   isSortable : () ->
     @sortable
 
+  isDeletable : () ->
+    @deletable
+
   resort : () ->
     @sort()
     @_triggerChange()

app/assets/javascripts/app/select2/related/view.coffee

@@ -32,9 +32,16 @@ class @Select2Input.RelatedView extends Backbone.View
     else
       false
 
+  isDeletable: () ->
+    if @model.collection
+      @model.collection.isDeletable()
+    else
+      false
+
   _getHtml : (data) ->
     JST['app/templates/related-item'] _.extend
       isSortable : @isSortable()
+      isDeletable : @isDeletable()
     , data
 
   @init : ($el) ->

app/assets/javascripts/app/templates/related-item.jst.ejs

@@ -3,4 +3,8 @@ if (isSortable) {
     %><i class="draggable-btn"></i><%
 }
 %><button class="select2-item-edit" data-edit="<%= editurl %>"><%= text %></button>
-<button class="select2-item-remove" data-remove><%= I18n.t('rademade_admin.relation.destroy') %></button>
+<%
+if (isDeletable) {
+    %><button class="select2-item-remove" data-remove><%= I18n.t('rademade_admin.relation.destroy') %></button><%
+}
+%>

app/assets/javascripts/rademade_admin.coffee

@@ -4,13 +4,6 @@
 #= require jquery-ujs
 #= require jquery-ui/ui/core
 #= require jquery-ui/ui/widget
-#= require jquery-ui/ui/mouse
-#= require jquery-ui/ui/draggable
-#= require jquery-ui/ui/resizable
-#= require jquery-ui/ui/sortable
-#= require jquery-ui/ui/slider
-#= require jquery-ui/ui/tabs
-#= require jquery-ui/ui/datepicker
 #= require touch-punch/jquery.ui.touch-punch
 #= require jcrop/js/jquery.Jcrop
 #= require jquery-filthypillow/jquery.filthypillow
@@ -32,12 +25,14 @@
 #= require flot/jquery.flot.resize
 #= require flot/jquery.flot.stack
 #= require knob/js/jquery.knob
-#= require uniform/dist/jquery.uniform.min
+#= require uniform/src/js/jquery.uniform
 #= require data-tables/media/js/jquery.dataTables
+#= require floatThead/dist/jquery.floatThead
 #= require wysihtml5/dist/wysihtml5-0.3.0
 #= require underscore/underscore
 #= require backbone/backbone
 #= require backbone-notifier/js/backbone.notifier
+#= require jquery-ujs
 #= require_tree ./ckeditor
 #= require_tree ./settings
 #= require_tree ./form

app/assets/javascripts/settings/ajax-csrf.coffee

@@ -1,4 +1,8 @@
 $ ->
   $.ajaxSetup(headers : {
     'X-CSRF-Token' : $('meta[name="csrf-token"]').attr('content')
-  })
+  })
+
+  $(document).on 'page:load ready init-plugins', () ->
+    $('table.fixed-thead').floatThead
+      position: 'fixed'

app/assets/stylesheets/rademade_admin.sass

@@ -4,7 +4,7 @@
  *= require jquery-ui/themes/base/core
  *= require jquery-ui/themes/base/slider
  *= require jquery-ui/themes/base/datepicker
- *= require uniform/themes/default/css/uniform.default
+ *= require uniform/dist/css/default.css
  *= require jcrop/css/jquery.Jcrop
  *= require leaflet/dist/leaflet
  *= require backbone-notifier/css/notifier-base

app/controllers/rademade_admin/file_controller.rb

@@ -6,7 +6,7 @@ def upload
     uploader.store!(params[param_key])
     render :json => {
       :html => RademadeAdmin::Upload::Preview::File.new(uploader).preview_html,
-      :file => uploader
+      :file => JSON.parse(uploader.to_json).merge(url: uploader.url)
     }
   rescue CarrierWave::UploadError => e
     show_error(e)

app/services/model_controller/model_options.rb

@@ -7,6 +7,7 @@ module ModelOptions
     #  - model
     #  - name
     #  - parent_menu (todo extract to menu method)
+    #  - fixed_thead
     #  - menu_count
     #  - list
     #  - form
@@ -28,6 +29,10 @@ def parent_menu_item
       configuration.parent_menu_item
     end
 
+    def fixed_thead_value
+      configuration.fixed_thead_value
+    end
+
     def model_class
       configuration.model_class
     end

app/views/rademade_admin/_blocks/_list.html.erb

@@ -17,7 +17,7 @@ end %>
         concat render @template_service.search_block
     %></div>
     <div class="content-table-holder">
-        <table class="content-table" cellspacing="0" cellpadding="0"><%
+        <table class="content-table<%= @model_info.fixed_thead ? ' fixed-thead' : '' %>" cellspacing="0" cellpadding="0"><%
             concat render @template_service.table_head_block
             concat render @template_service.table_head_list
         %></table>

app/views/rademade_admin/_blocks/_navigation.html.erb

@@ -10,7 +10,6 @@
             <i class="user-img"></i>
             <span class="user-name"><%= @current_user %></span><%
             concat link_to '', rademade_admin_route(:logout_sessions_url), {
-                :method => :delete,
                 :class => 'user-settings'
             }
         %></div>
@@ -19,4 +18,4 @@
             <a href="https://rademade.com"> Rademade</a> Admin
         </div>
     </div>
-</div>
+</div>

app/views/rademade_admin/_blocks/button/_destroy.html.erb

@@ -1,5 +1,5 @@
 <%
-if can? :destroy, @model
+if can? :destroy, item
     delete_uri = admin_delete_uri(item)
     unless delete_uri.nil?
         %><%= form_tag(delete_uri, :method => :delete, :class => 'inline-el', :data => { :'delete-item-form' => '' }) do
@@ -10,4 +10,4 @@ if can? :destroy, @model
             </button><%
         end
     end
-end %>
+end %>

lib/rademade_admin/engine.rb

@@ -12,7 +12,22 @@ class Engine < ::Rails::Engine
     config.assets.paths << "#{config.root}/vendor/assets/javascript/bower_components"
 
     initializer 'ckeditor.assets_precompile', :group => :all do |app|
-      app.config.assets.precompile += %w(rademade_admin.css rademade_admin.js ckeditor/* rademade_admin/fav1.ico)
+      filter_ckeditor_assets = Proc.new do |logical_path|
+        File.fnmatch('ckeditor/*', logical_path) \
+          && ! [
+            'ckeditor/CHANGES',
+            'ckeditor/LICENSE',
+            'ckeditor/README',
+            'ckeditor/plugins/scayt/CHANGELOG',
+            'ckeditor/plugins/scayt/LICENSE',
+            'ckeditor/plugins/scayt/README',
+            'ckeditor/plugins/wsc/LICENSE',
+            'ckeditor/plugins/wsc/README',
+            'ckeditor/skins/moono/readme',
+          ].include?(logical_path)
+      end
+      app.config.assets.precompile << filter_ckeditor_assets
+      app.config.assets.precompile += %w(rademade_admin.css rademade_admin.js rademade_admin/fav1.ico)
     end
 
     $LOAD_PATH << "#{config.root}/app/services/"
@@ -29,4 +44,4 @@ class Engine < ::Rails::Engine
     end
 
   end
-end
+end

lib/rademade_admin/input/related_select_input/related_list.rb

@@ -10,7 +10,8 @@ def related_list_html
           template.content_tag(:ul, related_list_items_html, {
             :class => 'select2-items-list',
             :data => {
-              :sortable => sortable_relation?
+              :sortable => sortable_relation?,
+              :deletable => destroyable_relation?
             }
           })
         end
@@ -51,7 +52,7 @@ def related_list_item_remove_html
           template.content_tag(:button, I18n.t('rademade_admin.relation.destroy'), {
             :'data-remove' => '',
             :class => 'select2-item-remove'
-          })
+          }) if destroyable_relation?
         end
 
         def related_item_class
@@ -64,6 +65,10 @@ def sortable_relation?
           related_data_item.relation.sortable?
         end
 
+        def destroyable_relation?
+          related_data_item.relation.destroyable?
+        end
+
       end
     end
   end