redde 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a103ef068f85b4d4a722389e6c72b54c463dcb7a
-  data.tar.gz: f93be0d19055af8f1fe3de13af44e16e84f9effb
+  metadata.gz: 5948cdc5b2b31de8f556a903d06211043b329adf
+  data.tar.gz: c1063541c99f5e9a0c1db1c9bb99b9c2e3a61b9b
 SHA512:
-  metadata.gz: 2949955d075d9606606b7d239a7ecf0520ba22504c53c83f0bcd68bc1f17c3e21077eb91484002cf9f9cd0f6279c3ce0926d78eab40e59a4c5aec936b51b2016
-  data.tar.gz: 21b2feb9b556aa76bc289a2b75bffc75c32dc6731245ba7b7e6b3c949020762571f4b42a5c14dffd81ed868d34d55e7f592d8e435f89dd4bb9ce6caefd141928
+  metadata.gz: 03a1967bb460a6ccb601bf63c056209deb83831c26a2a67db96c0d4dbc687ae135ec252d6a4e2f108397965632a991d0355da6e7ec3baa8f29d1e915256ef475
+  data.tar.gz: 754ff988354cfe98000fc2ef26701be93c8e4252ee93cc1b0381a699211853b7bfb389f4a05fc57e0063000636d5b347705ef3106a1908bca9972825362fbcf5

data/app/assets/javascripts/redde/sortable.coffee

@@ -28,9 +28,9 @@ $ ->
       dropOnEmpty: false
       cursor: "crosshair"
       opacity: 0.75
-      handle: ".handle"
+      handle: "[data-sortable-handle]"
       axis: "y"
-      items: "tr"
+      items: "[data-sortable-item]"
       scroll: true
       update: ->
         $.ajax

data/app/assets/stylesheets/{redde-admin/blocks/list-v2.sass → redde/blocks/list.sass}

@@ -4,25 +4,24 @@
 //= depend_on_asset redde/close.svg
 //= depend_on_asset redde/close-hover.svg
 
-.list-v2
+.list
   width: auto
   border-collapse: collapse
-  border-collapse: separate
   border-spacing: 0
   margin-left: -30px
   margin-right: -30px
 
-.list-v2__col
+.list__col
   &:first-child,
   &:last-child,
   &._del
     width: 0.01%
 
-.list-v2__head
+.list__head
   font-size: 11px
   text-transform: uppercase
   background: #d7e4ef
-  padding: 13px 0 13px 30px
+  padding: 13px 30px 13px 0
   border-bottom: 1px solid #dddddd
   // border-bottom: 0 none
   // border-top: 1px solid #ddd
@@ -30,17 +29,19 @@
   &:first-child,
   &:last-child
     background: #d7e4ef
-    padding-left: 0
+    padding-right: 0
     min-width: 10px
 
   &._img
     padding-left: 20px
 
-.list-v2__head_first
-  padding-left: 0
+.list__head_del
+  padding-right: 0
+.list__head_empty
+  padding-right: 0
 
-.list-v2__cell
-  padding: 3px 0 3px 30px
+.list__cell
+  padding: 3px 30px 3px 0
   vertical-align: middle
   font-size: 13px
   color: #000
@@ -52,14 +53,14 @@
 
   &._img
     width: 1%
-    padding-left: 20px
+    padding-right: 20px
 
   tr:hover > &
     background-color: #fff5d4
 
   &:first-child,
   &:last-child
-    padding-left: 0
+    padding-right: 0
     width: 10px
     border-bottom: 0 none
 
@@ -67,19 +68,21 @@
     min-width: 23px
     width: 0.01%
     background: image-url('redde/move-handler.png') no-repeat center
+    padding-right: 0
 
   &._eye
     padding-left: 7px
+    padding-right: 7px
     width: 0.01%
 
-.list-v2__cell_first
-  padding-left: 0
+.list__cell_del
+  padding-right: 0
 
-.list-v2__img
+.list__img
   border-radius: 2px
   display: block
 
-.list-v2__eye
+.list__eye
   display: block
   width: 20px
   height: 20px
@@ -87,7 +90,7 @@
   &._disactive
     background-image: image-url('redde/eye_disactive.svg')
 
-.list-v2__del
+.list__del
   background: image-url('redde/close.svg') no-repeat center
   display: block
   width: 20px

data/app/assets/stylesheets/redde/blocks/redde-form.sass

