caboose-cms 0.2.8 → 0.2.11

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 William Barry
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/caboose/pages_controller.rb

@@ -94,9 +94,9 @@ module Caboose
     # GET /pages/new
     def new
       return if !user_is_allowed('pages', 'add')
-      @pages = Page.new
-      @parent_id = params[:parent_id].nil? ? params[:parent_id] : -1
-      render :layout => 'caboose/admin'
+      @parent_id = params[:parent_id].nil? ? params[:parent_id] : 1
+      @parent = Page.find(@parent_id)
+      render :layout => 'caboose/modal'
     end
     
     # GET /pages/1/redirect

data/app/models/caboose/page_plugin.rb

@@ -21,7 +21,7 @@ class Caboose::PagePlugin < Caboose::CaboosePlugin
     	#item['children'] << { 'id' => 'use_redirect_urls', 'href' => '#', 'text' => '' + (uru ? 'Disable' : 'Enable') + ' Redirect Urls' }
     end
     if (user.is_allowed('pages', 'add') || is_admin)
-      item['children'] << { 'href' => "/pages/new?parent_id=#{page.id}"  , 'text' => 'New Page' }
+      item['children'] << { 'href' => "/pages/new?parent_id=#{page.id}"  , 'text' => 'New Page', 'modal' => true }
     end    
     nav << item
     return nav

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

@@ -1,23 +1,37 @@
 
 <h1>New Page</h1>
-<div id='page_new_container'></div>
+<p>Parent: <%= @parent ? @parent.title : "Home" %></p>
+<input type='hidden' id='parent_id' name='parent_id' value='<%= @parent_id %>' />
+<p><input type='text' id='title' name='title' placeholder='Title' style="width: 400px;" /></p>
+<p><input type='submit' value='Add Page' onclick='add_page();' /></p>
 
 <% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
 <script type='text/javascript'>
 
-var page = false;
+var modal = false;
 $(document).ready(function() {
+  modal = new CabooseModal(420);
+});
 
-  page = new Model({
-    name: 'Page',
-    id: 'new',
-    attributes: [
-      { name: 'parent_id' , type: 'select'  , value: <%= @parent_id %>, options_url: '/pages/sitemap-options' },
-      { name: 'title'     , type: 'text'    , value: '' }
-    ]
+function add_page()
+{
+  modal.autosize("<p class='loading'>Adding page...</p>");
+  $.ajax({
+    url: '/pages',
+    type: 'post',
+    data: {
+      parent_id: $('#parent_id').val(),
+      title: $('#title').val()
+    },
+    success: function(resp) {
+      if (resp.error)
+        modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect)
+        parent.window.location = resp.redirect
+    }
   });
-  
-});
+}
 
 </script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.8'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails