obitum-rails_admin 0.0.1 → 0.0.2

data/app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -8,7 +8,7 @@
       var operator_name = 'f[' +  field_name + '][' + index + '][o]';
       switch(field_type) {
         case 'boolean':
-          var control = '<select class="span3 " name="' + value_name + '">' +
+          var control = '<select class="input-small" name="' + value_name + '">' +
             '<option value="_discard">...</option>' +
             '<option value="true"' + (field_value == "true" ? 'selected="selected"' : '') + '>True</option>' +
             '<option value="false"' + (field_value == "false" ? 'selected="selected"' : '') + '>False</option>' +
@@ -20,7 +20,7 @@
         case 'date':
         case 'datetime':
         case 'timestamp':
-          var control = '<select class="switch-additionnal-fieldsets span3 " name="' + operator_name + '">' +
+          var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
             '<option data-additional-fieldset="false" value="_discard">...</option>' +
             '<option data-additional-fieldset="false"' + (field_operator == "today"     ? 'selected="selected"' : '') + ' value="today">Today</option>' +
             '<option data-additional-fieldset="false"' + (field_operator == "yesterday" ? 'selected="selected"' : '') + ' value="yesterday">Yesterday</option>' +
@@ -28,32 +28,31 @@
             '<option data-additional-fieldset="false"' + (field_operator == "last_week" ? 'selected="selected"' : '') + ' value="last_week">Last week</option>' +
             '<option data-additional-fieldset="true" ' + (field_operator == "less_than" ? 'selected="selected"' : '') + ' value="less_than">Less than ... days ago</option>' +
             '<option data-additional-fieldset="true" ' + (field_operator == "more_than" ? 'selected="selected"' : '') + ' value="more_than">More than ... days ago</option>' +
-            '<option data-additional-fieldset="true" ' + (field_operator == "mmddyyyy"	? 'selected="selected"' : '') + ' value="mmddyyyy">On specific date (mmddyyyy)</option>' +
+            '<option data-additional-fieldset="true" ' + (field_operator == "mmddyyyy"  ? 'selected="selected"' : '') + ' value="mmddyyyy">On specific date (mmddyyyy)</option>' +
             '<option disabled="disabled">---------</option>' +
             '<option data-additional-fieldset="false"' + (field_operator == "_not_null"  ? 'selected="selected"' : '') + ' value="_not_null">Is present</option>' +
             '<option data-additional-fieldset="false"' + (field_operator == "_null"    ? 'selected="selected"' : '') + ' value="_null" >Is blank</option>' +
           '</select>'
-          var additional_control = '<input class="additional-fieldset span2 " style="display:' + (field_operator == "less_than" || field_operator == "more_than" || field_operator == "mmddyyyy" ? 'block' : 'none') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
+          var additional_control = '<input class="additional-fieldset input-small" style="display:' + (field_operator == "less_than" || field_operator == "more_than" || field_operator == "mmddyyyy" ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
           break;
         case 'enum':
           var field_options = $('<div/>').html(field_options).text(); // entities decode
-          var control = '<span class="switch-select">' + 
-            '<select style="display:' + (multiple_values ? 'none' : 'block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="span3 select-single">' +
+          var control = '<select style="display:' + (multiple_values ? 'none' : 'inline-block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="select-single input-small">' +
               '<option value="_discard">...</option>' +
               '<option ' + (field_value == "_present" ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
               '<option ' + (field_value == "_blank"   ? 'selected="selected"' : '') + ' value="_blank">Is blank</option>' +
               '<option disabled="disabled">---------</option>' +
               field_options +
-            '</select>' + 
-            '<select multiple="multiple" style="display:' + (multiple_values ? 'block' : 'none') + '" ' + (multiple_values ? 'name="' + value_name + '[]"' : '') + ' data-name="' + value_name + '[]" class="span3 select-multiple">' +
-              field_options +
             '</select>' +
-          '</span>';
+            '<select multiple="multiple" style="display:' + (multiple_values ? 'inline-block' : 'none') + '" ' + (multiple_values ? 'name="' + value_name + '[]"' : '') + ' data-name="' + value_name + '[]" class="select-multiple input-small">' +
+              field_options +
+            '</select> ' +
+            '<a href="#" class="switch-select"><i class="icon-' + (multiple_values ? 'minus' : 'plus') + '"></i></a>';
         break;
         case 'string':
         case 'text':
         case 'belongs_to_association':
-          var control = '<select class="switch-additionnal-fieldsets span3 " value="' + field_operator + '" name="' + operator_name + '">' +
+          var control = '<select class="switch-additionnal-fieldsets input-small" value="' + field_operator + '" name="' + operator_name + '">' +
             '<option data-additional-fieldset="true"'  + (field_operator == "like"        ? 'selected="selected"' : '') + ' value="like">Contains</option>' +
             '<option data-additional-fieldset="true"'  + (field_operator == "is"          ? 'selected="selected"' : '') + ' value="is">Is exactly</option>' +
             '<option data-additional-fieldset="true"'  + (field_operator == "starts_with" ? 'selected="selected"' : '') + ' value="starts_with">Starts with</option>' +
@@ -62,28 +61,25 @@
             '<option data-additional-fieldset="false"' + (field_operator == "_present"    ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
             '<option data-additional-fieldset="false"' + (field_operator == "_blank"      ? 'selected="selected"' : '') + ' value="_blank">Is blank</option>' +
           '</select>'
-          var additional_control = '<input class="additional-fieldset span2" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
+          var additional_control = '<input class="additional-fieldset input-small" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'inline-block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
           break;
         default:
-          var control = '<input class="span2" type="text" name="' + value_name + '" value="' + field_value + '"/> ';
+          var control = '<input type="text" class="input-small" name="' + value_name + '" value="' + field_value + '"/> ';
           break;
       }
 
-      
-      var content = '<div class="row filter clearfix">' +
-          '<span class="span3">' +
-            '<span class="btn info delete">' + field_label + '</span>' +
-          '</span>' +
-          '<span class="span3">'+
-            control +
-          '</span>'+ 
-          (additional_control ? '<span class="span2">' + additional_control + '</span>' : '') +
-        '</div>'
+      var content = '<p class="filter form-search">' +
+        '<span class="label label-info form-label"><a href="#" class="delete"><i class="icon-trash icon-white"></i></a> ' + field_label + '</span> ' +
+        control + " " +
+        (additional_control || '') +
+      '</div> ';
       $('#filters_box').append(content);
+      $("hr.filters_box:hidden").show('slow');
     }
   }
 
-  $("#filters a").live('click', function() {
+  $("#filters a").live('click', function(e) {
+    e.preventDefault();
     $.filters.append(
       $(this).data('field-label'),
       $(this).data('field-name'),
@@ -96,25 +92,29 @@
     );
   });
 
-  $('#filters_box .delete').live('click', function() {
+  $('#filters_box .delete').live('click', function(e) {
+    e.preventDefault();
     form = $(this).parents('form');
     $(this).parents('.filter').remove();
+    !$("#filters_box").children().length && $("hr.filters_box:visible").hide('slow');
     form.submit();
   });
 
-  $('#filters_box .switch-select').live('dblclick', function() {
-    var selected_select = $(this).children('select:visible');
-    var not_selected_select = $(this).children('select:hidden');
+  $('#filters_box .switch-select').live('click', function(e) {
+    e.preventDefault();
+    var selected_select = $(this).siblings('select:visible');
+    var not_selected_select = $(this).siblings('select:hidden');
     not_selected_select.attr('name', not_selected_select.data('name')).show('slow');
     selected_select.attr('name', null).hide('slow');
+    $(this).find('i').toggleClass("icon-plus icon-minus")
   });
 
   $('#filters_box .switch-additionnal-fieldsets').live('change', function() {
     var selected_option = $(this).find('option:selected');
     if($(selected_option).data('additional-fieldset')) {
-      $(this).parent().siblings().children('.additional-fieldset').show('slow');
+      $(this).siblings('.additional-fieldset').show('slow');
     } else {
-      $(this).parent().siblings().children('.additional-fieldset').hide('slow');
+      $(this).siblings('.additional-fieldset').hide('slow');
     }
   });
 })( jQuery );

data/app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -55,7 +55,7 @@
             self._trigger("selected", event, {
               item: option
             });
-            $(self.element.parents('.input')[0]).find('.update').removeClass('disabled');
+            $(self.element.parents('.controls')[0]).find('.update').removeClass('disabled');
           },
           change: function(event, ui) {
             if (!ui.item) {
@@ -72,23 +72,23 @@
                 $(this).val(null);
                 select.html($('<option value="" selected="selected"></option>'));
                 input.data("autocomplete").term = "";
-                $(self.element.parents('.input')[0]).find('.update').addClass('disabled');
+                $(self.element.parents('.controls')[0]).find('.update').addClass('disabled');
                 return false;
               }
-              
+
             }
           }
         })
-      if(select.attr('placeholder')) 
+      if(select.attr('placeholder'))
         input.attr('placeholder', select.attr('placeholder'))
-        
+
       input.data("autocomplete")._renderItem = function(ul, item) {
         return $("<li></li>")
           .data("item.autocomplete", item)
           .append( $( "<a></a>" ).html( item.label || item.id ) )
           .appendTo(ul);
       };
-      
+
       // replace with dropdown button once ready in twitter-bootstrap
       var button = this.button = $('<label class="add-on ui-button ui-widget ui-state-default ui-corner-all ui-button-icon-only" title="Show All Items" role="button"><span class="ui-button-icon-primary ui-icon ui-icon-triangle-1-s"></span><span class="ui-button-text">&nbsp;</span></label>')
         .click(function() {
@@ -102,17 +102,17 @@
           input.autocomplete("search", "");
           input.focus();
         });
-      
+
       filtering_select.append(input).append(button).insertAfter(select);
-      
-        
+
+
     },
 
     _getResultSet: function(request, data, xhr) {
-	    var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
+      var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
 
       return $.map(data, function(el, i) {
-				// match regexp only for local requests, remote ones are already filtered, and label may not contain filtered term.
+        // match regexp only for local requests, remote ones are already filtered, and label may not contain filtered term.
         if ((el.id || el.value) && (xhr || matcher.test(el.label))) {
           return {
             label: el.label ? el.label.replace(

data/app/assets/javascripts/rails_admin/ra.nested-form-hooks.coffee

@@ -0,0 +1,40 @@
+$ = jQuery
+
+$(document).ready ->
+  window.nestedFormEvents.insertFields = (content, assoc, link) ->
+    tab_content = $(link).closest(".controls").siblings(".tab-content")
+    tab_content.append content
+    tab_content.children().last()
+
+$('form').live 'nested:fieldAdded', (content) ->
+  field = content.field.addClass('tab-pane');
+  new_tab = $('<li><a data-toggle="tab" href="#' + field.attr('id') + '">' + field.children('.object-infos').data('object-label') + '</a></li>')
+  parent_group = field.closest('.control-group')
+  controls = parent_group.children('.controls')
+  nav = controls.children('.nav')
+  content = parent_group.children('.tab-content')
+  toggler = controls.find('.toggler')
+  nav.append(new_tab)
+  new_tab.children('a').tab('show') # activate added tab
+  nav.select(':hidden').show('slow') # show nav if hidden
+  content.select(':hidden').show('slow') # show tabs content if hidden
+  # toggler 'on' if inactive
+  toggler.addClass('active').removeClass('disabled').children('i').addClass('icon-chevron-down').removeClass('icon-chevron-right')
+
+$('form').live 'nested:fieldRemoved', (content) ->
+  field = content.field
+  nav = field.closest(".control-group").children('.controls').children('.nav')
+  current_li = nav.children('li').has('a[href=#' + field.attr('id') + ']')
+  parent_group = field.closest(".control-group")
+  controls = parent_group.children('.controls')
+  toggler = controls.find('.toggler')
+
+  # try to activate another tab
+  (if current_li.next().length then current_li.next() else current_li.prev()).children('a:first').tab('show')
+
+  current_li.remove()
+
+  if nav.children().length == 0 # removed last tab
+    nav.select(':visible').hide('slow') # hide nav. No use anymore.
+    # toggler 'off' if active
+    toggler.removeClass('active').addClass('disabled').children('i').removeClass('icon-chevron-down').addClass('icon-chevron-right')

data/app/assets/javascripts/rails_admin/ra.remote-form.js

@@ -16,7 +16,7 @@
     _create: function() {
       var widget = this
       var dom_widget = widget.element;
-      
+
       var edit_url = dom_widget.find('select').data('edit-url');
       if(typeof(edit_url) != 'undefined' && edit_url.length) {
         dom_widget.find('.ra-multiselect option').live('dblclick', function(e){
@@ -27,7 +27,7 @@
       dom_widget.find('.create').unbind().bind("click", function(e){
         widget._bindModalOpening(e, $(this).data('link'))
       });
-      
+
       dom_widget.find('.update').unbind().bind("click", function(e){
         if(value = dom_widget.find('select').val()) {
           widget._bindModalOpening(e, $(this).data('link').replace('__ID__', value))
@@ -36,7 +36,7 @@
         }
       });
     },
-    
+
     _bindModalOpening: function(e, url) {
       e.preventDefault();
       widget = this;
@@ -44,61 +44,63 @@
         return false;
 
       var dialog = this._getModal();
-      $.ajax({
-        url: url,
-        beforeSend: function(xhr) {
-          xhr.setRequestHeader("Accept", "text/javascript");
-        },
-        success: function(data, status, xhr) {
-          dialog.find('.modal-body').html(data);
-          widget._bindFormEvents();
-        },
-        error: function(xhr, status, error) {
-          dialog.find('.modal-body').html(xhr.responseText);
-        },
-        dataType: 'text'
-      });
+      
+      setTimeout(function(){ // fix race condition with modal insertion in the dom (Chrome => Team/add a new fan => #modal not found when it should have). Somehow .on('show') is too early, tried it too.
+        $.ajax({
+          url: url,
+          beforeSend: function(xhr) {
+            xhr.setRequestHeader("Accept", "text/javascript");
+          },
+          success: function(data, status, xhr) {
+              dialog.find('.modal-body').html(data);
+              widget._bindFormEvents();
+          },
+          error: function(xhr, status, error) {
+            dialog.find('.modal-body').html(xhr.responseText);
+          },
+          dataType: 'text'
+        });
+      },100);
+
     },
-    
+
     _bindFormEvents: function() {
       var widget = this,
           dialog = this._getModal(),
           form = dialog.find("form"),
-          saveButtonText = dialog.find(":submit[name=_save]").text(),
-          cancelButtonText = dialog.find(":submit[name=_continue]").text();
-      dialog.find('.actions').remove();
-      
+          saveButtonText = dialog.find(":submit[name=_save]").html(),
+          cancelButtonText = dialog.find(":submit[name=_continue]").html();
+      dialog.find('.form-actions').remove();
+
       form.attr("data-remote", true);
-      dialog.find('.modal-header-title').text(form.data('title'));      
+      dialog.find('.modal-header-title').text(form.data('title'));
       dialog.find('.cancel-action').unbind().click(function(){
         dialog.modal('hide');
         return false;
-      }).text(cancelButtonText);
-      
+      }).html(cancelButtonText);
+
       dialog.find('.save-action').unbind().click(function(){
         form.submit();
         return false;
-      }).text(saveButtonText);
-      
+      }).html(saveButtonText);
+
       form.bind("ajax:complete", function(xhr, data, status) {
         if (status == 'error') {
           dialog.find('.modal-body').html(data.responseText);
           widget._bindFormEvents();
-
         } else {
-
           var json = $.parseJSON(data.responseText);
           var option = '<option value="' + json.id + '" selected>' + json.label + '</option>';
           var select = widget.element.find('select').filter(":hidden");
-          
+
           if(widget.element.find('.filtering-select').length) { // select input
             var input = widget.element.find('.filtering-select').children('.ra-filtering-select-input');
             input.val(json.label);
-            if (!select.find('option[value=' + json.id + ']').length) // replace
+            if (!select.find('option[value=' + json.id + ']').length) { // not a replace
               select.html(option).val(json.id);
-          
+              widget.element.find('.update').removeClass('disabled');
+            }
           } else { // multi-select input
-          
             var input = widget.element.find('.ra-filtering-select-input');
             var multiselect = widget.element.find('.ra-multiselect');
             if (multiselect.find('option[value=' + json.id + ']').length) { // replace
@@ -114,22 +116,22 @@
         }
       });
     },
-    
+
     _getModal: function() {
       var widget = this;
       if (!widget.dialog) {
         widget.dialog = $('\
-          <div id="modal" class="modal">\
+          <div id="modal" class="modal fade">\
             <div class="modal-header">\
-              <a href="#" class="close">&times;</a>\
+              <a href="#" class="close" data-dismiss="modal">&times;</a>\
               <h3 class="modal-header-title">...</h3>\
             </div>\
             <div class="modal-body">\
               ...\
             </div>\
             <div class="modal-footer">\
-              <a href="#" class="btn secondary cancel-action">...</a>\
-              <a href="#" class="btn primary save-action">...</a>\
+              <a href="#" class="btn cancel-action">...</a>\
+              <a href="#" class="btn btn-primary save-action">...</a>\
             </div>\
           </div>')
           .modal({
@@ -137,7 +139,7 @@
             backdrop: true,
             show: true
           })
-          .bind('hidden', function(){
+          .on('hidden', function(){
             widget.dialog.remove();   // We don't want to reuse closed modals
             widget.dialog = null;
           });

data/app/assets/javascripts/rails_admin/rails_admin.js.erb

@@ -1,8 +1,9 @@
-<% 
+<%
   theme = ENV['RAILS_ADMIN_THEME'] || :default
   require_asset 'jquery'
   require_asset 'jquery_ujs'
-  require_asset 'rails_admin/jquery_nested_form'
+  require_asset 'jquery_nested_form'
+  require_asset 'rails_admin/ra.nested-form-hooks'
   require_asset 'jquery.remotipart'
   require_asset 'rails_admin/jquery.pjax'
   require_asset 'rails_admin/jquery-ui-1.8.16.custom.js'
@@ -16,4 +17,4 @@
   require_asset 'rails_admin/ui'
   require_asset "rails_admin/themes/#{theme}/ui"
   require_asset 'rails_admin/custom/ui'
-%>
+%>

data/app/assets/javascripts/rails_admin/themes/default/ui.js

@@ -1,12 +1,12 @@
-/* 
-  Theme's JS behaviour 
-  
+/*
+  Theme's JS behaviour
+
   Available resources:
-  
+
   http://twitter.github.com/bootstrap/javascript.html
   https://github.com/twitter/bootstrap/tree/master/js
   http://jquery.com/
   http://jqueryui.com/ (parts of it)
-  
+
   rename to ui.js.coffee if needed.
-*/
+*/

data/app/assets/javascripts/rails_admin/ui.js.coffee

@@ -1,33 +1,61 @@
 $ = jQuery
 
-$("#list input.checkbox.toggle").live "click", ->
-  checked_status = $(this).is(":checked")
-  $("td.action.select input.checkbox[name='bulk_ids[]']").each ->
-    $(this).attr "checked", checked_status
-    if checked_status
-      $(this).parent().addClass "checked"
-    else
-      $(this).parent().removeClass "checked"
+$("#list input.toggle").live "click", ->
+  $("#list [name='bulk_ids[]']").attr "checked", $(this).is(":checked")
 
 $("#list a, #list form").live "ajax:complete", (xhr, data, status) ->
   $("#list").replaceWith data.responseText
 
-$("table#history th.header").live "click", ->
-  if $(this).data("link")
-    window.location = $(this).data("link")
+$("table#history th.header[data-href]").live "click", ->
+  window.location = $(this).data('href')
 
-$(document).ready ->
-  $('.pjax').pjax('[data-pjax-container]')
-  $('.pjax-form').live 'submit', (event) ->
+$('.pjax').live 'click', (event) ->
+  if $.support.pjax
+    event.preventDefault()
+    $.pjax
+      container: '[data-pjax-container]'
+      url: $(this).data('href') || $(this).attr('href')
+      timeout: 2000
+  else if $(this).data('href') # not a native #href, need some help
+    window.location = $(this).data('href')
+
+$('.pjax-form').live 'submit', (event) ->
+  if $.support.pjax
     event.preventDefault()
     $.pjax
       container: '[data-pjax-container]'
       url: this.action + (if (this.action.indexOf('?') != -1) then '&' else '?') + $(this).serialize()
-  $(".alert-message").alert()
-  $("[rel=twipsy]").twipsy()
+      timeout: 2000
+
+$('[data-target]').live 'click', ->
+  if !$(this).hasClass('disabled')
+    if $(this).has('i.icon-chevron-down').length
+      $(this).removeClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right')
+      $($(this).data('target')).select(':visible').hide('slow')
+    else
+      if $(this).has('i.icon-chevron-right').length
+        $(this).addClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right')
+        $($(this).data('target')).select(':hidden').show('slow')
+
+$('.form-horizontal legend').live 'click', ->
+  if $(this).has('i.icon-chevron-down').length
+    $(this).siblings('.control-group:visible').hide('slow')
+    $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right')
+  else
+    if $(this).has('i.icon-chevron-right').length
+      $(this).siblings('.control-group:hidden').show('slow')
+      $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right')
+
+$(document).ready ->
+
   $('.animate-width-to').each ->
     length = $(this).data("animate-length")
     width = $(this).data("animate-width-to")
     $(this).animate(width: width, length, 'easeOutQuad')
 
+  $('.form-horizontal legend').has('i.icon-chevron-right').each ->
+    $(this).siblings('.control-group').hide()
+
+  $('[rel=tooltip]').tooltip(delay: { show: 200, hide: 500 });
+
 

data/app/assets/stylesheets/rails_admin/base/README

@@ -1,2 +1,2 @@
-For RailsAdmin developpers;
-We should use sass variables & mixins as much as possible so that themers/users can override them cleanly
+For RailsAdmin developpers;
+We should use sass variables & mixins as much as possible so that themers/users can override them cleanly