constructor-core 0.8.19 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/constructor_core/devise/confirmations/new.html.slim +10 -0
  3. data/app/views/constructor_core/devise/mailer/confirmation_instructions.html.slim +5 -0
  4. data/app/views/constructor_core/devise/mailer/reset_password_instructions.html.slim +7 -0
  5. data/app/views/constructor_core/devise/mailer/unlock_instructions.html.slim +5 -0
  6. data/app/views/constructor_core/devise/passwords/edit.html.slim +21 -0
  7. data/app/views/constructor_core/devise/passwords/new.html.slim +13 -0
  8. data/app/views/constructor_core/devise/registrations/edit.html.slim +28 -0
  9. data/app/views/constructor_core/devise/registrations/new.html.slim +20 -0
  10. data/app/views/constructor_core/devise/shared/{_links.html.haml → _links.html.slim} +10 -10
  11. data/app/views/constructor_core/devise/unlocks/new.html.slim +9 -0
  12. data/app/views/constructor_core/sessions/{new.html.haml → new.html.slim} +1 -1
  13. data/app/views/constructor_core/users/{profile.haml → profile.html.slim} +0 -0
  14. data/app/views/layouts/constructor_core/{application_core.haml → application_core.html.slim} +28 -28
  15. data/constructor-core.gemspec +1 -0
  16. data/lib/constructor_core/version.rb +1 -1
  17. metadata +29 -15
  18. data/app/views/constructor_core/devise/confirmations/new.html.haml +0 -10
  19. data/app/views/constructor_core/devise/mailer/confirmation_instructions.html.haml +0 -5
  20. data/app/views/constructor_core/devise/mailer/reset_password_instructions.html.haml +0 -7
  21. data/app/views/constructor_core/devise/mailer/unlock_instructions.html.haml +0 -5
  22. data/app/views/constructor_core/devise/passwords/edit.html.haml +0 -21
  23. data/app/views/constructor_core/devise/passwords/new.html.haml +0 -13
  24. data/app/views/constructor_core/devise/registrations/edit.html.haml +0 -28
  25. data/app/views/constructor_core/devise/registrations/new.html.haml +0 -20
  26. data/app/views/constructor_core/devise/unlocks/new.html.haml +0 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 82e0a4b594f0a0fd1b64684a2776bf29723aa0e0
4
- data.tar.gz: ca6a327af9c32c64a934e69a1e4c8d0a5ba2deae
3
+ metadata.gz: 906c65c9ff48ad8acd4b9e1abffd0b40b4701179
4
+ data.tar.gz: b3fdaebed8225668deba2ec91a6b9e08cbc0eb18
5
5
  SHA512:
