caboose-cms 0.3.50 → 0.3.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTcxNDc2YWZmMzQ0MmUyMzExYjVkOTM1MDA2ZjcyZTI0YmJhNzMyNw==
+    NjExYWU5YWM2ZWUzZTIxODI3ZmE5Mzg4ZTcyZGEzNjQxMzE3MGRkZg==
   data.tar.gz: !binary |-
-    MTQ5NzgwOTk3NmU1YjY3ZDg3MWIwZThiNDcxNmI5OTVkYjBhYWZlZA==
+    YThhZDViODBjMzMxYWZjNWExNTBlNTNiMjg0ZmFjYmQ1ZWQ5OGI5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yzg3MmRkMjc3YTY3OTliNGViYjVkZjU5ZjFjNDFlMDAxYWNlOTM2MDVlNzA2
-    MTE1NjA5ZGViNGU0YTY3OTQ2NmY3YTZiNDEzZWEzZjg3OWRjYTBkNzFhYzQ3
-    NDBiMmVmMzQ0NTNkOGRjYTg3ZWYyYWVkNTQ4ZjFjYWViZDNlYTc=
+    NzkxNGZiYWYyYTlhZDhmMTAyNTdhY2M3NDhkODM5ZTFlN2Q0OTBkYjRiZjJm
+    MzM1MWI3MDVjMmQwZDIyYjk0ZWM1MTdmM2FiM2U3MDJmY2NmNWQ1NTVhNWNm
+    N2Y2ZGFjYzdhNWNkNzUyNWI2NDBkMWQyNGZlMzFkZjNmZjNhNGM=
   data.tar.gz: !binary |-
-    MWE0MTkwOWM4ZDE2OTgxNDFkYzQ3MWY0ZmUwOWY0MGI4OTM4Y2EwMTBiODJm
-    NmM3OWRiM2RkNTRiMTU3OWQ2YTlkOTRmYTEyMzg0YmQ4M2Q4YTYxNzc4YzY4
-    MjdjZTA1YmVkM2YyMGJjZjcxMzQxOGQzMWQ1NWVkYjcyZGY4NTg=
+    ZDgwNjM4ZjNjZDUzNGE5YmQyMmUzOTY3Zjc3OTk2YjliNDBhM2JjNGYxNmU4
+    YjhjZDk2NzY2MzEzMTY2NTUwMTQyNmIwYzBkZGU5MzMwY2YzMjJiY2MxZGUz
+    MjllMzAyNmRhYzRlMjI2MGZkNDExMzVkN2M3ODcxOGFjYmU5MGQ=

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

@@ -14,5 +14,5 @@
 //= require jquery_ujs
 //= require jquery.ui.all
 //= require colorbox-rails
+//= require caboose/jquery.placeholder
 //= require caboose/modal_integration
-//= require caboose/placeholder

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

@@ -10,9 +10,11 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
+//= require_tree ../../templates
 //= require jquery
 //= require jquery_ujs
 //= require colorbox-rails
+//= require caboose/jquery.detect
+//= require caboose/jquery.placeholder
 //= require caboose/modal_integration
-//= require application
-//= require caboose/placeholder
+//= require caboose/main

data/app/assets/javascripts/caboose/jquery.detect.js

@@ -0,0 +1,7 @@
+/**
+ * jQuery.browser.mobile (http://detectmobilebrowser.com/)
+ *
+ * jQuery.browser.mobile will be true if the browser is a mobile device
+ *
+ **/
+(function(a){(jQuery.browser = jQuery.browser || {}).mobile = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))})(navigator.userAgent||navigator.vendor||window.opera);

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

