constructor-core 0.3.3 → 0.4.0

data/app/assets/stylesheets/constructor_core/application.css.scss

@@ -1,58 +1,3 @@
-//= require_self
 //= require ckeditor/contents
 //= require ckeditor/skins/moono/editor.css
-//= require constructor_core/bootstrap
-//= require constructor_core/bootstrap-responsive
-//= require constructor_core/jquery.treeview
-//= require constructor_core/font-awesome.css
-
-body {
-  padding-top: 40px;
-}
-
-.images_controls {
-  float: left;
-  overflow: hidden;
-  display: inline-block;
-  width: 180px;
-  margin-bottom: 20px;
-  
-  .actions {
-    margin-top: 5px;
-    margin-left: 28px;
-  }
-}
-
-.sizes .controls {
-  margin-bottom: 30px;
-}
-
-.url {
-  font-size: 12px;
-
-  .full_url {
-    margin-top: 6px;
-    float: left;
-  }
-
-  .icon-pencil {
-    margin-top: 5px;
-    margin-left: 3px;
-  }
-
-  .address {
-    font-weight: bold;
-
-    &:hover {
-      background-color: #ffa;
-    }
-  }
-}
-
-.url .icon-pencil {
-    display: none;
-}
-
-.url:hover .icon-pencil {
-  display: inline-block;
-}
+//= require ./main

data/app/assets/stylesheets/constructor_core/main.css.scss

