rich_table_component 0.0.6 → 0.0.7

data/app/views/application/edit.js.erb

@@ -2,7 +2,7 @@ $('.modal, .modal-backdrop').remove();
 $('.cke_skin_kama').remove();
 
 <% params[:remote] = true if params[:remote].nil? %>
-<% params[:next_remote] = true if params[:next_remote].nil? %>
+<% params[:next_remote] = params[:remote] if params[:next_remote].nil? %>
 
 <% params[:form_partial] ||= "form" %>
 <% params[:form_title] ||= params[:modal_title].presence || "#{t('editing')} #{t(controller_name.singularize)}" %>

data/app/views/application/new.js.erb

@@ -1,7 +1,7 @@
 $('.modal, .modal-backdrop').remove();
 
 <% params[:remote] = true if params[:remote].nil? %>
-<% params[:next_remote] = true if params[:next_remote].nil? %>
+<% params[:next_remote] = params[:remote] if params[:next_remote].nil? %>
 
 var $modal = $('<%= j(render "new") %>');
 $modal.modal();

data/app/views/rich_table_component/rtc/_component_actions.html.haml

@@ -59,7 +59,10 @@
             - else
               - attribute_value = ea.to_s
               - splitter = attribute_value.split('.')
-              - attribute_label = t((splitter.last(2) - ['to_s']).join('_'))
+              - attribute_label = (splitter.last(2) - ['to_s']).join('_')
+              - if attribute_label.split('_to_s').one?
+                - attribute_label = attribute_label.split('_to_s').first
+              - attribute_label = t(attribute_label)
 
             .controls
               %label.checkbox

data/lib/rich_table_component/version.rb

@@ -1,3 +1,3 @@
 module RichTableComponent
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/rich_table_component.rb

@@ -140,7 +140,7 @@ module RichTableComponent
           relation = relation.page(params[:page].to_i).per_page(params[:per_page].to_i)
         end
 
-        relation = relation.group("#{_relation_table_name}.id")
+        relation = relation.uniq
         relation
       end
 
@@ -522,14 +522,14 @@ module RichTableComponent
         end
       end
 
-      def format_remote(format, act = action_name, obj = instance_variable_get("@#{controller_name}"))
+      def format_remote(format, act = action_name, obj = instance_variable_get("@#{controller_name}"), html_redirect = nil)
         case act
         when :create
           flash[:notice] = "#{obj.class.name.tableize} was successfully created."
-          format.html { redirect_to controller: obj.class.name.tableize, action: :edit, id: obj.id }
+          format.html { redirect_to controller: obj.class.name.tableize, action: html_redirect.presence || :edit, id: obj.id }
         when :update
           flash[:notice] = "#{obj.class.name.tableize} was successfully updated."
-          format.html { redirect_to controller: obj.class.name.tableize, action: :edit, id: obj.id }
+          format.html { redirect_to controller: obj.class.name.tableize, action: html_redirect.presence || :edit, id: obj.id }
         else
           format.html { render action: act }
         end

data/vendor/assets/javascripts/admin/starqle.grid.js