@@ -0,0 +1,126 @@
+//
+// Main
+//
+// :: Initialize
+// :: Events
+// :: Redirect
+// :: Reload
+// :: Login
+// :: Logout
+// :: Register
+
+var Caboose = function() {
+	var self = this;
+	
+	//
+	// Initialize
+	//
+	
+	self.initialize = function() {
+		self.loggedIn = window.loggedIn || false;
+		
+		$('a[href="/register"], [caboose=register]').click(function(event) {
+			event.preventDefault();
+			self.register( $(window).width() < 1024 );
+		});
+		
+		$('a[href="/login"], [caboose=login]').click(function(event) {
+			event.preventDefault();
+			self.login( $(window).width() < 1024 );
+		});
+		
+		$('a[href="/logout"], [caboose=logout]').click(function(event) {
+			event.preventDefault();
+			self.logout( $(window).width() < 1024 );
+		});
+	};
+	
+	//
+	// Events
+	//
+	
+	self.events = {};
+	
+	self.events.trigger = function(event) {
+		$(Caboose.events).trigger(event);
+	};
+	
+	self.events.on = function(event, callback) {
+		$(Caboose.events).on(event, callback);
+	};
+	
+	//
+	// Redirect
+	//
+	
+	self.redirect = function(url) {
+		if (!$.browser.mobile) {
+			window.location.href = url;
+		} else if ( (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) ) {
+			location.replace(url);
+		} else if ($.browser.mobile) {
+			document.location = url;
+		}
+	};
+	
+	//
+	// Reload
+	//
+	
+	self.reload = function() {
+		self.redirect(window.location.href);
+	};
+	
+	//
+	// Login
+	//
+	
+	self.login = function() {
+		if ($.browser.mobile) window.location.href = '/login?return_url=' + window.location.pathname;
+		
+		$.colorbox({
+			href: '/login?return_url=' + window.location.pathname,
+			iframe: true,
+			innerWidth: 200,
+			innerHeight: 50,
+			scrolling: false,
+			transition: 'fade',
+			closeButton: false,
+			opacity: 0.50
+		});
+	};
+	
+	//
+	// Logout
+	//
+	
+	self.logout = function() {
+		window.location = '/logout';
+	};
+	
+	//
+	// Register
+	//
+	
+	self.register = function(callback) {
+		if ($.browser.mobile) window.location.href = '/register?return_url=' + window.location.pathname;
+		
+		$.colorbox({
+			href: '/register?return_url=' + window.location.pathname,
+			iframe: true,
+			innerWidth: 200,
+			innerHeight: 50,
+			scrolling: false,
+			transition: 'fade',
+			closeButton: false,
+			opacity: 0.50
+		});
+	};
+	
+	// Init and return
+	$(document).ready(self.initialize);
+	return self;
+};
+
+// There can only be one
+var Caboose = new Caboose();

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

@@ -10,9 +10,10 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
+//= require_tree ../../templates
 //= require jquery
 //= require jquery_ujs
 //= require colorbox-rails
+//= require caboose/jquery.placeholder
+//= require caboose/jquery.detect
 //= require caboose/modal_integration
-//= require caboose/placeholder
-

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

@@ -16,3 +16,13 @@
  */
 
 #cboxLoadedContent { margin-bottom: 0; }
+
+#cboxTopLeft,
+#cboxTopRight,
+#cboxBottomLeft,
+#cboxBottomRight,
+#cboxMiddleLeft,
+#cboxMiddleRight,
+#cboxTopCenter,
+#cboxBottomCenter,
+#cboxClose { background: #111 !important; }

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

@@ -1,23 +1,46 @@
+/**
+ * Login
+ */
 
-#login_form .other_options {
-  position: absolute;
-  top: -4px;
-  right: 0;
+#modal_content { margin: 0 auto; }
+
+#login-form {
+	box-sizing: content-box;
+	max-width: 100%;
+	overflow: hidden;
+	padding: 12px 0;
+	position: relative;
+	width: 100%;
 }
 
-input#username,
-input#password {
-  font-size: 18px;
-  width: 95%;
-  margin: 0 0 8px 0;
-  padding: 7px;  
+@media all and (max-width: 400px) {
+	#login-form {
+		width: 400px;
+		margin: 0 auto;
+	}
 }
 
