constructor-core 0.9.1 → 1.0.0beta1

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

@@ -1,22 +1,13 @@
-- content_for :page_title do
-  =t :login
+= form_for(resource, as: resource_name, url: '/login', html: {class: 'b-login'}) do |f|
+  = f.label :email, class: 'b-login__label'
+  = f.email_field :email, class: 'b-login__field'
 
-= 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
+  = f.label :password, class: 'b-login__label'
+  = f.password_field :password, class: 'b-login__field'
 
-    - 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'
+  - if devise_mapping.rememberable?
+    .b-login__remember
+      => f.check_box :remember_me
+      =t :remember_me
+
+  = f.submit t(:login), class: 'b-button'

data/app/views/constructor_core/users/profile.html.slim

@@ -1,17 +1,11 @@
-- content_for :page_title do
-  =t :profile
-
-- cache do
-  = 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'
+.b-header
+  | Смена пароля
+= form_for @current_user, method: :post, html: {class: 'b-form'} do |f|
+  .b-form__row
+    = f.label :password, class: 'b-form__label'
+    = f.password_field :password, required: true, class: 'b-form__field'
+  .b-form__row
+    = f.label :password_confirmation, class: 'b-form__label'
+    = f.password_field :password_confirm, required: true, class: 'b-form__field'
+  .b-form__actions
+    = f.submit t(:save_password), class: 'b-button'

data/app/views/layouts/constructor_core/application_core.html.slim

@@ -1,18 +1,22 @@
 doctype html
-html lang="ru"
+html
   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'}