@@ -21,6 +21,10 @@
 .redde-form__inp
   width: 100%
 
+.redde-form__txtr
+  width: 100%
+  resize: none
+
 .redde-form__inp,
 .redde-form__sel
   .redde-form__row._error &

data/app/assets/stylesheets/redde/defaults/txtr.sass

@@ -0,0 +1,25 @@
+@import redde/mixins
+
+.txtr
+  box-sizing: border-box
+  display: inline-block
+  color: #404344
+  font-size: 13px
+  line-height: 21px
+  font-family: $family
+  padding: 6px 10px
+  border: 1px solid #cdd1d7
+  border-radius: 3px
+  outline: none
+
+  &::placeholder
+    color: #989c9f
+
+  // // сейчас не искользуется
+  // &._err
+  //   border-color: $light-red
+  //   box-shadow: 0 0 0 1px $light-red
+
+  &:focus
+    border-color: #5bacd4
+    box-shadow: 0 0 0 1px #5bacd4

data/app/assets/stylesheets/redde/layouts/main.sass

@@ -25,13 +25,13 @@
   margin: 0
   margin-left: -185px
 
+  +clearfix
+
   .sidebar + &
     float: left
     width: 100%
     margin-left: 0
 
-.main__page
-  +clearfix
 
 .main__sidebar
   float: right

data/app/controllers/admin/managers_controller.rb

@@ -1,7 +1,5 @@
 class Admin::ManagersController < Admin::BaseController
-  def index
-    @managers = scope.all
-  end
+  helper_method :column_names
 
   def new
     @manager = scope.new
@@ -28,12 +26,12 @@ class Admin::ManagersController < Admin::BaseController
     redirect_to [:admin, :managers], alert: 'Администратор удален'
   end
 
-  private
-
-  def scope
-    Manager
+  def column_names
+    %w(email)
   end
 
+  private
+
   def manager_params
     params[:manager].permit!
   end

data/app/form_builders/redde_form_builder.rb

@@ -8,6 +8,7 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
     when :text then redde_text_area(name, *args)
     when :boolean then redde_check_box(name, *args)
     when :time then redde_date_time(name, *args)
+    when :datetime then redde_date_time(name, *args)
     else
       redde_text_field(name, *args)
     end
@@ -21,9 +22,7 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
 
   def redde_date_time(name, *args)
     options = args.extract_options!
-    content_tag :tr, class: options[:wrapper_class] do
-      content_tag(:td, smart_label(name), class: 'redde-form__cell _lbl') + content_tag(:td, datetime_select(name, options))
-    end
+    wrap(name, datetime_select(name, options), options)
   end
 
   def redde_check_box(name, *args)
@@ -42,11 +41,8 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
 
   def redde_text_area(name, *args)
     options = args.extract_options!
-    content_tag :tr, class: options[:wrapper_class] do
-      content_tag :td, colspan: 2 do
-        smart_label(name) + tag(:br) + text_area(name, options)
-      end
-    end
+    options[:class] = assign_class(['txtr', 'redde-form__txtr'], options[:class])
+    wrap(name, text_area(name, options), options)
   end
 
   def redde_submit(text, opts)

data/app/helpers/redde/index_helper.rb

@@ -7,6 +7,39 @@ module Redde::IndexHelper
     model_name.columns.select { |i| i.type == :string }.first
   end
 
+  def list_table res_collection, &block
+    render layout: 'admin/redde/list', locals: { res_collection: res_collection } do
+      res_collection.each do |item|
+        concat list_table_row( item, &block )
+      end
+    end
+  end
+
+  def list_table_row item, &block
+    render layout: 'admin/redde/row', locals: { item: item } do
+      column_names.each do |column|
+        concat list_table_cell(item, column, &block)
+      end
+    end
+  end
+
+  def list_table_cell item, column, &block
+    case column
+    when 'position'
+      content_tag(:td, "", class: 'list__cell _handle', 'data-sortable-handle' => "")
+    when 'visible'
+      content_tag(:td, link_to('', url_for(id: item, action: :update, record => { visible: !item.visible} ), class: ['list__eye', ('_disactive' if !item.visible)], data: { method: 'put' }), class: 'list__cell _eye')
+    when 'title', 'name'
+      content_tag(:td, link_to(item.send(column), url_for(id: item, action: :edit)), class: 'list__cell')
+    else
+      if block_given?
+        capture(item, column, &block)
+      else
+        content_tag :td, item.send(column), class: 'list__cell'
+      end
+    end
+  end
+
   def collection
     controller_name
   end
