inline_forms 3.0.47 → 3.0.48

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 35dfebed2cc12956aaec59917de795b61a188cee
4
- data.tar.gz: a2c1f107f5fb4c499fe842f31f2b40f80f50a43e
3
+ metadata.gz: 87a41faae299c2fc9577280e4418df3b91b84a9b
4
+ data.tar.gz: 689be8f9d48c3830e110e8387c4c9f44dd8f2f00
5
5
  SHA512:
6
- metadata.gz: d540d2a21825619c830950ff76ac54d590ff9add22a8bb433bb442677f6732bf1fbeab9177f25a2d7499d7cc64598b4834eef9e8ce2e913a995b19544c11ffd0
7
- data.tar.gz: fa8279d95e33ec7d26b9d31b25056e62d23400f21c231de405ce4fbadfff20b9869b0e24c98a866e88417644d361e43121ef3941c81c13f1d6d684f3abb386b9
6
+ metadata.gz: aaf2b3b3379feaba275547d603c4b77db800f540f814830d04f28a17a2f2b15daaf5c63bcb94ad4284e8ff861a5ae644a0b3f08a10903003fed261d45b9defef
7
+ data.tar.gz: f99c5c268cb4326eeca3032f082a27138223efdcab0dc1f08a511b9c4232a4af5c699e0cd3ded2eb5a2e59e14f36c4030e219b147f2146238ac9d9af98891bc9
@@ -5,8 +5,8 @@ create_file 'Gemfile', "# created by inline_forms #{ENV['inline_forms_version']}
5
5
  add_source 'https://rubygems.org'
6
6
 
7
7
  gem 'rails', '~> 3.2.21'
8
- gem 'rake' #, '10.0.4'
9
- gem 'jquery-rails' #, '~> 2.3.0'
8
+ gem 'rake'
9
+ gem 'jquery-rails'
10
10
  gem 'jquery-ui-sass-rails'
11
11
  gem 'capistrano'
12
12
  gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git'
@@ -26,7 +26,6 @@ gem 'unicorn'
26
26
  gem 'rvm'
27
27
  gem 'rvm-capistrano', require: false
28
28
  gem 'foundation-rails'
29
- gem 'foundation-icons-sass-rails'
30
29
  gem 'mysql2'
31
30
 
32
31
 
@@ -36,25 +35,26 @@ gem_group :development do
36
35
  gem 'switch_user'
37
36
  gem 'sqlite3'
38
37
  gem 'rspec-rails'
39
- gem 'shoulda', '>= 0'
38
+ gem 'shoulda'
40
39
  gem 'bundler'
41
40
  gem 'jeweler'
42
41
  gem 'capybara'
43
42
  gem 'factory_girl'
44
43
  gem 'factory_girl_rails'
45
44
  gem 'rspec'
45
+ gem 'turbo-sprockets-rails3'
46
46
  end
47
47
 
48
48
  gem_group :production do
49
49
  gem 'therubyracer'
50
- gem 'uglifier' #, '>= 1.0.3'
50
+ gem 'uglifier'
51
51
  end
52
52
 
53
53
  gem_group :assets do
54
- gem 'sass-rails' #, '~> 3.2.3'
55
- gem 'coffee-rails' #, '~> 3.2.1'
56
- gem 'compass-rails' # you need this or you get an err
57
- gem 'turbo-sprockets-rails3'
54
+ gem 'sass-rails'
55
+ gem 'coffee-rails'
56
+ gem 'compass-rails'
57
+ gem 'foundation-icons-sass-rails'
58
58
  end
59
59
 
60
60
  say "- Running bundle..."
@@ -273,48 +273,34 @@ ROLES_MIGRATION
273
273
 
274
274
  append_to_file "db/seeds.rb", "Role.create({ id: 1, name: 'superadmin', description: 'Super Admin can access all.' }, without_protection: true)\n"
275
275
 
276
- # say "- Copy views..."
277
- # directory File.join(GENERATOR_PATH, 'lib/generators/views'), "app/views"
276
+ say "- Installaing ZURB Foundation..." #foundation_and_overrides will be overwritten in the next step!
277
+ generate "foundation:install", "-f"
278
278
 
