rademade_admin 0.1.0 → 0.1.1

data/app/services/saver.rb

@@ -94,7 +94,7 @@ module RademadeAdmin
     end
 
     def simple_field_params
-      @params.require(:data).permit(@model_info.data_items.save_form_fields)
+      @params.require(:data).symbolize_keys.slice(*@model_info.data_items.save_form_fields)
     end
 
     def related_entities(data_item, ids)

data/app/services/search/conditions/abstract.rb

@@ -37,7 +37,9 @@ module RademadeAdmin
         end
 
         def order
-          nil
+          order_conditions = RademadeAdmin::Search::Part::Order.new
+          order_conditions.add(:id, :desc)
+          order_conditions
         end
 
         def page

data/app/services/search/conditions/autocomplete.rb

@@ -23,7 +23,7 @@ module RademadeAdmin
         private
 
         def append_query_condition
-          if @params[:q].present?
+          if @params[:q].present? and not @data_items.filter_fields.empty?
             query_where = RademadeAdmin::Search::Part::Where.new(:or)
             @data_items.filter_fields.each do |field|
               query_where.add(field, /#{@params[:q]}/i)

data/app/services/search/conditions/list.rb

@@ -17,9 +17,9 @@ module RademadeAdmin
         end
 
         def order
-          order_conditions = RademadeAdmin::Search::Part::Order.new
+          order_conditions = super
           field = @params[:sort] || default_order_field
-          order_conditions.add(field, @params[:direction])
+          order_conditions.unshift(field, @params[:direction])
           order_conditions
         end
 

data/app/services/search/conditions/related_list.rb

@@ -25,9 +25,9 @@ module RademadeAdmin
         end
 
         def order
-          order_conditions = RademadeAdmin::Search::Part::Order.new
+          order_conditions = super
           field = @params[:sort] || default_order_field
-          order_conditions.add(field, @params[:direction])
+          order_conditions.unshift(field, @params[:direction])
           order_conditions
         end
 

data/app/services/search/part/abstract.rb

@@ -10,16 +10,30 @@ module RademadeAdmin
         end
 
         def add(field, value)
-          @parts << {
-            :field => field,
-            :value => value
-          }
+          @parts << part_object(field, value)
+        end
+
+        def unshift(field, value)
+          @parts.unshift(part_object(field, value))
         end
 
         def sub_add(part)
           @parts << part
         end
 
+        def sub_unshift(part)
+          @parts.unshift part
+        end
+
+        protected
+
+        def part_object(field, value)
+          {
+            :field => field,
+            :value => value
+          }
+        end
+
       end
     end
   end

data/app/services/search/part/order.rb

@@ -6,7 +6,9 @@ module RademadeAdmin
     module Part
       class Order < Abstract
 
-        def add(field, value)
+        protected
+
+        def part_object(field, value)
           value ||= :asc
           super(field, value.to_sym)
         end

data/app/services/upload/preview_service.rb

@@ -30,6 +30,18 @@ module RademadeAdmin
         end
       end
 
+      def is_image?
+        @uploader.class.ancestors.include? RademadeAdmin::Uploader::Photo
+      end
+
+      def is_crop?
+        @uploader.class.ancestors.include? RademadeAdmin::Uploader::CropPhoto
+      end
+
+      def is_video?
+        @uploader.class.ancestors.include? RademadeAdmin::Uploader::Video
+      end
+
       private
 
       def empty_file_html
@@ -48,20 +60,13 @@ module RademadeAdmin
         end
       end
 
-      def is_image?
-        @uploader.class.ancestors.include? RademadeAdmin::Uploader::Photo
-      end
-
-      def is_video?
-        @uploader.class.ancestors.include? RademadeAdmin::Uploader::Video
-      end
-
       def uploaded_image_preview
         content_tag(:img, '', {
           :src => @uploader.resize(230, 130),
           :class => 'image-preview',
           :width => 230,
-          :height => 130
+          :height => 130,
+          :data => preview_data
         })
       end
 
@@ -81,6 +86,12 @@ module RademadeAdmin
         })
       end
 