6
- metadata.gz: 8c4335f22fa976a8f91318f124ea3892f33f3e3b59988bc48066bc22ba1651a0e84513036259c13ac08a32a17fb8ec8bf8fc5dbcb4e293d790af42cf7268515d
7
- data.tar.gz: f709652fbbd82d6bd93bde94c0891f61a320970e71b20af411ae3d2bcfb728b212367472ca0aab9df564c26cf3974495b39ff0c3b7df57d9794497a36f67a341
6
+ metadata.gz: 2975f3e041cb2cdf8db3f240e0107df6c2e56d24c24021e8df020992d7fb0903bb828dd514cb60dcfdda856e5763264ce454660dea5ea5a40bd395b1d650235b
7
+ data.tar.gz: a1a3933d203e1bf8d5366e965c64962a6b0057a6927c4db1d7c491219b721bd094d5ded419cdc6497d30b8854003804c8d6946a76915e8b3d9f881d8952d5e88
@@ -0,0 +1,10 @@
1
+ h2 Отправить инструкцию активации
2
+ = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
3
+ = devise_error_messages!
4
+ p
5
+ = f.label :email
6
+ br
7
+ = f.email_field :email
8
+ p= f.submit 'Отправить'
9
+ = render partial: 'devise/shared/links'
10
+
@@ -0,0 +1,5 @@
1
+ p
2
+ | Добро пожаловать, #{@resource.email}!
3
+ p Для того чтобы подтвердить ваш аккаунт, пройдите по следующей ссылке:
4
+ p= link_to 'Подтвердить аккаунт', confirmation_url(@resource, confirmation_token: @resource.confirmation_token)
5
+
@@ -0,0 +1,7 @@
1
+ p
2
+ | Привет, #{@resource.email}!
3
+ p Вы сделали запрос на смену пароля. Для того чтобы изменить пароль пройдите по следующей ссылке:
4
+ p= link_to 'Изменить пароль', edit_password_url(@resource, reset_password_token: @resource.reset_password_token)
5
+ p Если Вы не делали запрос на изменение пароля, то проигнорируйте это письмо.
6
+ p Ваш пароль останется прежним до тех пор пока вы не пройдете по ссылке.
7
+
@@ -0,0 +1,5 @@
1
+ p
2
+ | Hello #{@resource.email}!
3
+ p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
4
+ p Click the link below to unlock your account:
5
+ p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token)
@@ -0,0 +1,21 @@
1
+ - content_for :page_title do
2
+ | Смена пароля
3
+
4
+ = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
5
+ = devise_error_messages!
6
+ = f.hidden_field :reset_password_token
7
+ .clearfix
8
+ = f.label :password, 'Новый пароль'
9
+ .input
10
+ = f.password_field :password
11
+ .clearfix
12
+ = f.label :password_confirmation, 'Еще раз'
13
+ .input
14
+ = f.password_field :password_confirmation
15
+ .clearfix
16
+ .input
17
+ = f.submit 'Сменить пароль', class: 'btn primary'
18
+
19
+ - content_for :sidebar do
20
+ = render partial: 'devise/shared/links'
21
+
@@ -0,0 +1,13 @@
1
+ - content_for :page_title do
2
+ | Восстановить пароль
3
+
4
+ = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
5
+ = devise_error_messages!
6
+ .clearfix
7
+ = f.label :email, 'Электропочта'
8
+ .input
9
+ = f.email_field :email
10
+ .clearfix
11
+ .input
12
+ = f.submit 'Отправить', class: 'btn primary'
13
+
@@ -0,0 +1,28 @@
1
+ h2
2
+ | Редактивароние аккаунта #{resource_name.to_s.humanize}
3
+ = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
4
+ = devise_error_messages!
5
+ p
6
+ = f.label :email
7
+ br
8
+ = f.email_field :email
9
+ p
10
+ = f.label :password
11
+ i (оставьте пустым, если хотите сохранить пароль прежним)
12
+ br
13
+ = f.password_field :password
14
+ p
15
+ = f.label :password_confirmation
16
+ br
17
+ = f.password_field :password_confirmation
18
+ p
19
+ = f.label :current_password
20
+ i (необходимо ввести ваш текущий пароль для подтверждения изменений)
21
+ br
22
+ = f.password_field :current_password
23
+ p= f.submit 'Сохранить'
24
+ h3 Удалить мой аккаунт
25
+ p
26
+ | #{link_to 'Удалить', registration_path(resource_name), confirm: 'Вы уверены?', method: :delete}.
27
+ = link_to 'Назад', :back
28
+
@@ -0,0 +1,20 @@
1
+ .register_form
2
+ h2 Регистрация
3
+ = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
4
+ = devise_error_messages!
5
+ p.email
6
+ = f.label :email
7
+ br
8
+ = f.email_field :email
9
+ p
10
+ = f.label :password
11
+ br
12
+ = f.password_field :password
13
+ p
14
+ = f.label :password_confirmation
15
+ br
16
+ = f.password_field :password_confirmation
17
+ p.button= f.submit 'Зарегистрироваться'
18
+
19
+ .links
20
+ = render partial: 'devise/shared/links'
@@ -1,19 +1,19 @@
1
1
  - if controller_name != 'sessions'
2
- = link_to "Вход с паролем", auth.new_session_path(resource_name)
3
- %br/
2
+ = link_to 'Вход с паролем', auth.new_session_path(resource_name)
3
+ br
4
4
  - if devise_mapping.registerable? && controller_name != 'registrations'
5
- = link_to "Регистрация", auth.new_registration_path(resource_name)
6
- %br/
5
+ = link_to 'Регистрация', auth.new_registration_path(resource_name)
6
+ br
7
7
  - if devise_mapping.recoverable? && controller_name != 'passwords'
8
- = link_to "Восстановление пароля", auth.new_password_path(resource_name)
9
- %br/
8
+ = link_to 'Восстановление пароля', auth.new_password_path(resource_name)
9
+ br
10
10
  - if devise_mapping.confirmable? && controller_name != 'confirmations'
11
- = link_to "Если вы не получили инструкцию о том как подтвердить адрес электронной почты", new_confirmation_path(resource_name)
12
- %br/
11
+ = link_to 'Если вы не получили инструкцию о том как подтвердить адрес электронной почты', new_confirmation_path(resource_name)
12
+ br
13
13
  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
14
14
  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
15
- %br/
15
+ br
16
16
  - if devise_mapping.omniauthable?
17
17
  - resource_class.omniauth_providers.each do |provider|
18
18
  = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
19
- %br/
19
+ br
@@ -0,0 +1,9 @@
1
+ h2 Resend unlock instructions
2
+ = form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
3
+ = devise_error_messages!
4
+ p
5
+ = f.label :email
6
+ br
7
+ = f.email_field :email
8
+ p= f.submit 'Resend unlock instructions'
9
+ = render partial: 'devise/shared/links'
@@ -15,7 +15,7 @@
15
15
  - if devise_mapping.rememberable?
16
16
  .control-group
17
17
  .controls
18
- %label.checkbox.inline{for: 'remember_me'}
18
+ label.checkbox.inline for='remember_me'
19
19
  = f.check_box :remember_me
20
20
  =t :remember_me
21
21
  .controls
@@ -1,14 +1,14 @@
1
- !!!
2
- %html{lang: 'ru'}
3
- %head
4
- %meta{charset: 'utf-8'}/
5
- %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge,chrome=1'}/
6
- %title=t :dashboard
1
+ doctype html
2
+ html lang="ru"
3
+ head
4
+ meta charset="utf-8"
5
+ meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'
6
+ title=t :dashboard
7
7
 
8
8
  / [if lt IE 9]
