redde 0.0.8 → 0.1.0

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/blocks/pagination.scss

@@ -0,0 +1,28 @@
+.pagination {
+  margin: 20px 0 0;
+  .page, .last, .next, .prev, .first {
+    &.current, a {
+      display: inline-block;
+      text-align: center;
+      color: #005782;
+      color: #666;
+      min-width: 14px;
+      padding: 0 5px;
+      line-height: 24px;
+      background:linear-gradient(to bottom, #fff, #dedede);
+      border: 1px solid #bbb;
+      box-shadow: 0 1px 2px #ccc;
+      border-radius: 4px;
+      font-weight: bold;      
+      text-decoration: none;
+    }
+    a:active {
+      box-shadow: inset 0 1px 2px #333;
+      background:linear-gradient(to top, #fff, #dedede);
+    }
+    &.current {
+      color: #fff;
+      background:linear-gradient(to bottom, #A9DCF5, #257DA8);
+    }
+  }
+}

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/blocks/phead-tabs.sass

@@ -0,0 +1,27 @@
+.phead-tabs
+  display: block
+  clear: both
+  font-size: 12px
+  padding-top: 15px
+  margin-bottom: -16px
+
+.phead-tabs__link
+  padding: 0.5em (5em/6)
+  display: inline-block
+  border: 1px solid transparent
+  border-radius: 3px 3px 0 0
+  margin-left: -1px
+  &:link
+    text-decoration: underline // по дефолту прописано a:hover, в дальнейшем убрать
+  &:first-child
+    margin-left: -(5em/6)
+  &:hover
+    background: #ddd
+    background-clip: padding-box
+  &._active
+    text-decoration: none
+    color: #000
+    font-weight: bold
+    background: #fff
+    border-color: #ddd
+    border-bottom-color: #fff

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/defaults/input.sass

@@ -0,0 +1,35 @@
+input[type=submit]
+  cursor: pointer
+  padding: 3px 17px
+  font-family: Helvetica, Arial, sans-serif
+  font-weight: bold
+  color: #444
+  background: image-url("admin/submit.png") repeat-x 0 50%
+  background: linear-gradient(to bottom, #f2f2f2 0%, #ebebeb 50%, #dddddd 51%, #cfcfcf 100%)
+  border: 1px solid #707070
+  border-radius: 2px
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.85)
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 1px 1px 0 #fff inset, -1px -1px 0 #fff inset
+
+  &[value=Сохранить],
+  &[value=Применить]
+    padding-left: 37px
+  &[value=Сохранить]
+    background: image-url("admin/arrow_enter.png") 4px -102px no-repeat, linear-gradient(to bottom, #f2f2f2 0%, #ebebeb 50%, #dddddd 51%, #cfcfcf 100%) 0 0
+    &:hover
+      background: image-url("admin/arrow_enter.png") 4px -1px no-repeat, linear-gradient(to bottom, #eaf6fd 0%, #d9f0fc 50%, #bee6fd 51%, #a7d9f5 100%) 0 0
+  &[value=Применить]
+    background: image-url("admin/arrow_down.png") 4px -102px no-repeat, linear-gradient(to bottom, #f2f2f2 0%, #ebebeb 50%, #dddddd 51%, #cfcfcf 100%) 0 0
+    &:hover
+      background: image-url("admin/arrow_down.png") 4px -1px no-repeat, linear-gradient(to bottom, #eaf6fd 0%, #d9f0fc 50%, #bee6fd 51%, #a7d9f5 100%) 0 0
+  &[value=Далее]
+    padding-right: 37px
+    background: image-url("admin/arrow_right.png") right -100px no-repeat, linear-gradient(to bottom, #f2f2f2 0%, #ebebeb 50%, #dddddd 51%, #cfcfcf 100%) 0 0
+    &:hover
+      background: image-url("admin/arrow_right.png") right 2px no-repeat, linear-gradient(to bottom, #eaf6fd 0%, #d9f0fc 50%, #bee6fd 51%, #a7d9f5 100%) 0 0
+  &:hover
+    background-image:image-url("admin/submit_hover.png")
+    background: linear-gradient(to bottom, #eaf6fd 0%, #d9f0fc 50%, #bee6fd 51%, #a7d9f5 100%)
+    border-color: #3c7fb1
+    box-shadow: 0 1px 6px rgb(44, 146, 193)
+    color: #025984

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/header.sass

@@ -0,0 +1,50 @@
+.header 
+  padding: 0 30px
+  color: #fff
+  line-height: 23px
+  text-decoration: none
+  margin-bottom: 20px
+  box-shadow: #666 0 0 3px
+  background-color: #005782
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1A719C', endColorstr='#005782')
+  background: linear-gradient(to bottom, #1A719C 0%, #005782 100%)
+
+.header__init
+  box-sizing: border-box
+  max-width: 1200px
+  min-width: 580px 
+  padding: 6px 0 6px (185px + 31px)
+  margin: 0 auto
+  overflow: hidden
+  position: relative
+  
+.header__logo
+  position: absolute
+  width: 123px
+  height: 31px
+  left: 0
+  top: 0
+  bottom: 0
+  margin: auto
+  overflow: hidden
+  background: image-url('admin/logo.png') no-repeat 0 0 
+  text-indent: -9999px
+  display: block
+    
+.header__center
+  overflow: hidden
+  float: left
+  font-size: (14em/12)
+  a
+    color: #fff
+  
+.header__links
+  float: right
+  margin-right: 1px
+  a 
+    margin-left: (8em/12)
+    color: #fff
+    font-size: (10em/12)
+    text-decoration: none
+    line-height: 46px
+    

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/launchbar.sass

@@ -0,0 +1,23 @@
+.launchbar 
+  background: #000
+  overflow: hidden
+  font-size: (14em/12)
+
+.launchbar__menu
+  padding: 0 25px	
+
+.launchbar__link
+  float: left
+  margin-right: 4px
+  padding: 5px 7px 6px 4px
+  color: #999
+  border-right: 1px solid #222
+  text-decoration: none
+  &._active
+    color: #ddd
+    font-weight: bold
+
+.launchbar__time
+  float: right
+  color: #fff
+  padding: 5px 4px 6px

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/main.sass

@@ -0,0 +1,39 @@
+.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
+
+.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
+	margin-left: -185px
+	.sidebar + &
+		float: left
+		width: 100%
+		margin-left: 0
+
+.content
+	padding: 30px
+
+// .sidebar .content
+// 	margin-right: 305px
+
+// .sidebar .page-sidebar
+// 	float: right

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-header.sass

@@ -0,0 +1,19 @@
+.page-header
+  overflow: hidden
+  background: #F1F5F9
+  border-bottom: 1px solid #DADEE5
+  padding: 15px 30px
+  margin: 0
+  border-top-right-radius: 5px
+  border-top-left-radius: 5px
+  h1 
+    font-size: 16px
+    float: left
+    font-weight: normal
+  p 
+    margin: 0
+    font-size: 11px
+    float: right
+    line-height: 1.8em
+    a
+      color: #0047B3

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-sidebar.sass

@@ -0,0 +1,22 @@
+.page-sidebar
+  float: right
+  margin: 0 30px 0 0
+  padding: 30px 0 0 30px
+  width: 245px
+  border-left: 1px solid #efefef
+  ul.photos
+    list-style-type: none
+    li
+      display: inline
+
+  h5
+    line-height: 1.0em
+    padding: 0 0 3px 0
+    font-size: 12px
+    text-transform: none
+    border-bottom: 1px solid #efefef
+    color: #222
+    font-weight: bold
+
+  p
+    font-size: 12px

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/sidebar.sass

@@ -0,0 +1,30 @@
+.sidebar
+  width: 215px
+  float: left
+  margin-top: 12px
+
+.sidebar__badge
+  font-size: 10px
+  color: #999
+  &:before
+    content: '('
+    color: #000
+  &:after
+    content: ')'
+    color: #000
+
+.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
+  &._active
+    font-weight: bold
+    color: #000
+    background-color: #e5e3de
+    border-radius: 4px 0 0 4px

data/lib/generators/redde/layout/templates/assets/stylesheets/admin/reset.sass

@@ -0,0 +1,33 @@
+*  
+  margin: 0
+  padding: 0
+
+th  
+  text-align: left
+
+a  
+  color: #0047B3
+  &: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 "Lucida Grande", "Lucida Sans Unicode", helvetica, arial, verdana, sans-serif
+
+label
+  font-size: 14px
+  font-weight: bold
+textarea  
+  width: 100%
+  min-width: 275px
+  font-size: 12px
+input
+  font-size: 18px

data/lib/generators/redde/layout/templates/assets/stylesheets/admin.scss

@@ -1,12 +1,12 @@
+//= require_self
+//= require admin/reset
+//= require admin/default
+//= require_tree ./admin/defaults/
+//= require_tree ./admin/layouts/
+//= require_tree ./admin/blocks/
+//= require redactor/redactor
+
 @charset "UTF-8";
 
-@import 
-"compass",
-"admin/reset",
-"admin/default",
-"admin/layouts/*",
-"admin/blocks/*",
-"admin/redactor/css/redactor",
-"admin/uploadify/uploadify",
-"admin/uploadifive/uploadifive",
+@import
 "admin/lightbox/css/jquery.lightbox-0.5";

data/lib/generators/redde/layout/templates/base/_header.html.haml

@@ -0,0 +1,12 @@
+%header.header
+  .header__init
+    = link_to admin_root_path || "/admin", class: 'header__logo' do
+      ReddeCMS
+      %br
+      %span custom system
+    .header__links
+      - if current_manager
+        = mail_to current_manager.email
+        = link_to "Выход", destroy_manager_session_path, :method => :delete
+    .header__center
+      = link_to "AppName", root_path, :target => :_blank

data/lib/generators/redde/layout/templates/base/_launchbar.html.haml

@@ -0,0 +1,11 @@
+- case controller_name
+  - when 'products' then @active = :shop
+  - when 'articles' then @active = :materials
+  - when 'users' then @active = :system
+
+.launchbar
+  %nav.launchbar__menu
+    = link_to "Материалы", nil, class: ['launchbar__link', ('_active' if @active == :shop)]
+    = link_to "Обратная связь", nil, class: ['launchbar__link', ('_active' if @active == :materials)]
+    = link_to "Система", nil, class: ['launchbar__link', ('_active' if @active == :system)]
+    %span.launchbar__time= Russian.strftime(Time.now,"%d %b, %Y %H:%M ")

data/lib/generators/redde/layout/templates/base/_sidebar.html.haml

@@ -0,0 +1,15 @@
+-# add this condition to remove empty sidebar 
+-# if @active
+%nav.sidebar
+  - case @active
+  - when :shop then
+    = link_to "Товары", admin_products_path, class: 'sidebar__link'
+  - when :materials then
+    = link_to "Статьи", [:admin, :articles], class: 'sidebar__link'
+  - when :system
+    = link_to "Пользователи", admin_users_path, class: 'sidebar__link'
+  - else
+    = link_to 'Демо active', nil, class: ['sidebar__link', '_active']
+    = link_to nil, class: ['sidebar__link'] do
+      Демо
+      %span.sidebar__badge 2

data/lib/generators/redde/layout/templates/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/lib/generators/redde/layout/templates/base/welcome.haml

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

data/lib/generators/redde/layout/templates/controllers/base_controller.rb

@@ -3,4 +3,9 @@
 class Admin::BaseController < ActionController::Base
   layout 'admin'
   before_filter :authenticate_manager!
+  include AdminHelper
+
+  def welcome
+  end
+  
 end

data/lib/generators/redde/layout/templates/layouts/admin.html.haml

@@ -1,30 +1,29 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en"}
+!!!
+%html{:lang => "en"}
   %head
-    %title= @page_title || "Без Заголовка"
+    %meta{:charset => "UTF-8"}/ 
+    %title= @page_title || "ReddeCMS"
+    = favicon_link_tag 'admin/favicon.png'
     = stylesheet_link_tag "admin"
     = javascript_include_tag "admin"
-    =# include_imperavi_stylesheet
-    =# include_imperavi_javascript
     = yield :js
     = csrf_meta_tag
   %body
-    =render "admin/shared/launchbar"
-    =render "admin/shared/header"
-    #wrapper
-      #sidebar
-        =render "admin/shared/sidebar"
-      #main
-        #page-header
+    = 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'}"}
+        .page{:class => "#{yield(:page_sidebar).empty? ? 'full' : 'sidebar'}"}
           #filter
             = yield(:filter)
-          #page_sidebar
+          .page-sidebar
             = yield(:page_sidebar)
-          #content
+          .content
             = yield

data/lib/generators/redde/scaffold/scaffold_generator.rb

@@ -50,6 +50,14 @@ module Redde
         resource_name.pluralize
       end
 
+      def capital_resource_name
+        resource_name.capitalize
+      end
+
+      def index_header
+        model_name.constantize.model_name.human(:count => 'other')
+      end
+
       def sort_priority(column_name)
         case column_name
         when "position" then 1

data/lib/generators/redde/scaffold/templates/edit.html.haml

@@ -4,14 +4,10 @@
       Добавить #{taccusative(:<%= resource_name %>)}
     - else
       Редактировать #{taccusative(:<%= resource_name %>)}
+  %p= link_to "Назад", [:admin, :<%= plural_resource_name %>]
 
 = form_for [:admin, @<%= resource_name %>] do |f|
-  - if @<%= resource_name %>.errors.any?
-    #error_explanation
-      %h2= "Ошибки при сохранении: #{@<%= resource_name %>.errors.count}"
-      %ul
-        - @<%= resource_name %>.errors.full_messages.each do |msg|
-          %li= msg
+  = render 'validate', {f: f}
   %table
     <%- columns.each do |column| -%>
     <%- if column.field_type.to_s == "text_area" -%>

data/lib/generators/redde/scaffold/templates/index.html.haml

@@ -1,5 +1,5 @@
 - content_for(:page_header) do
-  %h1= tplural(<%= resource_name.capitalize %>)
+  %h1= index_header
   %p= link_to "Добавить #{taccusative('<%= resource_name %>')}", [:new, :admin, :<%= resource_name %>]
   
 - unless @<%= plural_resource_name %>.empty?

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/lib/redde.rb

@@ -1,4 +1,7 @@
 require "redde/version"
 module Redde
+  require 'generators/redde/layout/layout_generator'
+  require 'generators/redde/scaffold/scaffold_generator'
+  require 'generators/redde/deploy/deploy_generator'
   # Your code goes here...
 end

data/redde.gemspec

@@ -1,12 +1,12 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 
 require File.expand_path('../lib/redde/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Oleg Bovykin"]
-  gem.email         = ["oleg.bovykin@gmail.com"]
-  gem.description   = %q{Simple admin scaffold generator}
-  gem.summary       = %q{Admin scaffold generator for redde shop engine}
+  gem.authors       = ["Oleg Bovykin", "Konstantin Gorozhankin"]
+  gem.email         = ["oleg.bovykin@gmail.com", "konstantin.gorozhankin@gmail.com", "info@redde.ru"]
+  gem.description   = %q{Admin scaffold generator for redde projects}
+  gem.summary       = %q{Admin scaffold generator for redde projects}
   gem.homepage      = "http://github.com/redde/redde"
 
   gem.files         = `git ls-files`.split($\)
@@ -15,14 +15,15 @@ Gem::Specification.new do |gem|
   gem.name          = "redde"
   gem.require_paths = ["lib"]
   gem.version       = Redde::VERSION
+  gem.license       = "MIT"
+
+  gem.add_runtime_dependency "jquery-rails"
+  gem.add_runtime_dependency "jquery-ui-rails"
 
-  gem.add_runtime_dependency 'russian', '>= 0.6.0'
-  gem.add_runtime_dependency 'haml-rails'
-  gem.add_runtime_dependency 'compass-rails'
-  gem.add_development_dependency 'jquery-ui-rails'
-  gem.add_development_dependency 'jquery-rails'
   gem.add_development_dependency 'rails', '>= 3.1'
   gem.add_development_dependency 'rspec-rails', '>= 2.7'
+  gem.add_development_dependency 'factory_girl_rails', '>= 2.7'
   gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency "sqlite3"
   gem.add_development_dependency 'generator_spec'
 end

data/spec/dummy/.rspec

@@ -0,0 +1 @@
+--color

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,14 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs

data/spec/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/dummy/app/controllers/articles_controller.rb

@@ -0,0 +1,12 @@
+# coding: utf-8
+
+class ArticlesController < ApplicationController
+
+  def index
+  end
+
+  def show
+    @article = Article.find(params[:id])
+  end
+  
+end

data/spec/dummy/app/models/article.rb

@@ -0,0 +1,3 @@
+class Article < ActiveRecord::Base
+  validates :title, presence: true
+end

data/spec/dummy/app/models/article_category.rb

@@ -0,0 +1,2 @@
+class ArticleCategory < ActiveRecord::Base
+end

data/spec/dummy/app/views/articles/show.html.haml

@@ -0,0 +1,2 @@
+%h1= @article.title
+= render @article.page

data/spec/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= yield :js %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>