caboose-cms 0.4.72 → 0.4.73

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQ2YWNkYzI0MTBjZjI1ZmYyNDRhYTE4NGE5ODA4ZDQ0MWRiMDBlMQ==
+    YTFiY2E2NjIxOWExYzgxMTEwY2FmNDFmNzMxNzFkN2JiMTUwOGU1Nw==
   data.tar.gz: !binary |-
-    YWM0MWU1NTc0ZjE4NWIyNTA3NTI2ZDJlNjhlY2U3N2NjZWQ1ZmExOQ==
+    ZjUwZjlkZWEzOWQyNGU2Y2I2OWI5ZGY3NjQ5ZjM0ZTk5YjZmYTg4ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWQyNGIzYTJhNThmYjRiM2M0ZjQ0NjA3ZDU1ZGNiOTRlNzYyYzk2YWNjYTM4
-    OGUxMzc2N2Q2ODVkOGViNjg0NjJkZjJmOTE5Yjk2MjJhZjQ5YjI5MTk1MDFm
-    ZGRkMzE4YzJjY2U1MTY2ZmVmOWM3NjRmNmMyMWQwNjdiNjMxMzI=
+    YjhkZGQ4MzY5OTdjZTRiM2MxZjVjOGI2Y2I3NTNkNzQzOTE1OTBhZTg1MjRl
+    NmFiMmE1YzY5Nzg0ZGMxMzZiYTAxMzMxOTI2ZWU0NzUyNzQxOTZjYWQwMWNj
+    YmQzMmE4MDg3MDY4NjI5ZmJiNzUxMGU4OGIwOTdmY2IwNjUyYzI=
   data.tar.gz: !binary |-
-    Yzk3NjQyZTQxZTAxNTM2OTBlMTA0MGQzYjFmZmIxZDhlMDkwNzYzOWNmYTM5
-    MTE2OWNkNjVkOTcyYmEwYzM4MDcwNWFmMzMwNmQxZDNjNDZmYTU2ZDg3N2Fi
-    MjZkMDRiNWI1Njk1ODE3ZDViMjAwZDczYWZhYmM5NjE0YmYwNzQ=
+    ZmJiYzZhYjE2MGVjYzgwOTNjZjkwZjIxNmMzY2VjMzllMjU5MjFjMjc3YTIw
+    MDYyMTg1NzA2NjM4MWYxMDc0NTkyNTlhZjFmODc0MTdhMGY4YjI4NmUwYzEz
+    OWEyMzUxMWVkOTkyMmFjNjZmMWE0YTE3NWQ0NjZkMWJjZjk3ZTQ=

data/app/assets/javascripts/caboose/admin_images_index.js

@@ -32,8 +32,8 @@ ImagesController.prototype = {
         that.cat = resp;        
       }        
     });        