279
279
  say "- Copy stylesheets..."
280
- copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets/inline_forms.scss'), "app/assets/stylesheets/inline_forms.scss"
281
- copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets/devise.scss'), "app/assets/stylesheets/devise.scss"
282
-
283
- say "- Create inline_forms.js..."
284
- copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts/inline_forms.js'), "app/assets/javascripts/inline_forms.js"
280
+ %w(application.scss devise.scss foundation_and_overrides.scss inline_forms.scss).each do |stylesheet|
281
+ copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets' , stylesheet), File.join('app/assets/stylesheets' , stylesheet)
282
+ end
285
283
 
286
- say "- Add stuff to application.js..."
287
- insert_into_file "app/assets/javascripts/application.js",
288
- "//= require jquery.ui.all
289
- \n//= require jquery.ui.datepicker-nl.js
290
- \n//= require inline_forms\n",
291
- :before => "//= require_tree .\n"
284
+ say "- Copy javascripts..."
285
+ %w(application.js inline_forms.js).each do |javascript|
286
+ copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
287
+ end
292
288
 
293
289
  say "- Install ckeditor..."
294
- generate "ckeditor:install --backend=carrierwave"
290
+ generate "ckeditor:install --orm=active_record --backend=carrierwave"
295
291
 
296
292
  say "- Mount Ckeditor::Engine to routes..."
297
293
  route "mount Ckeditor::Engine => '/ckeditor'"
298
294
 
299
295
  say "- Add ckeditor autoload_paths to application.rb..."
300
- application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)" # TODO ROYTJE is this still needed?
301
-
302
- say "- Add ckeditor/init to application.js..."
303
- insert_into_file "app/assets/javascripts/application.js",
304
- "//= require ckeditor/init\n",
305
- :before => "//= require_tree .\n"
296
+ application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
306
297
 
307
298
  say "- Create ckeditor config.js"
308
299
  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
309
300
 
310
- say "- Add remotipart to application.js..."
311
- insert_into_file "app/assets/javascripts/application.js", "//= require jquery.remotipart\n", :before => "//= require_tree .\n"
312
-
313
301
  say "- Paper_trail install..."
314
302
  generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc.
315
303
 
316
- say "- Installaing ZURB Foundation..."
317
- generate "foundation:install", "-f"
318
304
 
319
305
  # Create Translations
320
306
  say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
@@ -348,8 +334,6 @@ VIEW_MIGRATION
348
334
  say "- Migrating Database (only when using sqlite)"
349
335
  run "bundle exec rake db:migrate" if ENV['using_sqlite'] == 'true'
350
336
 
351
-
352
-
353
337
  say "- Seeding the database (only when using sqlite)"
354
338
  run "bundle exec rake db:seed" if ENV['using_sqlite'] == 'true'
355
339
 
@@ -512,36 +496,36 @@ END_FACTORY_GIRL
512
496
  remove_file 'spec/factories/users.rb'
513
497
  remove_file 'spec/models/user_spec.rb'
514
498
 
515
- # add stuff to application.css
516
- say "- Injecting stylesheets into app/assets/stylesheets/application.css..."
517
- insert_into_file "app/assets/stylesheets/application.css",
518
- "*= require devise\n*= require inline_forms\n",
519
- :before => "*= require_self\n"
520
-
521
-
522
499
  # devise mailer stuff
523
500
  say "- Injecting devise mailer stuff in environments/production.rb..."
524
501
  # strip_heredoc_with_indent(2) became strip_heredoc(2), but only in rails 4... :-(
525
502
  insert_into_file "config/environments/production.rb", <<-DEVISE_MAILER_STUFF.strip_heredoc, :before => "end\n"
526
503
  # for devise
527
- config.action_mailer.default_url_options = { :protocol => 'https', :host => 'YOURHOSTNAME' }
504
+ config.action_mailer.default_url_options = { protocol: 'https', host: 'YOURHOSTNAME' }
528
505
  config.action_mailer.delivery_method = :smtp
