redde 0.1.13 → 0.1.14

data/spec/dummy/app/views/admin/base/_sidebar.html.haml

@@ -0,0 +1,14 @@
+%nav.sidebar
+  - case @active
+  - when :shop
+    = link_to 'Товары', [:admin, :products], class: 'sidebar__link'
+  - when :materials
+    = link_to 'Статьи', [:admin, :articles], class: 'sidebar__link'
+  - when :system
+    = link_to 'Администраторы', [:admin, :managers], class: 'sidebar__link'
+    = link_to 'Пользователи', [:admin, :users], class: 'sidebar__link'
+  - else
+    = link_to 'Демо active', nil, class: ['sidebar__link', '_active']
+    = link_to nil, class: ['sidebar__link'] do
+      Демо
+      %span.sidebar__badge 2

data/spec/dummy/app/views/admin/base/_validate.haml

@@ -0,0 +1,8 @@
+- if f.object.errors.any?
+  .error-msg
+    .error-msg__badge Ошибок #{f.object.errors.count}
+    %ul.error-msg__list
+      - f.object.errors.each do |attribute, msg|
+        %li
+          %strong= f.object.class.human_attribute_name(attribute)
+          = msg

data/spec/dummy/app/views/admin/base/welcome.haml

@@ -0,0 +1,2 @@
+= content_for :page_header do
+  %h1 Welcome

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

@@ -0,0 +1,29 @@
+!!!
+%html{ lang: 'en' }
+  %head
+    %meta{ charset: 'UTF-8'}/
+    %title= @page_title || 'ReddeCMS'
+    = favicon_link_tag 'admin/favicon.png'
+    = stylesheet_link_tag 'admin'
+    = javascript_include_tag 'admin'
+    = yield :js
+    = csrf_meta_tag
+  %body
+    = render 'launchbar'
+    = render 'header'
+    .wrapper
+      = render 'sidebar'
+      .main
+        .page-header
+          = yield(:page_header)
+        - if notice
+          .notice= notice
+        - if alert
+          .alert= alert
+        .page{ class: "#{yield(:page_sidebar).empty? ? '_full' : '_sidebar'}" }
+          #filter
+            = yield(:filter)
+          .page-sidebar
+            = yield(:page_sidebar)
+          .content
+            = yield

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

@@ -0,0 +1,32 @@
+!!!
+%html.login{ 'xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => 'en' }
+  %head
+    %meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html;charset=UTF-8' }
+    %title Вход на сайт | Административная панель
+    = stylesheet_link_tag 'admin'
+    = javascript_include_tag "admin"
+    = csrf_meta_tag
+  %body
+    %table.login__table
+      %tr
+        %td.login__cell
+          .main._login
+            .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.text_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 'Войти'

data/spec/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
+  # devise_for :managers, controllers: { registrations: 'managers/registrations' }
   root to: "articles#index"
 end

data/spec/generators/layout_generator_spec.rb

@@ -12,7 +12,7 @@ describe Redde::Generators::LayoutGenerator do
   end
 
   after(:all) do
-    FileUtils.rm_rf 'tmp'
+    # FileUtils.rm_rf 'tmp'
   end
 
   describe 'layout' do
@@ -34,6 +34,9 @@ describe Redde::Generators::LayoutGenerator do
       assert_directory 'app/assets/images/admin'
       assert_directory 'app/assets/javascripts/admin'
       assert_directory 'app/assets/stylesheets/admin'
+
+      # check form_builders
+      assert_file 'app/form_builders/redde_form_builder.rb'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -230,6 +230,7 @@ files:
 - lib/generators/redde/layout/templates/controllers/base_controller.rb
 - lib/generators/redde/layout/templates/controllers/managers/registrations_controller.rb
 - lib/generators/redde/layout/templates/controllers/managers_controller.rb
+- lib/generators/redde/layout/templates/form_builders/redde_form_builder.rb
 - lib/generators/redde/layout/templates/helpers/admin_helper.rb
 - lib/generators/redde/layout/templates/layouts/admin.html.haml
 - lib/generators/redde/layout/templates/layouts/login.html.haml
@@ -260,20 +261,111 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
+- spec/dummy/app/assets/images/admin/addphoto.png
+- spec/dummy/app/assets/images/admin/ajaxloader2.gif
+- spec/dummy/app/assets/images/admin/arrow_down.png
+- spec/dummy/app/assets/images/admin/arrow_enter.png
+- spec/dummy/app/assets/images/admin/arrow_right.png
+- spec/dummy/app/assets/images/admin/coins.png
+- spec/dummy/app/assets/images/admin/confirm.png
+- spec/dummy/app/assets/images/admin/del.png
+- spec/dummy/app/assets/images/admin/delete.png
+- spec/dummy/app/assets/images/admin/email.png
+- spec/dummy/app/assets/images/admin/error-label-triangle.png
+- spec/dummy/app/assets/images/admin/error.png
+- spec/dummy/app/assets/images/admin/favicon.png
+- spec/dummy/app/assets/images/admin/fio.png
+- spec/dummy/app/assets/images/admin/folder.png
+- spec/dummy/app/assets/images/admin/folder_.png
+- spec/dummy/app/assets/images/admin/icon_eye.gif
+- spec/dummy/app/assets/images/admin/lightbox/css/jquery.lightbox-0.5.css
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-blank.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-close.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-next.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-prev.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-ico-loading.gif
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.min.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.pack.js
+- spec/dummy/app/assets/images/admin/logo.png
+- spec/dummy/app/assets/images/admin/logo_reddeshop.png
+- spec/dummy/app/assets/images/admin/move_handler.png
+- spec/dummy/app/assets/images/admin/phone.png
+- spec/dummy/app/assets/images/admin/photo_ico.png
+- spec/dummy/app/assets/images/admin/print.png
+- spec/dummy/app/assets/images/admin/refresh.png
+- spec/dummy/app/assets/images/admin/submit.png
+- spec/dummy/app/assets/images/admin/submit_hover.png
+- spec/dummy/app/assets/images/admin/view.png
+- spec/dummy/app/assets/images/admin/view_mk.png
+- spec/dummy/app/assets/images/redactor/icons.png
+- spec/dummy/app/assets/images/redactor/plugins/file.html
+- spec/dummy/app/assets/images/redactor/plugins/image.html
+- spec/dummy/app/assets/images/redactor/plugins/image_edit.html
+- spec/dummy/app/assets/images/redactor/plugins/link.html
+- spec/dummy/app/assets/images/redactor/plugins/table.html
+- spec/dummy/app/assets/images/redactor/plugins/video.html
+- spec/dummy/app/assets/javascripts/admin.js
+- spec/dummy/app/assets/javascripts/admin/jquery.mjs.nestedSortable.js
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js
+- spec/dummy/app/assets/javascripts/redactor/langs/en.js
+- spec/dummy/app/assets/javascripts/redactor/langs/ru.js
+- spec/dummy/app/assets/javascripts/redactor/redactor.js.erb
+- spec/dummy/app/assets/javascripts/redactor/toolbars/default.js
+- spec/dummy/app/assets/stylesheets/admin/blocks/error-msg.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/list.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/notice.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/orders.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/paginate.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/pagination.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/partners.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/phead-tabs.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/photos.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/sortable.sass
+- spec/dummy/app/assets/stylesheets/admin/custom/index.scss
+- spec/dummy/app/assets/stylesheets/admin/defaults/index.scss
+- spec/dummy/app/assets/stylesheets/admin/defaults/input.sass
+- spec/dummy/app/assets/stylesheets/admin/defaults/reset.sass
+- spec/dummy/app/assets/stylesheets/admin/defaults/table.scss
+- spec/dummy/app/assets/stylesheets/admin/index.scss
+- spec/dummy/app/assets/stylesheets/admin/layouts/header.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/launchbar.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/login.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/main.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/page-header.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/page-sidebar.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/sidebar.sass
+- spec/dummy/app/assets/stylesheets/admin/shop/_filter.scss
+- spec/dummy/app/assets/stylesheets/admin/shop/_order-sh.scss
+- spec/dummy/app/assets/stylesheets/admin/shop/_pe.scss
 - spec/dummy/app/assets/stylesheets/application.css.scss
+- spec/dummy/app/assets/stylesheets/redactor/index.scss
+- spec/dummy/app/assets/stylesheets/redactor/wym.css
+- spec/dummy/app/controllers/admin/base_controller.rb
+- spec/dummy/app/controllers/admin/managers_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/articles_controller.rb
+- spec/dummy/app/controllers/managers/registrations_controller.rb
+- spec/dummy/app/helpers/admin_helper.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/article_category.rb
 - spec/dummy/app/models/photo.rb
+- spec/dummy/app/views/admin/base/_header.html.haml
+- spec/dummy/app/views/admin/base/_launchbar.html.haml
+- spec/dummy/app/views/admin/base/_sidebar.html.haml
+- spec/dummy/app/views/admin/base/_validate.haml
+- spec/dummy/app/views/admin/base/welcome.haml
 - spec/dummy/app/views/admin/photos/_photo.haml
 - spec/dummy/app/views/admin/photos/_photos.haml
 - spec/dummy/app/views/admin/photos/create.js.erb
 - spec/dummy/app/views/admin/photos/destroy.js.erb
 - spec/dummy/app/views/articles/show.html.haml
+- spec/dummy/app/views/layouts/admin.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/login.html.haml
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -340,20 +432,111 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
+- spec/dummy/app/assets/images/admin/addphoto.png
+- spec/dummy/app/assets/images/admin/ajaxloader2.gif
+- spec/dummy/app/assets/images/admin/arrow_down.png
+- spec/dummy/app/assets/images/admin/arrow_enter.png
+- spec/dummy/app/assets/images/admin/arrow_right.png
+- spec/dummy/app/assets/images/admin/coins.png
+- spec/dummy/app/assets/images/admin/confirm.png
+- spec/dummy/app/assets/images/admin/del.png
+- spec/dummy/app/assets/images/admin/delete.png
+- spec/dummy/app/assets/images/admin/email.png
+- spec/dummy/app/assets/images/admin/error-label-triangle.png
+- spec/dummy/app/assets/images/admin/error.png
+- spec/dummy/app/assets/images/admin/favicon.png
+- spec/dummy/app/assets/images/admin/fio.png
+- spec/dummy/app/assets/images/admin/folder.png
+- spec/dummy/app/assets/images/admin/folder_.png
+- spec/dummy/app/assets/images/admin/icon_eye.gif
+- spec/dummy/app/assets/images/admin/lightbox/css/jquery.lightbox-0.5.css
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-blank.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-close.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-next.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-btn-prev.gif
+- spec/dummy/app/assets/images/admin/lightbox/images/lightbox-ico-loading.gif
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.min.js
+- spec/dummy/app/assets/images/admin/lightbox/js/jquery.lightbox-0.5.pack.js
+- spec/dummy/app/assets/images/admin/logo.png
+- spec/dummy/app/assets/images/admin/logo_reddeshop.png
+- spec/dummy/app/assets/images/admin/move_handler.png
+- spec/dummy/app/assets/images/admin/phone.png
+- spec/dummy/app/assets/images/admin/photo_ico.png
+- spec/dummy/app/assets/images/admin/print.png
+- spec/dummy/app/assets/images/admin/refresh.png
+- spec/dummy/app/assets/images/admin/submit.png
+- spec/dummy/app/assets/images/admin/submit_hover.png
+- spec/dummy/app/assets/images/admin/view.png
+- spec/dummy/app/assets/images/admin/view_mk.png
+- spec/dummy/app/assets/images/redactor/icons.png
+- spec/dummy/app/assets/images/redactor/plugins/file.html
+- spec/dummy/app/assets/images/redactor/plugins/image.html
+- spec/dummy/app/assets/images/redactor/plugins/image_edit.html
+- spec/dummy/app/assets/images/redactor/plugins/link.html
+- spec/dummy/app/assets/images/redactor/plugins/table.html
+- spec/dummy/app/assets/images/redactor/plugins/video.html
+- spec/dummy/app/assets/javascripts/admin.js
+- spec/dummy/app/assets/javascripts/admin/jquery.mjs.nestedSortable.js
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js
+- spec/dummy/app/assets/javascripts/redactor/langs/en.js
+- spec/dummy/app/assets/javascripts/redactor/langs/ru.js
+- spec/dummy/app/assets/javascripts/redactor/redactor.js.erb
+- spec/dummy/app/assets/javascripts/redactor/toolbars/default.js
+- spec/dummy/app/assets/stylesheets/admin/blocks/error-msg.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/list.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/notice.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/orders.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/paginate.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/pagination.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/partners.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/phead-tabs.sass
+- spec/dummy/app/assets/stylesheets/admin/blocks/photos.scss
+- spec/dummy/app/assets/stylesheets/admin/blocks/sortable.sass
+- spec/dummy/app/assets/stylesheets/admin/custom/index.scss
+- spec/dummy/app/assets/stylesheets/admin/defaults/index.scss
+- spec/dummy/app/assets/stylesheets/admin/defaults/input.sass
+- spec/dummy/app/assets/stylesheets/admin/defaults/reset.sass
+- spec/dummy/app/assets/stylesheets/admin/defaults/table.scss
+- spec/dummy/app/assets/stylesheets/admin/index.scss
+- spec/dummy/app/assets/stylesheets/admin/layouts/header.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/launchbar.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/login.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/main.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/page-header.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/page-sidebar.sass
+- spec/dummy/app/assets/stylesheets/admin/layouts/sidebar.sass
+- spec/dummy/app/assets/stylesheets/admin/shop/_filter.scss
+- spec/dummy/app/assets/stylesheets/admin/shop/_order-sh.scss
+- spec/dummy/app/assets/stylesheets/admin/shop/_pe.scss
 - spec/dummy/app/assets/stylesheets/application.css.scss
+- spec/dummy/app/assets/stylesheets/redactor/index.scss
+- spec/dummy/app/assets/stylesheets/redactor/wym.css
+- spec/dummy/app/controllers/admin/base_controller.rb
+- spec/dummy/app/controllers/admin/managers_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/articles_controller.rb
+- spec/dummy/app/controllers/managers/registrations_controller.rb
+- spec/dummy/app/helpers/admin_helper.rb
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/article_category.rb
 - spec/dummy/app/models/photo.rb
+- spec/dummy/app/views/admin/base/_header.html.haml
+- spec/dummy/app/views/admin/base/_launchbar.html.haml
+- spec/dummy/app/views/admin/base/_sidebar.html.haml
+- spec/dummy/app/views/admin/base/_validate.haml
+- spec/dummy/app/views/admin/base/welcome.haml
 - spec/dummy/app/views/admin/photos/_photo.haml
 - spec/dummy/app/views/admin/photos/_photos.haml
 - spec/dummy/app/views/admin/photos/create.js.erb
 - spec/dummy/app/views/admin/photos/destroy.js.erb
 - spec/dummy/app/views/articles/show.html.haml
+- spec/dummy/app/views/layouts/admin.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/login.html.haml
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake