rails_admin 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0409337248747730f7ea1bfeecd3c8a87970b95
-  data.tar.gz: a9a8e2ec8886981cdde444441df74ceaa5099e85
+  metadata.gz: 531cf0017e10c6ec70071cc36bf6f26bb022eb0a
+  data.tar.gz: 1660b6774fadf54a24b9d67a534305630727ccb1
 SHA512:
-  metadata.gz: 65f95de98ec19d04476bf20a64c6d930c35d76e99c5499a939bb78e2207d277effb01807f63d2e6cffa301c0a79ef6f9ddd5cfc48a18f4fbe8f0470ed69c88f4
-  data.tar.gz: ce24bd3ce10b5952c29ba58e0c25284bddb54abd0493328298750aa29c20c1ad878be3d2797ef2d462411b422c83e4f39cb1fb8876543540e26031367a803a96
+  metadata.gz: f2ca04cae79c6bfcdaab54dfadcbaa72b36bdc715ac37d15bbaa52d9ff383b27f7d514fd76537e466ebb6dd76ef1b5805c53dc73ade5abb6af717e1164e6a3a7
+  data.tar.gz: 39da0448e0b86dde4a980fa8444ec09007d9e095285d89a2329eb8c79bc03a2ec56dbed0c9c8da2503e50ba3391f36c4687f7995ce3a3c02b67f985f5d080674

data/Gemfile

@@ -1,48 +1,28 @@
 source 'https://rubygems.org'
 
-case ENV['RAILS_VERSION']
-when '4.0'
-  gem 'rails', '~> 4.0.0'
-  gem 'devise', '>= 3.2'
-  gem 'test-unit'
-when '4.1'
-  gem 'rails', '~> 4.1.0'
-  gem 'devise', '>= 3.2'
-else
-  gem 'rails', '~> 4.2.0'
-  gem 'sass-rails', '~> 5.0'
-  gem 'devise', '>= 3.4'
-end
+gem 'appraisal', '>= 2.0'
+gem 'devise'
 
-case ENV['CI_ORM']
-when 'mongoid'
-  gem 'mongoid', '~> 4.0.0.beta1'
+group :mongoid do
+  gem 'mongoid', '~> 4.0.0'
   gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
   gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
-else
+end
+
+group :active_record do
   platforms :jruby do
-    case ENV['CI_DB_ADAPTER']
-    when 'mysql'
-      gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
-      gem 'jdbc-mysql', '>= 5.1'
-    when 'postgresql'
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
-      gem 'jdbc-postgres', '>= 9.2'
-    else
-      gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta1'
-      gem 'jdbc-sqlite3', '>= 3.7'
-    end
+    gem 'activerecord-jdbcmysql-adapter', '>= 1.2'
+    gem 'jdbc-mysql', '>= 5.1'
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2'
+    gem 'jdbc-postgres', '>= 9.2'
+    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.beta1'
+    gem 'jdbc-sqlite3', '>= 3.7'
   end
 
   platforms :ruby, :mswin, :mingw do
-    case ENV['CI_DB_ADAPTER']
-    when 'mysql2'
-      gem 'mysql2', '~> 0.3.14'
-    when 'postgresql'
-      gem 'pg', '>= 0.14'
-    else
-      gem 'sqlite3', '>= 1.3'
-    end
+    gem 'mysql2', '~> 0.3.14'
+    gem 'pg', '>= 0.14'
+    gem 'sqlite3', '>= 1.3'
   end
 
   gem 'paper_trail', '~> 3.0'
@@ -64,7 +44,7 @@ group :test do
   gem 'generator_spec', '>= 0.8'
   gem 'launchy', '>= 2.2'
   gem 'mini_magick', '>= 3.4'
-  gem 'paperclip', '>= 3.4'
+  gem 'paperclip', ['>= 3.4', '!= 4.3.0']
   gem 'poltergeist', '~> 1.5'
   gem 'rack-cache', require: 'rack/cache'
   gem 'rspec-rails', '>= 2.14'

data/README.md