@@ -0,0 +1,200 @@
+@import 'bootstrap';
+@import 'font-awesome';
+
+$red: #ED2B00;
+$yellow: #FFC404;
+$green: #2AB500;
+$violet: #8E0BD6;
+$blue: #0D98FF;
+
+$redDark: #B82100;
+$yellowDark: #D9A603;
+$greenDark: #218F00;
+$violetDark: #6B08A1;
+$blueDark: #0A7BCF;
+
+body {
+  min-width: 950px;
+  color: $gray;
+}
+
+a {
+  &:link {
+    color: $blue;
+  }
+
+  &:active, &:hover, &:focus {
+    color: $red;
+  }
+}
+
+
+h3 {
+  font-weight: normal;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.avatar {
+  @include border-radius(2px);
+}
+
+.form-actions {
+  background-color: rgba(245,245,245,0.4);
+}
+
+.navbar-constructor > .navbar-inner {
+  padding: 5px;
+  background-color: rgba(245,245,245,0.7);
+  background-image: none;
+  @include border-radius(0);
+  @include box-shadow(none);
+  border: none;
+  border-bottom: 1px solid #ddd;
+}
+
+.navbar .nav > li > a {
+  &:hover { color: $red }
+}
+
+.btn {
+  @include buttonBackground(#fff, #eee, $grayDark);
+  background-color: $grayLighter;
+  color: $gray;
+  border: 1px solid #ddd;
+  text-shadow: none;
+  font-weight: normal;
+  @include box-shadow(none);
+
+  &:active, &:link, &:hover, &:focus {
+    color: $gray;
+  }
+
+  &.btn-link {
+    background-image: none;
+    color: $blue;
+    border: none;
+    background-color: transparent;
+
+    &:link {
+      color: $blue
+    }
+
+    &:active,  &:hover, &:focus {
+      color: $red;
+      text-decoration: none;
+    }
+  }
+
+  &.btn-danger {
+    background-image: none;
+    border: none;
+    color: $red;
+    background-color: transparent;
+
+
+    &:link {
+      color: $red;
+    }
+
+    &:active,  &:hover, &:focus {
+      background-color: $red;
+      color: $white;
+    }
+  }
+
+  &.btn-primary {
+    background-image: none;
+    border: none;
+    background-color: $blueDark;
+    color: $white;
+
+    &:link {
+      color: $white;
+    }
+
+    &:active,  &:hover, &:focus {}
+  }
+
+  &.btn-success {
+    background-image: none;
+    border: none;
+    background-color: $green;
+    color: $white;
+
+    &:link {
+      color: $white;
+    }
+
+    &:active,  &:hover, &:focus {}
+  }
+
+  &.btn-large { font-size: $baseFontSize*1.5 }
+}
+
+.images_controls {
+  float: left;
+  overflow: hidden;
+  display: inline-block;
+  width: 180px;
+  margin-bottom: 20px;
+
+  .actions {
+    margin-top: 5px;
+    margin-left: 28px;
+  }
+}
+
+.sizes .controls {
+  margin-bottom: 30px;
+}
+
+.url {
+  font-size: 12px;
+
+  .full_url {
+    margin-top: 6px;
+    float: left;
+  }
+
+  .icon-pencil {
+    margin-top: 10px;
+    margin-left: 3px;
+  }
+
+  .address {
+    font-weight: bold;
+
+    &:hover {
+      background-color: #ffa;
+    }
+  }
+}
+
+.url .icon-pencil {
+  display: none;
+}
+
+.url:hover .icon-pencil {
+  display: inline-block;
+}
+
+.b-tree {
+  ul {
+    list-style: none;
+    margin-top: 15px;
+    margin-left: 60px;
+
+    &:first-child {
+      margin-left: 0;
+      padding-left: 0;
+      margin-top: 0;
+    }
+
+    li {
+      margin-top: 10px;
+    }
+  }
+}

data/app/controllers/constructor_core/application_controller.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+module ConstructorCore
+  class ApplicationController < ApplicationController
+    helper_method :current_user
+  end
+end

data/app/controllers/constructor_core/sessions_controller.rb

@@ -3,11 +3,11 @@
 module ConstructorCore
   class SessionsController < Devise::SessionsController
     layout 'constructor_core/application_admin'
-    
+
     def after_sign_in_path_for(resource)
       return '/admin/pages'
     end
-    
+
     def after_sign_out_path_for(resource)
       return '/'
     end

data/app/helpers/constructor_core/application_helper.rb

@@ -0,0 +1,29 @@
+module ConstructorCore
+  module ApplicationHelper
+    def authenticate_user!
+      warden.authenticate!
+    end
+
+    def user_signed_in?
+      !!current_user
+    end
+
+    def current_user
+      @current_user ||= warden.authenticate
+    end
+
+    def user_session
+      current_user && warden.session
+    end
+
+    def warden
+      request.env['warden']
+    end
+
+    def gravatar_icon(user_email = '', size = 40)
+      gravatar_url = 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
+      user_email.strip!
+      sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
+    end
+  end
+end

data/app/models/constructor_core/user.rb

@@ -2,9 +2,7 @@
 
 module ConstructorCore
   class User < ActiveRecord::Base
-    # Include default devise modules. Others available are:
     devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :timeoutable  #:confirmable, :registerable, :omniauthable, :lockable, :encryptable
-    # Setup accessible (or protected) attributes for your model
     attr_accessible :email, :password, :password_confirmation, :remember_me
   end
 end

data/app/views/constructor_core/sessions/new.html.haml

@@ -1,5 +1,5 @@
 - content_for :page_title do
-  Вход на сайт
+  =t :login
 
 = form_for(resource, :as => resource_name, :url => '/login') do |f|
   .form-horizontal
@@ -16,9 +16,6 @@
         .controls
           %label.checkbox.inline{:for => 'remember_me'}
             = f.check_box :remember_me
-            Запомнить меня
+            =t :remember_me
       .controls
-        = f.submit "Войти", :class => "btn btn-primary"
-
-- content_for :sidebar do
-  //= render :partial => "devise/shared/links"
+        = f.submit t(:login), :class => "btn btn-primary"

data/app/views/layouts/constructor_core/application_admin.haml

@@ -3,42 +3,59 @@
   %head
     %meta{:charset => 'utf-8'}/
     %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}/
-    %title Панель управления     
-  
-    %meta{:name => 'viewport', :content => 'width=device-width,initial-scale=1'}/      
+    %title=t :dashboard
     
     / [if lt IE 9]
-      %script{:src => "http://html5shim.googlecode.com/svn/trunk/html5.js"}
+      %script{:src => 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
     
     :javascript
       var CKEDITOR_BASEPATH = '/assets/ckeditor/'
     
-    = stylesheet_link_tag "constructor_core/application"
-    = javascript_include_tag "constructor_core/application"
+    = stylesheet_link_tag 'constructor_core/application'
+    = javascript_include_tag 'constructor_core/application'
     = csrf_meta_tag
     = favicon_link_tag
     
-    %link{:rel => "apple-touch-icon", :href => "images/apple-touch-icon.png"}
-    %link{:rel => "apple-touch-icon", :sizes => "72x72", :href => "images/apple-touch-icon-72x72.png"}
-    %link{:rel => "apple-touch-icon", :sizes => "114x114", :href => "images/apple-touch-icon-114x114.png"}
+    %link{:rel => 'apple-touch-icon', :href => 'images/apple-touch-icon.png'}
+    %link{:rel => 'apple-touch-icon', :sizes => '72x72', :href => 'images/apple-touch-icon-72x72.png'}
+    %link{:rel => 'apple-touch-icon', :sizes => '114x114', :href => 'images/apple-touch-icon-114x114.png'}
   
   %body
-    .navbar.navbar-fixed-top
+    .navbar.navbar-constructor
       .navbar-inner
         .container-fluid          
-          = link_to "Главная страница", "/", :class => "brand"
-          %a.btn.btn-navbar{'data-toggle' => "collapse", 'data-target' => ".nav-collapse"}
+          = link_to t(:homepage), '/', :class => 'brand'
+          %a.btn.btn-navbar{'data-toggle' => 'collapse', 'data-target' => '.nav-collapse'}
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
           .nav-collapse
             %ul.nav
-              %li= link_to "Структура", "/admin/pages"
-              %li= link_to "Шаблоны", "/admin/templates"
-            %ul.nav.pull-right
               %li
-                = link_to "Выйти", "/logout"
-          
+                = link_to '/admin/pages' do
+                  %i.icon-sitemap
+                  =t :structure
+              %li
+                = link_to '/admin/templates' do
+                  %i.icon-film
+                  =t :templates
+              /
+                %li
+                  = link_to '/admin/users' do
+                    %i.icon-group
+                    =t :users
+
+            - if user_signed_in?
+              %ul.nav.pull-right
+                %li
+                  = link_to @current_user do
+                    = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'avatar'
+                    %span= current_user.email
+                %li
+                  = link_to @current_user, class: 'logout', method: :delete do
+                    %i.icon-signout
+                    =t :logout
+
     .container-fluid
       .page-header
         .row-fluid
@@ -47,11 +64,11 @@
           .span4
             - unless notice.nil?
               .alert.fade.in
-                = link_to "×", "#", :class => "close", 'data-dismiss' => "alert"
+                = link_to '×', '#', :class => 'close', 'data-dismiss' => 'alert'
                 = notice
             - unless alert.nil?
               .alert.alert-error.fade.in
-                = link_to "×", "#", :class => "close", 'data-dismiss' => "alert"         
+                = link_to '×', '#', :class => 'close', 'data-dismiss' => 'alert'
                 = alert                            
 
           = yield :actions

data/config/environments/production.rb

@@ -1,5 +1,3 @@
 Rails.application.class.configure do
   config.assets.precompile += ['ckeditor/*']
-  config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
-  config.assets.precompile += %w( .svg .eot .woff .ttf )
 end

data/config/initializers/devise.rb

@@ -1,216 +1,15 @@
-# Use this hook to configure devise mailer, warden hooks and so forth.
-# Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+  config.mailer_sender = 'ivanzotov@gmail.com'
 
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  config.parent_controller = 'ActionController::Base'
 
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
   require 'devise/orm/active_record'
 
-  # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating a user. The default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating a user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
-  # You can also supply a hash where the value is a boolean determining whether
-  # or not authentication should be aborted when the value is not present.
-  # config.authentication_keys = [ :email ]
-
-  # Configure parameters from the request object used for authentication. Each entry
-  # given should be a request method and it will automatically be passed to the
-  # find_for_authentication method and considered in your model lookup. For instance,
-  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
-  # The same considerations mentioned for authentication_keys also apply to request_keys.
-  # config.request_keys = []
-
-  # Configure which authentication keys should be case-insensitive.
-  # These keys will be downcased upon creating or modifying a user and when used
-  # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [ :email ]
-
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
   config.strip_whitespace_keys = [ :email ]
-
-  # Tell if authentication through request.params is enabled. True by default.
-  # It can be set to an array that will enable params authentication only for the
-  # given strategies, for example, `config.params_authenticatable = [:database]` will
-  # enable it only for database (email + password) authentication.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication.
-  # config.http_authenticatable = false
-
-  # If http headers should be returned for AJAX requests. True by default.
-  # config.http_authenticatable_on_xhr = true
-
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
-
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
-  # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
-  # Notice that if you are skipping storage for all authentication paths, you
-  # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
   config.skip_session_storage = [:http_auth]
-
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
   config.stretches = Rails.env.test? ? 1 : 10
-
-  # Setup a pepper to generate the encrypted password.
-  # config.pepper = "8101638e8d8142db6ce79325617afe094d9a69ca35fcdb1f7aacf4b0ba25bfacb0a57783d93a11829c309a3d4f05d104e22c4cd305ceec9f3f8a61d2389bb59b"
-
-  # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
-  # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
-  # config.allow_unconfirmed_access_for = 2.days
-
-  # If true, requires any email changes to be confirmed (exctly the same way as
-  # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
   config.reconfirmable = true
-
-  # Defines which key will be used when confirming an account
-  # config.confirmation_keys = [ :email ]
-
-  # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
-
-  # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
-
-  # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
-  # config.cookie_options = {}
-
-  # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
-
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-
-  # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again. Default is 30 minutes.
-  # config.timeout_in = 30.minutes
-
-  # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
-
-  # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
-
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
-
-  # ==> Configuration for :recoverable
-  #
-  # Defines which key will be used when recovering the password for an account
-  # config.reset_password_keys = [ :email ]
-
-  # Time interval you can reset your password with a reset password key.
-  # Don't put a too small interval or your users won't have the time to
-  # change their passwords.
   config.reset_password_within = 6.hours
-
-  # ==> Configuration for :encryptable
-  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
-  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
-  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
-  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper)
-  # config.encryptor = :sha512
-
-  # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
-
-  # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
-  # config.scoped_views = false
-
-  # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes (usually :user).
-  # config.default_scope = :user
-
-  # Configure sign_out behavior.
-  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
-  # The default is true, which means any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = true
-
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  #
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists.
-  #
-  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
-
-  # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :delete
-
-  # ==> OmniAuth
-  # Add a new OmniAuth provider. Check the wiki for more information on setting
-  # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-
-  # ==> Warden configuration
-  # If you want to use other strategies, that are not supported by Devise, or
-  # change the failure app, you can configure them inside the config.warden block.
-  #
-  # config.warden do |manager|
-  #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
-  # end
 end