-input#btn_login {
-  font-size: 18px;
+#login-form #login-options {
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	top: 12px;
+	right: 0;
 }
 
-input#btn_cancel {
-  font-size: 18px;
+#login-form input#username,
+#login-form input#password {
+	font-size: 18px;
+	margin: 0 0 8px 0;
+	max-width: 100%;
+	padding: 7px;
+	width: 386px; /* 400 - 14:padding */
 }
 
+#login-form label {
+	cursor: pointer;
+	display: block;
+}
+	
+#login-form input[type=checkbox] { top: 8px; }
+#login-form .btn { font-size: 18px; }

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

@@ -13,6 +13,8 @@
  *= require caboose/caboose
  */
 
+html { width: 100%; }
+
 body {
   background: #111111;
   margin: 0;
@@ -29,6 +31,7 @@ body {
 
 #modal_content {
   width: 100%;
+	max-width: 100%;
   padding: 0;
 }
 
@@ -317,6 +320,16 @@ Message boxes
 	color: #ffffff;	
 }
 
+#cboxTopLeft,
+#cboxTopRight,
+#cboxBottomLeft,
+#cboxBottomRight,
+#cboxMiddleLeft,
+#cboxMiddleRight,
+#cboxTopCenter,
+#cboxBottomCenter,
+#cboxClose { background: #111 !important; }
+
 /*******************************************************************************
 Page Bar Generator
 *******************************************************************************/

data/app/controllers/caboose/application_controller.rb

@@ -3,13 +3,16 @@ module Caboose
 
     protect_from_forgery  
     before_filter :before_before_action
+    helper_method :logged_in?
+    
     @find_page = true
     
     def before_before_action
       
-      # Modify the built-in params array with URL params if necessary 
+      # Modify the built-in params array with URL params if necessary
       parse_url_params if Caboose.use_url_params
-                  
+      
+      
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
       
       # Initialize AB Testing
@@ -18,11 +21,12 @@ module Caboose
       # Try to find the page 
       @page = Page.new
       @crumb_trail  = []
-		  @subnav       = {}
+      @subnav       = {}
       @actions      = {}
       @tasks        = {}
       @page_tasks   = {}
-      @is_real_page = false      
+      @is_real_page = false
+      
       if @find_page
         @page = Page.page_with_uri(request.fullpath)
         @crumb_trail  = Caboose::Page.crumb_trail(@page)		    
@@ -30,10 +34,10 @@ module Caboose
       
       # Sets an instance variable of the logged in user
       @logged_in_user = logged_in_user      
-
+      
       before_action
     end
-
+    
     # Parses any parameters in the URL and adds them to the params
     def parse_url_params      
       return if !Caboose.use_url_params      

data/app/controllers/caboose/login_controller.rb

@@ -6,7 +6,7 @@ module Caboose
     def index
       @return_url = params[:return_url].nil? ? "/" : params[:return_url]
       @modal = params[:modal].nil? ? false : params[:modal]
-      redirect_to @return_url if logged_in?
+      redirect_to @return_url and return if logged_in?
     end
     
     # POST /login

data/app/controllers/caboose/modal_controller.rb

@@ -2,6 +2,11 @@ module Caboose
   class ModalController < Caboose::ApplicationController    
     layout 'caboose/application'
     
+    # GET /modal
+    def layout
+      render 'layouts/caboose/modal', layout: false
+    end
+    
     # GET /modal/:url
     def index
       @url = "/#{params[:url]}"

data/app/models/caboose/page_bar_generator.rb

@@ -57,6 +57,7 @@ module Caboose
   		@options.each { |key, val| @options[key] = post_get[key].nil? ? val : post_get[key] }
   		#@custom_url_vars = custom_url_vars if !custom_url_vars.nil?
   		@use_url_params = @options['use_url_params'].nil? ? Caboose.use_url_params : @options['use_url_params']
