Merge branch 'knewter/master'

app/controllers/admin/pages_controller.rb

@@ -29,7 +29,7 @@ def update
       flash.now[:message] = 'Page Updated Successfully'
       @preview_url = @page.ancestor_path + @page.name
       @page_id = @page.id
-      render :template => 'preview'
+      render :action => 'preview'
     else
       render :action => 'edit'
     end
@@ -44,10 +44,19 @@ def new
   def create
     @page.name = @page.name.gsub(' ', '_')
     if @page.save
-      flash.now[:message] = 'Page Added Successfully'
+      message = 'Page Added Successfully'
       @preview_url = @page.ancestor_path + @page.name
       @page_id = @page.id
-      render 'preview', "<h1>Page Added Successfully</h1>"
+      respond_to do |format|
+        format.html{ 
+          flash[:notice] = message
+          redirect_to admin_pages_path
+        }
+        format.js{
+          flash.now[:message] = message
+          render 'preview', "<h1>Page Added Successfully</h1>"
+        }
+      end
     else
       render :action => 'new'
     end
@@ -59,8 +68,15 @@ def destroy
      sub.parent_id = 0
      sub.save
    end
+   page_name = @page.name
    @page.destroy
-   manage_tree
+   respond_to do |format|
+     format.html{
+       flash[:notice] = "Page: #{page_name} was deleted"
+       redirect_to admin_pages_path
+     }
+     format.js{ manage_tree }
+   end
  end
 
  def menu
@@ -76,9 +92,10 @@ def menu
   def shift_order
     @page.swap! params[:shift].to_i if @page and params[:shift]
     params[:parent_id] = @page.parent_id
-    manage_tree
-    #rescue
-    # render_text "An Error has occured!" # Add something more graceful later
+    respond_to do |format|
+      format.html{ redirect_to admin_pages_path }
+      format.js{ manage_tree }
+    end
   end
 
   def manage_tree

app/controllers/admin/site_settings_controller.rb

@@ -0,0 +1,31 @@
+class Admin::SiteSettingsController < Admin::BaseController
+  include ThemesManagementHelper
+  before_filter :get_settings
+  before_filter :get_themes, :only => [:edit]
+
+  protected
+  def get_settings
+    @settings = settings # This is defined in site_settings_helper
+  end
+
+  def get_themes
+    @themes = list_themes
+  end
+
+  public
+  def show
+  end
+
+  def edit
+  end
+
+  def update
+    if @settings.update_attributes(params[:site_setting])
+      flash[:notice] = "Site Settings were updated successfully."
+      redirect_to :action => 'show'
+    else
+      flash.now[:error] = "There was a problem updating the site settings."
+      render :action => 'edit'
+    end
+  end
+end

app/controllers/application.rb

@@ -1,7 +1,9 @@
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
+  include SiteSettingsHelper
   before_filter :login_from_cookie, :setup_plugin_nav, :set_layout_variables
   helper :all
+  theme  :get_theme_setting
 
   def set_layout_variables
     @root = Page.root

app/helpers/fam_fam_fam_helper.rb

@@ -0,0 +1,5 @@
+module FamFamFamHelper
+  def famfamfam_icon name
+    image_tag('famfamfam_icons/' + name + '.png')
+  end
+end

app/helpers/flashes_helper.rb

@@ -0,0 +1,23 @@
+module FlashesHelper
+  include FamFamFamHelper
+
+  def display_standard_flashes(message = 'There were some problems with your submission:')
+    if flash[:notice]
+      flash_to_display, level, icon = flash[:notice], 'notice', 'tick'
+    elsif flash[:warning]
+      flash_to_display, level, icon = flash[:warning], 'warning', 'delete'
+    elsif flash[:error]
+      level = 'error'
+      if flash[:error].instance_of? ActiveRecord::Errors
+        flash_to_display = message
+        flash_to_display << activerecord_error_list(flash[:error])
+      else
+        flash_to_display = flash[:error]
+      end
+      icon = 'error'
+    else
+      return
+    end
+    content_tag 'div', famfamfam_icon(icon) + ' ' + flash_to_display, :class => "flash #{level}"
+  end
+end

