constructor-cms 0.7.3 → 0.7.4

data/core/app/controllers/constructor_core/application_controller.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-
-module ConstructorCore
-  class ApplicationController < ::ApplicationController
-    layout 'constructor_core/application_core'
-    before_filter :authenticate_user!, :except => [:show]
-
-    helper_method :current_user
-
-    private
-
-    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
-  end
-end

data/core/app/controllers/constructor_core/sessions_controller.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-
-module ConstructorCore
-  class SessionsController < Devise::SessionsController
-    layout 'constructor_core/application'
-
-    def after_sign_in_path_for(resource)
-      return '/admin/pages'
-    end
-
-    def after_sign_out_path_for(resource)
-      return '/'
-    end
-  end
-end

data/core/app/controllers/constructor_core/users_controller.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-module ConstructorCore
-  class UsersController < ConstructorCore::ApplicationController
-    def profile
-      @user = current_user
-    end
-
-    def update_password
-      @user = current_user
-
-      if params[:user][:password] == params[:user][:password_confirm]
-        @user.password = params[:user][:password]
-
-        if @user.save
-          redirect_to '/login', :notice => t(:password_changed)
-          return
-        end
-      end
-
-      redirect_to :back, :notice => t(:password_error_confirm)
-    end
-  end
-end

data/core/app/helpers/constructor_core/application_helper.rb

@@ -1,9 +0,0 @@
-module ConstructorCore
-  module ApplicationHelper
-    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/core/app/models/constructor_core/user.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-module ConstructorCore
-  class User < ActiveRecord::Base
-    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :timeoutable, :registerable  #:confirmable,  :omniauthable, :lockable, :encryptable
-  end
-end

data/core/app/views/constructor_core/devise/confirmations/new.html.haml

@@ -1,10 +0,0 @@
-%h2 Отправить инструкцию активации
-= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.email_field :email
-  %p= f.submit "Отправить"
-= render :partial => "devise/shared/links"
-

data/core/app/views/constructor_core/devise/mailer/confirmation_instructions.html.haml

@@ -1,5 +0,0 @@
-%p
-  Добро пожаловать, #{@resource.email}!
-%p Для того чтобы подтвердить ваш аккаунт, пройдите по следующей ссылке:
-%p= link_to 'Подтвердить аккаунт', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
-

data/core/app/views/constructor_core/devise/mailer/reset_password_instructions.html.haml

@@ -1,7 +0,0 @@
-%p
-  Привет, #{@resource.email}!
-%p Вы сделали запрос на смену пароля. Для того чтобы изменить пароль пройдите по следующей ссылке:
-%p= link_to 'Изменить пароль', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
-%p Если Вы не делали запрос на изменение пароля, то проигнорируйте это письмо.
-%p Ваш пароль останется прежним до тех пор пока вы не пройдете по ссылке.
-

data/core/app/views/constructor_core/devise/mailer/unlock_instructions.html.haml

@@ -1,5 +0,0 @@
-%p
-  Hello #{@resource.email}!
-%p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
-%p Click the link below to unlock your account:
-%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)

data/core/app/views/constructor_core/devise/passwords/edit.html.haml

@@ -1,21 +0,0 @@
-- content_for :page_title do
-  Смена пароля
-  
-= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
-  = devise_error_messages!
-  = f.hidden_field :reset_password_token
-  .clearfix
-    = f.label :password, "Новый пароль"
-    .input
-      = f.password_field :password
-  .clearfix
-    = f.label :password_confirmation, "Еще раз"
-    .input
-      = f.password_field :password_confirmation
-  .clearfix
-    .input
-      = f.submit "Сменить пароль", :class => "btn primary"
-
-- content_for :sidebar do
-  = render :partial => "devise/shared/links"
-

data/core/app/views/constructor_core/devise/passwords/new.html.haml

@@ -1,13 +0,0 @@
-- content_for :page_title do
-  Восстановить пароль
-  
-= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
-  = devise_error_messages!
-  .clearfix
-    = f.label :email, "Электропочта"
-    .input
-      = f.email_field :email
-  .clearfix
-    .input
-      = f.submit "Отправить", :class => "btn primary"
-

data/core/app/views/constructor_core/devise/registrations/edit.html.haml

