flexible_admin 0.2.0.1 → 0.2.0.2

data/lib/flexible_admin/version.rb

@@ -1,3 +1,3 @@
 module FlexibleAdmin
-  VERSION = "0.2.0.1"
+  VERSION = "0.2.0.2"
 end

data/lib/generators/flexible_admin/templates/admin_layout.html.erb

@@ -20,12 +20,15 @@
   <%%= render 'layouts/admin/navigation' %>
 
   <div class="container-fluid">
-    <div class="sidebar">
-      <%%= yield :sidebar %>
-    </div><!-- .sidebar -->
-    <div class="content">
-      <%%= render 'layouts/admin/flash', :flash => flash %>
-      <%%= yield :layout %>
+    <div class="row-fluid">
+      <div class="span2">
+        <%%= yield :sidebar %>
+        &nbsp;
+      </div>
+      <div class="span10">
+        <%%= render 'layouts/admin/flash', :flash => flash %>
+        <%%= yield :layout %>
+      </div>
     </div>
   </div>
 

data/lib/generators/flexible_admin/templates/javascripts/app.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
   $("#flash").delay(6000).fadeOut(3000);
-  $('.sortable').dataTable();    
+  $('.sortable').dataTable({aaSorting: []});
 });
 

data/lib/generators/flexible_admin/templates/stylesheets/admin.sass

@@ -1,38 +1,21 @@
-body
-  padding-top: 60px
-  background: #fff url(/assets/admin/admin-background.png) repeat-y
-  
-label.checkbox
-  float: none
-
-div.signin
-  margin-top: 10px
-  margin-left: 10px
-  float: right    
-    
-form .clearfix
-  .field_with_errors
-    label, .help-block, .help-inline
-      color: #b94a48
-    input, textarea
-      color: #b94a48
-      border-color: #ee5f5b
-    input:focus, textarea:focus
-      border-color: #e9322d
-      -webkit-box-shadow: 0 0 6px #f8b9b7
-      -moz-box-shadow: 0 0 6px #f8b9b7
-      box-shadow: 0 0 6px #f8b9b7
-    .input-prepend .add-on, .input-append .add-on
-      color: #b94a48
-      background-color: #fce6e6
-      border-color: #b94a48
-    
+.error, .field_with_error, .field_with_errors
+  > label, .help-block, .help-inline
+    color: #b94a48
+  input, select, textarea
+    color: #b94a48
+    border-color: #b94a48
+  input:focus, select:focus, textarea:focus
+    border-color: #953b39
+    -webkit-box-shadow: 0 0 6px #d59392
+    -moz-box-shadow: 0 0 6px #d59392
+    box-shadow: 0 0 6px #d59392
+  .input-prepend .add-on, .input-append .add-on
+    color: #b94a48
+    background-color: #f2dede
+    border-color: #b94a48
 
 #navigation
   color: #ababab
-
-.nav
-  min-width: 300px
   
 .dataTables_wrapper
   a
@@ -45,4 +28,5 @@ form .clearfix
   margin-bottom: 10px
   label
     float: none
-    
+  input
+    display: inline

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexible_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083518900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *70354083518900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083518480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083518480
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083518020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083518020
 - !ruby/object:Gem::Dependency
   name: ckeditor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083517520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 3.6.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.6.3
+  version_requirements: *70354083517520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083517100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083517100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083516640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083516640
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083516220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083516220
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70354083515800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,12 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70354083515800
 description: Rails 3.1+ admin generator
 email:
 - josh@joshcrews.com
@@ -229,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -963619048934454845
+      hash: 1620435888910517458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,10 +198,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -963619048934454845
+      hash: 1620435888910517458
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails 3.1+ admin generator