+      
   		fix_desc
   		set_item_count
   	end
@@ -69,11 +70,13 @@ module Caboose
   	  m = @options['model'].constantize
   		return m if @options['includes'].nil?
   		
+  		# See if any fields that we know have includes have values
   		associations = []
   		@options['includes'].each do |field, arr|    		          
   		  next if @params[field].nil? || (@params[field].kind_of?(String) && @params[field].length == 0)  		  
         associations << arr[0]
       end
+      # See if any fields in the sort option are listed in a table_name.column_name format
       if @options['sort']
         @options['sort'].split(',').each do |col|
           tbl_col = col.split('.')
@@ -84,6 +87,7 @@ module Caboose
           end
         end
       end
+      # See if any parameters are listed in a table_name.column_name format
       @params.each do |k,v|
         k.split('_concat_').each do |col,v2|        
           tbl_col = col.split('.')
@@ -98,7 +102,8 @@ module Caboose
   		return m
   	end
   	
-  	def table_name_of_association(assoc)  	    	  
+  	def table_name_of_association(assoc)
+      ap assoc
   	  return @options['model'].constantize.reflect_on_association(assoc.to_sym).class_name.constantize.table_name
   	end
   	

data/app/models/caboose/states.rb

@@ -0,0 +1,57 @@
+class Caboose::States
+  def self.all
+    return { 
+      'AL' => 'Alabama',
+      'AK' => 'Alaska',
+      'AZ' => 'Arizona',
+      'AR' => 'Arkansas',
+      'CA' => 'California',
+      'CO' => 'Colorado',
+      'CT' => 'Connecticut',
+      'DE' => 'Delaware',
+      'DC' => 'District of Columbia',
+      'FL' => 'Florida',
+      'GA' => 'Georgia',
+      'HI' => 'Hawaii',
+      'ID' => 'Idaho',
+      'IL' => 'Illinois',
+      'IN' => 'Indiana',
+      'IA' => 'Iowa',
+      'KS' => 'Kansas',
+      'KY' => 'Kentucky',
+      'LA' => 'Louisiana',
+      'ME' => 'Maine',
+      'MT' => 'Montana',
+      'NE' => 'Nebraska',
+      'NV' => 'Nevada',
+      'NH' => 'New Hampshire',
+      'NJ' => 'New Jersey',
+      'NM' => 'New Mexico',
+      'NY' => 'New York',
+      'NC' => 'North Carolina',
+      'ND' => 'North Dakota',
+      'OH' => 'Ohio',
+      'OK' => 'Oklahoma',
+      'OR' => 'Oregon',
+      'MD' => 'Maryland',
+      'MA' => 'Massachusetts',
+      'MI' => 'Michigan',
+      'MN' => 'Minnesota',
+      'MS' => 'Mississippi',
+      'MO' => 'Missouri',
+      'PA' => 'Pennsylvania',
+      'RI' => 'Rhode Island',
+      'SC' => 'South Carolina',
+      'SD' => 'South Dakota',
+      'TN' => 'Tennessee',
+      'TX' => 'Texas',
+      'UT' => 'Utah',
+      'VT' => 'Vermont',
+      'VA' => 'Virginia',
+      'WA' => 'Washington',
+      'WV' => 'West Virginia',
+      'WI' => 'Wisconsin',
+      'WY' => 'Wyoming'
+    }
+  end
+end

data/app/views/caboose/login/index.html.erb

