redde 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5948cdc5b2b31de8f556a903d06211043b329adf
-  data.tar.gz: c1063541c99f5e9a0c1db1c9bb99b9c2e3a61b9b
+  metadata.gz: 4453c93ffd2ab8fa7e1ad201948890a902d46188
+  data.tar.gz: 14be1bdcf588202ce8c319ac2164f7dcb90bbd59
 SHA512:
-  metadata.gz: 03a1967bb460a6ccb601bf63c056209deb83831c26a2a67db96c0d4dbc687ae135ec252d6a4e2f108397965632a991d0355da6e7ec3baa8f29d1e915256ef475
-  data.tar.gz: 754ff988354cfe98000fc2ef26701be93c8e4252ee93cc1b0381a699211853b7bfb389f4a05fc57e0063000636d5b347705ef3106a1908bca9972825362fbcf5
+  metadata.gz: c270cee3ea39d48822e0faab9bf95a69aaa8ff0f0396967097d872348932b0c115b40b18ee7c03a3899bb132fb42e19028a2eec08cdc8d229d4af688064e7b15
+  data.tar.gz: 950368c314e35e826aac88c11853fbfb9b06361f27baa07beced6a402a330eb8c65ced8075d27c05e3bbe70a08d3d440ac10f1f850a7bbe24349412acfa27ad1

data/app/assets/stylesheets/redde/{layouts → blocks}/header.sass

