caboose-cms 0.2.5 → 0.2.6

data/app/controllers/caboose/admin_controller.rb

@@ -4,15 +4,7 @@ module Caboose
       
     # GET /admin
     def index
-      return if !user_is_allowed('admin', 'view')
-      
-      @mods = [
-        { 'href' => '/admin/users'        , 'text' => 'Users' },
-        { 'href' => '/admin/roles'        , 'text' => 'Roles' },
-        { 'href' => '/admin/permissions'  , 'text' => 'Permissions' }
-      ]
-      @mods = Caboose.plugin_hook('admin_nav', @mods)
-      
+      return if !user_is_allowed('admin', 'view')      
     end
     
     # GET /station

data/app/controllers/caboose/pages_controller.rb

@@ -40,6 +40,7 @@ module Caboose
 		  page.content = Caboose.plugin_hook('page_content', page.content)
 		  @page = page
 		  @user = user
+		  @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false
 		  @crumb_trail = Caboose::Page.crumb_trail(@page)
 		  @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
       
@@ -108,24 +109,48 @@ module Caboose
     def edit
       return if !user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      
-      session['caboose_station_state'] = 'left'
-      session['caboose_station_open_tabs'] = ['pages']
-      session['caboose_station_return_url'] = "/#{@page.uri}"
-      
-      render :layout => 'caboose/admin'
+    end
+    
+    # GET /pages/1/edit-title
+    def edit_title
+      return if !user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /pages/1/edit-content
+    def edit_content
+      return if !user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/modal'
     end
     
     # GET /pages/1/edit-settings
     def edit_settings
       return if !user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      
-      session['caboose_station_state'] = 'left'
-      session['caboose_station_open_tabs'] = ['pages']
-      session['caboose_station_return_url'] = "/#{@page.uri}"
-      
-      render :layout => 'caboose/admin'
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /pages/1/edit-css
+    def edit_css
+      return if !user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /pages/1/edit-js
+    def edit_js
+      return if !user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/modal'
+    end
+    
+    # GET /pages/1/edit-seo
+    def edit_seo
+      return if !user_is_allowed('pages', 'edit')
+      @page = Page.find(params[:id])
+      render :layout => 'caboose/modal'
     end
     
     # POST /pages
@@ -210,12 +235,16 @@ module Caboose
 		    			resp.attributes['parent_id'] = { 'text' => parent.title }
 		    		end
 		    		
-		    	when 'title', 'menu_title', 'alias', 'redirect_url', 'hide', 
-		    	  'content_format', 'custom_css', 'custom_js', 'layout',
+		    	when 'title', 'menu_title', 'alias', 'hide', 
+		    	  'custom_css', 'custom_js', 'layout', 'redirect_url',
 		    	  'seo_title', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
 		    	  
 		    	  page[name.to_sym] = value
 		    	  
+		    	when 'content_format'
+		    	  page.content_format = value
+		    	  resp.attributes['content_format'] = { 'text' => value }
+		    	  
 		    	when 'meta_robots'
 		    	  if (value.include?('index') && value.include?('noindex'))
 		    	    resp.error = "You can't have both index and noindex"

data/app/controllers/caboose/station_controller.rb

@@ -6,6 +6,9 @@ module Caboose
     # GET /station
     def index
       @user = logged_in_user
+      page_id = params['page_id'].nil? ? 1 : params['page_id']
+      @page = Page.find(page_id)
+      @tab = params['tab']
       
       if (@user.nil? || @user == Caboose::User.logged_out_user)
         redirect_to "/login"

data/app/models/caboose/page_plugin.rb

@@ -15,7 +15,7 @@ class Caboose::PagePlugin < Caboose::CaboosePlugin
     if (actions.include?('edit') || is_admin)
     	item['children'] << { 'href' => "/pages/#{page.id}/sitemap"       , 'text' => 'Site Map This Page'  }
     	item['children'] << { 'href' => "/pages/#{page.id}/edit"          , 'text' => 'Edit Page Content'   }
-    	item['children'] << { 'href' => "/pages/#{page.id}/edit-settings" , 'text' => 'Edit Page Settings'  }
+    	item['children'] << { 'href' => "/pages/#{page.id}/edit-settings" , 'text' => 'Edit Page Settings', 'modal' => true }
 
     	#uru = session['use_redirect_urls'].nil? ? true : session['use_redirect_urls']
     	#item['children'] << { 'id' => 'use_redirect_urls', 'href' => '#', 'text' => '' + (uru ? 'Disable' : 'Enable') + ' Redirect Urls' }

data/app/models/caboose/user_plugin.rb

@@ -1,6 +1,6 @@
 class Caboose::UserPlugin < Caboose::CaboosePlugin
 
