caboose-cms 0.2.5 → 0.2.6

data/app/views/caboose/pages/show.html.erb

@@ -1,2 +1,2 @@
-<% content_for :page_title do %><%= @page.title %><% end %>
-<% content_for :page_content do %><%= @page.content %><% end %>
+<% content_for :page_title   do %><%= raw @page.title   %><% end %>
+<% content_for :page_content do %><%= raw @page.content %><% end %>

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

@@ -2,6 +2,9 @@
 @nav = Caboose.plugin_hook('admin_nav', [], @user, @page)
 return_url = session[:caboose_station_return_url].nil? ? '/' : session[:caboose_station_return_url]
 return_url = '/' if return_url.starts_with?('/admin/') || return_url == '/admin'
+
+width = 200
+@nav.each {|item| width = 400 if item['id'] == @tab } if @tab
 %>
 
 <%= content_for :caboose_js do %>
@@ -10,8 +13,8 @@ return_url = '/' if return_url.starts_with?('/admin/') || return_url == '/admin'
 var modal = false;
 var station = false;
 $(document).ready(function() {
-  modal = new CabooseModal(200);
-  station = new CabooseStation(modal);
+  modal = new CabooseModal(<%= width %>);
+  station = new CabooseStation(modal<%= raw @tab ? ", '#{@tab}'" : '' %>);
 });
 </script>
 <% end %>

data/app/views/caboose/users/edit.html.erb

@@ -31,7 +31,7 @@ pic = "http://gravatar.com/avatar/#{gravatar_id}.png?s=150" #&d=/assets/caboose/
 <% end %>
 
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/bound_input.js" %>
+<%= javascript_include_tag "caboose/model_binder.js" %>
 <script type="text/javascript">
 
 var model = false;

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

@@ -6,9 +6,7 @@
     <li><a href='/login?return_url=#{request.fullpath}' id='caboose_login'><span>Login</span></a></li>
   <% else %>
     <li class='back'    ><a href='/'><span><< Back to Site</span></a></li>
-    <li class='cpanel'  ><a href='/station' id='caboose_station'><span>Control Panel</span></a></li>
-    <li class='account' ><a href='/admin/users/<%= @user.id %>/edit'><span>Account</span></a></li>
-    <li class='logout'  ><a href='/logout'><span>Logout</span></a></li>
+    <li class='cpanel'  ><a href='/station' id='caboose_station'><span>Dashboard</span></a></li>
   <% end %>
   </ul>
 </div>

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

@@ -5,7 +5,7 @@
   <% if (@user.nil? || @user == Caboose::User.logged_out_user) %>
     <li><a href='/login?return_url=#{request.fullpath}' id='caboose_login'><span>Login</span></a></li>
   <% else %>
-    <li class='cpanel'  ><a href='/station' id='caboose_station'><span>Control Panel</span></a></li>
+    <li class='cpanel'  ><a href='/station?page_id=<%= @page.id %>' id='caboose_station'><span>Control Panel</span></a></li>
     <li class='account' ><a href='/admin/users/<%= @user.id %>/edit'><span>Account</span></a></li>
     <li class='logout'  ><a href='/logout'><span>Logout</span></a></li>
   <% end %>

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

@@ -9,9 +9,9 @@
 <%= yield :caboose_css %>
 <% end %>
 
-<% if (File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.id}.html.erb")) %>
+<% 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}" %>
-<% elsif (!@page.layout.nil? && @page.layout.length > 0 && File.exists?("#{Rails.root}/app/views/layouts/layout_#{@page.layout}.html.erb")) %>
+<% 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}" %>
 <% else %>
 <%= render :file => "layouts/layout_default" %>

data/config/routes.rb

@@ -47,10 +47,15 @@ Caboose::Engine.routes.draw do
   get     "pages"                         => "pages#index"
   get     "pages/sitemap-options"         => "pages#sitemap_options"
   get     "pages/robots-options"          => "pages#robots_options"
-  get     "pages/content-format-options"  => "pages#content_format_options"
+  get     "pages/format-options"          => "pages#content_format_options"
   get     "pages/new"                     => "pages#new"
   get     "pages/:id/redirect"            => "pages#redirect"
   get     "pages/:id/edit-settings"       => "pages#edit_settings"