@@ -623,6 +623,12 @@ var initExportButton = function(){
       $el.find('input').each(function(){
         $(this).clone().appendTo($the_form.find('.hide'));
       });
+
+      $el.find('select').each(function(i){
+        var select = this;
+        $(this).clone().appendTo($the_form.find('.hide'));
+        $the_form.find('.hide').find('select').eq(i).val($(select).val());
+      });
     }
     else{
       $elmt.find('.rtc_search #search').clone().appendTo($the_form.find('.hide'));

data/vendor/assets/stylesheets/partial/_base_variables.sass

@@ -24,41 +24,29 @@ $wrapper_bgcolor: white
 $region_bgcolor: white
 
 $first_color: #444
-$second_color: #FF9900
-$third_color: #06f
+$second_color: #08c
+$third_color: #005580
 $fourth_color: #555
 $fifth_color: #555
 
-$thin_color: lighten($first_color, 30)
 
 $dark_color: black
 $bright_color: white
 
+$small_radius: 5px
+$medium_radius: 10px
+$large_radius: 20px
 
 
-
-
-
-
-$red: #FF122C
-$blue: #2783d0
-
 $theme_color: #222222
-$sub_theme_color: adjust-hue(lighten($theme_color, 7%), -13deg)
-$theme_border_box_shadow_color: transparentize($dark_color, 0.85)
-
 
-$body_color: lighten($dark_color, 20%)
 $font_size: 13px
 $button_font_size: 12px
-  
-$hyperlink_color: $blue
-$focus_color: #0080FF
 
-$main_menu_color: mix($theme_color, $bright_color, 20%)
-$menu_background_color: darken($bright_color, 3%)
 
-$web_width: 960px
+$main_font_size: 13px
+$main_font_family: Helvetica, Arial, sans-serif
+$quote_font_family: times, serif
 
 
 
@@ -66,11 +54,4 @@ $web_width: 960px
 
 
 
-$main_text_color: $first_color
-$main_font_size: 13px
-$main_font_family: Helvetica, Arial, sans-serif
-$quote_font_family: times, serif
 
-$small_radius: 5px
-$medium_radius: $small_radius * 2
-$large_radius: $medium_radius * 2

data/vendor/assets/stylesheets/partial/_base_variables_derivation.sass

@@ -0,0 +1,12 @@
+$thin_color: lighten($first_color, 30)
+
+$sub_theme_color: adjust-hue(lighten($theme_color, 7%), -13deg)
+$theme_border_box_shadow_color: transparentize($dark_color, 0.85)
+
+
+$body_color: lighten($dark_color, 20%)
+
+
+$main_menu_color: mix($theme_color, $bright_color, 20%)
+$menu_background_color: darken($bright_color, 3%)
+

data/vendor/assets/stylesheets/partial/_style.sass

@@ -46,7 +46,7 @@ img
 body
   background: $body_bgcolor
   font: $main_font_size $main_font_family
-  color: $main_text_color
+  color: $first_color
 
   #wrapper
     background: $body_bgcolor url($images_dir + "unm_pinisi.png") no-repeat center bottom
@@ -225,7 +225,7 @@ body
               .continue_reading_part
                 font-size: $main_font_size * 0.9
                 font-style: italic
-                color: lighten($main_text_color, 50)
+                color: lighten($first_color, 50)
                 &:hover
                   color: $third_color
 
@@ -274,7 +274,7 @@ body
                   .part_label
                     margin-right: 5px
                   .part_value
-                    color: $main_text_color
+                    color: $first_color
                     background-color: mix($thin_color, white, 25)
                     padding: 1px 5px
                     +border-radius(8px)
@@ -310,7 +310,7 @@ body
                 .button_part
                   margin-left: 5px
                   .part_value
-                    color: $main_text_color
+                    color: $first_color
                     background-color: none
                     padding: 0
                     +border-radius(none)

data/vendor/assets/stylesheets/rtc_bootstrap_and_overrides.css.less

@@ -31,8 +31,6 @@ body { padding-top: 60px; }
 // @linkColor: #ff0000;
 
 
-@linkColor: #ff9900;
-@btnPrimaryBackground: #08c;
 @baseFontSize: 12px;
 @baseLineHeight: 15px;
 

data/vendor/assets/stylesheets/rtc_config.sass

@@ -17,6 +17,8 @@ table, caption, tbody, tfoot, thead, tr, th, td
 
 @import "partial/grid"
 @import "partial/base_variables"
+@import "rich_table_component/custom_variables"
+@import "partial/base_variables_derivation"
 @import "partial/base_functions"
 @import "partial/position"
 //@import "partial/button"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rich_table_component
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
@@ -431,6 +431,7 @@ files:
 - vendor/assets/stylesheets/fontfaces/museo700-regular-webfont.woff
 - vendor/assets/stylesheets/partial/_base_functions.sass
 - vendor/assets/stylesheets/partial/_base_variables.sass
+- vendor/assets/stylesheets/partial/_base_variables_derivation.sass
 - vendor/assets/stylesheets/partial/_form.sass
 - vendor/assets/stylesheets/partial/_grid.css
 - vendor/assets/stylesheets/partial/_notification.sass
@@ -441,6 +442,7 @@ files:
 - vendor/assets/stylesheets/partial/_user_component.sass
 - vendor/assets/stylesheets/rich_table_component.css
 - vendor/assets/stylesheets/rich_table_component/_custom.sass
+- vendor/assets/stylesheets/rich_table_component/_custom_variables.sass
 - vendor/assets/stylesheets/rtc_bootstrap_and_overrides.css.less
 - vendor/assets/stylesheets/rtc_config.sass
 - vendor/assets/stylesheets/rtc_jquery.fileupload-ui.css