redde 0.1.5 → 0.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.sass +25 -0
  2. data/lib/generators/redde/layout/templates/base/_header.html.haml +1 -1
  3. data/lib/generators/redde/layout/templates/layouts/login.html.haml +16 -16
  4. data/lib/redde/version.rb +1 -1
  5. metadata +5 -7
  6. data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.scss +0 -10
  7. data/spec/dummy/log/development.log +0 -26606
data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.sass ADDED
@@ -0,0 +1,25 @@
1
+ .main._login
2
+ min-height: 0
3
+ width: 370px
4
+ margin: 0 auto
5
+ margin-bottom: 100px
6
+
7
+ .login__table
8
+ border-collapse: collapse
9
+ width: 100%
10
+ height: 100%
11
+
12
+ .login__cell
13
+ vertical-align: middle
14
+
15
+ .login__inp
16
+ box-sizing: border-box
17
+ width: 100%
18
+ margin-left: 0 !important
19
+ margin-top: 1px
20
+
21
+ .login__fields
22
+ margin-bottom: 5px
23
+
24
+ .login__actions
25
+ margin-top: 10px
data/lib/generators/redde/layout/templates/base/_header.html.haml CHANGED
@@ -9,4 +9,4 @@
9
9
  = mail_to current_manager.email
10
10
  = link_to "Выход", destroy_manager_session_path, :method => :delete
11
11
  .header__center
12
- = link_to "AppName", root_path, :target => :_blank
12
+ = link_to "AppName", root_path ||= '/', :target => :_blank
data/lib/generators/redde/layout/templates/layouts/login.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1
+ !!!
2
2
  %html.login{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en"}
3
3
  %head
4
4
  %meta{"http-equiv" => "Content-Type", :content => "text/html;charset=UTF-8"}
@@ -7,26 +7,26 @@
7
7
  = javascript_include_tag "admin"
8
8
  = csrf_meta_tag
9
9
  %body
10
- %table.login
11
- %tr.login
12
- %td.login
13
- #main
14
- #page-header
10
+ %table.login__table
11
+ %tr
12
+ %td.login__cell
13
+ .main._login
14
+ .page-header
15
15
  %h1 Административная панель
16
- #page
17
- #content
16
+ .page
17
+ .content
18
18
  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
19
- .fields
19
+ .login__fields
20
20
  = f.label :email, "E-mail"
21
21
  %br
22
- = f.text_field :email
23
- .fields
22
+ = f.text_field :email, class: 'login__inp'
23
+ .login__fields
24
24
  = f.label :password, "Пароль"
25
25
  %br
26
- = f.password_field :password, :size => 35
27
- .actions
28
- - if devise_mapping.rememberable?
26
+ = f.password_field :password, :size => 35, class: 'login__inp'
27
+ - if devise_mapping.rememberable?
28
+ .login__fields
29
29
  = f.check_box :remember_me
30
30
  = f.label :remember_me, "Оставаться в системе"
31
- %br
32
- = f.submit "Войти"
31
+ .login__actions
32
+ = f.submit "Войти"
data/lib/redde/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Redde
2
- VERSION = "0.1.5"
2
+ VERSION = "0.1.6"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redde
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-02-25 00:00:00.000000000 Z
13
+ date: 2014-03-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: jquery-rails
@@ -231,7 +231,7 @@ files:
231
231
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/index.scss
232
232
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/header.sass
233
233
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/launchbar.sass
234
- - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.scss
234
+ - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.sass
235
235
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/main.sass
236
236
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-header.sass
237
237
  - lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/page-sidebar.sass
@@ -305,7 +305,6 @@ files:
305
305
  - spec/dummy/db/test.sqlite3
306
306
  - spec/dummy/lib/assets/.keep
307
307
  - spec/dummy/log/.keep
308
- - spec/dummy/log/development.log
309
308
  - spec/dummy/public/404.html
310
309
  - spec/dummy/public/422.html
311
310
  - spec/dummy/public/500.html
@@ -329,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
329
328
  version: '0'
330
329
  segments:
331
330
  - 0
332
- hash: 1230283241805079294
331
+ hash: -2453261268062063134
333
332
  required_rubygems_version: !ruby/object:Gem::Requirement
334
333
  none: false
335
334
  requirements:
@@ -338,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
338
337
  version: '0'
339
338
  segments:
340
339
  - 0
341
- hash: 1230283241805079294
340
+ hash: -2453261268062063134
342
341
  requirements: []
343
342
  rubyforge_project:
344
343
  rubygems_version: 1.8.24
@@ -386,7 +385,6 @@ test_files:
386
385
  - spec/dummy/db/test.sqlite3
387
386
  - spec/dummy/lib/assets/.keep
388
387
  - spec/dummy/log/.keep
389
- - spec/dummy/log/development.log
390
388
  - spec/dummy/public/404.html
391
389
  - spec/dummy/public/422.html
392
390
  - spec/dummy/public/500.html
data/lib/generators/redde/layout/templates/assets/stylesheets/admin/layouts/login.scss DELETED
@@ -1,10 +0,0 @@
1
- html.login {
2
- &, body { width:100%; height:100%; }
3
- #main {min-height:0; width:370px; margin:0 auto; margin-bottom:100px;}
4
- table.login {border-collapse:collapse; width:100%; height:100%;}
5
- td.login {vertical-align:middle;}
6
- .fields {
7
- margin:0 0 5px 0;
8
- input {width:100%}
9
- }
10
- }