9
9
  %script{src: 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
10
10
 
11
- :javascript
11
+ javascript:
12
12
  var CKEDITOR_BASEPATH = '/assets/ckeditor/'
13
13
 
14
14
  = stylesheet_link_tag 'constructor_core/application'
@@ -16,33 +16,33 @@
16
16
  = csrf_meta_tag
17
17
  = favicon_link_tag
18
18
 
19
- %link{rel: 'apple-touch-icon', href: 'images/apple-touch-icon.png'}
20
- %link{rel: 'apple-touch-icon', sizes: '72x72', href: 'images/apple-touch-icon-72x72.png'}
21
- %link{rel: 'apple-touch-icon', sizes: '114x114', href: 'images/apple-touch-icon-114x114.png'}
19
+ link rel='apple-touch-icon' href='images/apple-touch-icon.png'
20
+ link rel='apple-touch-icon' sizes='72x72' href='images/apple-touch-icon-72x72.png'
21
+ link rel='apple-touch-icon' sizes='114x114' href='images/apple-touch-icon-114x114.png'
22
22
 
23
- %body
23
+ body
24
24
  .navbar.navbar-constructor
25
25
  .navbar-inner
26
26
  .container-fluid
27
27
  = link_to t(:homepage), '/', class: 'brand'
28
- %a.btn.btn-navbar{'data-toggle' => 'collapse', 'data-target' => '.nav-collapse'}
29
- %span.icon-bar
30
- %span.icon-bar
31
- %span.icon-bar
28
+ a.btn.btn-navbar data-toggle='collapse' data-target='.nav-collapse'
29
+ span.icon-bar
30
+ span.icon-bar
31
+ span.icon-bar
32
32
  .nav-collapse
33
- %ul.nav
33
+ ul.nav
34
34
  /
35
35
  %li
36
36
  = link_to '/admin/dashboard' do
37
37
  %i.icon-dashboard
38
38
  =t :dashboard
39
- %li
39
+ li
40
40
  = link_to '/admin/pages' do
41
- %i.icon-sitemap
41
+ i.icon-sitemap>
42
42
  =t :structure
43
- %li
43
+ li
44
44
  = link_to '/admin/templates' do
45
- %i.icon-film
45
+ i.icon-film>
46
46
  =t :templates
47
47
  /
48
48
  %li
@@ -55,25 +55,25 @@
55
55
  =t :settings
56
56
 
57
57
  - if current_user
58
- %ul.nav.pull-right
59
- %li
58
+ ul.nav.pull-right
59
+ li
60
60
  = link_to core.user_path(current_user.id) do
61
61
  = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'avatar'
62
- %span= current_user.email
63
- %li
62
+ span<= current_user.email
63
+ li
64
64
  = link_to 'http://ivanzotov.github.io/constructor/' do
65
- %i.icon-question-sign
65
+ i.icon-question-sign>
66
66
  =t :help
67
- %li
67
+ li
68
68
  = link_to core.logout_path, method: :delete do
69
- %i.icon-signout
69
+ i.icon-signout>
70
70
  =t :logout
71
71
 
72
72
  .container-fluid
73
73
  .page-header
74
74
  .row-fluid
75
75
  .span4
76
- %h3.muted= yield :page_title
76
+ h3.muted= yield :page_title
77
77
  .span4
78
78
  - unless notice.nil?
79
79
  .alert.fade.in
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.add_dependency 'rails', '~> 4.0.0'
20
20
  s.add_dependency 'devise', '~> 3.0.0.rc'
21
21
  s.add_dependency 'bootstrap-sass', '~> 2.0'
22
+ s.add_dependency 'slim'
22
23
  s.add_dependency 'font-awesome-sass-rails'
23
24
  s.add_dependency 'cache_digests'
24
25
  end
@@ -1,3 +1,3 @@
1
1
  module ConstructorCore
2
- VERSION = '0.8.19'
2
+ VERSION = '0.9.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: constructor-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.19
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Zotov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-09 00:00:00.000000000 Z
11
+ date: 2014-02-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: '2.0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: slim
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - '>='
67
+ - !ruby/object:Gem::Version
68
+ version: '0'
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: font-awesome-sass-rails
57
71
  requirement: !ruby/object:Gem::Requirement
@@ -116,19 +130,19 @@ files:
116
130
  - app/controllers/constructor_core/users_controller.rb
117
131
  - app/helpers/constructor_core/application_helper.rb
118
132
  - app/models/constructor_core/user.rb
119
- - app/views/constructor_core/devise/confirmations/new.html.haml
120
- - app/views/constructor_core/devise/mailer/confirmation_instructions.html.haml
121
- - app/views/constructor_core/devise/mailer/reset_password_instructions.html.haml
122
- - app/views/constructor_core/devise/mailer/unlock_instructions.html.haml
123
- - app/views/constructor_core/devise/passwords/edit.html.haml
124
- - app/views/constructor_core/devise/passwords/new.html.haml
125
- - app/views/constructor_core/devise/registrations/edit.html.haml
126
- - app/views/constructor_core/devise/registrations/new.html.haml
127
- - app/views/constructor_core/devise/shared/_links.html.haml
128
- - app/views/constructor_core/devise/unlocks/new.html.haml
129
- - app/views/constructor_core/sessions/new.html.haml
130
- - app/views/constructor_core/users/profile.haml
131
- - app/views/layouts/constructor_core/application_core.haml
133
+ - app/views/constructor_core/devise/confirmations/new.html.slim
134
+ - app/views/constructor_core/devise/mailer/confirmation_instructions.html.slim
135
+ - app/views/constructor_core/devise/mailer/reset_password_instructions.html.slim
136
+ - app/views/constructor_core/devise/mailer/unlock_instructions.html.slim
137
+ - app/views/constructor_core/devise/passwords/edit.html.slim
138
+ - app/views/constructor_core/devise/passwords/new.html.slim
139
+ - app/views/constructor_core/devise/registrations/edit.html.slim
140
+ - app/views/constructor_core/devise/registrations/new.html.slim
141
+ - app/views/constructor_core/devise/shared/_links.html.slim
142
+ - app/views/constructor_core/devise/unlocks/new.html.slim
143
+ - app/views/constructor_core/sessions/new.html.slim
144
+ - app/views/constructor_core/users/profile.html.slim
145
+ - app/views/layouts/constructor_core/application_core.html.slim
132
146
  - config/environments/production.rb
133
147
  - config/initializers/devise.rb
134
148
  - config/locales/devise.en.yml
@@ -1,10 +0,0 @@
1
- %h2 Отправить инструкцию активации
2
- = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
3
- = devise_error_messages!
4
- %p
5
- = f.label :email
6
- %br/
7
- = f.email_field :email
8
- %p= f.submit "Отправить"
9
- = render :partial => "devise/shared/links"
10
-
@@ -1,5 +0,0 @@
1
- %p
2
- Добро пожаловать, #{@resource.email}!
3
- %p Для того чтобы подтвердить ваш аккаунт, пройдите по следующей ссылке:
4
- %p= link_to 'Подтвердить аккаунт', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
5
-
@@ -1,7 +0,0 @@
1
- %p
2
- Привет, #{@resource.email}!
3
- %p Вы сделали запрос на смену пароля. Для того чтобы изменить пароль пройдите по следующей ссылке:
4
- %p= link_to 'Изменить пароль', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
5
- %p Если Вы не делали запрос на изменение пароля, то проигнорируйте это письмо.
6
- %p Ваш пароль останется прежним до тех пор пока вы не пройдете по ссылке.
7
-
@@ -1,5 +0,0 @@
1
- %p
2
- Hello #{@resource.email}!
3
- %p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
4
- %p Click the link below to unlock your account:
5
- %p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token)
@@ -1,21 +0,0 @@
1
- - content_for :page_title do
2
- Смена пароля
3
-
4
- = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
5
- = devise_error_messages!
6
- = f.hidden_field :reset_password_token
7
- .clearfix
8
- = f.label :password, "Новый пароль"
9
- .input
10
- = f.password_field :password
11
- .clearfix
12
- = f.label :password_confirmation, "Еще раз"
13
- .input
14
- = f.password_field :password_confirmation
15
- .clearfix
16
- .input
17
- = f.submit "Сменить пароль", :class => "btn primary"
18
-
19
- - content_for :sidebar do
20
- = render :partial => "devise/shared/links"
21
-
@@ -1,13 +0,0 @@
1
- - content_for :page_title do
2
- Восстановить пароль
3
-
4
- = form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
5
- = devise_error_messages!
6
- .clearfix
7
- = f.label :email, "Электропочта"
8
- .input
9
- = f.email_field :email
10
- .clearfix
11
- .input
12
- = f.submit "Отправить", :class => "btn primary"
13
-
@@ -1,28 +0,0 @@
1
- %h2
2
- Редактивароние аккаунта #{resource_name.to_s.humanize}
3
- = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
4
- = devise_error_messages!
5
- %p
6
- = f.label :email
7
- %br/
8
- = f.email_field :email
9
- %p
10
- = f.label :password
11
- %i (оставьте пустым, если хотите сохранить пароль прежним)
12
- %br/
13
- = f.password_field :password
14
- %p
15
- = f.label :password_confirmation
16
- %br/
17
- = f.password_field :password_confirmation
18
- %p
19
- = f.label :current_password
20
- %i (необходимо ввести ваш текущий пароль для подтверждения изменений)
21
- %br/
22
- = f.password_field :current_password
23
- %p= f.submit "Сохранить"
24
- %h3 Удалить мой аккаунт
25
- %p
26
- #{link_to "Удалить", registration_path(resource_name), :confirm => "Вы уверены?", :method => :delete}.
27
- = link_to "Назад", :back
28
-
@@ -1,20 +0,0 @@
1
- .register_form
2
- %h2 Регистрация
3
- = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
4
- = devise_error_messages!
5
- %p.email
6
- = f.label :email
7
- %br/
8
- = f.email_field :email
9
- %p
10
- = f.label :password
11
- %br/
12
- = f.password_field :password
13
- %p
14
- = f.label :password_confirmation
15
- %br/
16
- = f.password_field :password_confirmation
17
- %p.button= f.submit "Зарегистрироваться"
18
-
19
- .links
20
- = render :partial => "devise/shared/links"
@@ -1,9 +0,0 @@
1
- %h2 Resend unlock instructions
2
- = form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
3
- = devise_error_messages!
4
- %p
5
- = f.label :email
6
- %br/
7
- = f.email_field :email
8
- %p= f.submit "Resend unlock instructions"
9
- = render :partial => "devise/shared/links"