caboose-cms 0.2.57 → 0.2.62

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NmODY1MTQ0YTliMGNiMjZiZDg0YzNhYmY5MTkxMWE2MTMzNDMxYw==
+    ZWFjMWM1MDg5OWE2NzQ2OGUwNGE2OTdiZTg5OTE2Y2ZhMDJlNTJkZg==
   data.tar.gz: !binary |-
-    YmJhNjY1NDg1MTY1M2Q1YjQxNzZkNjNhZDYyZGU1YmVmZGMyZjM0MQ==
+    MDAwNTZkZDY4ODk1NjlmMWMxNGJkZjI4NDhlMGI3OGI5YTYxNDcxMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDdkMzc1N2JiZGZmM2U4YzlkNDhlMzU3OGI0ZTQwZWNkYTA4ZWFhNDIwZGMy
-    OTBjNTIwNDBhN2JiOTdkZTEzNjczNTRiMjlmNjE2OWYzZTVhMjI4ZWE3NGRk
-    OWNlOThmMzVhYWY4YWYzYjU1MDc0OGU2YzE2MTAxZGNlZGMxM2M=
+    Yjk4YmI4YmRjNWVkNjBkMTExYTVmZmQ0ZWRkNmFkYjJiYWNmMGI4MDE5ZjBh
+    NjhiMmFhNjQ5ODk1MjNhOTkzOTEwMTM2Y2VkZTkwNWRmYzI2ZTEzMjM4NmJk
+    YzYxZGIwZTdmNjcxYzlmYjA5YjljZWIyYmZlMzY2N2RhY2RiZjg=
   data.tar.gz: !binary |-
-    ODZkZTQwZmZkYWU2OTVhMDVkNjExODU2ZmM4NDQ3NDVkOTllMWViNWIzODNm
-    Zjk3YWQ4NzkzYjJmZDE4NjExNTEwNDU5NGQ4NDgzYjhmNTgyMTRlNDVkZjFj
-    ZjQ4NjJjYmU3ZjdmMzI2NzM5OGY2YzZlZDJhYTQ4NGViZjU0ODc=
+    YTcwYjA2YzRmMzQ2OGU2N2RlZGRkN2ZmZTgzMmE5NzcwMjc5NGM3OGQ3NDhm
+    NjRlNWFmMTUwZTA2ODMxM2FkOTBjMTFjYTc0MzEzMjgwMGNhMzY0YmE3NTkw
+    NTFjMzZkNTM0NTY5ZjY3ZTg3ODI0MDY0MmEzNWNjNWMxNzJiY2M=

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

@@ -410,3 +410,49 @@ Page Bar Generator
 
 #search_form input[type='text']   { height: 20px; padding: 6px 12px; }
 #search_form input[type='submit'] { height: 35px; padding: 0 12px; }
+
+
+/******************************************************************************/
+
+#tabs { 
+  width: 200px;
+  float: left;  
+  /*
+  position: absolute;
+  top: 41px;
+  left: 0;
+  */
+  list-style: none; 
+  margin: -20px 0 0 -30px; 
+  padding: 0;
+  border-top: #ccc 0px solid;
+}
+#tabs ul li { 
+  list-style: none; 
+  margin: 0; 
+  padding: 0; 
+}
+#tabs li.back {
+  padding: 10px;
+}
+#tabs a {
+  display: block;
+  margin: 0;
+  padding: 16px 12px 12px 12px;
+  text-decoration: none;
+  background: #efefef;
+  border-bottom: #ccc 1px solid;
+  color: #000;
+}
+#tabs a:hover {
+  background: #666;
+  color: #fff;  
+}
+#tabs li.selected a {
+  background: transparent;
+  color: #000;
+  font-weight: bold;  
+}
+#content2 {
+  margin-left: 220px; 
+}

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

@@ -8,6 +8,7 @@
 input#first_name,
 input#last_name,
 input#email,
+input#phone,
 input#pass1,
 input#pass2 {
   font-size: 18px;

data/app/controllers/caboose/pages_controller.rb

@@ -4,11 +4,7 @@ module Caboose
     
     def before_action
       @page = Page.page_with_uri('/admin')
-    end
-    
-    # GET /pages
-    def index      
-    end
+    end    
 
     # GET /pages/:id
     def show
@@ -90,77 +86,68 @@ module Caboose
 
     end
     
-    # GET /pages/new
-    def new
-      return unless user_is_allowed('pages', 'add')
-      @parent_id = params[:parent_id].nil? ? params[:parent_id] : 1
-      @parent = Page.find(@parent_id)
-      render :layout => 'caboose/modal'
-    end
-    
     # GET /pages/1/redirect
     def redirect
       @page = Page.find(params[:id])
       redirect_to "/#{@page.uri}"
     end
     
-    # GET /pages/1/edit
-    def edit
-      return unless user_is_allowed('pages', 'edit')
-      @page = Page.find(params[:id])
-    end
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
     
-    # GET /pages/1/edit-title
-    def edit_title
-      return unless user_is_allowed('pages', 'edit')
-      @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+    # GET /admin/pages
+    def admin_index
+      return if !user_is_allowed('pages', 'view')
+      @home_page = Page.find(1)
+      render :layout => 'caboose/admin'      
     end
-    
-    # GET /pages/1/edit-content
-    def edit_content
-      return unless user_is_allowed('pages', 'edit')
-      @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+
+    # GET /admin/pages/new
+    def admin_new
+      return unless user_is_allowed('pages', 'add')
+      @parent_id = params[:parent_id].nil? ? params[:parent_id] : 1
+      @parent = Page.find(@parent_id)
+      render :layout => 'caboose/admin'
     end
     
-    # GET /pages/1/edit-settings
-    def edit_settings
+    # GET /admin/pages/1/edit
+    def admin_edit_general
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
-    
-    # GET /pages/1/edit-css
-    def edit_css
+     
+    # GET /admin/pages/1/content
+    def admin_edit_content
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
     
-    # GET /pages/1/edit-js
-    def edit_js
+    # GET /admin/pages/1/css
+    def admin_edit_css
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
     
-    # GET /pages/1/edit-seo
-    def edit_seo
+    # GET /admin/pages/1/js
+    def admin_edit_js
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
     
-    # GET /pages/1/edit-resources
-    def edit_resources
+    # GET /admin/pages/1/seo
+    def admin_edit_seo
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      render :layout => 'caboose/modal'
+      render :layout => 'caboose/admin'
     end
     