@@ -48,14 +81,17 @@ module Redde::IndexHelper
     {}.tap do |options|
       if column_names.include? 'position'
         options['class'] = 'sortable'
-        options['data-sortable'] = true
+        options['data-sortable'] = ""
       end
     end
   end
 
   def sort_table_options(item)
     {}.tap do |options|
-      options[:id] = "pos_#{item.id}" if column_names.include?('position')
+      if column_names.include?('position')
+        options[:id] = "pos_#{item.id}"
+        options['data-sortable-item'] = ""
+      end
     end
   end
 end

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

@@ -1,68 +1,10 @@
 = page_header
 
 - res_collection = instance_variable_get("@#{collection}")
-- if res_collection.any?
-  %table.list-v2{list_table_options}
-    %colgroup
-      %col.list-v2__col
-      - column_names.each do |column|
-        %col.list-v2__col
-      %col.list-v2__col._del
-      %col.list-v2__col
-    %thead
-      %tr
-        %th.list-v2__head
-        - column_names.each_with_index do |column, index|
-          %th.list-v2__head{ class: 'list-v2__head_first' }= model_name.human_attribute_name(column) unless ['position', 'visible'].include? column
-        %th.list-v2__head._del
-        %th.list-v2__head
-    - res_collection.each do |item|
-      %tr{sort_table_options(item), 'data-href' => url_for([:edit, :admin, item])}
-        %td.list-v2__cell
-        - column_names.each do |column|
-          - case column
-          - when 'position'
-            %td.list-v2__cell._handle{ class: 'list-v2__cell_first' }
-          - when 'visible'
-            %td.list-v2__cell._eye{ class: 'list-v2__cell_first' }
-              = link_to '', send("admin_#{record}_path", item, record => { visible: !item.visible} ), class: ['list-v2__eye', ('_disactive' if !item.visible)], data: { method: 'put' }
-          - else
-            %td.list-v2__cell{ class: 'list-v2__cell_first' }= link_to item.send(column), url_for([:edit, :admin, item])
-        %td.list-v2__cell= link_to '', [:admin, item], method: :delete, data: { confirm: 'Точно Удалить?' }, class: 'list-v2__del'
-        %td.list-v2__cell
 
-  = paginate res_collection, theme: 'redde'
-
-- else
-  %h3
-    Ни одной #{tplural(model_name)} не найдено
-
--# unless @<%= controller_name %>.empty?
-  %table.list<%= ".sortable{ 'data-sortable' => true }" if column_names.include?('position') %>
-    %colgroup
-      <%- columns.each do |column| -%>
-      %col<%= '.w1' if ['position', 'visible'].include? column.name %>
-      <%- end -%>
-      %col.w1
-    %thead
-      %tr
-        <%- columns.each do |column| -%>
-        %th<%- unless ['position', 'visible'].include? column.name %>= <%= model_name.demodulize %>.human_attribute_name('<%= column.name %>')<% end %>
-        <%- end -%>
-        %th
-    - @<%= plural_resource_name %>.each do |<%= resource_name %>|
-      <%- if column_names.include?('position') -%>
-      %tr{ id: "pos_#{<%= resource_name %>.id}" }
-      <%- else -%>
-      %tr
-      <%- end -%>
-        <%- columns.each do |column| -%>
-        <%- if column.name == 'position' -%>
-        %td.handle= image_tag 'admin/move_handler.png'
-        <%- elsif column.name == 'visible' -%>
-        %td.show= link_to '', admin_<%= singular_controller_routing_path %>_path(<%= resource_name %>, <%= resource_name %>: { visible: !<%= resource_name %>.visible} ), class: <%= resource_name %>.visible ? nil : 'not-show', data: { method: 'put' }
-        <%- else -%>
-        %td= link_to <%= resource_name %>.<%= column.name %>, [:edit, :admin, <%= resource_name %>]
-        <%- end -%>
-        <%- end -%>
-        %td= link_to 'Удалить', [:admin, <%= resource_name %>], method: :delete, data: { confirm: 'Точно Удалить?' }, class: :del
+= list_table res_collection do |item, column|
+  %td.list__cell
+    - if item.send(column).is_a?(Time)
+      = l item.send(column), format: '%d %b %Y, %H:%M'
+    - else
+      = item.send(column)

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