app/helpers/page_admin_helper.rb

@@ -77,14 +77,12 @@ def tree_ul(acts_as_tree_set, init=true, &block)
       acts_as_tree_set.collect do |item|
         next if item.parent_id && init
         ret << '<li>'
-        ret += yield item
-        ret << ' (page controls partial)'
+        ret << yield(item)
+        ret << render(:partial => 'page_controls', :locals => { :page => item })
         ret << tree_ul(item.children, false, &block) if item.children.size > 0
         ret << '</li>'
       end
       ret << '</ul>'
     end
   end
-
-
 end

app/models/site_setting.rb

@@ -0,0 +1,6 @@
+class SiteSetting < ActiveRecord::Base
+  def get_theme_setting
+    theme_setting = self.send(:user_theme_name)
+    theme_setting.blank? ? 'default' : theme_setting
+  end
+end

app/views/admin/pages/_tabs.html.erb → app/views/admin/_tabs.html.erb

@@ -1,11 +1,13 @@
 <% if logged_in? %>
   <div id="hd">
-    <ul>
-      <li><%= create_tab('Manage Pages', '/admin/pages') %></li>
-      <li><%= create_tab('List Plugins', '/admin/plugins') %></li>
+    <%= render :partial => "admin/page_plugins/admin_plugins_nav" -%>
+    <ul id='base-links'>
+      <li><%= create_tab('Manage Pages',  '/admin/pages') %></li>
+      <li><%= create_tab('Site Settings', '/admin/site_settings') %></li>
+      <li><%= create_tab('List Plugins',  '/admin/plugins') %></li>
       <li><%= create_tab('Account Settings', '/admin/account/update') %></li>
       <li><%= create_tab('Logout', '/admin/account/logout') %></li>
     </ul>
-    <%= render :partial => "admin/page_plugins/admin_plugins_nav" -%>
+    <div class='clear'></div>
   </div>
 <% end %>

app/views/admin/page_plugins/_admin_plugins_nav.html.erb

@@ -1,5 +1,5 @@
 <ul id='admin-plugins-nav'>
   <% @admin_plugin_nav.each do |text, url| -%>
-    <li><%= link_to text, url -%></li>
+    <li><%= create_tab text, url -%></span></li>
   <% end -%>
 </ul>

app/views/admin/pages/_page_controls.html.erb

@@ -0,0 +1,6 @@
+<span class='page_controls'>
+  <%= link_to 'dn', shift_order_admin_page_path(:id => page.id, :shift => 1) -%>
+  <%= link_to 'up', shift_order_admin_page_path(:id => page.id, :shift => -1) -%>
+  <%= link_to("X", admin_page_path(page), :method => :delete, :confirm => 'Are you sure?  This will delete this page permanently and all sub-pages will be orphaned!') -%>
+  <%= link_to("Add", new_admin_page_path(:parent_id => page.id)) -%>
+</span>

app/views/admin/pages/edit.html.erb

@@ -1,20 +1,33 @@
-<h1>Edit Page</h1>
-<% form_remote_tag :url => { :action => 'update', :id => @page.id },
-	:update => 'main',
-	:complete => remote_function(
-		:update => "item#{@page.parent_id}",
-		:url => { :action => 'manage_tree', :parent_id => @page.parent_id, :tree_post_id => @post_id },
-		:complete => 'refresh_visibility()'),
-	:html => { 'name' => 'page_form' } do -%>
-	<%= render :partial => 'form' %>
-	<%= submit_tag 'Update', :class => 'submit' -%>
+<% content_for :sidebar do -%>
+  <% form_remote_tag :url => admin_page_path(@page),
+    :update => 'main',
+    :method => :put,
+    :complete => remote_function(
+      :update => "item#{@page.parent_id}",
+      :url => { :action => 'manage_tree', :parent_id => @page.parent_id, :tree_post_id => @post_id },
+      :complete => 'refresh_visibility()'),
+    :html => { 'name' => 'page_form' } do -%>
+    <%= render :partial => 'form' %>
+    <%= submit_tag 'Update', :class => 'submit' -%>
+  <% end -%>
+<% end -%>
+
+<% content_for :sidebar do -%>
+  <h2>Plugins on this page</h2>
+  <ul id="page_plugins" class='page_plugins'>
+    <% @page.page_plugins.each do |plugin| -%>
+      <li><%= link_to(plugin.module_type, plugin.module.edit_path, :class => 'edit_page_plugin') -%></li>
+    <% end -%>
+  </ul>
+  <%= link_to "Add Plugin", new_admin_page_plugin_path(:page_id => @page.id) -%>
 <% end -%>