+  get     "pages/:id/edit-css"            => "pages#edit_css"
+  get     "pages/:id/edit-js"             => "pages#edit_js"
+  get     "pages/:id/edit-seo"            => "pages#edit_seo"
+  get     "pages/:id/edit-content"        => "pages#edit_content"
+  get     "pages/:id/edit-title"          => "pages#edit_title"
   get     "pages/:id/edit"                => "pages#edit"
   get     "pages/:id"                     => "pages#show"
   put     "pages/:id"                     => "pages#update"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,11 +172,22 @@ files:
 - app/assets/images/caboose/loading_white_on_black.gif
 - app/assets/javascripts/caboose/admin.js
 - app/assets/javascripts/caboose/application.js
-- app/assets/javascripts/caboose/bound_input.js
 - app/assets/javascripts/caboose/modal.js
 - app/assets/javascripts/caboose/modal_integration.js
+- app/assets/javascripts/caboose/model/all.js
+- app/assets/javascripts/caboose/model/attribute.js
+- app/assets/javascripts/caboose/model/bound_checkbox.js
+- app/assets/javascripts/caboose/model/bound_checkbox_multiple.js
+- app/assets/javascripts/caboose/model/bound_control.js
+- app/assets/javascripts/caboose/model/bound_select.js
+- app/assets/javascripts/caboose/model/bound_text.js
+- app/assets/javascripts/caboose/model/bound_textarea.js
+- app/assets/javascripts/caboose/model/class.js
+- app/assets/javascripts/caboose/model/model.js
+- 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/shortcut.js
 - app/assets/javascripts/caboose/station.js
 - app/assets/stylesheets/caboose/admin.css
 - app/assets/stylesheets/caboose/application.css
@@ -228,7 +239,12 @@ files:
 - app/views/caboose/extras/error404.html.erb
 - app/views/caboose/login/index.html.erb
 - app/views/caboose/pages/edit.html.erb
+- app/views/caboose/pages/edit_content.html.erb
+- app/views/caboose/pages/edit_css.html.erb
+- app/views/caboose/pages/edit_js.html.erb
+- app/views/caboose/pages/edit_seo.html.erb
 - app/views/caboose/pages/edit_settings.html.erb
+- app/views/caboose/pages/edit_title.html.erb
 - app/views/caboose/pages/index.html.erb
 - app/views/caboose/pages/new.html.erb
 - app/views/caboose/pages/show.html.erb

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

@@ -1,198 +0,0 @@
-
-var Model = function(params) {
-  for (var thing in params)
-    this[thing] = params[thing];
-};
-
-Model.prototype = {
-  name: false,
-  id: false,
-  attributes: [],
-  attributes_clean: [],
-  update_url: false,
-  
-  save: function(attrib, after) {
-    var this2 = this;
-    $.ajax({
-      url: this.update_url,
-      type: 'put',
-      data: attrib + '=' + this.attributes[attrib],
-			success: function(resp) {			  
-				if (resp.success)
-				{
-				  this2.attributes_clean[attrib] = this2.attributes[attrib];
-				  if (resp.attributes && resp.attributes[attrib])
-				  {
-				    this2.attributes[attrib]       = resp.attributes[attrib];
-				    this2.attributes_clean[attrib] = resp.attributes[attrib];
-				  }
-				}
-				after(resp);
-			},
-			error: function() { 
-			  after(false);
-			}
-		});
-  }
-};
-
-/******************************************************************************/
-
-var BoundControl = function(model, attribute, el) {
-  this.init(model, attribute, el);
-};
-
-BoundControl.prototype = {
-  el: false, 
-  check: false,
-  message: false,
-  model: false,
-  attribute: false,
-  binder: false, 
-  
-  init: function(model, attribute, el) {    
-    this.model = model;
-    this.attribute = attribute;
-    this.el = el ? el : model.name.toLowerCase() + '_' + model.id + '_' + attribute;
-    this.check   = this.el + '_check';
-    this.message = this.el + '_message';
-         
-    $('#'+this.el).wrap($('<div/>')
-      .attr('id', this.el + '_container')
-      .css('position', 'relative')
-    );
-    
-    var this2 = this;
-    $('#'+this.el).on('focus', function() { this2.edit(); });
-    //$('#'+this.el).keydown(function() {
-    //  if (this2.model.attributes[attribute] != this2.model.attributes_clean[attribute])
-    //    this2.edit();
-    //});
-  },
-  
-  view: function() {
-    if ($('#'+this.check).length)   $('#'+this.check).remove();
-    if ($('#'+this.message).length) $('#'+this.message).remove();    
-    $('#'+this.el).val(this.model.attributes[this.attribute]);      
-  },
-  
-  edit: function() {
-    this.binder.cancel_active();
-    this.binder.active_control = this;
-    
-    var w = $('#'+this.el).outerWidth();
-    var h = $('#'+this.el).outerHeight();
-    var this2 = this;    
-    $('#'+this.el+'_container').prepend($('<div/>')
-      .attr('id', this.el + '_check')
-      .addClass('bound_input_check')
-      .css('position', 'absolute')      
-      .css('top', 0)
-      .css('left', w-2)
-      .css('width', h+2)
-      .css('overflow', 'hidden')
-      .append($('<a/>')
-        .html('&#10003;')
-        .css('width', h)
-        .css('margin-left', -h)
-        .attr('href', '#')
-        .click(function(event) {
-          event.preventDefault();
-          this2.save();
-        })
-      )
-    );
-    $('#'+this.el+'_check a').animate({ 'margin-left': 0 }, 300);
-  },
-  
-  save: function() {
-    $('#'+this.el+'_check a').addClass('loading');
-    this.model.attributes[this.attribute] = $('#'+this.el).val();
-    
-    var this2 = this;
-    this.model.save(this.attribute, function(resp) {
-      $('#'+this2.el+'_check a').removeClass('loading');
-      if (resp.error) this2.error(resp.error);
-      else
-      {
-        this2.binder.active_control = this2;
-        //this2.view();
-        //if ($('#'+this.check).length)   $('#'+this.check).remove();
-        //if ($('#'+this.message).length) $('#'+this.message).remove();    
-        //$('#'+this.el).val(this.model.attributes[this.attribute]);
-        //$('#'+this2.el).focus();
-      }
-    });
-  },
-  
-  cancel: function() {
-    this.model.attributes[this.attribute] = this.model.attributes_clean[this.attribute];
-    $('#'+this.el).val(this.model.attributes[this.attribute]);
-    
-    if ($('#'+this.el+'_check a').length)
-    {
-      var this2 = this;
-      var h = $('#'+this.el).outerHeight();
-      $('#'+this.el+'_check a').animate({ 'margin-left': -h }, 300, function() {
-        this2.view();    
-      });
-    }
-    else
-      this.view();
-  },
-    
-  error: function(str) {
-    if (!$('#'+this.message).length)
-      $('#'+this.el+'_container').prepend($('<div/>').attr('id', this.message));
-    $('#'+this.message).html("<p class='note error'>" + str + "</p>");
-  }
-};
-
-/******************************************************************************/
-
-var ModelBinder = function(params) { this.init(params); };
-
-ModelBinder.prototype = {
-  model: false,
-  controls: [],
-  active_control: false,
-  
-  init: function(params) {
-    this.model = new Model({        
-      name:       params['name'],
-      id:         params['id'],
-      update_url: params['update_url'],
-      attributes: {},
-      attributes_clean: {}
-    });
-    
-    var this2 = this;
-    $.each(params['attributes'], function(i, attrib) {
-      var el = (this2.model.name + '_' + this2.model.id + '_' + attrib).toLowerCase();
-      this2.model.attributes[attrib]        = $('#'+el).val();
-      this2.model.attributes_clean[attrib]  = $('#'+el).val();
-      var control = new BoundControl(this2.model, attrib);
-      control.binder = this2;
-      this2.controls.push();    
-    });
-    
-    $(document).keyup(function(e) {
-      if (e.keyCode == 27) this2.cancel_active(); // Escape
-      if (e.keyCode == 13) this2.save_active();   // Enter
-    });
-  },
-  
-  cancel_active: function() {
-    if (!this.active_control)
-      return;
-    this.active_control.cancel();
-    this.active_control = false;    
-  },
-  
-  save_active: function() {
-    if (!this.active_control)
-      return;
-    this.active_control.save();      
-    this.active_control = false;    
-  },
-};