-    
+
+    - if Rails.env.production?
+      / [if lt IE 9]
+        %script{src: 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
+
+      link href='http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic' rel='stylesheet' type='text/css'
+
     javascript:
       var CKEDITOR_BASEPATH = '/assets/ckeditor/'
-    
+
     = stylesheet_link_tag 'constructor_core/application'
     = javascript_include_tag 'constructor_core/application'
+
     = csrf_meta_tag
     = favicon_link_tag
     
@@ -21,73 +25,43 @@ html lang="ru"
     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
+    .l-all.l-base
+      .l-sidebar.b-inline
+        = link_to 'Constructor', '/', class: 'b-logo'
+        ul.b-menu
+          li.b-menu__item
+            = menu_item('pages', 'sitemap')
+          li.b-menu__item
+            = menu_item('templates', 'film')
+
+      .l-main.b-inline
+        .l-header
+          .b-inline
+            = link_to '/', class: 'l-header__link' do
+              =t :go_to_website
+              i.fa.fa-external-link.l-header__link-icon
+
+          .b-inline.g-float_right
+            .b-inline.l-header__profile
+              = link_to core.user_path(current_user.id), class: 'l-header__email' do
+                = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'l-header__avatar'
+                = current_user.email
+
+              = link_to core.logout_path, method: :delete, class: 'l-header__logout' do
+                i.fa.fa-sign-out>
+                =t :logout
+
 
-            - 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                            
+        - unless notice.nil?
+          = link_to '×', '#', class: 'b-close', 'data-dismiss' => 'alert'
+          = notice
+        - unless alert.nil?
+          = link_to '×', '#', class: 'b-close', 'data-dismiss' => 'alert'
+          = alert
 
-          = yield :actions
-      .content          
-        .row-fluid
-          = yield            
+        .l-content
+          = yield
         
   / [if lt IE 7 ]
     %script{src: '//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js'}

data/app/views/layouts/constructor_core/login.html.slim

@@ -0,0 +1,27 @@
+doctype html
+html
+  head
+    meta charset="utf-8"
+    meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'
+    title=t :login
+
+    / [if lt IE 9]
+      %script{src: 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
+
+    = 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
+    .l-all.l-base
+      = 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/config/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   dashboard: Dashboard
+  are_you_sure?: Are you sure?
   users: Users
-  homepage: Home page
   login: Login
   logout: Logout
   cancel: Cancel
@@ -12,4 +12,5 @@ en:
   profile: Profile
   password_error_confirm: Password confirmation failed
   save_password: Save password
-  password_changed: Password changed
+  password_changed: Password changed
+  go_to_website: Go to website

data/config/locales/fr.yml

@@ -1,7 +1,7 @@
 fr:
   dashboard: Tableau de bord
+  are_you_sure?: Etes-vous sûr?
   users: Utilisateurs
-  homepage: Page d'accueil
   login: S'identifier
   logout: Déconnexion
   cancel: Résilier
@@ -12,4 +12,5 @@ fr:
   profile: Profil
   password_error_confirm: Confirmation mot de passe n'a pas
   save_password: Enregistrer le mot de passe
-  password_changed: Mot de passe modifié
+  password_changed: Mot de passe modifié
+  go_to_website: Go to website

data/config/locales/ru.yml

@@ -1,6 +1,6 @@
 ru:
   dashboard: Панель управления
-  homepage: Главная страница
+  are_you_sure?: Вы уверены?
   users: Пользователи
   login: Войти
   logout: Выйти
@@ -13,6 +13,7 @@ ru:
   save_password: Сохранить пароль
   password_changed: Пароль успешно изменен
   password_error_confirm: Пароли не совпадают
+  go_to_website: Перейти на сайт
 
   activerecord:
     attributes:

data/constructor-core.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'rails', '~> 4.0.0'
+  s.add_dependency 'rails', '~> 4.0.2'
   s.add_dependency 'devise', '~> 3.0.0.rc'
-  s.add_dependency 'bootstrap-sass', '~> 2.0'
   s.add_dependency 'slim'
-  s.add_dependency 'font-awesome-sass-rails'
+  s.add_dependency 'jquery-ui-rails'
+  s.add_dependency 'the_sortable_tree'
+  s.add_dependency 'font-awesome-sass'
   s.add_dependency 'cache_digests'
 end

data/lib/constructor-core.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
 require 'devise'
-require 'bootstrap-sass'
-require 'font-awesome-sass-rails'
+require 'slim'
+require 'sass-rails'
+require 'font/awesome/sass'
+require 'jquery-ui-rails'
+require 'the_sortable_tree'
 require 'constructor_core/engine'
 require 'constructor_core/string'

data/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.9.1'
+  VERSION = '1.0.0beta1'
 end

data/vendor/assets/stylesheets/constructor_core/framework/all.scss

@@ -0,0 +1,4 @@
+@import 'mixin';
+@import 'classes';
+@import 'globals';
+@import 'grid';

data/vendor/assets/stylesheets/constructor_core/framework/classes.scss

@@ -0,0 +1,4 @@
+.l-base { @include base; }
+.b-block { @include display-block; }
+.b-inline { @include display-inline; }
+.b-center { @include center-block; }

data/vendor/assets/stylesheets/constructor_core/framework/globals.scss

@@ -0,0 +1,49 @@
+.g-out { overflow: visible !important}
+
+.g-line {
+  @include clearfix;
+}
+
+.g-align_left {
+  text-align: left !important;
+}
+
+.g-align_right {
+  text-align: right !important;
+}
+
+.g-align_center {
+  text-align: center !important;
+}
+
+.g-float_left {
+  float: left !important;
+}
+
+.g-float_right {
+  float: right !important;
+}
+
+.g-hidden, .g-hide {
+  display: none !important;
+}
+
+.g-uppercase {
+  text-transform: uppercase !important;
+}
+
+.g-spin {
+  -webkit-animation-name: spin;
+  -webkit-animation-duration: 2000ms;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-timing-function: linear;
+  -moz-animation-name: spin;
+  -moz-animation-duration: 2000ms;
+  -moz-animation-iteration-count: infinite;
+  -moz-animation-timing-function: linear;
+  -ms-animation-name: spin;
+  -ms-animation-duration: 2000ms;
+  -ms-animation-iteration-count: infinite;
+  -ms-animation-timing-function: linear;
+  -o-transition: rotate(3600deg);
+}

data/vendor/assets/stylesheets/constructor_core/framework/grid.scss

@@ -0,0 +1,33 @@
+.l-row {
+  @include clearfix;
+  overflow: hidden;
+  margin-left: -20px;
+}
+
+.l-col {
+  float: left;
+  overflow: hidden;
+  margin-left: 20px;
+  @include box-sizing(border-box);
+}
+
+.l-col-i {
+  padding: 0 10px;
+}
+
+.l-col-1 { width: 40px; }
+.l-col-2 { width: 100px; }
+.l-col-3 { width: 160px; }
+.l-col-4 { width: 220px; }
+.l-col-5 { width: 280px; }
+.l-col-6 { width: 340px; }
+.l-col-7 { width: 400px; }
+.l-col-8 { width: 460px; }
+.l-col-9 { width: 520px; }
+.l-col-10 { width: 580px; }
+.l-col-11 { width: 640px; }
+.l-col-12 { width: 700px; }
+.l-col-13 { width: 760px; }
+.l-col-14 { width: 820px; }
+.l-col-15 { width: 880px; }
+.l-col-16 { width: 940px; }

data/vendor/assets/stylesheets/constructor_core/framework/mixin.scss

@@ -0,0 +1,193 @@
+@mixin gradient-vertical($startColor: #555, $endColor: #333) {
+    background-color: mix($startColor, $endColor, 60%);
+    background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
+    background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down
+}
+
+@mixin gradient-horizontal($startColor: #555, $endColor: #333) {
+  background-color: $endColor;
+  background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
+  background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
+  background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
+  background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
+  background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down
+}
+
+@mixin gradient-radial($innerColor: #555, $outerColor: #333)  {
+    background-color: $outerColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor));
+    background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
+    background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
+    background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
+    background-repeat: no-repeat;
+}
+
+@mixin box-shadow($shadow...) {
+    -webkit-box-shadow: $shadow;
+    -moz-box-shadow: $shadow;
+    box-shadow: $shadow;
+}
+
+@mixin box-sizing($boxmodel) {
+  -webkit-box-sizing: $boxmodel;
+  -moz-box-sizing: $boxmodel;
+  box-sizing: $boxmodel;
+}
+
+@mixin border-radius($radius) {
+    -webkit-border-radius: $radius;
+    -moz-border-radius: $radius;
+    border-radius: $radius;
+}
+
+@mixin border-top-left-radius($radius) {
+    -webkit-border-top-left-radius: $radius;
+    -moz-border-radius-topleft: $radius;
+    border-top-left-radius: $radius;
+}
+@mixin border-top-right-radius($radius) {
+    -webkit-border-top-right-radius: $radius;
+    -moz-border-radius-topright: $radius;
+    border-top-right-radius: $radius;
+}
+@mixin border-bottom-right-radius($radius) {
+    -webkit-border-bottom-right-radius: $radius;
+    -moz-border-radius-bottomright: $radius;
+    border-bottom-right-radius: $radius;
+}
+@mixin border-bottom-left-radius($radius) {
+    -webkit-border-bottom-left-radius: $radius;
+    -moz-border-radius-bottomleft: $radius;
+    border-bottom-left-radius: $radius;
+}
+
+@mixin border-top-radius($radius) {
+    @include border-top-right-radius($radius);
+    @include border-top-left-radius($radius);
+}
+@mixin border-right-radius($radius) {
+    @include border-top-right-radius($radius);
+    @include border-bottom-right-radius($radius);
+}
+@mixin border-bottom-radius($radius) {
+    @include border-bottom-right-radius($radius);
+    @include border-bottom-left-radius($radius);
+}
+@mixin border-left-radius($radius) {
+    @include border-top-left-radius($radius);
+    @include border-bottom-left-radius($radius);
+}
+
+@mixin transition($transition) {
+    -webkit-transition: $transition;
+    -moz-transition: $transition;
+    -o-transition: $transition;
+    transition: $transition;
+}
+
+@mixin opacity($opacity) {
+  opacity: $opacity / 100;
+  filter: alpha(opacity=$opacity);
+}
+
+@mixin size($height, $width) {
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size) {
+  @include size($size, $size);
+}
+
+
+// Transformations
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+  -moz-transform: rotate($degrees);
+  -ms-transform: rotate($degrees);
+  -o-transform: rotate($degrees);
+  transform: rotate($degrees);
+}
+@mixin scale($ratio) {
+  -webkit-transform: scale($ratio);
+  -moz-transform: scale($ratio);
+  -ms-transform: scale($ratio);
+  -o-transform: scale($ratio);
+  transform: scale($ratio);
+}
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+  -moz-transform: translate($x, $y);
+  -ms-transform: translate($x, $y);
+  -o-transform: translate($x, $y);
+  transform: translate($x, $y);
+}
+@mixin skew($x, $y) {
+  -webkit-transform: skew($x, $y);
+  -moz-transform: skew($x, $y);
+  -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
+  -o-transform: skew($x, $y);
+  transform: skew($x, $y);
+  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
+}
+@mixin translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+  -moz-transform: translate3d($x, $y, $z);
+  -o-transform: translate3d($x, $y, $z);
+  transform: translate3d($x, $y, $z);
+}
+
+
+
+@mixin display-inline() {
+    position: relative;
+    display: -moz-inline-stack;
+    display: inline-block;
+    overflow: hidden;
+    vertical-align: top;
+    *display: inline;
+    *zoom: 1;
+}
+
+@mixin display-block() {
+    position: relative;
+    display: block;
+    overflow: hidden;
+}
+
+@mixin clearfix(){
+  &:before,
+  &:after {
+    content: " ";
+    display: table;
+  }
+
+  &:after {
+    clear: both;
+  }
+
+  *zoom: 1;
+}
+
+@mixin center-block() {
+  @include display-block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+@mixin background-asset($asset, $options...) {
+  background: asset-data-url($asset) $options;
+  *background: asset-url($asset) $options;
+}
+
+@mixin base($width: 1000px) {
+  @include center-block;
+  width: $width;
+}