@@ -60,7 +60,7 @@ class Ball < ActiveRecord::Base
 end
 ```
 
-[Details](https://github.com/sferik/rails_admin/wiki/Railsadmin-DSL)
+Details: [Models](https://github.com/sferik/rails_admin/wiki/Models), [Groups](https://github.com/sferik/rails_admin/wiki/Groups), [Fields](https://github.com/sferik/rails_admin/wiki/Fields)
 
 ## Documentation
 https://github.com/sferik/rails_admin/wiki

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

@@ -24,8 +24,7 @@
         chooseAll: "Choose all",
         chosen: "Chosen records",
         clearAll: "Clear all",
-        remove: "Remove",
-        selectChoice: "Select your choice(s) and click"
+        remove: "Remove"
       },
       searchDelay: 400,
       remote_source: null,
@@ -101,6 +100,13 @@
       this.selection.wrap('<div class="wrapper"/>');
 
       this.element.css({display: "none"});
+
+      this.tooManyObjectsPlaceholder = $('<option disabled="disabled" />').text(RailsAdmin.I18n.t("too_many_objects"));
+      this.noObjectsPlaceholder = $('<option disabled="disabled" />').text(RailsAdmin.I18n.t("no_objects"))
+
+      if(this.options.xhr){
+        this.collection.append(this.tooManyObjectsPlaceholder);
+      }
     },
 
     _bindEvents: function() {
@@ -164,13 +170,21 @@
       var widget = this;
       widget._query(val, function(matches) {
         var i;
-        widget.collection.html('');
+        var filtered = [];
         for (i in matches) {
           if (matches.hasOwnProperty(i) && !widget.selected(matches[i].id)) {
+            filtered.push(i);
+          }
+        }
+        if (filtered.length > 0) {
+          widget.collection.html('');
+          for (i in filtered) {
             widget.collection.append(
               $('<option></option>').attr('value', matches[i].id).attr('title', matches[i].label).text(matches[i].label)
             );
           }
+        } else {
+          widget.collection.html(widget.noObjectsPlaceholder);
         }
       });
     },
@@ -209,10 +223,11 @@
               matches.push({id: i, label: this._cache[i]});
             }
           }
+          success.apply(this, [matches]);
+        } else {
+          this.collection.html(this.tooManyObjectsPlaceholder);
         }
 
-        success.apply(this, [matches]);
-
       } else {
 
         if (this.options.xhr) {

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

@@ -39,7 +39,7 @@
           return { label: $(this).text(), value: this.value };
         }).toArray();
       }
-      var filtering_select = $('<div class="input-append filtering-select" style="float:left"></div>')
+      var filtering_select = $('<div class="input-group filtering-select col-sm-2" style="float:left"></div>')
       var input = this.input = $('<input type="text">')
         .val(value)
         .addClass("form-control ra-filtering-select-input")
@@ -94,12 +94,11 @@
       input.data("ui-autocomplete")._renderItem = function(ul, item) {
         return $("<li></li>")
           .data("ui-autocomplete-item", item)
-          .append( $( "<a></a>" ).html( item.label || item.id ) )
+          .append( $( "<a></a>" ).html( item.html || 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>')
+      var button = this.button = $('<span class="input-group-btn"><label class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Show All Items" role="button"><span class="caret"></span><span class="ui-button-text">&nbsp;</span></label></span>')
         .click(function() {
           // close if already visible
           if (input.autocomplete("widget").is(":visible")) {
@@ -119,17 +118,21 @@
 
     _getResultSet: function(request, data, xhr) {
       var matcher = new RegExp($.ui.autocomplete.escapeRegex(request.term), "i");
+      var highlighter = function(label, word){
+        if(word.length > 0){
+          return $.map(label.split(word), function(el, i){
+            return $('<span></span>').text(el).html();
+          }).join($('<strong></strong>').text(word)[0].outerHTML);
+        }else{
+          return $('<span></span>').text(label).html();
+        }
+      };
 
       return $.map(data, function(el, i) {
         // 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(
-              new RegExp(
-                "(?![^&;]+;)(?!<[^<>]*)(" +
-                $.ui.autocomplete.escapeRegex(request.term) +
-                ")(?![^<>]*>)(?![^&;]+;)", "gi"
-             ), "<strong>$1</strong>") : el.id,
+            html: highlighter(el.label || el.id, request.term),
             value: el.label || el.id,
             id: el.id || el.value
           };

data/app/assets/javascripts/rails_admin/ra.i18n.coffee

@@ -2,5 +2,5 @@ class @RailsAdmin
 @RailsAdmin.I18n = class Locale
   @init: (@locale)->
   @t:(key) ->
-    humanize = key.charAt(0).toUpperCase() + key.replace("_", " ").slice(1)
+    humanize = key.charAt(0).toUpperCase() + key.replace(/_/g, " ").slice(1)
     @locale[key] || humanize

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

@@ -19,7 +19,7 @@
 
       var edit_url = dom_widget.find('select').first().data('options') && dom_widget.find('select').first().data('options')['edit-url'];
       if(typeof(edit_url) != 'undefined' && edit_url.length) {
-        dom_widget.on('dblclick', '.ra-multiselect option', function(e){
+        dom_widget.on('dblclick', '.ra-multiselect option:not(:disabled)', function(e){
           widget._bindModalOpening(e, edit_url.replace('__ID__', this.value))
         });
       }
@@ -109,7 +109,7 @@
               select.find('option[value=' + json.id + ']').text(json.label);
               multiselect.find('option[value= ' + json.id + ']').text(json.label);
             } else { // add
-              select.prepend(option);
+              select.append(option);
               multiselect.find('select.ra-multiselect-selection').append(option);
             }
           }

data/app/assets/javascripts/rails_admin/ra.widgets.coffee

@@ -46,7 +46,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
       input = this
       image_container = $("#" + input.id).parent().children(".preview")
       unless image_container.length
-        image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview')).find('img.preview')
+        image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview').addClass('img-thumbnail')).find('img.preview')
         image_container.parent().find('img:not(.preview)').hide()
       ext = $("#" + input.id).val().split('.').pop().toLowerCase()
       if input.files and input.files[0] and $.inArray(ext, ['gif','png','jpg','jpeg','bmp']) != -1

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

@@ -92,3 +92,11 @@ $(document).on 'pjax:popstate', () ->
       return
     return
   return
+
+#Remove all filter and then refresh
+$(document).on 'click',  "#remove_filter",(event) ->
+  event.preventDefault()
+  $("#filters_box").html("")
+  $("hr.filters_box").hide()
+  $(this).parent().siblings("input[type='search']").val("")
+  $(this).parents("form").submit()  

data/app/assets/stylesheets/rails_admin/base/theming.scss

@@ -3,6 +3,8 @@
   Keep it clean, people
 */
 
+$avatar-size: 30px;
+
 body.rails_admin {
 
   .thumbnail {
@@ -12,12 +14,18 @@ body.rails_admin {
   /* room for upper navbar */
   padding-top: $navbar-height;
 
-  /* Application name */
-  .navbar .brand {
-    small {
-      color:#9d261d;
-      font-weight:bold;
-      line-height: 1;
+  .navbar {
+    .edit_user_root_link {
+      position: relative;
+
+      img {
+        position: absolute;
+        top: ((40px - $avatar-size) / 2);
+
+        & + span {
+          margin-left: ($avatar-size + 5px);
+        }
+      }
     }
   }
 
@@ -62,6 +70,18 @@ body.rails_admin {
       display:none;
     }
 
+    .control-group {
+      .img-thumbnail {
+        margin-bottom: 10px;
+      }
+
+      .btn-remove-image {
+        &.btn-info {
+          margin-top: 10px;
+        }
+      }
+    }
+
     legend {
       cursor:pointer;
       i {
@@ -114,6 +134,8 @@ body.rails_admin {
 
     /* nested forms */
     .tab-content {
+      clear: both;
+
       .tab-pane {
         @include clearfix;
         border-left: 5px solid #049cdb;
@@ -300,8 +322,16 @@ body.rails_admin {
   }
 }
 
-@media screen and (min-width: $screen-sm-min) {
+@media screen and (min-width: $grid-float-breakpoint) {
   body.rails_admin {
+    .navbar {
+      .edit_user_root_link {
+        img {
+          top: (($navbar-height - $avatar-size) / 2);
+        }
+      }
+    }
+
     .sidebar-nav {
       position: fixed;
       top: $navbar-height;

data/app/assets/stylesheets/rails_admin/ra.widgets.scss

@@ -2,7 +2,8 @@ iframe.wysihtml5-sandbox{
   height: 250px !important;
   width: 75% !important;
 }
+
 .controls img.preview{
-  max-height: 100px;
-  max-width: 100px;
+  max-height: 200px;
+  max-width: 300px;
 }

data/app/assets/stylesheets/rails_admin/themes/cerulean/theming.scss

@@ -1,97 +1,133 @@
-// Bootswatch.less
-// Swatch: Cerulean
-// Version: 2.0.2
-// -----------------------------------------------------
-
-// TYPOGRAPHY
-// -----------------------------------------------------
+// Cerulean 3.3.1
+// Bootswatch
+// .rails_admin .sidebar-nav added to prevent same link color
+// ------------------------------------------------------------------
+
+@mixin btn-shadow($color){
+  @include gradient-vertical-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%));
+  filter: none;
+  border-bottom: 1px solid darken($color, 10%);
+}
 
-@import url(https://fonts.googleapis.com/css?family=Telex);
+// Navbar =====================================================================
 
-.navbar, .subnav {
-	font-family: $headingsFontFamily;
+.navbar {
+  @include btn-shadow($navbar-default-bg);
+  filter: none;
+  @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
 }
 
-// NAVBAR
-// -----------------------------------------------------
+.navbar.navbar-default .badge {
+      background-color: #fff;
+      color: $navbar-default-bg;
+  }
 
-.navbar-inner {
-  @include gradient-vertical-three-colors($navbarBackground, $navbarBackground, 0.9, $navbarBackgroundHighlight);
-}
+.navbar.navbar-inverse , .rails_admin .sidebar-nav  {
+    @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
+    filter: none;
+    border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
+  }
 
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
-  background-color: $navbarBackground;
-  background-color: rgba(0,0,0,.2);
-}
 
-.navbar .search-query {
-	border: 1px solid darken($linkColor, 10%);
+.navbar.navbar-inverse .badge {
+  background-color: #fff;
+  color: $navbar-inverse-bg;
 }
 
-// responsive menu colors
+.navbar .navbar-nav > li > a,
+.navbar .navbar-brand {
+    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+  }
 
-.navbar .nav-collapse.in > .nav > li .dropdown-menu a {
-	color: $white;
 
-	&:hover {
-		color: $white;
-	}
-}
+@media (max-width: $grid-float-breakpoint-max) {
 
-.navbar .nav-collapse.in .nav li > a {
-	color: $white;
+  .navbar {
 
-	&:hover {
-		background-color: #2B7CAC;
-	}
+    .dropdown-header {
+      color: #fff;
+    }
+  }
 }
 
-.btn-navbar:hover {
-    background-color: darken($white, 20%);
+// Buttons ====================================================================
+
+.btn {
+
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+
+  .caret {
+    border-top-color: #fff;
+  }
 }
 
-// BUTTONS
-// -----------------------------------------------------
+.btn-default {
+
+  @include btn-shadow($btn-default-bg);
 
-.btn {
-  @include gradient-vertical-three-colors($white, $white, 0.05, darken($white, 0%));
-  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  @include box-shadow($shadow);
-  
   &:hover {
-  	background-position: 0 0;
+    color: $btn-default-color;
+  }
+
+  .caret {
+    border-top-color: $text-color;
   }
 }
 
-.btn-primary {
-  @include buttonBackground(lighten($btnPrimaryBackground, 5%), $btnPrimaryBackground);
+.btn-default {
+  @include btn-shadow($btn-default-bg);
 }
 
-.btn-info {
-  @include buttonBackground(lighten($btnInfoBackground, 5%), $btnInfoBackground);
+.btn-primary {
+  @include btn-shadow($btn-primary-bg);
 }
 
 .btn-success {
-  @include buttonBackground(lighten($btnSuccessBackground, 5%), $btnSuccessBackground);
+  @include btn-shadow($btn-success-bg);
+}
+
+.btn-info {
+  @include btn-shadow($btn-info-bg);
 }
 
 .btn-warning {
-  @include buttonBackground(lighten($btnWarningBackground, 5%), $btnWarningBackground);
+  @include btn-shadow($btn-warning-bg);
 }
 
 .btn-danger {
-  @include buttonBackground(lighten($btnDangerBackground, 5%), $btnDangerBackground);
+  @include btn-shadow($btn-danger-bg);
 }
 
-.btn-inverse {
-  @include buttonBackground(lighten($btnInverseBackground, 5%), $btnInverseBackground);
+// Typography =================================================================
+
+// Tables =====================================================================
+table,
+.table {
+  > thead > tr > th {
+
+    color: $headings-color;
+  }
+
 }
 
-// ICONS
-// -----------------------------------------------------
+// Forms ======================================================================
+
+// Navs =======================================================================
+
+// Indicators =================================================================
+
+// Progress bars ==============================================================
 
-// Make icons gray
-i[class^="icon-"]{
-	opacity: 0.8;
-}
+// Containers =================================================================
+
+.panel-primary,
+.panel-success,
+.panel-warning,
+.panel-danger,
+.panel-info {
+
+  .panel-heading,
+  .panel-title {
+    color: #fff;
+  }
+}