+      def preview_data
+        {
+          :'original-dimensions' =>  is_crop? ? @uploader.original_dimensions.join(',') : ''
+        }
+      end
+
     end
   end
 end

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

@@ -5,7 +5,7 @@
                 <img src="<%= image_path 'rademade_admin/logos/logo.png' %>" alt="Rademade admin">
             </a>
             <div class="fl-r">
-                <form class="header-search fl-l" role="search">
+                <form class="header-search fl-l hide" role="search">
                     <div class="header-search-box">
                         <input type="text" class="header-search-input" placeholder="<%= t('rademade_admin.search') %>">
                     </div>
@@ -15,7 +15,7 @@
                     <div class="menu-item">
                         <span class="menu-link disabled"><%= @current_user %> <b class="caret"></b></span>
                     </div>
-                    <div class="menu-item js-box">
+                    <div class="menu-item js-box hide">
                         <span class="menu-link js-link"><i class="glyphicon glyphicon-list"></i></span>
                         <div class="menu-droplist js-droplist">
                             <%# <div class="menu-droplist-header">Active links</div>

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

@@ -1,44 +1,8 @@
 <div id="sidebar-nav" class="content-menu">
     <ul id="dashboard-menu"><%
-        main_menu.each do |menu_item|
-            has_sub_items = (menu_item[:sub].is_a? Array and menu_item[:sub].size > 0)
-            if has_sub_items || menu_item[:uri]
-                item_name = menu_item[:name] || menu_item[:model_info].item_name
-                is_active = active?(menu_item)
-                %><li class="menu-box<%
-                    if is_active
-                        %> active<%
-                    end
-                %>"><%
-                    if is_active
-                        %><div class="pointer">
-                            <div class="arrow"></div>
-                            <div class="arrow_border"></div>
-                        </div><%
-                    end
-
-                    %><a href="<%= menu_item[:uri] %>" class="menu-link<%
-                        if has_sub_items
-                            %> dropdown-toggle<%
-                        end
-                    %>">
-                        <i class="<%= menu_item[:ico] %>"></i>
-                        <span><%= item_name %></span><%
-                        if has_sub_items
-                            %><span class="caret"></span><%
-                        end
-                    %></a><%
-                    if has_sub_items
-                        %><ul class="submenu"><%
-                            concat render @template_service.sub_menu_link_block, {
-                                :uri => admin_list_uri(menu_item[:model_info]),
-                                :title => menu_item[:model_info].item_name
-                            }
-                            concat render @template_service.sub_menu_block, :menu_item => menu_item
-                        %></ul><%
-                    end
-                %></li><%
-            end
+        concat render_cell(:menu, :root_item)
+        RademadeAdmin::MenuService.instance.main_menu.each do |menu_item|
+            concat render_cell(:menu, :item, menu_item)
         end
     %></ul>
 </div>

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

@@ -0,0 +1,3 @@
+<%
+edit_url = admin_edit_uri(item)
+concat link_to t('rademade_admin.edit'), edit_url, :class => 'glyphicon glyphicon-pencil fl-l' if edit_url %>

data/app/views/rademade_admin/_blocks/form/_lang_panel.html.erb

@@ -1,10 +1,13 @@
 <%
 if @form_fields_with_locale.length > 0
     %><div data-lang-panel>
-        <ul><%
+        <ul class="form-box">
+          <li class="form-label">
+            <span class="text"><%= t('rademade_admin.language') %></span>
+          </li><%
             I18n.available_locales.each do |locale|
-                %><li class="btn blue-btn" style="margin-right: 10px; padding: 0px">
-                    <a href="#locale-<%= locale %>" style="color: #ffffff; display: block; width: 37px; line-height: 30px"><%= locale %></a>
+                %><li class="lang-btn" style="margin-right: 10px; padding: 0px">
+                    <a href="#locale-<%= locale %>" style="color: #ffffff; display: block; width: 37px; line-height: 30px"><%= t("rademade_admin.locale_#{locale}", :default => locale) %></a>
                 </li><%
             end
         %></ul><%