+<div id="modal" class="jqmWindow"></div>
 
-<h2>Plugins on this page</h2>
-<ul id="page_plugins" class='page_plugins'>
+<% if @page.display_title %>
+  <h2><%= @page.full_title %></h2>
+<% end %>
+<% if @page.page_plugins.any? -%>
   <% @page.page_plugins.each do |plugin| -%>
-    <li><%= link_to(plugin.module_type, plugin.module.edit_path, :class => 'edit_page_plugin') -%></li>
+    <%= render :partial => plugin.module_class.view_partial, :locals => { :plugin_module => plugin.module } -%>
   <% end -%>
-</ul>
-<%= link_to "Add Plugin", new_admin_page_plugin_path(:page_id => @page.id) -%>
-<div id="modal" class="jqmWindow"></div>
+<% end -%>

app/views/admin/pages/index.html.erb

@@ -1,3 +1,3 @@
 <div id="tree">
-  <%= tree_ul(@page_hierarchy) {|item| link_to h(item.name), :action => 'edit', :id => item } %>
-</div>
+  <%= tree_ul(@page_hierarchy) {|item| link_to h(item.name), edit_admin_page_path(item) } %>
+</div>

app/views/admin/pages/new.html.erb

@@ -1,13 +1,7 @@
 <h1 style="text-align:center;">Create a New Page</h1>
-<% form_remote_tag :url => { :action => 'create'} ,
-	:update => 'main',
-	:complete => remote_function( 
-	:update => "item#{@page.parent_id}",
-	:url => { :action => 'manage_tree', :parent_id => @page.parent_id, :tree_post_id => @postId } ),
-	:html => { 'name' => 'page_form' } do %>
+<% form_tag admin_pages_path, :html => { 'name' => 'page_form' } do %>
 	<%= hidden_field 'page', 'parent_id' %>
 	<%= hidden_field 'page', 'page_order' %>
 	<%= render :partial => 'form' %>
 	<%= submit_tag 'Create', :class => 'submit' %>
 <% end -%>
-

app/views/admin/site_settings/edit.html.erb

@@ -0,0 +1,7 @@
+<h1>Edit Site Settings</h1>
+<% form_tag 'update' do -%>
+  <% fields_for @settings do |f| -%>
+    <%= f.select(:user_theme_name, @themes) -%>
+    <%= submit_tag 'Update' -%>
+  <% end -%>
+<% end -%>

app/views/admin/site_settings/show.html.erb

@@ -0,0 +1,5 @@
+<h1>Site Settings</h1>
+<% content_for :sidebar do -%>
+  <%= link_to 'Edit Settings', edit_admin_site_settings_path -%>
+<% end -%>
+User Theme: <%= @settings.get_theme_setting -%>

app/views/layouts/admin.html.erb

@@ -8,12 +8,10 @@
     <meta http-equiv="Content-Script-Type" content="text/javascript" />
     <meta name="description" content="Ansuz Content Management System" />
   	<meta name="keywords" content="Ansuz Content Management System" />
-    <link rel="shortcut icon" href="favicon.ico" type="image/vnd.microsoft.icon" />
-    <link rel="icon"          href="favicon.ico" type="image/vnd.microsoft.icon" />
     <%= stylesheet_link_tag 'reset-fonts-grids' %>
 	  <%= stylesheet_link_tag 'sprite' %>
-	  <%= stylesheet_link_tag 'base' %>
     <%= stylesheet_link_tag 'admin' %>