-  def self.admin_nav(nav, user, page)
+  def self.admin_nav(nav, user = nil, page = nil)
     return nav if user.nil? || !user.is_allowed('users', 'view')
     
     item = {

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

@@ -1,5 +1 @@
 <h1>Admin</h1>
-
-<% @mods.each do |mod| %>
-  <p><a href='<%= mod['href'] %>'><%= mod['text'] %></a></p>
-<% end %>

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

@@ -1,25 +1,12 @@
-
-<h1>Edit Page Content</h1>
-<p class='current_page_editing'>Currently editing: /<%= @page.uri %></p>
-
-<div id='page_<%= @page.id %>_container'></div>
-
+<% content_for :page_title   do %><%= raw "<span id='editmode_title_container'>#{@page.title}</span>"   %><% end %>
+<% content_for :page_content do %><%= raw "<div id='editmode_content_container'>#{@page.content}</div>" %><% end %>
 <% content_for :caboose_js do %>
-<%= javascript_include_tag "caboose/model.form.page" %>
-<script type="text/javascript">
+<script type='text/javascript'>
 
 $(document).ready(function() {
-  var page = new Model({
-    name: 'Page',
-    id: <%= @page.id %>,
-    form: 'Model.Form.Page',
-    attributes: [
-      { name: 'title'                 , type: 'h1'                , value: <%= raw Caboose.json(@page.title   ) %>, width: '500px' },
-      { name: 'content'               , type: 'rich-text'         , value: <%= raw Caboose.json(@page.content ) %> }
-    ]
-  });
+  $('#editmode_title_container'  ).click(function() { $.colorbox({ href: '/pages/<%= @page.id %>/edit-title'   , iframe: true, initialWidth: 500, initialHeight:  80, innerWidth: 500, innerHeight:  80, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 }); });
+  $('#editmode_content_container').click(function() { $.colorbox({ href: '/pages/<%= @page.id %>/edit-content' , iframe: true, initialWidth: 600, initialHeight: 400, innerWidth: 600, innerHeight: 400, scrolling: false, transition: 'fade', closeButton: false, onComplete: fix_colorbox, opacity: 0.50 }); });
 });
 
 </script>
-<%= tinymce :caboose %>
-<% end %>
+<% end %>

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

@@ -0,0 +1,48 @@
+
+<p><textarea id='page_<%= @page.id %>_content' placeholder='Content' style='width: 600px; height: 400px;' class='tinymce'><%= raw @page.content %></textarea></p>
+<div id='message'></div>
+<div id='controls'>
+<input type='button' value='Close' onclick="modal.close();" />
+<input type='button' value='Update' onclick="updateContent();" />
+</div>
+
+<% content_for :caboose_css do %>
+
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "tinymce/preinit.js" %>
+<%= javascript_include_tag "tinymce/tinymce_jquery.js" %>
+<%= javascript_include_tag "tinymce/jquery.tinymce.js" %>
+<%= javascript_include_tag "tinymce-jquery.js" %>
+<script type="text/javascript">
+
+var modal = false;
+$(document).ready(function() {  
+  modal = new CabooseModal(600, 475);
+});
+
+function updateContent()
+{
+  tinymce.triggerSave();
+  $.ajax({
+    url: '/pages/<%= @page.id %>',
+    type: 'put',
+    data: {
+      content: $('#page_<%= @page.id %>_content').val()
+    },
+    success: function(resp) {
+      if (resp.success)
+      {
+        parent.$('#editmode_content_container').html($('#page_<%= @page.id %>_content').val());
+        modal.close();
+      }
+      if (resp.error)
+        modal.autosize("<p class='note success'>" + resp.error + "</p>");
+    }
+  });
+}
+</script>
+<%= tinymce :caboose %>
+<% end %>

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

@@ -0,0 +1,36 @@
+
+<h1>Page Settings</h1>
+<div class='top_right_controls'>
+<input type='button' value='General' onclick="window.location='/pages/<%= @page.id %>/edit-settings';" />
+<input type='button' value='CSS'     disabled='true' onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
+<input type='button' value='JS'      onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
+<input type='button' value='SEO'     onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+</div>
+<p><div id='page_<%= @page.id %>_custom_css'></div></p>
+                    
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+var modal = false;
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/pages/<%= @page.id %>',
+    attributes: [
+      {
+        name: 'custom_css',
+        nice_name: 'Custom CSS',
+        type: 'textarea',
+        width: 580,
+        height: 400,
+        value: <%= raw Caboose.json(@page.custom_css) %> 
+      }      
+    ]
+  });  
+  modal = new CabooseModal(600, 460);
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,36 @@
+
+<h1>Page Settings</h1>
+<div class='top_right_controls'>
+<input type='button' value='General' onclick="window.location='/pages/<%= @page.id %>/edit-settings';" />
+<input type='button' value='CSS'     onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
+<input type='button' value='JS'      disabled='true' onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
+<input type='button' value='SEO'     onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+</div>
+<p><div id='page_<%= @page.id %>_custom_js'></div></p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+var modal = false;
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/pages/<%= @page.id %>',
+    attributes: [
+      {
+        name: 'custom_js',
+        nice_name: 'Custom Javascript',
+        type: 'textarea',
+        width: 580,
+        height: 400,
+        value: <%= raw Caboose.json(@page.custom_js) %> 
+      }      
+    ]
+  });  
+  modal = new CabooseModal(600, 460);
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,39 @@
+
+<h1>Page Settings</h1>
+<div class='top_right_controls'>
+<input type='button' value='General' onclick="window.location='/pages/<%= @page.id %>/edit-settings';" />
+<input type='button' value='CSS'     onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
+<input type='button' value='JS'      onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
+<input type='button' value='SEO'     disabled='true' onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+</div>
+<p><div id='page_<%= @page.id %>_seo_title'></div></p>
+<p><div id='page_<%= @page.id %>_meta_description'></div></p>
+<p><div id='page_<%= @page.id %>_meta_robots'></div></p>
+<p><div id='page_<%= @page.id %>_canonical_url'></div></p>
+<p><div id='page_<%= @page.id %>_fb_description'></div></p>
+<p><div id='page_<%= @page.id %>_gp_description'></div></p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+var modal = false;
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/pages/<%= @page.id %>',
+    attributes: [      
+      { name: 'seo_title'         , nice_name: 'SEO Title'            , type: 'text'      , value: <%= raw Caboose.json(@page.seo_title)        %>, width: 580 },        
+      { name: 'meta_robots'       , nice_name: 'Meta Robots'          , type: 'text'      , value: <%= raw Caboose.json(@page.meta_robots)      %>, width: 580 },
+      { name: 'canonical_url'     , nice_name: 'Canonical URL'        , type: 'text'      , value: <%= raw Caboose.json(@page.canonical_url)    %>, width: 580 },
+      { name: 'meta_description'  , nice_name: 'Meta Description'     , type: 'textarea'  , value: <%= raw Caboose.json(@page.meta_description) %>, width: 580, height: 80 },
+      { name: 'fb_description'    , nice_name: 'Facebook Description' , type: 'textarea'  , value: <%= raw Caboose.json(@page.fb_description)   %>, width: 580, height: 80 },
+      { name: 'gp_description'    , nice_name: 'Google+ Description'  , type: 'textarea'  , value: <%= raw Caboose.json(@page.gp_description)   %>, width: 580, height: 80 }
+    ]
+  });  
+  modal = new CabooseModal(600, 540);
+});
+
+</script>
+<% end %>

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