@@ -1,28 +0,0 @@
-%h2
-  Редактивароние аккаунта #{resource_name.to_s.humanize}
-= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.email_field :email
-  %p
-    = f.label :password
-    %i (оставьте пустым, если хотите сохранить пароль прежним)
-    %br/
-    = f.password_field :password
-  %p
-    = f.label :password_confirmation
-    %br/
-    = f.password_field :password_confirmation
-  %p
-    = f.label :current_password
-    %i (необходимо ввести ваш текущий пароль для подтверждения изменений)
-    %br/
-    = f.password_field :current_password
-  %p= f.submit "Сохранить"
-%h3 Удалить мой аккаунт
-%p
-  #{link_to "Удалить", registration_path(resource_name), :confirm => "Вы уверены?", :method => :delete}.
-= link_to "Назад", :back
-

data/core/app/views/constructor_core/devise/registrations/new.html.haml

@@ -1,20 +0,0 @@
-.register_form
-  %h2 Регистрация
-  = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
-    = devise_error_messages!
-    %p.email
-      = f.label :email
-      %br/
-      = f.email_field :email
-    %p
-      = f.label :password
-      %br/
-      = f.password_field :password
-    %p
-      = f.label :password_confirmation
-      %br/
-      = f.password_field :password_confirmation
-    %p.button= f.submit "Зарегистрироваться"
-
-  .links
-    = render :partial => "devise/shared/links"

data/core/app/views/constructor_core/devise/shared/_links.html.haml

@@ -1,19 +0,0 @@
-- if controller_name != 'sessions'
-  = link_to "Вход с паролем", auth.new_session_path(resource_name)
-  %br/
-- if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Регистрация", auth.new_registration_path(resource_name)
-  %br/
-- if devise_mapping.recoverable? && controller_name != 'passwords'
-  = link_to "Восстановление пароля", auth.new_password_path(resource_name)
-  %br/
-- if devise_mapping.confirmable? && controller_name != 'confirmations'
-  = link_to "Если вы не получили инструкцию о том как подтвердить адрес электронной почты", new_confirmation_path(resource_name)
-  %br/
-- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
-  %br/
-- if devise_mapping.omniauthable?
-  - resource_class.omniauth_providers.each do |provider|
-    = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
-    %br/

data/core/app/views/constructor_core/devise/unlocks/new.html.haml

@@ -1,9 +0,0 @@
-%h2 Resend unlock instructions
-= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
-  = devise_error_messages!
-  %p
-    = f.label :email
-    %br/
-    = f.email_field :email
-  %p= f.submit "Resend unlock instructions"
-= render :partial => "devise/shared/links"

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

@@ -1,22 +0,0 @@
-- content_for :page_title do
-  =t :login
-
-= form_for(resource, as: resource_name, url: '/login') do |f|
-  .form-horizontal
-    .control-group
-      = f.label :email, class: 'control-label'
-      .controls
-        = f.email_field :email
-    .control-group 
-      = f.label :password, class: 'control-label'
-      .controls
-        = f.password_field :password
-
-    - if devise_mapping.rememberable?
-      .control-group
-        .controls
-          %label.checkbox.inline{for: 'remember_me'}
-            = f.check_box :remember_me
-            =t :remember_me
-      .controls
-        = f.submit t(:login), class: 'btn btn-primary'

data/core/app/views/constructor_core/users/profile.haml

@@ -1,16 +0,0 @@
-- content_for :page_title do
-  =t :profile
-
-= form_for @current_user, method: :post do |f|
-  .form-horizontal
-    .control-group
-      = f.label :password, class: 'control-label'
-      .controls
-        = f.password_field :password, required: true
-    .control-group
-      = f.label :password_confirmation, class: 'control-label'
-      .controls
-        = f.password_field :password_confirm, required: true
-    .control-group
-      .controls
-        = f.submit t(:save_password), class: 'btn btn-primary'

data/core/app/views/layouts/constructor_core/application_core.haml

