inline_forms 1.1.16 → 1.1.17

data/lib/app/assets/javascripts/ckeditor/config.js

@@ -55,6 +55,7 @@ CKEDITOR.editorConfig = function( config )
 
     config.language = 'nl';
 
+/* Toolbars */
 
     config.toolbar = 'Minimal';
 
@@ -66,21 +67,6 @@ CKEDITOR.editorConfig = function( config )
             ['PasteFromWord','Source','Undo','Redo','RemoveFormat'],
         ];
 
-/* Toolbars */
-  config.toolbar = 'Easy';
-  
-  config.toolbar_Easy =
-    [
-        ['Source','-','Preview'],
-        ['Cut','Copy','Paste','PasteText','PasteFromWord',],
-        ['Undo','Redo','-','SelectAll','RemoveFormat'],
-        ['Styles','Format'], ['Subscript', 'Superscript', 'TextColor'], ['Maximize','-','About'], '/',
-        ['Bold','Italic','Underline','Strike'], ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
-        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-        ['Link','Unlink','Anchor'], ['Image', 'Attachment', 'Flash', 'Embed'],
-        ['Table','HorizontalRule','Smiley','SpecialChar','PageBreak']
-    ];
-
    config.toolbar_None =
      [ '-' ];
 

data/lib/app/assets/stylesheets/inline_forms.css

@@ -23,7 +23,7 @@ body {
     padding: 0;
     margin: 0 auto;
     font-family: sans-serif;
-    font-size: 12pt;
+    font-size: 11pt;
     max-width: 1200px;
 }
 
@@ -34,8 +34,9 @@ a {
 .inline_forms_list {
     font-size: 100%;
     font-weight: normal;
-    padding: 0.7em;
-    margin: 0.4em 1em 0.4em 1em;
+    padding: 0;
+    padding-bottom: 8px;
+    margin: 0;
     list-style-type: none;
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
@@ -44,23 +45,29 @@ a {
     background-color: #F9EBAE;
 }
 
+.inline_forms_list ul {
+    list-style-type: none;
+    padding-left: 0;
+}
 
 .inline_forms_list .new_record_link {
-    font-size: 110%;
-   padding: 0.3em;
-    border: solid #999999 1px;
-    text-decoration: none;
-    text-align: center;
-    color:black;
-    background-color: #EBEAE9;
-    background-image: -moz-linear-gradient(100% 100% 90deg, #cccccc,#EBEAE9);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#cccccc), to(#EBEAE9));
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 2px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 2px 3px rgba(0,0,0, .4);
-    margin-bottom: 0.5em;
-    width: 14em;
+    background-color: transparent;
+    height: 25px;
+    padding-bottom: 0;
+}
+
+.inline_forms_list .new_record_link a {
+    float: right;
+    width: 24px;
+    height: 24px;
+    margin: 0;
+    padding: 0;
+}
+
+.inline_forms_list .new_record_link img {
+    width: 24px;
+    height: 24px;
+    border: 0;
 }
 
 .inline_forms_list li a {
@@ -78,7 +85,7 @@ a {
 
 .inline_forms_list li.even {
     background-color: #FFEDB0;
-    }
+}
 
 .inline_forms_list li table {
     border: 1px solid #EFCA4B;
@@ -101,7 +108,7 @@ a {
 }
 
 .inline_forms_list div.attribute_value {
-    margin-left: 1em;
+    margin: 0;
 }
 
 .inline_forms_list div.attribute_value a{
@@ -174,7 +181,7 @@ ul.checklist li {
     -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
     /*    border: 1px solid white;*/
     padding: 0.4em;
-    margin: 0.4em 1em 0.4em 1em;
+    margin: 0.4em 0 0.3em 0;
 }
 
 #title {
@@ -198,12 +205,12 @@ ul.checklist li {
     background-image: -moz-linear-gradient(100% 100% 90deg, #F9EBAE, #EFCA4B);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F9EBAE), to(#F9EBAE));
     padding: 0.4em;
-    margin: 0 1em 0.4em 1em;
+    margin: 0 0 0.4em 0;
     font-size: 10pt;
 }
 
 #tabs li {
-    font-size: 130%;
+    font-size: 110%;
     font-weight: bold;
     display: inline-block;
     background-color: #EFE06C;
@@ -242,14 +249,9 @@ ul.checklist li {
 }
 
 .pagination {
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    background-image: -moz-linear-gradient(100% 100% 90deg, #EFCA4B, #F9EBAE );
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFCA4B), to(#F9EBAE));
-    padding: 0.7em;
-    margin: 0 1em 0.4em 1em;
+    padding: 0;
+    margin: 0;
+    margin-bottom: 5px;
 }
 
 .pagination a, .pagination span, .pagination em {

data/lib/app/controllers/inline_forms_controller.rb

@@ -87,6 +87,7 @@
         @parent_id = params[:parent_id]
         @object[@parent_class.foreign_key] = @parent_id
       end
+      @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
       respond_to do |format|
         format.js { }
       end

data/lib/app/helpers/inline_forms_helper.rb

@@ -69,7 +69,12 @@ module InlineFormsHelper
   def link_to_new_record(text, model, path_to_new, update_span, parent_class, parent_id)
     out = ""
     out << "<li class='new_record_link'>"
-    out << (link_to text, send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ), :remote => true)
+    out << (link_to image_tag(  'add.png',
+                                :class => "new_record_icon",
+                                :title => text ),
+                    send(path_to_new, :update => update_span, :parent_class => parent_class, :parent_id => parent_id ),
+                    :remote => true)
+    out << "<div style='clear: both;'></div>"
     out << "</li>"
     ""
     if cancan_enabled?

data/lib/app/views/inline_forms/_list.html.erb

@@ -72,11 +72,10 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   </li>
 <% end -%>
 <!--  # pagination -->
-<li class="even">
-  <%  if parent_id.nil? -%>
-    <%= will_paginate objects -%>
-  <% else %>
-    <%= will_paginate objects, :ajax => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
-  <% end %>
-</li>
+<% if parent_id.nil? -%>
+  <% pagination = will_paginate objects -%>
+<% else %>
+  <% pagination = will_paginate objects, :ajax => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
+<% end %>
+<%= raw "<li class=\"#{cycle('odd', 'even')}\">" + pagination + "</li>" if pagination -%>
 <%= raw "</ul>" if ul_needed -%>

data/lib/app/views/inline_forms/close.js.erb

@@ -1 +1,4 @@
-$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/close' ))%>')
+$('#<%= @update_span %>').fadeOut("slow", function() {
+$(this).html('<%= escape_javascript(render(:partial => 'inline_forms/close' ))%>');
+$(this).fadeIn("slow");
+});

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.1.16"
+  VERSION = "1.1.17"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 1
-  - 16
-  version: 1.1.16
+  - 17
+  version: 1.1.17
 platform: ruby
 authors: 
 - Ace Suares
@@ -110,6 +110,7 @@ files:
 - Rakefile
 - bin/inline_forms
 - inline_forms.gemspec
+- lib/app/assets/images/add.png
 - lib/app/assets/images/close.png
 - lib/app/assets/images/glass_plate.gif
 - lib/app/assets/images/trash.png