-    # POST /pages
-    def create
+    # POST /admin/pages
+    def admin_create
       return unless user_is_allowed('pages', 'add')
 
       resp = Caboose::StdClass.new({
@@ -211,8 +198,8 @@ module Caboose
       render json: resp
     end
     
-    # PUT /pages/1
-    def update
+    # PUT /admin/pages/1
+    def admin_update
       return unless user_is_allowed('pages', 'edit')
       
       resp = StdClass.new({'attributes' => {}})
@@ -310,8 +297,8 @@ module Caboose
       render json: resp
     end
       
-    # DELETE /pages/1
-    def destroy
+    # DELETE /admin/pages/1
+    def admin_destroy
       return unless user_is_allowed('pages', 'delete')
       user = Page.find(params[:id])
       user.destroy

data/app/helpers/caboose/pages_helper.rb

@@ -0,0 +1,25 @@
+module Caboose
+  module PagesHelper
+    
+    def pages_list(page)
+      str = "<ul>"
+      str << pages_list_helper(page)      
+      str << "</ul>"
+      return str
+    end
+    
+    def pages_list_helper(page)
+      str = "<li><a href='/admin/pages/#{page.id}/edit'>#{page.title}</a>"
+      if page.children && page.children.count > 0
+        str << "<ul>"
+        page.children.each do |p|
+          str << pages_list_helper(p)
+        end
+        str << "</ul>"
+      end
+      str << "</li>"
+      return str
+    end
+    
+  end
+end

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', 'modal' => true }
+    	item['children'] << { 'href' => "/pages/#{page.id}/edit-settings" , 'text' => 'Edit Page Settings', 'modal' => false }
 
     	#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/views/caboose/pages/_admin_footer.html.erb

@@ -0,0 +1,2 @@
+<br style='clear: left; line-height: 0;' />
+</div><!-- modal_content2 -->

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

@@ -0,0 +1,28 @@
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/pages" %>
+<% end %>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<%= javascript_include_tag "caboose/pages" %>
+<% end %>
+
+<h1>Edit Page</h1>
+<ul id='tabs'>
+<%
+tabs = {
+  "/admin/pages/#{@page.id}/edit"        => 'General',
+  "/admin/pages/#{@page.id}/content"     => 'Content',
+  "/admin/pages/#{@page.id}/css"         => 'Custom CSS',
+  "/admin/pages/#{@page.id}/js"          => 'Custom JS',
+  "/admin/pages/#{@page.id}/seo"         => 'SEO',
+  "/admin/pages/#{@page.id}/sitemap"     => 'Sitemap',
+  "/admin/pages/#{@page.id}/delete"      => 'Delete Product'
+}
+
+%>
+<% tabs.each do |href,text| %>
+<li<%= raw request.fullpath == href ? " class='selected'" : '' %>><a href='<%= href %>'><%= raw text %></a></li>
+<% end %>
+<li class='back'><input type='button' value='< Back' onclick="window.location='/admin/pages';" /></li>
+</ul>
+<div id='content2'>

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

@@ -0,0 +1,30 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p><div id='page_<%= @page.id %>_content'></div></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/admin/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'content', nice_name: 'Page Content', type: 'richtext', value: <%= raw Caboose.json(@page.content) %>, width: 800, height: 500 }             
+    ]
+  });
+});
+
+</script>
+<%= tinymce_assets %>
+<%= tinymce :caboose, width: '800px', height:'400px' %>
+<% end %>

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

@@ -0,0 +1,28 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p><div id='page_<%= @page.id %>_custom_css'></div></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/admin/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'custom_css', nice_name: 'Custom CSS', type: 'textarea', value: <%= raw Caboose.json(@page.custom_css) %>, width: 800, height: 400 }             
+    ]
+  });
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,46 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p><div id='page_<%= @page.id %>_title'                 ></div></p>
+<p><div id='page_<%= @page.id %>_menu_title'            ></div></p>
+<p><div id='page_<%= @page.id %>_parent_id'             ></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>
+<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>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/admin/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title        ) %> , width: 400 },
+      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id %>                       , width: 400, 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: 400 },     
+      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 400 }, 
+      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 400 }, 
+      { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url ) %> , width: 400 },
+      { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 400 },
+      { name: 'layout'                , nice_name: 'Layout'               , type: 'text'       , value: <%= raw Caboose.json(@page.layout       ) %> , width: 400 },
+      { name: 'custom_sort_children'  , nice_name: 'Custom sort children' , type: 'checkbox'   , value: <%= raw @page.custom_sort_children %>        , width: 400 },
+      { name: 'content_format'        , nice_name: 'Content format'       , type: 'select'     , value: <%= raw Caboose.json(@page.content_format) %>, width: 400, text: <%= raw Caboose.json(@page.content_format) %>, options_url: '/pages/format-options' },       
+    ]
+  });
+});
+
+</script>
+<% end %>

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