@@ -1,38 +1,49 @@
 
-<h1>Edit Page Settings</h1>
-<p class='current_page_editing'>Currently editing: /<%= @page.uri %></p>
- 
-<div id='page_<%= @page.id %>_container'></div>
+<h1>Page Settings</h1>
+<div class='top_right_controls'>
+<input type='button' value='General' disabled='true' onclick="window.location='/pages/<%= @page.id %>/edit-settings';" />
+<input type='button' value='CSS'     onclick="window.location='/pages/<%= @page.id %>/edit-css';" />
+<input type='button' value='JS'      onclick="window.location='/pages/<%= @page.id %>/edit-js';" />
+<input type='button' value='SEO'     onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
+</div>
+<div style='float: left; width: 310px;'>
+  <p><div id='page_<%= @page.id %>_parent_id'             ></div></p>
+  <p><div id='page_<%= @page.id %>_menu_title'            ></div></p>     
+  <p><div id='page_<%= @page.id %>_slug'                  ></div></p>                              
+  <p><div id='page_<%= @page.id %>_alias'                 ></div></p> 
+  <p><div id='page_<%= @page.id %>_redirect_url'          ></div></p>
+</div>
+<div style='float: left;'>
+  <p><div id='page_<%= @page.id %>_hide'                  ></div></p>  
+  <p><div id='page_<%= @page.id %>_layout'                ></div></p>
+  <p><div id='page_<%= @page.id %>_custom_sort_children'  ></div></p>
+  <p><div id='page_<%= @page.id %>_content_format'        ></div></p>
+</div>            
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
 