data/app/views/rademade_admin/_layouts/inner/index_table.html.erb

@@ -20,7 +20,9 @@
                     end
                     %><td class="table-item">
                         <span class="table-actions"><%
-                            concat link_to t('rademade_admin.edit'), admin_edit_uri(item), :class => 'glyphicon glyphicon-pencil fl-l'
+                            concat render 'rademade_admin/_blocks/button/edit', {
+                                :item => item
+                            }
                             concat button_to t('rademade_admin.destroy'), admin_delete_uri(item), {
                                 :method => :delete,
                                 :form => { :class => 'delete-item-form' }

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

@@ -31,7 +31,9 @@ end %>
                     end
                     %><td class="table-item">
                         <span class="table-actions"><%
-                            concat link_to t('rademade_admin.edit'), admin_edit_uri(item), :class => 'glyphicon glyphicon-pencil fl-l'
+                            concat render 'rademade_admin/_blocks/button/edit', {
+                                :item => item
+                            }
                             %><div class="glyphicon glyphicon-remove fl-l"><%
                                 concat button_to t('rademade_admin.destroy'), admin_delete_uri(item), {
                                     :method => :delete,

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

@@ -21,6 +21,9 @@ end
         has_position = @sortable_service.has_position?
         %><tbody class="table-content" data-position='false'><%
             @items.each do |item|
+                unlink_url = admin_unlink_uri(@item, params[:relation], {
+                    :related_id => item.id
+                })
                 %><tr class="table-line" <%
                     if has_position
                         %> id='<%= item.position %>'<%
@@ -30,13 +33,17 @@ end
                         %><td><%= display_item_value(item, field) %></td><%
                     end
                     %><td class="table-item">
-                        <span class="table-actions"><%=
-                            button_to t('rademade_admin.unlink'), admin_unlink_uri(@item, params[:relation], {
-                                :related_id => item.id
-                                }), {
-                                      :method => :delete,
-                                      :form => { :class => 'delete-item-form' }
-                        } %></span>
+                        <span class="table-actions"><%
+                            concat render 'rademade_admin/_blocks/button/edit', {
+                                :item => item
+                            }
+                            %><div class="glyphicon glyphicon-remove fl-l"><%
+                                concat button_to t('rademade_admin.unlink'), unlink_url, {
+                                    :method => :delete,
+                                    :form => { :class => 'delete-item-form' }
+                                }
+                            %></div>
+                        </span>
                     </td>
                 </tr><%
             end

data/config/initializers/carrier_wave/mongoid.rb

@@ -45,4 +45,4 @@ module CarrierWave
     end
 
   end
-end
+end if defined? CarrierWave::Mongoid

data/config/locales/rademade_admin.en.yml

@@ -25,4 +25,9 @@ en:
     upload_file: "Upload file"
     enter_search: "Enter search phrase"
     record_remove_confirm: "Do you really want delete this record?"
-    model_remove_confirm: "Do you really want delete this model?"
+    model_remove_confirm: "Do you really want delete this model?"
+    language: "Language"
+    locale_en: "English"
+    locale_ru: "Russian"
+    edit_related_item: "Edit"
+    crop: "Crop"

data/config/locales/rademade_admin.ru.yml

@@ -0,0 +1,28 @@
+ru:
+  rademade_admin:
+    login: "Войти"
+    dashboard: "Главная"
+    home: "Главная"
+    or: "или"
+    toggle_nav: "Переключить навигацию"
+    show_results: "Показать результаты на странице"
+    reset_sort: "Сбросить сортировку"
+    management: "Управление"
+    edit: " "
+    destroy: "Удалить"
+    unlink: "Убрать связь"
+    new_record: "Новая запись"
+    hello: "Привет"
+    file_not_chosen: "Файл не выбран"
+    add_new: "Добавить"
+    save: "Сохранить"
+    cancel: "Отмена"
+    exit: "Выход"
+    title_description: ""
+    submit: "Подтвердить"
+    search: "Поиск"
+    edit_record: "Редактировать"
+    upload_file: "Загрузить файл"
+    enter_search: "Введите фразу для поиска"
+    record_remove_confirm: "Вы действительно хотите удалть данную запись?"
+    model_remove_confirm: "Вы действительно хотите удалить данную модель?"

data/config/locales/simple_form.ru.yml

@@ -0,0 +1,7 @@
+ru:
+  helpers:
+    submit:
+      create: "Создать"
+      update: "Сохранить изменения"
+      reset: "Сбросить"
+      cancel: "Отмена"

data/config/routes.rb

@@ -6,6 +6,7 @@ RademadeAdmin::Engine.routes.draw do
   root 'dashboard#index'
 
   match 'file-upload' => 'file#upload', :via => [:post, :patch]
+  match 'file-crop' => 'file#crop', :via => [:post, :patch]
 
   post 'sessions' => 'sessions#login'
   get 'login' => 'dashboard#login', :as => 'login'

data/lib/rademade_admin.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'kaminari'
+require 'light_resizer'
 require 'carrierwave'
-require 'breadcrumbs'
 
 require 'cancan'
 require 'bower-rails'
@@ -12,6 +12,8 @@ require 'turbolinks'
 
 require 'i18n-js'
 
+require 'slim'
+require 'cells'
 require 'simple_form'
 require 'ckeditor'
 
@@ -19,7 +21,6 @@ require 'rademade_admin/sortable'
 require 'rademade_admin/engine'
 
 require 'mongoid_sortable_relation'
-require 'activerecord_sortable'
 
 module RademadeAdmin
 

data/lib/rademade_admin/engine.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 require 'rademade_admin/routing/mapper'
 require 'simple_form'
+require 'breadcrumbs'
 
 module RademadeAdmin
   class Engine < ::Rails::Engine
@@ -13,6 +14,7 @@ module RademadeAdmin
     paths = %W(
       #{config.root}/app/helpers/**/*.rb
       #{config.root}/app/services/**/*.rb
+      #{config.root}/app/cells/**/*.rb
       #{config.root}/app/inputs/**/*.rb
       #{config.root}/lib/rademade_admin/**/*.rb
     )

data/lib/rademade_admin/input/related_select_input/related_list.rb

@@ -12,7 +12,7 @@ module RademadeAdmin
             :data => {
               :sortable => related_data_item.relation.sortable?
             }
-          })
+          }) + related_list_link_html
         end
 
         def related_list_items_html
@@ -36,7 +36,14 @@ module RademadeAdmin
         end
 
         def related_list_item_edit_html(serialized_value)
-          template.content_tag(:button, I18n.t('rademade_admin.edit'), :'data-edit' => serialized_value[:edit_url])
+          if serialized_value[:edit_url]
+            template.content_tag(
+              :button, I18n.t('rademade_admin.edit_related_item'),
+              :'data-edit' => serialized_value[:edit_url]
+            )
+          else
+            ''
+          end
         end
 
         def related_list_item_remove_html
@@ -44,14 +51,12 @@ module RademadeAdmin
         end
 
         def related_list_link_html
-          if multiple?
-            relation_name = RademadeAdmin::Model::Graph.instance.model_info(related_to).item_name
-            url = admin_related_item(model, relation_getter)
-            template.content_tag(:a, relation_name, {
-              :href => url,
-              :class => 'related-link'
-            }) + related_list_html if url
-          end
+          relation_name = RademadeAdmin::Model::Graph.instance.model_info(related_to).item_name
+          url = admin_related_item(model, relation_getter)
+          template.content_tag(:a, relation_name, {
+            :href => url,
+            :class => 'related-link'
+          }) if url
         end
 
       end