+    <%= stylesheet_link_tag 'jqmodal' %>
     <%= javascript_include_tag :defaults, 'jquery', 'jqModal', 'jquery.growl.js', 'ansuz/growls' %>
     <%= javascript_include_tag 'show_and_hide' %>
     <%= javascript_include_tag 'fckeditor/fckeditor' %>
@@ -23,11 +21,16 @@
     <div id='header'>
       <h1>
         <span class='logo'></span>
-        <span>Ansuz CMS: Admin [ Currently Editing: <b><%= current_database %></b> ]</span>
+        <span>Ansuz CMS: Admin</span>
       </h1>
     </div>
+    <div id='toolbar'>
+      <%= render :partial => "/admin/tabs" %>
+    </div>
+    <div id='sidebar'>
+      <%= yield :sidebar -%>
+    </div>
     <div id="doc2" class="yui-t7">
-      <%= render :partial => "/admin/pages/tabs" %>
       <div id="bd">
         <div class="yui-g">
           <%# TODO: I need to use the helper I use to print all flash messages here, way more stylable / useful -ja -%>
@@ -37,7 +40,9 @@
           <%= @content_for_layout %>
         </div>
       </div>
-      <div id="ft">Add a Plugin</div>
+      <div id="ft">
+        [ Currently Editing: <b><%= current_database %></b> ]
+      </div>
     </div>
   </body>
 </html>

app/views/layouts/page.html.erb

@@ -14,7 +14,7 @@
 	  <%= stylesheet_link_tag 'base' -%>
 	  <%= stylesheet_link_tag 'sprite' -%>
 	  <%= stylesheet_link_tag 'lightbox' -%>
-    <%= javascript_include_tag :defaults, 'effects', 'builder', 'lightbox', 'niftycube', 'handle_rounded_corners', 'jquery', 'jqModal', , 'jquery.growl.js' -%>
+    <%= javascript_include_tag :defaults, 'effects', 'builder', 'lightbox', 'niftycube', 'handle_rounded_corners', 'jquery', 'jqModal', 'jquery.growl.js', 'ansuz/growls' -%>
     <!--[if lt IE 7.]><%= javascript_include_tag 'pngfix.js' %><![endif]-->
   </head>
   <body>

app/views/page/_top_nav.html.erb

@@ -9,5 +9,5 @@
         </li> 
     <% end %> 
   </ul>
-  <%= render :partial => "page_plugins/plugins_nav" -%>
+  <%= render :partial => "/admin/page_plugins/plugins_nav" -%>
 </div>

config/routes.rb

@@ -6,11 +6,12 @@
 
   map.resources :users
   map.namespace :admin do |admin|
-    admin.resources :pages
+    admin.resources :pages, :member => [:shift_order]
     admin.resources :page_plugins
     admin.resources :plugins
     admin.resource  :account
     admin.connect 'account/:action/:id', :controller => 'account'
+    admin.resource  :site_settings
   end
   map.connect '/admin', :controller => 'admin/pages'
 

db/migrate/20080913132029_create_site_settings.rb

@@ -0,0 +1,14 @@
+class CreateSiteSettings < ActiveRecord::Migration
+  def self.up
+    create_table :site_settings do |t|
+      t.string :name
+      t.string :user_theme_name
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :site_settings
+  end
+end

lib/site_settings_helper.rb

@@ -0,0 +1,13 @@
+module SiteSettingsHelper
+  def get_setting(name)
+    settings.send(name)
+  end
+
+  def get_theme_setting
+    settings.get_theme_setting
+  end
+
+  def settings
+    SiteSetting.find_or_create_by_name(:default)
+  end
+end

lib/tasks/utils.rake

@@ -10,4 +10,4 @@ namespace :utils do
         puts "Initial user already exists, exiting"
       end    
   end
-end
+end

lib/themes_management_helper.rb

@@ -0,0 +1,9 @@
+module ThemesManagementHelper
+  def list_themes
+    themes_dir.entries.sort.delete_if{|e| e =~ /^\.$|^\.\.$/ }
+  end
+
+  def themes_dir
+    Dir.new("#{RAILS_ROOT}/themes")
+  end
+end