529
506
  config.action_mailer.smtp_settings = {
530
- :address => 'YOURMAILSERVER',
531
- :enable_starttls_auto => true,
532
- :password => 'YOURPASSWORD',
533
- :user_name => 'YOURUSERNAME'
507
+ address: 'YOURMAILSERVER',
508
+ enable_starttls_auto: true,
509
+ password: 'YOURPASSWORD',
510
+ user_name: 'YOURUSERNAME'
534
511
  }
535
512
 
536
513
  DEVISE_MAILER_STUFF
537
514
 
538
- # assets
539
- #say "- Setting config.assets.compile to true in environments/production.rb (needed for ckeditor)..."
540
- #insert_into_file "#{app_name}/config/environments/production.rb", "config.assets.compile = false\n", :before => "end\n" if dry_run?
541
- #gsub_file "config/environments/production.rb", /config.assets.compile = false/, "config.assets.compile = true"
542
- ### we don't do that no more
543
-
515
+ say "- Injecting devise mailer stuff in environments/development.rb..."
516
+ # strip_heredoc_with_indent(2) became strip_heredoc(2), but only in rails 4... :-(
517
+ insert_into_file "config/environments/development.rb", <<-DEVISE_MAILER_STUFF.strip_heredoc, :before => "end\n"
518
+ # for devise
519
+ config.action_mailer.default_url_options = { protocol: 'http', host: 'localhost', port: 3000 }
520
+ config.action_mailer.delivery_method = :smtp
521
+ config.action_mailer.smtp_settings = {
522
+ address: 'YOURMAILSERVER',
523
+ enable_starttls_auto: true,
524
+ password: 'YOURPASSWORD',
525
+ user_name: 'YOURUSERNAME'
526
+ }
544
527
 
528
+ DEVISE_MAILER_STUFF
545
529
 
546
530
  # capify
547
531
  say "- Capify..."
@@ -0,0 +1,3 @@
1
+ <h1>Hell All1</h1>
2
+
3
+ sldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sdsldk lsdk lasdj aqldj a;lskj ;alsjkd a;lskd la;sd
@@ -0,0 +1,44 @@
1
+ <%= form_for(resource, as: resource_name,
2
+ url: session_path(resource_name),
3
+ html: { id: 'inline_forms_devise_form' }
4
+ ) do |f| %>
5
+
6
+ <div class="row">
7
+ <div class="columns">
8
+ <label><%= t :email %></label>
9
+ <%= f.email_field :email %>
10
+ </div>
11
+ </div>
12
+
13
+ <div class="row">
14
+ <div class="columns">
15
+ <label><%= t :password %></label>
16
+ <%= f.password_field :password %>
17
+ </div>
18
+ </div>
19
+
20
+ <% if devise_mapping.rememberable? -%>
21
+ <div class="row">
22
+ <div class="small-5 columns lower">
23
+ <%= f.check_box :remember_me %><label><%= t :remember_me %></label>
24
+ </div>
25
+ <div class="small-7 columns text-right">
26
+ <%= f.submit :login, class: 'button' %>
27
+ </div>
28
+ </div>
29
+ <% else %>
30
+ <div class="row">
31
+ <div class="columns text-right">
32
+ <%= f.submit :login, class: 'button' %>
33
+ </div>
34
+ </div>
35
+ <% end -%>
36
+
37
+
38
+ <div class="row">
39
+ <div class="columns">
40
+ <%= render :partial => "devise/shared/links" %>
41
+ </div>
42
+ </div>
43
+
44
+ <% end %>
@@ -0,0 +1,18 @@
1
+ <div class='contain-to-grid'>
2
+ <nav id='inline_forms_devise_top_nav_bar' class='top-bar' data-topbar>
3
+ <ul class='title-area'>
4
+ <li class='name'>
5
+ <h1><a href='/'><%= t('inline_forms.general.title_for_devise') %> <%= InlineForms::VERSION %></a></h1>
6
+ </li>
7
+ <li class='toggle-topbar menu-icon'>
8
+ <a href='#'><span></span></a>
9
+ </li>
10
+ </ul>
11
+ </nav>
12
+ </div>
13
+
14
+ <div id='inline_forms_devise_flash_div' class='row'>
15
+ <% flash.each do |name, msg| %>
16
+ <%= content_tag :div, msg, :id => "flash_#{name}", :class => 'devise flash' %>
17
+ <% end unless flash.blank? %>
18
+ </div>
@@ -1,29 +1,30 @@
1
- <div class="row">
2
1
 
