redde 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff8f56400af753e3a0920dd703951ed530ebee8
-  data.tar.gz: d1c115a92042bbe4448447bdfcc2b8715b9364bd
+  metadata.gz: 5dfe0485b6b977a44124ef52c40206d970a8da28
+  data.tar.gz: d2e0b886c2906a310ee6e865f34fd5ee014709d8
 SHA512:
-  metadata.gz: 4cc07ec6f8bf3ca41af2a05c1a8b6fa96fa34c032046a47576a23893d496ad31b8cd5738b8ec5395aea54e3bde7229e2fea065e15e4883abd750347b08cf0db3
-  data.tar.gz: 654b4ae1a306f8e7b5c47f779500ebc5112b6c5361a5c9d9154776e57a2f6ab9405b7c2eee43cf496ac81adba8fb5ca32af4d53e2162b8ee6633ace2a3c77a31
+  metadata.gz: 0fca82ce871d89b082e6e38cb4a0bfc3e665639efc9d794b0c103d70a4bd483843e111b23d8a3a482bfb1e96b86325e38cfd5b189c76fc3edcb481fa8f65234a
+  data.tar.gz: 49ca40569bf78635f09bbc943451967531914ebce3fa3b6af93b1f09dd0db1dc94edab5918ac6dd53b25d51ec7b17b708a1ce3e50c8e2ba2ae2de9161059ca2d

data/app/helpers/redde/admin_helper.rb

@@ -1,5 +1,26 @@
 # coding: utf-8
 module Redde::AdminHelper
+
+  def page_header(item = nil, &block)
+    if block_given?
+      content_for(:page_header, content_tag(:div, capture(&block), class: 'page-header'))
+    elsif action_name == 'index'
+      content_for(:page_header, content_tag(:div, render('admin/redde/page_header'), class: 'page-header'))
+    else
+      content_for(:page_header, content_tag(:div, render('admin/redde/page_header_edit', item: instance_variable_get("@#{record}")), class: 'page-header'))
+    end
+  end
+
+  def redde_page(&block)
+    item = instance_variable_get("@#{record}")
+
+    capture do
+      concat page_header
+      concat redde_form_for([:admin, item]) { |f| capture(f, &block) }
+      concat photoable(item)
+    end
+  end
+
   def command_link(name, action, confirm = nil)
     options = { method: :put }
     options[:data] = { confirm: confirm } if confirm.present?
@@ -16,7 +37,7 @@ module Redde::AdminHelper
   end
 
   def photoable(parent)
-    render('admin/redde_photos/photos', parent: parent)
+    render('admin/redde_photos/photos', parent: parent) if parent.class.reflect_on_association(:photos)
   end
 
   def tsingular(model)

data/app/helpers/redde/form_helper.rb

@@ -18,7 +18,6 @@ module Redde::FormHelper
         concat f.redde_submits
       end
     end
-
   end
 
   def redde_fields_for(record_name, record_object = nil, options = {}, &block)

data/app/views/admin/base/edit.html.haml

@@ -1,19 +1,9 @@
-- item = instance_variable_get("@#{record}")
-- content_for :page_header do
-  .page-header__title
-    - if item.new_record?
-      Добавить #{taccusative(record)}
-    - else
-      Редактировать #{taccusative(record)}
-  = link_to 'Назад', { action: :index }, class: 'btn page-header__btn'
-
-= photoable(item) if item.class.reflect_on_association(:photos)
-
-= redde_form_for [:admin, item] do |f|
+= redde_page do |f|
   - form_column_names.each do |column|
     = f.redde_field column.to_sym
   - if column_names.include?('ancestry')
     = f.redde_select :parent_id, options_from_collection_for_select(f.object.class.all, :id, :title, f.object.parent_id), { include_blank: '- Выбрать -' }
+
   -# %div= render 'redditor/admin/page', { f: f } if @article.methods.include?(:page)
 
   -# проверить и написать правильное условие

data/app/views/admin/base/index.html.haml

@@ -1,4 +1,4 @@
-= render 'admin/redde/page_header'
+= page_header
 
 - res_collection = instance_variable_get("@#{collection}")
 - if res_collection.any?

data/app/views/admin/base/tree.html.haml

@@ -1,12 +1,10 @@
-= render 'admin/redde/page_header'
+= page_header
 
 - res_collection = instance_variable_get("@#{collection}")
 - if res_collection.any?
   - cache [model_name.maximum(:updated_at).to_i] do
     %ol.sort-tree{ 'data-sort-tree' => '' }= render partial: 'tree_item', collection: res_collection, as: :item
 
-  =# sort_tree sort_admin_categories_path, 2
-
 - else
   %h3
     Ни одной

data/app/views/admin/managers/edit.html.haml

@@ -1,10 +1,4 @@
-- content_for :page_header do
-  %h1
-    - if @manager.new_record?
-      Добавить #{taccusative(:manager)}
-    - else
-      Редактировать #{taccusative(:manager)}
-  %p= link_to 'Назад', [:admin, :managers]
+= page_header
 
 = redde_form_for [:admin, @manager] do |f|
   = f.redde_text_field :email

data/app/views/admin/managers/index.html.haml

@@ -1,6 +1,4 @@
-- content_for(:page_header) do
-  %h1= tplural Manager
-  %p= link_to "Добавить #{taccusative('manager')}", [:new, :admin, :manager]
+= page_header
 
 - unless @managers.empty?
   %table.list

data/app/views/admin/redde/_page_header.html.haml

@@ -1,3 +1,2 @@
-- content_for(:page_header) do
-  .page-header__title= tplural model_name
-  = link_to "Добавить #{taccusative("#{record}")}", { action: :new }, class: 'btn page-header__btn'
+.page-header__title= tplural model_name
+= link_to "Добавить #{taccusative("#{record}")}", { action: :new }, class: 'btn page-header__btn'

data/app/views/admin/redde/_page_header_edit.html.haml

@@ -0,0 +1,7 @@
+.page-header__title
+  - if item.new_record?
+    Добавить
+  - else
+    Редактировать
+  = taccusative(record)
+= link_to 'Назад', { action: :index }, class: 'btn page-header__btn'

data/app/views/admin/system_commands/index.html.haml

@@ -1,5 +1,5 @@
-= content_for :page_header do
-  %h1 Системные команды
+= page_header do
+  .page-header__title Системные команды
 
 %h2 Сброс кэша
 %p

data/app/views/layouts/admin.html.haml

@@ -13,16 +13,11 @@
     .wrapper
       = render 'admin/redde/sidebar'
       .main
-        .page-header
-          = yield(:page_header)
+        = yield(:page_header)
         - if notice
           .flash-msg._notice= notice
         - if alert
           .flash-msg._alert= alert
-        .main__page
-          #filter
-            = yield(:filter)
-          - if yield(:page_sidebar).present?
-            .main__sidebar.page-sidebar= yield(:page_sidebar)
-          .main__content
-            = yield
+        - if yield(:page_sidebar).present?
+          .main__sidebar.page-sidebar= yield(:page_sidebar)
+        .main__content= yield

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -567,6 +567,7 @@ files:
 - app/views/admin/redde/_header.html.haml
 - app/views/admin/redde/_main_menu.html.haml
 - app/views/admin/redde/_page_header.html.haml
+- app/views/admin/redde/_page_header_edit.html.haml
 - app/views/admin/redde/_sidebar.html.haml
 - app/views/admin/redde/_validate.haml
 - app/views/admin/redde_photos/_photo.haml
@@ -621,7 +622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Admin scaffold generator for redde projects