@@ -0,0 +1,28 @@
+
+<%= render :partial => 'caboose/pages/admin_header' %>
+
+<p><div id='page_<%= @page.id %>_custom_js'></div></p>
+
+<%= render :partial => 'caboose/pages/admin_footer' %>
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+
+var modal = false;
+$(window).load(function() {
+  modal = new CabooseModal(800);
+});
+
+$(document).ready(function() {
+  m = new ModelBinder({
+    name: 'Page',
+    id: <%= @page.id %>,
+    update_url: '/admin/pages/<%= @page.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'custom_js', nice_name: 'Custom Javascript', type: 'textarea', value: <%= raw Caboose.json(@page.custom_js) %>, width: 800, height: 400 }             
+    ]
+  });
+});
+
+</script>
+<% end %>

data/app/views/caboose/pages/{edit_seo.html.erb → admin_edit_seo.html.erb}

@@ -1,12 +1,6 @@
 
-<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'       onclick="window.location='/pages/<%= @page.id %>/edit-seo';" disabled='true' />
-<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" />
-</div>
+<%= render :partial => 'caboose/pages/admin_header' %>
+
 <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>
@@ -14,6 +8,7 @@
 <p><div id='page_<%= @page.id %>_fb_description'></div></p>
 <p><div id='page_<%= @page.id %>_gp_description'></div></p>
 
+<%= render :partial => 'caboose/pages/admin_footer' %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">

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

@@ -0,0 +1,5 @@
+<h1>Pages</h1>
+
+<p><a href='/pages/new'>New Page</a></p>
+
+<%= raw pages_list(@home_page) %>

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

@@ -0,0 +1,6 @@
+
+<style type='text/css'>
+#content li.hidden a { color: #990000; }
+</style>
+
+<%= raw pages_list(@page) %>

data/config/routes.rb

@@ -44,25 +44,23 @@ Caboose::Engine.routes.draw do
   post    "admin/settings"                => "settings#create"
   delete  "admin/settings/:id"            => "settings#destroy"
   
-  get     "pages"                         => "pages#index"
-  get     "pages/sitemap-options"         => "pages#sitemap_options"
-  get     "pages/robots-options"          => "pages#robots_options"
-  get     "pages/format-options"          => "pages#content_format_options"
-  get     "pages/new"                     => "pages#new"
-  get     "pages/:id/sitemap"             => "pages#sitemap"
-  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-resources"      => "pages#edit_resources"
-  get     "pages/:id/edit-content"        => "pages#edit_content"
-  get     "pages/:id/edit-title"          => "pages#edit_title"
-  get     "pages/:id/edit"                => "pages#edit"
+  #get     "pages"                           => "pages#index"
   get     "pages/:id"                     => "pages#show"
-  put     "pages/:id"                     => "pages#update"
-  post    "pages"                         => "pages#create"
-  delete  "pages/:id"                     => "pages#destroy"
+  get     "pages/:id/redirect"            => "pages#redirect"
+  get     "admin/pages/sitemap-options"   => "pages#admin_sitemap_options"
+  get     "admin/pages/robots-options"    => "pages#admin_robots_options"
+  get     "admin/pages/format-options"    => "pages#admin_content_format_options"
+  get     "admin/pages/new"               => "pages#admin_new"  
+  get     "admin/pages/:id/sitemap"       => "pages#admin_sitemap"
+  get     "admin/pages/:id/edit"          => "pages#admin_edit_general"
+  get     "admin/pages/:id/css"           => "pages#admin_edit_css"
+  get     "admin/pages/:id/js"            => "pages#admin_edit_js"
+  get     "admin/pages/:id/seo"           => "pages#admin_edit_seo" 
+  get     "admin/pages/:id/content"       => "pages#admin_edit_content"  
+  put     "admin/pages/:id"               => "pages#admin_update"
+  get     "admin/pages"                   => "pages#admin_index"
+  post    "admin/pages"                   => "pages#admin_create"  
+  delete  "admin/pages/:id"               => "pages#admin_destroy"
   
   match '*path' => 'pages#show'
   root :to => 'pages#show'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.57'
+  VERSION = '0.2.62'
 end