3
- <div class="large-4 columns">
4
- <h2>Sign in</h2>
2
+ <%= render 'top-bar-and-flash' %>
3
+
4
+ <div class="row" id='inline_forms_devise_welcome_row'>
5
+ <div class="small-11 centered column">
6
+ <h1><%= t('inline_forms.general.welcome_for_devise') %></h1>
5
7
  </div>
8
+ </div>
6
9
 
7
- <div class="large-4 columns">
8
- <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
10
+ <div id='inline_forms_devise_new_login_session' class="row">
9
11
 
10
- <div><%= f.label :email %><br />
11
- <%= f.email_field :email %></div>
12
+ <div id='inline_forms_devise_form_column' class="large-5 columns">
12
13
 
13
- <div><%= f.label :password %><br />
14
- <%= f.password_field :password %></div>
14
+ <%= render 'form' %>
15
15
 
16
- <% if devise_mapping.rememberable? -%>
17
- <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
18
- <% end -%>
16
+ </div>
19
17
 
20
- <div><%= f.submit "Sign in" %></div>
18
+ <div id='inline_forms_devise_content_column' class="large-7 columns">
21
19
 
22
- <% end %>
23
- </div>
20
+ <div class="hide-for-large-up row text-centered">
21
+ <hr />
22
+ </div>
23
+
24
+ <div id='content_for_devise_login' class="row">
25
+ <%= render '/devise/inline_forms/content_for_devise_login' %>
26
+ </div>
24
27
 
25
- <div class="large-4 columns">
26
- <%= render :partial => "devise/shared/links" %>
27
28
  </div>
28
29
 
29
30
  </div>
@@ -0,0 +1,20 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <meta charset="utf-8" />
5
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
+ <title>
7
+ <%= t('inline_forms.general.application_title') %> v<%= InlineForms::VERSION %>
8
+ </title>
9
+ <%= stylesheet_link_tag "application" %>
10
+ <%= javascript_include_tag "vendor/modernizr" %>
11
+ <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
12
+ <%= csrf_meta_tags %>
13
+ </head>
14
+
15
+ <body>
16
+
17
+ <%= yield %>
18
+
19
+ </body>
20
+ </html>
@@ -1,47 +1,21 @@
1
1
  <!DOCTYPE html>
2
- <html lang="en">
2
+ <html>
3
3
  <head>
4
4
  <meta charset="utf-8" />
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
- <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,400italic' rel='stylesheet' type='text/css' />
7
- <title><%= application_title + " v" + InlineForms::VERSION -%></title>
8
-
9
- <%= stylesheet_link_tag "application" %>
6
+ <title>
7
+ <%= t('inline_forms.general.application_title') %> v<%= InlineForms::VERSION %>
8
+ </title>
9
+ <%= stylesheet_link_tag "devise" %>
10
10
  <%= javascript_include_tag "vendor/modernizr" %>
11
11
  <%= csrf_meta_tags %>
12
12
  </head>
13
13
 
14
14
  <body>
15
15
 
16
- <div id="devise_outer_container">
17
-
18
- <div class="row contain-to-grid">
19
- <nav id='devise_top_bar' class="top-bar" data-topbar>
20
- <ul class="title-area">
21
- <li class="name">
22
- <h1><a href="/"><%= application_name %> v<%= inline_forms_version %></a></h1>
23
- </li>
24
- <li class="toggle-topbar menu-icon">
25
- <a href="#"><span></span></a>
26
- </li>
27
- </ul>
28
- <section class="top-bar-section">
29
- <ul class="right">
30
- </ul>
31
- </section>
32
- </nav>
33
- </div>
34
-
35
- <div id="devise_flash">
36
- <% flash.each do |name, msg| %>
37
- <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash row" %>
38
- <% end %>
39
- </div>
40
- <%= yield %>
41
-
16
+ <div id="inline_forms_devise_outer_container">
17
+ <%= yield %>
42
18
  </div>
43
19
 
44
- <%= javascript_include_tag "application" %>
45
-
46
20
  </body>
47
21
  </html>
@@ -0,0 +1,18 @@
1
+ // This is a manifest file that'll be compiled into application.js, which will include all the files
2
+ // listed below.
3
+ //
4
+ // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5
+ // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
6
+ //
7
+ // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8
+ // the compiled file.
9
+ //
10
+ // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
11
+ // GO AFTER THE REQUIRES BELOW.
12
+ //
13
+ //= require jquery
14
+ //= require jquery_ujs
15
+ //= require jquery.ui.all
16
+ //= require foundation
17
+ //= require jquery.remotipart
18
+ //= require inline_forms
@@ -1,14 +1,17 @@
1
1
  $(document).foundation();
2
2
 
3
- $(document).ready(function() {
4
- // initialize datepickers
5
- $.datepicker.setDefaults({
6
- changeMonth : true,
7
- changeYear : true,
8
- yearRange: '-100:+100'
3
+ // initialize datepickers
4
+ $(document).ready(function() {
5
+ $.datepicker.setDefaults({
6
+ changeMonth : true,
7
+ changeYear : true,
8
+ yearRange: '-100:+100'
9
+ });
9
10
  });
10
- // get rid of translation_missing tooltips
11
- $(this).on('mouseover', '.translation_missing', function() {
12
- $(this).attr('title', '');
11
+
12
+ // get rid of translation_missing tooltips
13
+ $(document).ready(function() {
14
+ $(this).on('mouseover', '.translation_missing', function() {
15
+ $(this).attr('title', '');
16
+ });
13
17
  });
14
- });
@@ -0,0 +1,15 @@
1
+ /*
2
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
3
+ * listed below.
4
+ *
5
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
7
+ *
8
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
9
+ * compiled file, but it's generally better to create a new file per style scope.
10
+ *
11
+ *= require jquery.ui.core
12
+ *= require jquery.ui.theme
13
+ *= require foundation_and_overrides
14
+ *= require inline_forms
15
+ */
@@ -1,21 +1,77 @@
1
- //devise
1
+ @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic);
2
+ @import 'foundation_and_overrides';
2
3
 
3
- #devise_outer_container a {
4
+ .contain-to-grid {
5
+ background-color: $body-bg !important;
6
+ }
7
+
8
+ #inline_forms_devise_outer_container a {
4
9
  color: #A3381E;
5
10
  }
6
11
 
7
- #devise_top_bar {
12
+ #inline_forms_devise_top_nav_bar {
8
13
  background-color: #A3381E;
9
14
  a {
10
15
  color: #FFFFFF;
11
- }
16
+ }
17
+ }
18
+
19
+ #inline_forms_devise_flash_div {
20
+ border-top: 0.5em solid #fade7a;
21
+ .flash {
22
+ margin-top: 0.2em;
23
+ padding: 0.5em;
24
+ color: #A3381E;
25
+ font-size: 130%;
26
+ font-weight: bold;
27
+ line-height: 120%;
28
+ background-color: white;
29
+ border: none;
30
+ }
12
31
  }
13
32
 
14
- #devise_login {
33
+ #inline_forms_devise_welcome_row{
34
+ h1 {
35
+ text-align: center;
36
+ margin: 30px 0;
37
+ color: #A3381E;
38
+ }
39
+ }
40
+
41
+ #inline_forms_devise_new_login_session {
15
42
  .row {
16
43
  margin-bottom: 30px;
17
44
  }
18
45
  }
19
46
 
47
+ #inline_forms_devise_form {
48
+ label {
49
+ padding-bottom: 0.2em;
50
+ padding-left: 0.3em;
51
+ }
52
+ input[type=checkbox] {
53
+ position: relative;
54
+ top: 2px;
55
+ }
56
+ .lower {
57
+ top: 15px;
58
+ }
59
+ }
60
+
61
+ #inline_forms_devise_content_column {
62
+ hr {
63
+ width: 96%;
64
+ margin: auto;
65
+ }
66
+ }
67
+
68
+ #content_for_devise_login {
69
+ padding: 0 2em;
70
+ h1 {
71
+ text-align: center;
72
+ margin: 0 0 0.5em 0;
73
+ color: #A3381E;
74
+ }
20
75
 