-    $('#message').empty();
-    var ul = $('#media');
+    $('#message').empty();    
+    var ul = $('<ul/>');
     if (this.cat.children.length > 0 || this.cat.images.count > 0)
     {
       $.each(this.cat.children, function(i, cat2) {
@@ -46,14 +46,17 @@ ImagesController.prototype = {
       });
       $.each(this.cat.images, function(i, mi) {      
         ul.append($('<li/>').addClass('image').attr('id', 'image' + mi.id)
-          .append($('<a/>').attr('href', '/admin/images/' + mi.id)
+          .append($('<a/>')
+            .attr('href', '/admin/images/' + mi.id)
             .css('background-image', mi.tiny_url)
             .append($('<span/>').addClass('name').html(mi.name))
           )
         );
       });
     }
-    ul.replaceWith($('<p/>').html("This category is empty."));
+    else
+      ul = $('<p/>').html("This category is empty.");
+    $('#media').empty().append(ul);
   },
   
   // Adds a new media category  

data/app/assets/javascripts/caboose/application.js

@@ -8,5 +8,4 @@
 //= require caboose/jquery.placeholder
 //= require caboose/modal_integration
 //= require caboose/main
-//= require_tree ../../templates
-//= require application
+//= require_tree ../../templates

data/app/assets/stylesheets/caboose/admin_images_index.css.scss

@@ -0,0 +1,53 @@
+
+#media {
+  ul {
+    list-style: none; margin: 0; padding: 0; 
+    
+    li { 
+      list-style: none; margin: 4px; padding: 0; float: left;   
+      a { 
+        display: block; 
+        width: 150px; 
+        height: 150px;
+        overflow: hidden; 
+        border: #666 4px solid; 
+        background-size: contain; 
+        background-repeat: no-repeat; 
+        background-position: center; 
+        background-color: #666; 
+        position: relative; 
+        text-align: center;
+        
+        span { color: #fff; text-decoration: none; }
+        span.name { display: block; background: #666; color: #fff; text-decoration: none !important; border: 0; }
+          
+        &:hover { 
+          background-color: #fff69f;
+          border-color: #fff69f;
+          
+          span      { background: #efefef; color: #000; }
+          span.name { background: #fff69f; color: #000; }
+        }
+        
+        &.selected span, 
+        &.selected:hover span { background: #fff69f; color: #000; border: #fff69f 1px solid; }
+      }
+      &.category {                                    
+        a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
+        a:hover span.icon { background: #fff69f; color: #000; }      
+      }
+    }
+  }
+}
+ 
+.progress { 
+  max-width: 600px; 
+  margin: 0.2em 0 0.2em 0;
+  .bar { 
+    height: 1.2em; 
+    padding: 0.2em;
+    color: white;
+    display: none; 
+  }
+}
+

data/app/assets/stylesheets/caboose/application.css

@@ -12,8 +12,7 @@
  *= require caboose/fonts
  *= require caboose/page_bar_generator
  *= require caboose/caboose
- *= require caboose/model_binder 
- *= require application
+ *= require caboose/model_binder  
  */
 
 #cboxLoadedContent { margin-bottom: 0; }

data/app/controllers/caboose/images_controller.rb

@@ -25,7 +25,7 @@ module Caboose
       
       id = params[:media_category_id]        
       cat = id ? MediaCategory.find(id) : MediaCategory.top_image_category(@site.id)      
-      render :json => cat.api_hash      
+      render :json => cat.api_hash
     end
 
     # GET /admin/images/new

data/app/models/caboose/site.rb

@@ -16,4 +16,8 @@ class Caboose::Site < ActiveRecord::Base
     return d.site_id
   end
   
+  def self.sanitize_name(name)
+    self.name = self.name.downcase.gsub(' ', '_')
+  end
+  
 end

data/app/views/layouts/caboose/application.html.erb

@@ -2,13 +2,15 @@
 <% if !@page.nil? && @page.title != 'Access Denied' %>
 <% content_for :js do %>
 <%= javascript_include_tag "caboose/application" %>
+<%= javascript_include_tag @site.name == 'application' ? 'application' : "@site.name/application" %>
 <script>window.loggedIn = <%= logged_in?.to_json %></script>
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
 <% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
 <%= yield :caboose_js %>
 <% end %>  
 <% content_for :css do %>
-<%= stylesheet_link_tag('caboose/application') %>
+<%= stylesheet_link_tag 'caboose/application' %>
+<%= stylesheet_link_tag @site.name == 'application' ? 'application' : "@site.name/application" %>
 <% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
 <% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
 <%= yield :caboose_css %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.72'
+  VERSION = '0.4.73'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.72
+  version: 0.4.73
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS built on rails with love.
 email:
 - william@nine.is
@@ -232,7 +246,7 @@ files:
 - app/assets/javascripts/caboose/testing.js
 - app/assets/javascripts/tinymce/plugins/caboose/plugin.js
 - app/assets/stylesheets/caboose/admin.css
-- app/assets/stylesheets/caboose/admin_images_index.css
+- app/assets/stylesheets/caboose/admin_images_index.css.scss
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css

data/app/assets/stylesheets/caboose/admin_images_index.css

@@ -1,33 +0,0 @@
-
-ul.media { list-style: none; margin: 0; padding: 0; }
-ul.media li { list-style: none; margin: 4px; padding: 0; float: left; }
-ul.media a { 
-  display: block; 
-  width: 150px; 
-  height: 150px;
-  overflow: hidden; 
-  border: #666 4px solid; 
-  background-size: contain; 
-  background-repeat: no-repeat; 
-  background-position: center; 
-  background-color: #666; 
-  position: relative; 
-  text-align: center;
-}
-ul.media a:hover { 
-  background-color: #fff69f;
-  border-color: #fff69f; 
-}
-ul.media li a span { color: #fff; text-decoration: none; }
-ul.media li a:hover span { background: #efefef; color: #000; }
-ul.media li a span.name       { display: block; background: #666; color: #fff; text-decoration: none !important; border: 0; }
-ul.media li a:hover span.name { background: #fff69f; color: #000; }
-
-ul.media li a.selected span, 
-ul.media li a.selected:hover span { background: #fff69f; color: #000; border: #fff69f 1px solid; }
-
-ul.media li.category a span.icon { display: block; padding: 10px 20px; font-size: 24pt; color: #fff; }
-ul.media li.category a:hover span.icon { background: #fff69f; color: #000; }
-
-.progress { max-width: 600px; margin: 0.2em 0 0.2em 0; }
-.progress .bar { height:  1.2em; padding: 0.2em; color: white; display: none; }