data/lib/tasks/caboose.rake

@@ -33,6 +33,28 @@ namespace :caboose do
   
   desc "Performs caboose migrations to transition from the current version to the latest installed version"
   task :migrate => :migrate_between
+  
+  desc "Sync production db to development"
+  task :sync_dev_db do
+    
+    ddb = Rails.application.config.database_configuration['development']
+    pdb = Rails.application.config.database_configuration['production']
+    
+    dump_file = "#{Rails.root}/db/backups/#{pdb['database']}_#{DateTime.now.strftime('%FT%T')}.dump"
+    if !File.exists?("#{Rails.root}/db/backups")
+      `mkdir -p #{Rails.root}/db/backups`
+    end
+    
+    puts "Capturing production database..."
+    `heroku pgbackups:capture`
+    
+    puts "Downloading production database dump file..."
+    `curl -o #{dump_file} \`heroku pgbackups:url\``
+    
+    puts "Restoring development database from dump file..."
+    `pg_restore --verbose --clean --no-acl --no-owner -h #{ddb['host']} -U #{ddb['username']} -d #{ddb['database']} #{dump_file}`
+    
+  end
 
   #=============================================================================
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.57
+  version: 0.2.62
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,6 +187,7 @@ files:
 - app/controllers/caboose/station_controller.rb
 - app/controllers/caboose/users_controller.rb
 - app/helpers/caboose/application_helper.rb
+- app/helpers/caboose/pages_helper.rb
 - app/helpers/caboose/permissions_helper.rb
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb
@@ -214,18 +215,17 @@ files:
 - app/views/caboose/extras/error.html.erb
 - 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_resources.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/_admin_footer.html.erb
+- app/views/caboose/pages/_admin_header.html.erb
+- app/views/caboose/pages/admin_edit_content.html.erb
+- app/views/caboose/pages/admin_edit_css.html.erb
+- app/views/caboose/pages/admin_edit_general.html.erb
+- app/views/caboose/pages/admin_edit_js.html.erb
+- app/views/caboose/pages/admin_edit_seo.html.erb
+- app/views/caboose/pages/admin_index.html.erb
+- app/views/caboose/pages/admin_new.html.erb
+- app/views/caboose/pages/admin_sitemap.html.erb
 - app/views/caboose/pages/show.html.erb
-- app/views/caboose/pages/sitemap.html.erb
 - app/views/caboose/pages/test.html.erb
 - app/views/caboose/pages/update_pic.html.erb
 - app/views/caboose/pages/update_resume.html.erb

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