21
- #devise_flash {}
76
+
77
+ }
@@ -0,0 +1,11 @@
1
+ @import 'foundation/functions';
2
+
3
+ $include-html-classes: true;
4
+ $include-html-global-classes: $include-html-classes;
5
+
6
+ // We use these to define default font stacks
7
+ $font-family-sans-serif: "Open Sans", sans-serif;
8
+ // $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif;
9
+ // $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace;
10
+
11
+ @import 'foundation';
@@ -1,11 +1,9 @@
1
- @import 'foundation_and_overrides';
1
+ @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic);
2
2
  @import 'foundation-icons';
3
-
4
- $ffDefault: 'Open Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif !default;
5
-
6
3
  @import 'themes/jquery.ui.sunny';
7
4
  @import 'jquery.ui.all';
8
5
 
6
+ @import 'foundation_and_overrides';
9
7
 
10
8
  .contain-to-grid {
11
9
  background-color: $body-bg !important;
@@ -19,7 +17,6 @@ select {
19
17
  background-color: #fff8e0 !important;
20
18
  border: 0 !important;
21
19
  margin: 2px 0 !important;
22
- font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Helvetica, Arial, sans-serif !important;
23
20
  padding: 0;
24
21
 
25
22
  }
@@ -92,7 +89,7 @@ select:hover, select:focus {
92
89
  .odd {
93
90
  background-color: #FBE38E;
94
91
  }
95
- .even {
92
+ .even {
96
93
  background-color: #FBEEC1;
97
94
  }
98
95
  }
@@ -119,7 +116,7 @@ select:hover, select:focus {
119
116
 
120
117
  .object_presentation {
121
118
  background-color: #B94C32;
122
- color: white;
119
+ color: white;
123
120
  .close_button {
124
121
  background-color: #B94C32;
125
122
  font-size: 1.3rem;
@@ -163,7 +160,7 @@ select:hover, select:focus {
163
160
  color: white;
164
161
  -webkit-transition-property: color;
165
162
  transition-property: color;
166
- }
163
+ }
167
164
  }
168
165
 
169
166
  .pagination {
@@ -182,7 +179,7 @@ select:hover, select:focus {
182
179
  font-style: normal;
183
180
  }
184
181
  span.disabled {
185
- color: #AAA;
182
+ color: #AAA;
186
183
  }
187
184
  }
188
185
 
@@ -222,7 +219,7 @@ select:hover, select:focus {
222
219
  margin: 0;
223
220
  padding: 0.3em;
224
221
  }
225
-
222
+
226
223
 
227
224
  .column {
228
225
  padding-right: 0 !important;
@@ -311,4 +308,15 @@ select:hover, select:focus {
311
308
 
312
309
  /* LEFT */
313
310
 
311
+ #category_id {
312
+ margin-top: -2px !important;
313
+ }
314
314
 
315
+ #input_search {
316
+ border: none !important;
317
+ margin-top: -2px;
318
+ }
319
+
320
+ #inline_forms_model_top_bar .top-bar-section .inline_forms_model_top_bar_buttons {
321
+ top: 6px !important;
322
+ }
@@ -49,14 +49,14 @@ namespace :deploy do
49
49
  run "kill -s KILL `cat #{shared_path}/pids/unicorn.pid`"
50
50
  sleep 10
51
51
  run "rvm rvmrc trust #{current_release}"
52
- run "cd #{current_path} ; bundle exec r193_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
52
+ run "cd #{current_path} ; bundle exec r200_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
53
53
  end
54
54
 
55
55
 
56
56
  desc "Start unicorn"
57
57
  task :start, :except => { :no_release => true } do
58
58
  run "rvm rvmrc trust #{current_release}"
59
- run "cd #{current_path} ; bundle exec r193_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
59
+ run "cd #{current_path} ; bundle exec r200_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
60
60
  end
61
61
 
62
62
  desc "Stop unicorn"
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module InlineForms
3
- VERSION = "3.0.47"
3
+ VERSION = "3.0.48"
4
4
  end
metadata CHANGED
@@ -1,55 +1,55 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: inline_forms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.47
4
+ version: 3.0.48
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ace Suares
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-10 00:00:00.000000000 Z
11
+ date: 2015-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rvm
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: thor
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - '>='
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: validation_hints
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
@@ -70,70 +70,70 @@ dependencies:
70
70
  name: rails-i18n
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec-rails
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: shoulda
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: jeweler
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  description: Inline Forms aims to ease the setup of forms that provide inline editing.
@@ -147,8 +147,8 @@ executables:
147
147
  extensions: []
148
148
  extra_rdoc_files: []
149
149
  files:
150
- - ".document"
151
- - ".gitignore"
150
+ - .document
151
+ - .gitignore
152
152
  - Gemfile
153
153
  - LICENSE.txt
154
154
  - README.rdoc
@@ -206,6 +206,7 @@ files:
206
206
  - lib/app/validators/is_email_address_validator.rb
207
207
  - lib/app/validators/must_be_a_value_validator.rb
208
208
  - lib/app/views/devise/confirmations/new.html.erb
209
+ - lib/app/views/devise/inline_forms/_content_for_devise_login.html.erb
209
210
  - lib/app/views/devise/mailer/confirmation_instructions.html.erb
210
211
  - lib/app/views/devise/mailer/reset_password_instructions.html.erb
211
212
  - lib/app/views/devise/mailer/unlock_instructions.html.erb
@@ -213,6 +214,8 @@ files:
213
214
  - lib/app/views/devise/passwords/new.html.erb
214
215
  - lib/app/views/devise/registrations/edit.html.erb
215
216
  - lib/app/views/devise/registrations/new.html.erb
217
+ - lib/app/views/devise/sessions/_form.html.erb
218
+ - lib/app/views/devise/sessions/_top-bar-and-flash.html.erb
216
219
  - lib/app/views/devise/sessions/new.html.erb
217
220
  - lib/app/views/devise/shared/_header_and_errors.html.erb
218
221
  - lib/app/views/devise/shared/_links.erb
@@ -237,13 +240,17 @@ files:
237
240
  - lib/app/views/inline_forms/show_element.js.erb
238
241
  - lib/app/views/inline_forms/show_undo.js.erb
239
242
  - lib/app/views/inline_forms/update.js.erb
243
+ - lib/app/views/layouts/application.html.erb
240
244
  - lib/app/views/layouts/devise.html.erb
241
245
  - lib/app/views/layouts/inline_forms.html.erb
242
246
  - lib/generators/USAGE
243
247
  - lib/generators/assets/images/glass_plate.gif
248
+ - lib/generators/assets/javascripts/application.js
244
249
  - lib/generators/assets/javascripts/ckeditor/config.js
245
250
  - lib/generators/assets/javascripts/inline_forms.js
251
+ - lib/generators/assets/stylesheets/application.scss
246
252
  - lib/generators/assets/stylesheets/devise.scss
253
+ - lib/generators/assets/stylesheets/foundation_and_overrides.scss
247
254
  - lib/generators/assets/stylesheets/inline_forms.scss
248
255
  - lib/generators/inline_forms_generator.rb
249
256
  - lib/generators/templates/_inline_forms_tabs.html.erb
@@ -276,17 +283,17 @@ require_paths:
276
283
  - lib
277
284
  required_ruby_version: !ruby/object:Gem::Requirement
278
285
  requirements:
279
- - - ">="
286
+ - - '>='
280
287
  - !ruby/object:Gem::Version
281
288
  version: '0'
282
289
  required_rubygems_version: !ruby/object:Gem::Requirement
283
290
  requirements:
284
- - - ">="
291
+ - - '>='
285
292
  - !ruby/object:Gem::Version
286
293
  version: '0'
287
294
  requirements: []
288
295
  rubyforge_project: inline_forms
289
- rubygems_version: 2.4.5
296
+ rubygems_version: 2.4.8
290
297
  signing_key:
291
298
  specification_version: 4
292
299
  summary: Inline editing of forms.