+var modal = false;
 $(document).ready(function() {
-  var page = new Model({
+  m = new ModelBinder({
     name: 'Page',
     id: <%= @page.id %>,
+    update_url: '/pages/<%= @page.id %>',
     attributes: [
-      { name: 'parent_id'             , nice_name: 'Parent'                   , type: 'select'            , value: <%= raw Caboose.json(@page.parent_id, -1        ) %>, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/pages/sitemap-options' },  
-      { name: 'menu_title'            , nice_name: 'Menu title'               , type: 'text'              , value: <%= raw Caboose.json(@page.menu_title           ) %> },     
-      { name: 'slug'                  , nice_name: 'Slug'                     , type: 'text'              , value: <%= raw Caboose.json(@page.slug                 ) %> }, 
-      { name: 'alias'                 , nice_name: 'Alias'                    , type: 'text'              , value: <%= raw Caboose.json(@page.alias                ) %> }, 
-      { name: 'redirect_url'          , nice_name: 'Redirect URL'             , type: 'text'              , value: <%= raw Caboose.json(@page.redirect_url         ) %> }, 
-      { name: 'hide'                  , nice_name: 'Hide'                     , type: 'checkbox'          , value: <%= raw @page.hide %> }, 
-      { name: 'content_format'        , nice_name: 'Content format'           , type: 'select'            , value: <%= raw Caboose.json(@page.content_format       ) %> }, 
-      { name: 'custom_css'            , nice_name: 'Custom CSS'               , type: 'textarea'          , value: <%= raw Caboose.json(@page.custom_css           ) %> }, 
-      { name: 'custom_js'             , nice_name: 'Custom javascript'        , type: 'textarea'          , value: <%= raw Caboose.json(@page.custom_js            ) %> }, 
-      { name: 'layout'                , nice_name: 'Layout'                   , type: 'text'              , value: <%= raw Caboose.json(@page.layout               ) %> }, 
-      { name: 'custom_sort_children'  , nice_name: 'Custom sort child pages'  , type: 'checkbox'          , value: <%= raw @page.custom_sort_children%> },      
-      { name: 'seo_title'             , nice_name: 'SEO title'                , type: 'text'              , value: <%= raw Caboose.json(@page.seo_title            ) %> },
-      { name: 'meta_description'      , nice_name: 'Meta description'         , type: 'text'              , value: <%= raw Caboose.json(@page.meta_description     ) %> },
-      { name: 'meta_robots'           , nice_name: 'Meta robots'              , type: 'checkbox-multiple' , value: <%= raw (@page.meta_robots.nil? ? [] : @page.meta_robots.split(', ')).to_json %>, text: <%= raw (@page.meta_robots.nil? ? "[Empty]" : @page.meta_robots).to_json %>, options_url: '/pages/robots-options' },
-      { name: 'canonical_url'         , nice_name: 'Canonical URL'            , type: 'text'              , value: <%= raw Caboose.json(@page.canonical_url        ) %> },
-      { name: 'fb_description'        , nice_name: 'Facebook description'     , type: 'text'              , value: <%= raw Caboose.json(@page.fb_description       ) %> },
-      { name: 'gp_description'        , nice_name: 'Google+ description'      , type: 'text'              , value: <%= raw Caboose.json(@page.gp_description       ) %> }
+      { name: 'parent_id'             , nice_name: 'Parent'                   , type: 'select'     , value: <%= @page.parent_id %>                       , width: 270, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/pages/sitemap-options' },
+      { name: 'menu_title'            , nice_name: 'Menu title'               , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title   ) %> , width: 270 },     
+      { name: 'slug'                  , nice_name: 'Slug'                     , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 270 }, 
+      { name: 'alias'                 , nice_name: 'Alias'                    , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 270 }, 
+      { name: 'redirect_url'          , nice_name: 'Redirect URL'             , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url ) %> , width: 270 },
+      { name: 'hide'                  , nice_name: 'Hide'                     , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 270 },
+      { name: 'layout'                , nice_name: 'Layout'                   , type: 'text'       , value: <%= raw Caboose.json(@page.layout       ) %> , width: 270 },
+      { name: 'custom_sort_children'  , nice_name: 'Custom sort children'     , type: 'checkbox'   , value: <%= raw @page.custom_sort_children %>        , width: 270 },
+      { name: 'content_format'        , nice_name: 'Content format'           , type: 'select'     , value: <%= raw Caboose.json(@page.content_format) %>, width: 270, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/pages/format-options' },      
     ]
-  });
+  });  
+  modal = new CabooseModal(600, 344);
 });
 
 </script>
-<%= tinymce :caboose %>
 <% end %>

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

@@ -0,0 +1,29 @@
+<p><div id='page_<%= @page.id %>_title'></div></p>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+var modal = false;
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/pages/<%= @page.id %>',
+    attributes: [{ 
+      name: 'title',
+      nice_name: 'Title',
+      type: 'text',
+      value: <%= raw Caboose.json(@page.title) %>,
+      width: 480
+    }],
+    success: function(control) {
+      parent.$.fn.colorbox.close();
+      parent.$('#editmode_title_container').html(control.attribute.value);
+    }
+  });  
+  modal = new CabooseModal(500, 80);
+});
+
+</script>
+<% end %>