@@ -0,0 +1,25 @@
+- if res_collection.any?
+  %table.list{list_table_options}
+    %colgroup
+      %col.list__col
+      - column_names.each do |column|
+        %col.list__col
+      %col.list__col._del
+      %col.list__col
+    %thead
+      %tr
+        %th.list__head
+        - column_names.each_with_index do |column, index|
+          - if ['position', 'visible'].include? column
+            %th.list__head.list__head_empty
+          - else
+            %th.list__head= model_name.human_attribute_name(column)
+        %th.list__head.list__head_del
+        %th.list__head
+    = yield
+
+  = paginate res_collection, theme: 'redde'
+
+- else
+  %h3
+    Ни одной #{tplural(model_name)} не найдено

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

@@ -0,0 +1,5 @@
+%tr{sort_table_options(item), 'data-href' => url_for(id: item, action: :edit)}
+  %td.list__cell
+  = yield
+  %td.list__cell.list__cell_del= link_to '', url_for(id: item, action: :destroy), method: :delete, data: { confirm: 'Точно Удалить?' }, class: 'list__del'
+  %td.list__cell

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -413,19 +413,13 @@ files:
 - app/assets/fonts/redde-admin.woff
 - app/assets/images/.keep
 - app/assets/images/admin/ajaxloader2.gif
-- app/assets/images/admin/coins.png
 - app/assets/images/admin/confirm.png
 - app/assets/images/admin/delete.png
 - app/assets/images/admin/email.png
 - app/assets/images/admin/error.png
 - app/assets/images/admin/fio.png
-- app/assets/images/admin/logo_reddeshop.png
 - app/assets/images/admin/phone.png
-- app/assets/images/admin/photo_ico.png
-- app/assets/images/admin/print.png
 - app/assets/images/admin/refresh.png
-- app/assets/images/admin/view.png
-- app/assets/images/admin/view_mk.png
 - app/assets/images/redde/close-hover.svg
 - app/assets/images/redde/close.svg
 - app/assets/images/redde/enter.svg
@@ -465,12 +459,9 @@ files:
 - app/assets/javascripts/redde/sortTree/index.js.coffee
 - app/assets/javascripts/redde/sortTree/jquery.mjs.nestedSortable.js
 - app/assets/javascripts/redde/sortable.coffee
-- app/assets/stylesheets/redde-admin/blocks/list-v2.sass
-- app/assets/stylesheets/redde-admin/defaults/del.sass
 - app/assets/stylesheets/redde/blocks/error-msg.sass
 - app/assets/stylesheets/redde/blocks/flash-msg.sass
-- app/assets/stylesheets/redde/blocks/list-v2.sass
-- app/assets/stylesheets/redde/blocks/list.scss
+- app/assets/stylesheets/redde/blocks/list.sass
 - app/assets/stylesheets/redde/blocks/orders.scss
 - app/assets/stylesheets/redde/blocks/paginate.sass
 - app/assets/stylesheets/redde/blocks/pagination.scss
@@ -487,6 +478,7 @@ files:
 - app/assets/stylesheets/redde/defaults/reset.sass
 - app/assets/stylesheets/redde/defaults/sbm.sass
 - app/assets/stylesheets/redde/defaults/sel.sass
+- app/assets/stylesheets/redde/defaults/txtr.sass
 - app/assets/stylesheets/redde/fonts.sass
 - app/assets/stylesheets/redde/index.scss
 - app/assets/stylesheets/redde/layouts/header.sass
@@ -530,11 +522,12 @@ files:
 - app/views/admin/base/tree.html.haml
 - app/views/admin/base/welcome.haml
 - app/views/admin/managers/edit.html.haml
-- app/views/admin/managers/index.html.haml
 - app/views/admin/redde/_header.html.haml
+- app/views/admin/redde/_list.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/_row.html.haml
 - app/views/admin/redde/_sidebar.html.haml
 - app/views/admin/redde/_validate.haml
 - app/views/admin/redde_photos/_photo.haml

data/app/assets/stylesheets/redde/blocks/list-v2.sass