@@ -6,7 +6,6 @@
   box-shadow: #666 0 0 3px
   background-color: #176d99
   background-image: linear-gradient(to top, #156d97, #19719b)
-  margin-bottom: 20px
 
 .header__init
   box-sizing: border-box

data/app/assets/stylesheets/redde/{layouts → blocks}/main-menu.sass

@@ -7,13 +7,14 @@
 //= depend_on_asset redde/main-menu/list.svg
 //= depend_on_asset redde/main-menu/list_active.svg
 
+@import redde/mixins
+
 .main-menu
-  float: left
+  font-size: 14px
 
 .main-menu__link
   color: #bfd8e3
   text-decoration: none
-  font-size: 14px
   line-height: 17px
   float: left
   padding: 17px 21px

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

@@ -0,0 +1,22 @@
+@import redde/mixins
+
+.main
+  +clearfix
+  box-shadow: 0 0 3px #ccc
+  border-radius: 6px
+  border: 1px solid #D7D7D7
+  min-height: 500px
+  background-color: #fff
+  padding: 0
+  border-bottom: 1px solid #DADEE5
+
+.main__sidebar
+  float: right
+  padding: 30px
+  width: 245px
+  border-left: 1px solid $pale-gray
+
+.main__content
+  padding: 30px
+  .main__sidebar + &
+    margin-right: 305px

data/app/assets/stylesheets/redde/{layouts → blocks}/page-header.sass

@@ -1,17 +1,14 @@
 //= depend_on_asset redde/plus.svg
+@import redde/mixins
 
 .page-header
   position: relative
   background: #F1F5F9
   border-bottom: 1px solid #DADEE5
   padding: 18px 30px
-  margin: 0
   border-top-right-radius: 5px
   border-top-left-radius: 5px
-  &:after
-    content: ''
-    display: table
-    clear: both
+  +a_clearfix
 
 .page-header__title
   font-size: 16px

data/app/assets/stylesheets/redde/{layouts → blocks}/page-sidebar.sass

@@ -1,9 +1,8 @@
-.page-sidebar
-  font-size: 12px
+@import redde/mixins
 
 .page-sidebar__title
   line-height: 1
   padding: 0 0 3px 0
-  border-bottom: 1px solid #efefef
+  border-bottom: 1px solid $pale-gray
   color: #222
   font-weight: bold

data/app/assets/stylesheets/redde/blocks/ra-layout.sass

@@ -0,0 +1,38 @@
+@import redde/mixins
+
+.ra-layout,
+.ra-layout__body
+  width: 100%
+  height: 100%
+
+.ra-layout__body
+  min-width: 1000px
+  overflow-y: scroll
+  background-color: #F3F1EC
+  text-align: left
+  font: 12px $family
+
+.ra-layout__header
+  margin-bottom: 20px
+
+.ra-layout__wrapper
+  +a_clearfix
+  box-sizing: border-box
+  padding: 0 30px 30px 215px
+  max-width: 1260px
+  min-width: 800px
+  margin: 0 auto
+
+.ra-layout__sidebar
+  width: 215px
+  float: left
+  margin-top: 12px
+  margin-left: -215px
+
+.ra-layout__main
+  margin-left: -185px
+
+  .ra-layout__sidebar + &
+    float: left
+    width: 100%
+    margin-left: 0

data/app/assets/stylesheets/redde/blocks/ra-login.sass

@@ -0,0 +1,38 @@
+@import redde/mixins
+
+.ra-login,
+.ra-login__body
+  width: 100%
+  height: 100%
+
+.ra-login__body
+  background-color: #F3F1EC
+  text-align: left
+  font: 12px $family
+
+.ra-login__main.main
+  min-height: 0
+  width: 370px
+  margin: 20px auto 120px
+
+.ra-login__table
+  border-collapse: collapse
+  width: 100%
+  height: 100%
+
+.ra-login__cell
+  vertical-align: middle
+
+.ra-login__inp
+  box-sizing: border-box
+  width: 100%
+  margin-top: 2px
+
+.ra-login__label
+  font-size: 13px
+
+.ra-login__field
+  margin-bottom: 5px
+
+.ra-login__actions
+  margin-top: 10px

data/app/assets/stylesheets/redde/{layouts → blocks}/sidebar.sass

@@ -1,7 +1,5 @@
 .sidebar
-  width: 215px
-  float: left
-  margin-top: 12px
+  font-size: 13px
 
 .sidebar__badge
   font-size: 10px
@@ -13,13 +11,12 @@
     content: ')'
     color: #000
 
-.sidebar__link 
+.sidebar__link
   display: block
   overflow: hidden
   padding: 6px 6px 6px 36px
   margin-left: -6px
   text-decoration: none
-  font-size: 13px
   line-height: (16em/13)
   color: #555
   text-shadow: 0px 1px 1px #fff
@@ -27,4 +24,4 @@
     font-weight: bold
     color: #000
     background-color: #e5e3de
-    border-radius: 4px 0 0 4px
+    border-radius: 4px 0 0 4px

data/app/assets/stylesheets/redde/blocks/sort-tree.sass

@@ -1,5 +1,5 @@
 //= depend_on_asset redde/folder.png
-//= depend_on_asset redde/defaults/del.css
+//= depend_on_asset redde/elements/del.css
 
 .sort-tree
   // сделать через класс не получилось всвязи особенности скрипта, при создании нового вложенного списка класс не добавляется => искользуем каскады

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

@@ -10,16 +10,4 @@ th
 a
   color: $link
   &:hover
-    text-decoration:none
-
-html,
-body
-  width: 100%
-  height: 100%
-
-body
-  min-width: 1000px
-  overflow-y: scroll
-  background-color: #F3F1EC
-  text-align: left
-  font: 12px $family
+    text-decoration: none

data/app/assets/stylesheets/redde/{defaults → elements}/btn.sass

@@ -9,3 +9,5 @@
   color: #fff
   background-color: #53a0c6
   padding: 8px 13px
+  border: 0 none
+  cursor: pointer

data/app/assets/stylesheets/redde/{defaults → elements}/sbm.sass

@@ -2,23 +2,24 @@
 
 .sbm
   display: inline-block
-  background: #19709b
+  background: $link
   color: #fff
-  font-size: 13px
+  font-size: $sbm-size
   font-family: $family
-  padding: 9px 20px
+  padding: round(9/13*$sbm-size) round(20/13*$sbm-size)
   border: 0 none
-  border-radius: 3px
+  border-radius: round(3/13*$sbm-size)
   cursor: pointer
   outline: none
+  text-decoration: none
 
   &[disabled]
     background: #9ea2a4
     cursor: default
 
   &:hover
-    background: mix(#19709b, #388cb5)
-    background: linear-gradient(#19709b 70%, #388cb5 100%)
+    background: mix($link, #388cb5)
+    background: linear-gradient($link 70%, #388cb5 100%)
 
   &:active
     background: mix(#186991, #10435c)
@@ -27,6 +28,6 @@
   &._save:before
     content: "\A0"
     display: inline-block
-    width: 16px
-    margin-right: 10px
+    width: round(16/13*$sbm-size)
+    margin-right: round(10/13*$sbm-size)
     background: image-url('redde/enter.svg') no-repeat 0 5px

data/app/assets/stylesheets/redde/index.scss

@@ -1,5 +1,5 @@
 //= require ./defaults
 //= require ./fonts
-//= require_directory ./layouts
+//= require_directory ./elements
 //= require_directory ./blocks
 //= require ./redactor

data/app/assets/stylesheets/redde/mixins.sass

@@ -3,6 +3,15 @@ $family: "Lucida Grande", "Lucida Sans Unicode", helvetica, arial, verdana, sans
 $text: #000
 $link: #19709b
 $light-red: #fb4657
+$pale-gray: #efefef
+
+$sbm-size: 13px !default
+
+=a_clearfix
+  &:after
+    content: ''
+    display: table
+    clear: both
 
 =clearfix
   &:before, &:after

data/app/helpers/redde/admin_helper.rb

@@ -1,6 +1,13 @@
 # coding: utf-8
 module Redde::AdminHelper
 
+  def page_sidebar title = nil, &block
+    content_for :page_sidebar do
+      concat content_tag(:div, title, class: 'page-sidebar__title') if title
+      concat capture(&block)
+    end
+  end
+
   def page_header(item = nil, &block)
     if block_given?
       content_for(:page_header, content_tag(:div, capture(&block), class: 'page-header'))

data/app/helpers/redde/form_helper.rb

@@ -54,5 +54,4 @@ module Redde::FormHelper
       ::ActionView::Base.field_error_proc = default_field_error_proc
     end
   end
-
 end

data/app/helpers/redde/index_helper.rb

@@ -94,4 +94,26 @@ module Redde::IndexHelper
       end
     end
   end
+
+  def show_tree(c)
+    link = link_to c.name, [:edit, :admin, c]
+    edit = link_to 'Удал', [:admin, c], data: { confirm: 'Точно удалить?' },
+                                        method: :delete, class: 'del'
+    html = content_tag(:div, link + content_tag(:p, edit))
+    if c.children.any?
+      html << content_tag(:ol) do
+        raw c.children.map { |ch| show_tree(ch) }.join('')
+      end
+    end
+    content_tag :li, raw(html), id: "list_#{c.id}"
+  end
+
+  def ancestry_options(items, symbol = :name)
+    result = []
+    items.map do |item, sub_items|
+      result << [yield(item), item.id]
+      result += ancestry_options(sub_items) { |i| "#{'---' * i.depth} #{i.send(symbol)}" }
+    end
+    result
+  end
 end

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

@@ -1,4 +1,4 @@
-%header.header
+%header.ra-layout__header.header
   .header__init
     = link_to admin_root_path || '/admin', class: 'header__logo' do
       ReddeCMS

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

@@ -1,4 +1,4 @@
-%nav.sidebar
+%nav.ra-layout__sidebar.sidebar
   - case @active
   - when :shop
     = sidebar_link 'Товары', [:admin, :products]

data/app/views/admin/redde_photos/_photos.haml

@@ -1,10 +1,5 @@
 - unless parent.new_record?
-  = content_for(:page_sidebar) do
-    .page-sidebar__title
-      Фотографии
-      - if editable ||= false
-        = link_to "ред.", [:admin, parent]
-
+  = page_sidebar raw("Фотографии ").concat(if editable ||= false then link_to("ред.", [:admin, parent]) end) do
     %ul.photos.js-photos{ "data-sortable" => { items: :li, handle: nil, axis: nil, url: url_for([:sort, :admin, :redde_photos])}.to_json }
       = render partial: 'admin/redde_photos/photo', collection: parent.photos
 

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

@@ -1,5 +1,5 @@
 !!!
-%html{ lang: 'en' }
+%html.ra-layout{ lang: 'en' }
   %head
     %meta{ charset: 'UTF-8'}
     %title= @page_title || 'ReddeCMS'
@@ -8,11 +8,11 @@
     = javascript_include_tag 'admin'
     = yield :js
     = csrf_meta_tag
-  %body
+  %body.ra-layout__body
     = render 'admin/redde/header'
-    .wrapper
+    .ra-layout__wrapper
       = render 'admin/redde/sidebar'
-      .main
+      .ra-layout__main.main
         = yield(:page_header)
         - if notice
           .flash-msg._notice= notice

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

@@ -1,32 +1,31 @@
 !!!
-%html.login{ lang: 'en' }
+%html.ra-login{ lang: 'en' }
   %head
     %meta{ charset: 'UTF-8'}
     %title Вход на сайт | Административная панель
     = stylesheet_link_tag 'admin'
     = javascript_include_tag "admin"
     = csrf_meta_tag
-  %body
-    %table.login__table
+  %body.ra-login__body
+    %table.ra-login__table
       %tr
-        %td.login__cell
-          .main._login
+        %td.ra-login__cell
+          .ra-login__main.main
             .page-header
-              %h1 Административная панель
-            .page
-              .content
-                = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-                  .login__fields
-                    = f.label :email, 'E-mail'
-                    %br
-                    = f.email_field :email, class: 'login__inp'
-                  .login__fields
-                    = f.label :password, 'Пароль'
-                    %br
-                    = f.password_field :password, size: 35, class: 'login__inp'
-                  - if devise_mapping.rememberable?
-                    .login__fields
-                      = f.check_box :remember_me
-                      = f.label :remember_me, 'Оставаться в системе'
-                  .login__actions
-                    = f.submit 'Войти', class: 'sbm'
+              .page-header__title Административная панель
+            .main__content
+              = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+                .ra-login__field
+                  = f.label :email, 'E-mail', class: 'ra-login__label'
+                  %br
+                  = f.email_field :email, class: 'inp ra-login__inp'
+                .ra-login__field
+                  = f.label :password, 'Пароль', class: 'ra-login__label'
+                  %br
+                  = f.password_field :password, size: 35, class: 'inp ra-login__inp'
+                - if devise_mapping.rememberable?
+                  .ra-login__field
+                    = f.check_box :remember_me
+                    = f.label :remember_me, 'Оставаться в системе', class: 'ra-login__label'
+                .ra-login__actions
+                  = f.submit 'Войти', class: 'sbm'

data/lib/redde/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -461,33 +461,34 @@ files:
 - app/assets/javascripts/redde/sortable.coffee
 - app/assets/stylesheets/redde/blocks/error-msg.sass
 - app/assets/stylesheets/redde/blocks/flash-msg.sass
+- app/assets/stylesheets/redde/blocks/header.sass
 - app/assets/stylesheets/redde/blocks/list.sass
+- app/assets/stylesheets/redde/blocks/main-menu.sass
+- app/assets/stylesheets/redde/blocks/main.sass
 - app/assets/stylesheets/redde/blocks/orders.scss
+- app/assets/stylesheets/redde/blocks/page-header.sass
+- app/assets/stylesheets/redde/blocks/page-sidebar.sass
 - app/assets/stylesheets/redde/blocks/paginate.sass
 - app/assets/stylesheets/redde/blocks/pagination.scss
 - app/assets/stylesheets/redde/blocks/partners.scss
 - app/assets/stylesheets/redde/blocks/phead-tabs.sass
 - app/assets/stylesheets/redde/blocks/photos-uploader.sass
 - app/assets/stylesheets/redde/blocks/photos.sass
+- app/assets/stylesheets/redde/blocks/ra-layout.sass
+- app/assets/stylesheets/redde/blocks/ra-login.sass
 - app/assets/stylesheets/redde/blocks/redde-form.sass
+- app/assets/stylesheets/redde/blocks/sidebar.sass
 - app/assets/stylesheets/redde/blocks/sort-tree.sass
-- app/assets/stylesheets/redde/defaults/btn.sass
-- app/assets/stylesheets/redde/defaults/del.sass
 - app/assets/stylesheets/redde/defaults/index.sass
-- app/assets/stylesheets/redde/defaults/inp.sass
 - 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/elements/btn.sass
+- app/assets/stylesheets/redde/elements/del.sass
+- app/assets/stylesheets/redde/elements/inp.sass
+- app/assets/stylesheets/redde/elements/sbm.sass
+- app/assets/stylesheets/redde/elements/sel.sass
+- app/assets/stylesheets/redde/elements/txtr.sass
 - app/assets/stylesheets/redde/fonts.sass
 - app/assets/stylesheets/redde/index.scss
-- app/assets/stylesheets/redde/layouts/header.sass
-- app/assets/stylesheets/redde/layouts/login.sass
-- app/assets/stylesheets/redde/layouts/main-menu.sass
-- app/assets/stylesheets/redde/layouts/main.sass
-- app/assets/stylesheets/redde/layouts/page-header.sass
-- app/assets/stylesheets/redde/layouts/page-sidebar.sass
-- app/assets/stylesheets/redde/layouts/sidebar.sass
 - app/assets/stylesheets/redde/mixins.sass
 - app/assets/stylesheets/redde/redactor/index.scss
 - app/assets/stylesheets/redde/redactor/wym.css

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

@@ -1,25 +0,0 @@
-.main._login
-  min-height: 0
-  width: 370px
-  margin: 0 auto
-  margin-bottom: 100px
-
-.login__table
-  border-collapse: collapse
-  width: 100%
-  height: 100%
-
-.login__cell
-  vertical-align: middle
-
-.login__inp
-  box-sizing: border-box
-  width: 100%
-  margin-left: 0 !important
-  margin-top: 1px
-
-.login__fields
-  margin-bottom: 5px
-
-.login__actions
-  margin-top: 10px

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

@@ -1,48 +0,0 @@
-@import redde/mixins
-
-.wrapper
-  box-sizing: border-box
-  padding: 0 30px 30px 215px
-  max-width: 1260px
-  min-width: 800px
-  margin: 0 auto
-  &:after
-    content: ''
-    display: table
-    clear: both
-
-.sidebar
-  margin-left: -215px
-
-.main
-  box-shadow: 0 0 3px #ccc
-  border-radius: 6px
-  border: 1px solid #D7D7D7
-  min-height: 500px
-  background-color: #fff
-  padding: 0
-  border-bottom: 1px solid #DADEE5
-  margin: 0
-  margin-left: -185px
-
-  +clearfix
-
-  .sidebar + &
-    float: left
-    width: 100%
-    margin-left: 0
-
-
-.main__sidebar
-  float: right
-  padding: 30px
-  width: 245px
-  border-left: 1px solid #efefef
-
-.main__content
-  padding: 30px
-  .main__sidebar + &
-    margin-right: 305px
-
-// .sidebar .page-sidebar
-//   float: right