Merge branch 'release/0.2.2'

* release/0.2.2: update schema db social networks accesses upgrade account update gems update gems
ulmic · May 23, 2015 · 40ac127 · 40ac127
2 parents d44e1bb + dda9928
commit 40ac127
Show file tree

Hide file tree

Showing 32 changed files with 305 additions and 172 deletions.
diff --git a/Capfile b/Capfile
@@ -25,7 +25,7 @@ require 'capistrano/rails/console'
 require 'capistrano/rails_tail_log'
 #require 'capistrano/sidekiq'
 #require 'capistrano/sidekiq/monit'
-# require 'capistrano/rails/assets'
+require 'capistrano/rails/assets'
 # require 'capistrano/rails/migrations'
 # require "whenever/capistrano"
 

diff --git a/Gemfile b/Gemfile
@@ -87,7 +87,7 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'capistrano'
   gem 'capistrano-bundler'
-  gem 'capistrano-rails'
+  gem 'capistrano-rails', '1.1.3'
   gem 'capistrano3-unicorn'
   gem 'capistrano-sidekiq'
   gem 'capistrano-rvm'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,9 +7,9 @@ GIT
 
 GIT
   remote: git://github.com/galetahub/ckeditor.git
-  revision: 455c022caca84646ed2d3feddde411277076a2bc
+  revision: 46f5ac6db09331692b54d22454b8f4bdf4039bc4
   specs:
-    ckeditor (4.1.1)
+    ckeditor (4.1.2)
       cocaine
       orm_adapter (~> 0.5.0)
 
@@ -51,7 +51,7 @@ GIT
 
 GIT
   remote: https://github.com/fnando/i18n-js
-  revision: 80675ba8b7b12143a4c196fd86c6338af258c14a
+  revision: 78030390e36529b2611f960bda88df1d9e01aafd
   specs:
     i18n-js (3.0.0.rc9)
       i18n (~> 0.6)
@@ -245,14 +245,14 @@ GEM
       domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    jbuilder (2.2.13)
+    jbuilder (2.2.16)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.3)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     js-routes (1.0.1)
       railties (>= 3.2)
@@ -272,7 +272,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.5)
-    mini_magick (4.2.3)
+    mini_magick (4.2.4)
     mini_portile (0.6.2)
     minitest (5.6.1)
     multi_json (1.11.0)
@@ -317,7 +317,7 @@ GEM
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     orm_adapter (0.5.0)
-    pg (0.18.1)
+    pg (0.18.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -361,7 +361,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (10.4.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (4.2.0)
@@ -416,7 +416,7 @@ GEM
     spring (1.3.4)
     sprockets (3.1.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.0)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -473,7 +473,7 @@ DEPENDENCIES
   byebug
   capistrano
   capistrano-bundler
-  capistrano-rails
+  capistrano-rails (= 1.1.3)
   capistrano-rails-console
   capistrano-rails-tail-log
   capistrano-rvm

diff --git a/app/assets/javascripts/web/users/account.js.coffee b/app/assets/javascripts/web/users/account.js.coffee
@@ -12,9 +12,10 @@ $ ->
           access: value
           member_id: $(this).data().id
           member_attribute: $(this).attr('name')
-      url: Routes.users_attribute_accesses_path()
+      url: Routes.api_users_account_attribute_accesses_path()
       method: 'POST'
-      success: -> alert(I18n.t('notices.web.users.account.attribute_accesses.changed'))
-      error: -> alert(I18n.t('notices.web.users.account.attribute_accesses.not_changed'))
+      #TODO нормальные алерты
+      #success: -> alert(I18n.t('notices.web.users.account.attribute_accesses.changed'))
+      #error: -> alert(I18n.t('notices.web.users.account.attribute_accesses.not_changed'))
     return
   return
diff --git a/app/assets/stylesheets/web/account.scss b/app/assets/stylesheets/web/account.scss
@@ -261,5 +261,22 @@
       margin-bottom: 50px;
     }
   }
-
+}
+.account-form {
+  .actions {
+    text-align: justify;
+    .row {
+      padding-bottom: 15px;
+    }
+  }
+  .row {
+    border-bottom: 1px solid #ccc;
+    margin-bottom: 15px;
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+  .table {
+    margin-top: 15px;
+  }
 }
diff --git a/app/assets/stylesheets/web/application.scss b/app/assets/stylesheets/web/application.scss
@@ -158,10 +158,16 @@ ul {
 
 .select2-container {
   width: 100%;
+  margin-bottom: 10px;
 }
 
 .columns {
   &.email {
     padding-left: 0;
   }
 }
+
+input[type=checkbox] {
+  width: 39px;
+  height: 39px;
+}
diff --git a/app/assets/stylesheets/web/foundation/application.scss b/app/assets/stylesheets/web/foundation/application.scss
@@ -2,9 +2,17 @@
 // =require web/foundation/category-navbar
 
 a {
-    font-family: 'mic';
-    color: #333333;
+  font-family: 'mic';
+  color: #333333;
 }
 a:hover {
-	color: #f45c10;
+  color: #f45c10;
+}
+
+span {
+  &.label {
+    font-family: 'mic';
+    font-size: 12pt;
+    margin-bottom: 10px;
+  }
 }
diff --git a/app/assets/stylesheets/web/icons.scss b/app/assets/stylesheets/web/icons.scss
@@ -3,122 +3,134 @@
 @import "font-awesome";
 
 .big-icon {
-    font-size: 46px;
-    color: white;
-    vertical-align: middle;
+  font-size: 46px;
+  color: white;
+  vertical-align: middle;
 }
-a.big-icon {
-    &:hover {
-	      color: #FFA911;
-    }
+.big-icon {
+  &a:hover {
+    color: #FFA911;
+  }
 }
 @mixin fa-rounded-icon($name) {
-    @extend .fa;
-    @extend #{$name};
-    overflow: hidden;
-    border-radius: 19%;
-    font-size: 52px;
-}
-.icon-vk {
-    transform: translate(0, 0);
-    display: inline-block;
-    @extend .icon-rus-vk-01;
+  @extend .fa;
+  @extend #{$name};
+  overflow: hidden;
+  border-radius: 19%;
+  font-size: 52px;
+}
+.icon-vkontakte {
+  transform: translate(0, 0);
+  display: inline-block;
+  @extend .icon-rus-vk-01;
+  &.colored {
+    color: #45668e;
+  }
 }
 .icon-facebook {
-    @include fa-rounded-icon(".fa-facebook-official");
+  @include fa-rounded-icon(".fa-facebook-official");
+  &.colored {
+    color: #3b5998;
+  }
 }
 .icon-twitter {
-    @include fa-rounded-icon(".fa-twitter-square");
+  @include fa-rounded-icon(".fa-twitter-square");
+  &.colored {
+    color: #55acee;
+  }
 }
 .icon-google {
-    @include fa-rounded-icon(".fa-google-plus-square");
+  @include fa-rounded-icon(".fa-google-plus-square");
+  &.colored {
+    color: #db4437;
+  }
 }
 
 .min-icon {
-    vertical-align: middle;
-    padding: 0;
-    margin: 0;
-    &.icon-vk {
-        width: 28px;
-        height: 32px;
-        font-size: 28px;
-        line-height: 32px;
-    }
-    &.icon-facebook, &.icon-twitter, &.icon-google {
-        width: 28px;
-        height: 32px;
-        font-size: 32px;
-        line-height: 32px;
-    }
+  vertical-align: middle;
+  padding: 0;
+  margin: 0;
+  &.icon-vkontakte {
+    width: 28px;
+    height: 32px;
+    font-size: 28px;
+    line-height: 32px;
+  }
+  &.icon-facebook, &.icon-twitter, &.icon-google {
+    width: 28px;
+    height: 32px;
+    font-size: 32px;
+    line-height: 32px;
+  }
 }
 
 
 .icon-calendar {
-		width: 18px;
-		height: 18px;
-		display: inline-block;
-    background: image-url("calendar-icon.png") no-repeat;
+  width: 18px;
+  height: 18px;
+  display: inline-block;
+  background: image-url("calendar-icon.png") no-repeat;
 }
 
 .icon-learn {
-    vertical-align: middle;
-    background: image-url("learn-icon.png") no-repeat;
-		display: inline-block;
-    background-size: 31px;
-    width: 31px;
-    height: 22px;
+  vertical-align: middle;
+  background: image-url("learn-icon.png") no-repeat;
+  display: inline-block;
+  background-size: 31px;
+  width: 31px;
+  height: 22px;
 }
 
 .icon-pointer {
-    vertical-align: middle;
-    background: image-url("pointer-icon.png") no-repeat;
-		display: inline-block;
-    background-size: 17px;
-    width: 17px;
-    height: 26px;
+  vertical-align: middle;
+  background: image-url("pointer-icon.png") no-repeat;
+  display: inline-block;
+  background-size: 17px;
+  width: 17px;
+  height: 26px;
 }
 
 .icon-addition {
-    background: image-url("addon.png") no-repeat;
-		width: 64px;
-		height: 60px;
+  background: image-url("addon.png") no-repeat;
+  width: 64px;
+  height: 60px;
 }
 
 .icon-download {
-    background: image-url("download-icon.png") no-repeat;
-		width: 14px;
-		height: 16px;
+  background: image-url("download-icon.png") no-repeat;
+  width: 14px;
+  height: 16px;
 }
 
 .icon-stage {
-    background: image-url("stage-icon.png") no-repeat;
-    background-size: 24px;
-		width: 24px;
-		height: 24px;
+  background: image-url("stage-icon.png") no-repeat;
+  background-size: 24px;
+  width: 24px;
+  height: 24px;
 }
 
 .icon-bigcalendar {
-    background: image-url("big-calendar-icon.png") no-repeat;
-    background-size: 60px;
-		width: 60px;
-    display: inline-block;
-		height: 60px;
+  background: image-url("big-calendar-icon.png") no-repeat;
+  background-size: 60px;
+  width: 60px;
+  display: inline-block;
+  height: 60px;
 }
 
 .icon-eye {
-    background: image-url("eye-icon.png") no-repeat;
-		width: 29px;
-		height: 19px;
+  background: image-url("eye-icon.png") no-repeat;
+  width: 29px;
+  height: 19px;
 }
 
 .icon-tags {
-    background: image-url("tag-icon.png") no-repeat;
-		width: 27px;
-		height: 20px;
+  background: image-url("tag-icon.png") no-repeat;
+  width: 27px;
+  height: 20px;
 }
 
 .icon-human {
-    background: image-url("human-icon.png") no-repeat;
-		width: 17px;
-		height: 23px;
+  background: image-url("human-icon.png") no-repeat;
+  width: 17px;
+  height: 23px;
 }
diff --git a/...eb/users/attribute_accesses_controller.rb → .../account/attribute_accesses_controller.rb b/...eb/users/attribute_accesses_controller.rb → .../account/attribute_accesses_controller.rb
@@ -1,4 +1,4 @@
-class Web::Users::AttributeAccessesController < Web::Users::ApplicationController
+class Api::Users::Account::AttributeAccessesController < Api::Users::ApplicationController
   def create
     @access = AttributeAccess.where(member_attribute: params[:attribute_access][:member_attribute], member_id: params[:attribute_access][:member_id]).first
     unless @access