@@ -1,95 +0,0 @@
-!!!
-%html{lang: 'ru'}
-  %head
-    %meta{charset: 'utf-8'}/
-    %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge,chrome=1'}/
-    %title=t :dashboard
-    
-    / [if lt IE 9]
-      %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'
-    = 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'}
-  
-  %body
-    .navbar.navbar-constructor
-      .navbar-inner
-        .container-fluid          
-          = 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/dashboard' do
-                    %i.icon-dashboard
-                    =t :dashboard
-              %li
-                = 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
-                %li
-                  = link_to '/admin/settings' do
-                    %i.icon-cogs
-                    =t :settings
-
-            - if current_user
-              %ul.nav.pull-right
-                %li
-                  = link_to core.user_path(current_user.id) do
-                    = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'avatar'
-                    %span= current_user.email
-                %li
-                  = link_to 'http://ivanzotov.github.io/constructor/' do
-                    %i.icon-question-sign
-                    =t :help
-                %li
-                  = link_to core.logout_path, method: :delete do
-                    %i.icon-signout
-                    =t :logout
-
-    .container-fluid
-      .page-header
-        .row-fluid
-          .span4
-            %h3.muted= yield :page_title          
-          .span4
-            - unless notice.nil?
-              .alert.fade.in
-                = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
-                = notice
-            - unless alert.nil?
-              .alert.alert-error.fade.in
-                = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
-                = alert                            
-
-          = yield :actions
-      .content          
-        .row-fluid
-          = yield            
-        
-  / [if lt IE 7 ]
-    %script{src: '//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js'}
-    %script
-      window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})

data/core/config/environments/production.rb

@@ -1,3 +0,0 @@
-Rails.application.class.configure do
-  config.assets.precompile += ['ckeditor/*']
-end

data/core/config/initializers/devise.rb

@@ -1,15 +0,0 @@
-Devise.setup do |config|
-  config.mailer_sender = 'ivanzotov@gmail.com'
-
-  config.parent_controller = 'ActionController::Base'
-
-  require 'devise/orm/active_record'
-
-  config.case_insensitive_keys = [ :email ]
-  config.strip_whitespace_keys = [ :email ]
-  config.skip_session_storage = [:http_auth]
-  config.stretches = Rails.env.test? ? 1 : 10
-  config.reconfirmable = true
-  config.reset_password_within = 6.hours
-  config.sign_out_via = :delete
-end

data/core/config/locales/devise.en.yml

@@ -1,56 +0,0 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-
-en:
-  errors:
-    messages:
-      expired: has expired, please request a new one
-      not_found: not found
-      already_confirmed: was already confirmed, please try signing in
-      not_locked: was not locked
-      not_saved:
-        one: '1 error prohibited this %{resource} from being saved:'
-        other: '%{count} errors prohibited this %{resource} from being saved:'
-
-  devise:
-    failure:
-      already_authenticated: You are already signed in.
-      unauthenticated: You need to sign in or sign up before continuing.
-      unconfirmed: You have to confirm your account before continuing.
-      locked: Your account is locked.
-      invalid: Invalid email or password.
-      invalid_token: Invalid authentication token.
-      timeout: Your session expired, please sign in again to continue.
-      inactive: Your account was not activated yet.
-    sessions:
-      signed_in: Signed in successfully.
-      signed_out: Signed out successfully.
-    passwords:
-      send_instructions: You will receive an email with instructions about how to reset your password in a few minutes.
-      updated: Your password was changed successfully. You are now signed in.
-      updated_not_active: Your password was changed successfully.
-      send_paranoid_instructions: If your e-mail exists on our database, you will receive a password recovery link on your e-mail
-    confirmations:
-      send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
-      send_paranoid_instructions: If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.
-      confirmed: Your account was successfully confirmed. You are now signed in.
-    registrations:
-      signed_up: Welcome! You have signed up successfully.
-      updated: You updated your account successfully.
-      destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
-      signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
-      signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please open the link to activate your account.
-      signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
-    unlocks:
-      send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
-      unlocked: Your account was successfully unlocked. You are now signed in.
-      send_paranoid_instructions: If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.
-    omniauth_callbacks:
-      success: Successfully authorized from %{kind} account.
-      failure: Could not authorize you from %{kind} because "%{reason}".
-    mailer:
-      confirmation_instructions:
-        subject: Confirmation instructions
-      reset_password_instructions:
-        subject: Reset password instructions
-      unlock_instructions:
-        subject: Unlock Instructions