@@ -1,57 +1,67 @@
-
-<form action='/login' method='post' id='login_form'>
-<h1>Login</h1>
-<input type='hidden'    name='return_url' value='<%= @return_url %>' />
-<input type='text'      name='username' id='username' placeholder='Login or email' />
-<input type='password'  name='password' id='password' placeholder='Password' />
-<input type='checkbox'  name='remember' id='remember' value='1' checked='true' /> Remember me
-<ul class='other_options'>
-<li><a href='/register?return_url=<%= @return_url %>'>Need to register?</a></li>
-<li><a href='/login/forgot-password?return_url=<%= @return_url %>'>Forgot your password?</a></li>
-</ul>
-<div id='message'></div>
-<p class='buttons'>
-  <input type='button' id='btn_cancel' value='Cancel' onclick="parent.$.fn.colorbox.close();" />
-	<input type='submit' id='btn_login'  value='Login' onclick='login(); return false;' />
-</p>
+<form action="/login" method="post" id="login-form">
+	<h1>Login</h1>
+	
+	<input type="hidden"   name="return_url" value="<%= @return_url %>" />
+	<input type="text"     name="username" id="username" placeholder="Login or email" />
+	<input type="password" name="password" id="password" placeholder="Password" />
+	
+	<label>
+		<input type="checkbox" name="remember" id="remember" value="1" checked="true" /> Remember me
+	</label>
+	
+	<ul id="login-options">
+		<li><a href="/register?return_url=<%= @return_url %>">Need to register?</a></li>
+		<li><a href="/login/forgot-password?return_url=<%= @return_url %>">Forgot your password?</a></li>
+	</ul>
+	
+	<div id="message"></div>
+	
+	<p class="buttons">
+	  <input type="button" class="btn" value="Cancel" onclick="parent.$.fn.colorbox.close();" />
+		<input type="submit" class="btn" value="Login" onclick='login(); return false;' />
+	</p>
 </form>
 
 <% content_for :caboose_css do %>
-<style type="text/css">
-#modal_content input[type="checkbox"] { position: relative; }
-</style>
+	<%= stylesheet_link_tag 'caboose/login' %>
+	
+	<style type="text/css">
+		#modal_content input[type=checkbox] { position: relative; }
+	</style>
 <% end %>
-<% content_for :caboose_js do %>
-<script type='text/javascript'>
-
-var modal = false;
-$(window).load(function() {
-  modal = new CabooseModal(400);
-});
 