@@ -1,56 +0,0 @@
-<h1 id='editmode_title_container' ><%= @page.title %></h1>
-<div id='editmode_content_container' ><%= @page.content == nil || @page.content.length == 0 ? 'No content.' : (raw @page.content) %></div>
-
-<% content_for :caboose_css do %>
-  <% @page.linked_resources_map[:css].each do |r| %>
-    <!--link type='text/css' rel='stylesheet' href="<%= r %>" /-->
-    <%= stylesheet_link_tag r %>
-  <% end %>
-
-  <style><%= raw @page.custom_css %></style>
-<% end %>
-
-<% content_for :caboose_js do %>
-
-  <% @page.linked_resources_map[:js].each do |r| %>
-    <!--script type='text/javascript' src="<%= r %>" ></script-->
-    <%= javascript_include_tag r %>
-  <% end %>
-
-  <script type='text/javascript'><%= raw @page.custom_js %></script>
-
-  <script type='text/javascript'>
-    $(document).ready(function() {
-      $('#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>
-<% end %>

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

@@ -1,59 +0,0 @@
-
-<textarea id='page_<%= @page.id %>_content' placeholder='Content' style='width:795px; height:545px;' class='tinymce'><%= raw @page.content %></textarea>
-<br />
-<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_js do %>
-
-  <%= javascript_include_tag "caboose/model/all" %>
-
-  <script type="text/javascript">
-
-  var modal = false;
-  $(document).ready(function() {  
-    modal = new CabooseModal(800, 700);
-  });
-
-  function updateContent()
-  {
-    tinymce.triggerSave();
-
-    function log(msg) {
-      setTimeout(function() {
-        throw new Error(msg);
-      }, 0);
-    }
-    // log($('#page_<%= @page.id %>_content').val());
-
-    $.ajax({
-      url: '/pages/<%= @page.id %>',
-      type: 'put',
-      data: {
-        authenticity_token: "<%= form_authenticity_token %>",
-        content: $('#page_<%= @page.id %>_content').val()
-      },
-      success: function(resp) {
-        if (resp.success)
-        {
-          contentVal = $('#page_<%= @page.id %>_content').val();
-          parent.$('#editmode_content_container').html(contentVal == null || contentVal.length == 0 ? 'No content.' : contentVal);
-          modal.close();
-        }
-        if (resp.error)
-          modal.autosize("<p class='note success'>" + resp.error + "</p>");
-      }
-    });
-  }
-
-  </script>
-  <%= tinymce :caboose,
-    width:'795px',
-    height:'545px'
-    # theme_advanced_source_editor_width: '100px',
-    # theme_advanced_source_editor_height: '100px'
-  %>
-<% end %>

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

@@ -1,51 +0,0 @@
-
-<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';" disabled='true' />
-<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';" />
-<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" />
-</div>
-
-<textarea id='page_<%= @page.id %>_custom_css' placeholder='Custom CSS' style='width:795px; height:595px;'><%= raw @page.custom_css %></textarea>
-<br />
-<div id='message'></div>
-<div id='controls'>
-<input type='button' value='Close' onclick="modal.close();" />
-<input type='button' value='Update' onclick="updateCustomCSS();" />
-</div>
-
-<% content_for :caboose_js do %>
-
-  <%= javascript_include_tag "caboose/model/all" %>
-  <script type="text/javascript">
-
-  var modal = false;
-  $(document).ready(function() {  
-    modal = new CabooseModal(800, 700);
-  });
-
-  function updateCustomCSS()
-  {
-    $.ajax({
-      url: '/pages/<%= @page.id %>',
-      type: 'put',
-      data: {
-        authenticity_token: "<%= form_authenticity_token %>",
-        custom_css: $('#page_<%= @page.id %>_custom_css').val()
-      },
-      success: function(resp) {
-        if (resp.success) {
-          contentVal = $('#page_<%= @page.id %>_custom_css').val();
-          // parent.$('#editmode_content_container').html(contentVal == null || contentVal.length == 0 ? 'No content.' : contentVal);
-          modal.close();
-        }
-        if (resp.error)
-          modal.autosize("<p class='note success'>" + resp.error + "</p>");
-      }
-    });
-  }
-
-  </script>
-<% end %>

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

@@ -1,51 +0,0 @@
-
-<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';" disabled='true' />
-<input type='button' value='SEO'       onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
-<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" />
-</div>
-
-<textarea id='page_<%= @page.id %>_custom_js' placeholder='Custom Javascript' style='width:795px; height:595px;'><%= raw @page.custom_js %></textarea>
-<br />
-<div id='message'></div>
-<div id='controls'>
-<input type='button' value='Close' onclick="modal.close();" />
-<input type='button' value='Update' onclick="updateCustomJs();" />
-</div>
-
-<% content_for :caboose_js do %>
-
-  <%= javascript_include_tag "caboose/model/all" %>
-  <script type="text/javascript">
-
-  var modal = false;
-  $(document).ready(function() {  
-    modal = new CabooseModal(800, 700);
-  });
-
-  function updateCustomJs()
-  {
-    $.ajax({
-      url: '/pages/<%= @page.id %>',
-      type: 'put',
-      data: {
-        authenticity_token: "<%= form_authenticity_token %>",
-        custom_js: $('#page_<%= @page.id %>_custom_js').val()
-      },
-      success: function(resp) {
-        if (resp.success) {
-          contentVal = $('#page_<%= @page.id %>_custom_js').val();
-          // parent.$('#editmode_content_container').html(contentVal == null || contentVal.length == 0 ? 'No content.' : contentVal);
-          modal.close();
-        }
-        if (resp.error)
-          modal.autosize("<p class='note success'>" + resp.error + "</p>");
-      }
-    });
-  }
-
-  </script>
-<% end %>

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

@@ -1,41 +0,0 @@
-
-<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'       onclick="window.location='/pages/<%= @page.id %>/edit-seo';" />
-<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" disabled='true' />
-</div>
-<p><div id='page_<%= @page.id %>_linked_resources'></div></p>
-<p>Here you can provide paths to resources to be included in your page, such as css and javascript files.</p>
-<br />
-<p>Paths should be given on separate lines</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 %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      {
-        name: 'linked_resources',
-        nice_name: 'Linked Resources',
-        type: 'textarea',
-        width: 580,
-        height: 400,
-        value: <%= raw Caboose.json(@page.linked_resources) %> 
-      }      
-    ]
-  });  
-  modal = new CabooseModal(600, 460);
-});
-
-</script>
-<% end %>

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

@@ -1,51 +0,0 @@
-
-<h1>Page Settings</h1>
-<div class='top_right_controls'>
-<input type='button' value='General'   onclick="window.location='/pages/<%= @page.id %>/edit-settings';" disabled='true' />
-<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';" />
-<input type='button' value='Resources' onclick="window.location='/pages/<%= @page.id %>/edit-resources';" />
-</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() {
-  m = new ModelBinder({
-    name: 'Page',
-    id: <%= @page.id %>,
-    update_url: '/pages/<%= @page.id %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    attributes: [
-      { 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>
-<% end %>

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

@@ -1,30 +0,0 @@
-<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 %>',
-    authenticity_token: '<%= form_authenticity_token %>',
-    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 %>

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

@@ -1,33 +0,0 @@
-<h1>Users</h1>
-
-<p><a href='/users/new'>New User</a></p>
-
-<form action='/users' method='get'>
-<table cellpadding='4' cellspacing='0' border='0'>
-<tr><td>First name: 	</td><td><input type='text' name='first_name' value='<%= @gen.params['first_name'] %>' style='width: 200px;' /></td></tr>
-<tr><td>Last name: 	  </td><td><input type='text' name='last_name' 	value='<%= @gen.params['last_name']  %>' style='width: 200px;' /></td></tr>
-<tr><td>Username: 		</td><td><input type='text' name='username' 	value='<%= @gen.params['username'] 	 %>' style='width: 200px;' /></td></tr>
-</table><br />
-<p><input type='submit' value='Search' /></p>
-</form>
-
-<table class='data'>
-  <tr>
-    <%= raw @gen.sortable_table_headings({
-				'first_name' => 'First Name',
-				'last_name, first_name'	=> 'Last Name',
-				'username' => 'Username',
-				'email'	=> 'Email'
-			}) %>
-  </tr>
-<% @users.each do |user| %>
-  <tr onclick="window.location='/users/<%= user.id %>/edit';">
-    <td><%= user.first_name %></td>
-    <td><%= user.last_name %></td>
-    <td><%= user.username %></td>
-    <td><%= user.email %></td>
-  </tr>
-<% end %>
-</table>
-
-<p><%= raw @gen.generate %></p>

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

@@ -1,12 +0,0 @@
-
-<style type='text/css'>
-#content li.hidden a { color: #990000; }
-</style>
-
-<h1>Page Sitemap</h1>
-
-<ul>
-<% @options.each do |option| %>
-  <li><%= link_to option['text'], pages_path + '/' + option['value'].to_s %></li>
-<% end %>
-</ul>