@@ -1,96 +0,0 @@
-//= depend_on_asset redde/move-handler.png
-//= depend_on_asset redde/eye.svg
-//= depend_on_asset redde/eye_disactive.svg
-//= depend_on_asset redde/close.svg
-//= depend_on_asset redde/close-hover.svg
-
-.list-v2
-  width: auto
-  border-collapse: collapse
-  border-collapse: separate
-  border-spacing: 0
-  margin-left: -30px
-  margin-right: -30px
-
-.list-v2__col
-  &:first-child,
-  &:last-child,
-  &._del
-    width: 0.01%
-
-.list-v2__head
-  font-size: 11px
-  text-transform: uppercase
-  background: #d7e4ef
-  padding: 13px 0 13px 30px
-  border-bottom: 1px solid #dddddd
-  // border-bottom: 0 none
-  // border-top: 1px solid #ddd
-
-  &:first-child,
-  &:last-child
-    background: #d7e4ef
-    padding-left: 0
-    min-width: 10px
-
-  &._img
-    padding-left: 20px
-
-.list-v2__head_first
-  padding-left: 0
-
-.list-v2__cell
-  padding: 3px 0 3px 30px
-  vertical-align: middle
-  font-size: 13px
-  color: #000
-  cursor: pointer
-  width: auto
-  border-bottom: 1px solid #dddddd
-  // border-top: 1px solid #ddd
-  // border-bottom: 0 none
-
-  &._img
-    width: 1%
-    padding-left: 20px
-
-  tr:hover > &
-    background-color: #fff5d4
-
-  &:first-child,
-  &:last-child
-    padding-left: 0
-    width: 10px
-    border-bottom: 0 none
-
-  &._handle
-    min-width: 23px
-    width: 0.01%
-    background: image-url('redde/move-handler.png') no-repeat center
-
-  &._eye
-    padding-left: 7px
-    width: 0.01%
-
-.list-v2__cell_first
-  padding-left: 0
-
-.list-v2__img
-  border-radius: 2px
-  display: block
-
-.list-v2__eye
-  display: block
-  width: 20px
-  height: 20px
-  background: image-url('redde/eye.svg') no-repeat center
-  &._disactive
-    background-image: image-url('redde/eye_disactive.svg')
-
-.list-v2__del
-  background: image-url('redde/close.svg') no-repeat center
-  display: block
-  width: 20px
-  height: 20px
-  &:hover
-    background: image-url('redde/close-hover.svg') no-repeat center

data/app/assets/stylesheets/redde/blocks/list.scss

@@ -1,22 +0,0 @@
-table.list {
-  margin-left:0; width:auto; border-collapse:collapse;
-  td {border:1px solid #ededed; border-width:1px 0;}
-  col.w1 { width:1%;}
-  a:hover {color:#737300;}
-  td, th {vertical-align:middle; width:auto; padding:0 5px 0 0;}
-  th {background:#ededed; letter-spacing:1px;}
-  .handle {border-color:#fff;}
-  td * {vertical-align:middle;}
-  td.show {
-    a {border-radius:10px; border:1px solid transparent; display:inline-block; width:20px; height:20px; background:image-url("admin/icon_eye.gif") no-repeat 1px 1px;}
-    a.not-show {opacity:0.4; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=40);}
-  }
-  tr:hover {
-    td {background:#ffc;}
-  }
-  .green {color:green; font-weight:bold; text-shadow:0 0 10px green;}
-}
-
-table.sortable {
-  margin-left:-18px;
-}

data/app/assets/stylesheets/redde-admin/defaults/del.sass

@@ -1,23 +0,0 @@
-//= depend_on_asset redde/close.svg
-//= depend_on_asset redde/close-hover.svg
-
-%del
-  display: inline-block
-  width: 20px
-  height: 20px
-  background: image-url('redde/close.svg') center no-repeat
-  text-decoration: none
-
-.del
-  @extend %del
-  &:before
-    content: '\A0'
-  &:hover
-    background-image: image-url('redde/close-hover.svg')
-
-.a_del
-  &:after
-    @extend %del
-    content: '\A0'
-  &:hover:after
-    background-image: image-url('redde/close-hover.svg')

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

@@ -1,15 +0,0 @@
-= page_header
-
-- unless @managers.empty?
-  %table.list
-    %colgroup
-      %col
-      %col.w1
-    %thead
-      %tr
-        %th= Manager.human_attribute_name('email')
-        %th
-    - @managers.each do |manager|
-      %tr
-        %td= link_to manager.email, [:edit, :admin, manager]
-        %td= link_to 'Удалить', [:admin, manager], method: :delete, data: { confirm: 'Точно Удалить?' }, class: :del