-function login()
-{
-  modal.autosize("<p class='loading'>Logging in...</p>");
-	$.ajax({
-		url: '/login',
-		type: 'post',
-		data: $('#login_form').serialize(),
-		success: function(resp) {
-		  if (resp.error)
-		    modal.autosize("<p class='note error'>" + resp.error + "</p>");
-			else if (resp.redirect != false)
-			  <%= @modal ? "" : "parent." %>window.location = resp.redirect;
-			else
-			  parent.location.reload(true);
-		},
-		error: function() {	
-			modal.autosize("<p class='note error'>Error</p>");			
+<% content_for :caboose_js do %>
+	<script type="text/javascript">
+		var modal = false;
+		
+		$(window).load(function() {
+		  modal = new CabooseModal(400);
+		});
+		
+		function login() {
+		  modal.autosize("<p class='loading'>Logging in...</p>");
+	
+			$.ajax({
+				url: '/login',
+				type: 'post',
+				data: $('#login-form').serialize(),
+				success: function(response) {
+					if (response.error) {
+						modal.autosize("<p class='note error'>" + response.error + "</p>");
+					} else if (response.redirect != false) {
+						<%= @modal ? "" : "parent." %>window.location = response.redirect;
+					} else {
+						parent.location.reload(true);
+					}
+				},
+				error: function() {	
+					modal.autosize("<p class='note error'>Error</p>");			
+				}
+			});
 		}
-	});
-}
-
-</script>
+	</script>
 <% end %>
+
 <%= content_for :caboose_css do %>
-<%= stylesheet_link_tag "caboose/login", :media => "all" %>
+	<%= stylesheet_link_tag "caboose/login", media: "all" %>
 <% end %>

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

@@ -1,21 +1,19 @@
 
 <%= content_for :js do %>
-<%= javascript_include_tag "caboose/application" %>
-<% Caboose::plugin_hook('global_js_assets', []).each do |file| %>
-<%= javascript_include_tag file %>
-<% end %>
-<%= yield :caboose_js %>
+	<script>window.loggedIn = <%= logged_in?.to_json %></script>
+	<%= javascript_include_tag(*Caboose::javascripts) %>
+	<%= yield :caboose_js %>
 <% end %>
 
 <%= content_for :css do %>
-<%= stylesheet_link_tag "caboose/application", :media => "all" %>
-<%= yield :caboose_css %>
+	<%= stylesheet_link_tag(*Caboose::stylesheets) %>
+	<%= yield :caboose_css %>
 <% end %>
 
 <% if (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.haml")) %>
-<%= render :file => "layouts/layout_#{@page.id}" %>
+	<%= render :file => "layouts/layout_#{@page.id}" %>
 <% elsif (!@page.layout.nil? && @page.layout.length > 0 && (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.erb") || File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.haml"))) %>
-<%= render :file => "layouts/layout_#{@page.layout}" %>
+	<%= render :file => "layouts/layout_#{@page.layout}" %>
 <% else %>
-<%= render :file => "layouts/layout_default" %>
+	<%= render :file => "layouts/layout_default" %>
 <% end %>

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

@@ -9,6 +9,7 @@
 <% end %>
 <%= yield :caboose_css %>
 <%= csrf_meta_tags %>
+<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
 </head>
 <body>
 <div id='modal_wrapper'>

data/config/routes.rb

@@ -5,7 +5,8 @@ Caboose::Engine.routes.draw do
   get     "station"               => "station#index"
   get     "station/plugin-count"  => "station#plugin_count"
   
-  get     "modal/:url" => "modal#index", :constraints => {:url => /.*/}
+  get "modal"      => "modal#layout"
+  get "modal/:url" => "modal#index", :constraints => {:url => /.*/}
   
   get     "login/forgot-password"           => "login#forgot_password_form"
   post    "login/forgot-password"           => "login#send_reset_email"  

data/lib/caboose.rb

@@ -45,5 +45,10 @@ module Caboose
   # Email settings
   mattr_accessor :email_from
   @@email_from = "webmaster@caboosecms.com"
-
+  
+  # Define asset collections
+  mattr_accessor :javascripts, :stylesheets
+  @@javascripts = ['caboose/application']
+  @@stylesheets = ['caboose/application']
+  
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.50'
+  VERSION = '0.3.51'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.50
+  version: 0.3.51
 platform: ruby
 authors:
 - William Barry
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: underscore-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'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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
@@ -130,6 +158,9 @@ files:
 - app/assets/javascripts/caboose/admin_page_edit_content.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
 - app/assets/javascripts/caboose/application.js
+- app/assets/javascripts/caboose/jquery.detect.js
+- app/assets/javascripts/caboose/jquery.placeholder.js
+- app/assets/javascripts/caboose/main.js
 - app/assets/javascripts/caboose/modal.js
 - app/assets/javascripts/caboose/modal_integration.js
 - app/assets/javascripts/caboose/model/all.js
@@ -148,9 +179,9 @@ files:
 - app/assets/javascripts/caboose/model/model_binder.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
-- app/assets/javascripts/caboose/placeholder.js
 - app/assets/javascripts/caboose/shortcut.js
 - app/assets/javascripts/caboose/station.js
+- 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_page_edit_content.css
@@ -167,6 +198,7 @@ files:
 - app/assets/stylesheets/caboose/station_modal.css
 - app/assets/stylesheets/caboose/station_sidebar.css
 - app/assets/stylesheets/caboose/tinymce.css
+- app/assets/templates/caboose/messages/error.jst.ejs
 - app/controllers/caboose/ab_options_controller.rb
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
@@ -227,6 +259,7 @@ files:
 - app/models/caboose/role_permission.rb
 - app/models/caboose/schema.rb
 - app/models/caboose/setting.rb
+- app/models/caboose/states.rb
 - app/models/caboose/std_class.rb
 - app/models/caboose/user.rb
 - app/models/caboose/utilities/schema.rb