Changeset 870

Timestamp:

05/16/08 15:13:20 (3 months ago)

Author:

seancribbs

Message:

Integrate shards into core.

Files:

• trunk/radiant/app/helpers/admin/regions_helper.rb (added)
• trunk/radiant/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/radiant/app/views/admin/layout/edit.html.haml (modified) (1 diff)
• trunk/radiant/app/views/admin/page/_node.html.haml (modified) (1 diff)
• trunk/radiant/app/views/admin/page/_part.html.haml (modified) (1 diff)
• trunk/radiant/app/views/admin/page/edit.html.haml (modified) (1 diff)
• trunk/radiant/app/views/admin/page/index.html.haml (modified) (2 diffs)
• trunk/radiant/app/views/admin/snippet/edit.html.haml (modified) (1 diff)
• trunk/radiant/app/views/admin/user/edit.html.haml (modified) (1 diff)
• trunk/radiant/lib/radiant/admin_ui (added)
• trunk/radiant/lib/radiant/admin_ui.rb (modified) (2 diffs)
• trunk/radiant/lib/radiant/admin_ui/region_partials.rb (added)
• trunk/radiant/lib/radiant/admin_ui/region_set.rb (added)
• trunk/radiant/spec/controllers/admin/abstract_model_controller_spec.rb (modified) (1 diff)
• trunk/radiant/spec/helpers/admin/regions_helper_spec.rb (added)
• trunk/radiant/spec/helpers/application_helper_spec.rb (modified) (1 diff)
• trunk/radiant/spec/lib/radiant/admin_ui (added)
• trunk/radiant/spec/lib/radiant/admin_ui/region_partials_spec.rb (added)
• trunk/radiant/spec/lib/radiant/admin_ui/region_set_spec.rb (added)
• trunk/radiant/spec/lib/radiant/admin_ui_spec.rb (modified) (10 diffs)

trunk/radiant/app/helpers/application_helper.rb

@@ -1 +1 @@
-module ApplicationHelper
-  include LocalTime
+  include Admin::RegionsHelper
-  
-  def config

trunk/radiant/app/views/admin/layout/edit.html.haml

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+

trunk/radiant/app/views/admin/page/_node.html.haml

@@ -1 +1 @@
-%tr.node{:id => "page-#{page.id}", :class =>"level-#{level}#{children_class}#{virtual_class}"}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-- if expanded

trunk/radiant/app/views/admin/page/_part.html.haml

@@ -12 +12 @@
-        %span{:id => "tag-reference-link-#{@index}"}
-          = link_to_function 'Available Tags', "load_tag_reference(#{@index});"
+      = render_region :part_controls
-    %div
-      ~ text_area_tag "part[#{@index}][content]", h(part.content), :class => "textarea", :style => "width: 100%", :id => "part_#{@index}_content"

trunk/radiant/app/views/admin/page/edit.html.haml

@@ -14 +14 @@
-            .textbox
-              width: 90%
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+

trunk/radiant/app/views/admin/page/index.html.haml

@@ -3 +3 @@
-%h1 Pages
-
+= render_region :top
+
-%table#site-map.index{:summary=>"Page hierarchy of the current site"}
-  %thead
-    %tr
-
-
-
+
+
+
+
+
+
+
-  %tbody
-    - if @homepage
@@ -16 +22 @@
-        %td.note{:colspan => 4} No Pages
-
+= render_region :bottom
+
-- unless @homepage
-  %p

trunk/radiant/app/views/admin/snippet/edit.html.haml

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

trunk/radiant/app/views/admin/user/edit.html.haml

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/radiant/lib/radiant/admin_ui.rb

@@ -1 +1 @@
-require 'simpleton'
+require 'ostruct'
-
-module Radiant
-  class AdminUI
+    # This may be loaded before ActiveSupport, so do an explicit require
+    require 'radiant/admin_ui/region_set'
-    
-    class DuplicateTabNameError < StandardError; end
@@ -75 +78 @@
-    attr_accessor :tabs
-    
+    # Region sets
+    attr_accessor :page, :snippet, :layout, :user
+    
-    def initialize
-      @tabs = TabSet.new
+      load_default_regions
-    end
-    
+    private
+
+    def load_default_regions
+      @page = load_default_page_regions
+      @snippet = load_default_snippet_regions
+      @layout = load_default_layout_regions
+      @user = load_default_user_regions
+    end
+      
+    def load_default_page_regions
+      returning OpenStruct.new do |page|
+        page.edit = RegionSet.new do |edit|
+            edit.main.concat %w{edit_header edit_form edit_popups}
+            edit.form.concat %w{edit_title edit_extended_metadata
+                                  edit_page_parts}
+            edit.form_bottom.concat %w{edit_buttons}
+            edit.parts_bottom.concat %w{edit_layout_and_type edit_timestamp}
+        end
+        page.index = RegionSet.new do |index|
+          index.sitemap_head.concat %w{title_column_header status_column_header
+                                      modify_column_header}
+          index.node.concat %w{title_column status_column add_child_column remove_column}
+        end
+        page.remove = page.children = page.index
+        page._part = page.edit
+      end
+    end
+
+    def load_default_user_regions
+      returning OpenStruct.new do |user|
+        user.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_name edit_email edit_username edit_password 
+                              edit_roles edit_notes}
+          edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+        end
+      end
+    end
+
+    def load_default_snippet_regions
+      returning OpenStruct.new do |snippet|
+        snippet.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_title edit_content edit_filter edit_timestamp}
+          edit.form_bottom.concat %w{edit_buttons}
+        end
+      end
+    end
+
+    def load_default_layout_regions
+      returning OpenStruct.new do |layout|
+        layout.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_title edit_extended_metadata edit_content edit_timestamp}
+          edit.form_bottom.concat %w{edit_buttons}
+        end
+      end
+    end
-  end
-end

trunk/radiant/spec/controllers/admin/abstract_model_controller_spec.rb

@@ -10 +10 @@
-    "#{Admin::LayoutController.controller_path}/#{default_action_name}"
-  end
+  
+  before_filter {|c| c.send(:instance_variable_set, "@controller_name", 'layout')}
-end
-

trunk/radiant/spec/helpers/application_helper_spec.rb

@@ -164 +164 @@
-    admin.should == Radiant::AdminUI.instance
-  end
+  
+  it "should include the regions helper" do
+    ApplicationHelper.included_modules.should include(Admin::RegionsHelper)
+  end
-end

trunk/radiant/spec/lib/radiant/admin_ui_spec.rb

@@ -3 +3 @@
-describe Radiant::AdminUI do
-  before :each do
-instance
+new
-  end
-
+
-  it "should be a Simpleton" do
-    Radiant::AdminUI.included_modules.should include(Simpleton)
-    Radiant::AdminUI.should respond_to(:instance)
-  end
-
+
-  it "should have a TabSet" do
-    @admin.should respond_to(:tabs)
-    @admin.tabs.should_not be_nil
-    @admin.tabs.should be_instance_of(Radiant::AdminUI::TabSet)
+  end
+
+  it "should have collections of Region Sets for every controller" do
+    %w{page snippet layout user}.each do |collection|
+      @admin.should respond_to(collection)
+      @admin.send(collection).should_not be_nil
+      @admin.send(collection).should be_kind_of(OpenStruct)
+    end
+  end
+
+  it "should load the default page regions" do
+    page = @admin.page
+    %w{edit remove children index}.each do |action|
+      page.send(action).should_not be_nil
+      page.send(action).should be_kind_of(Radiant::AdminUI::RegionSet)
+    end
+    page.edit.main.should == %w{edit_header edit_form edit_popups}
+    page.edit.form.should == %w{edit_title edit_extended_metadata
+                                edit_page_parts}
+    page.edit.parts_bottom.should == %w{edit_layout_and_type edit_timestamp}
+    page.edit.form_bottom.should == %w{edit_buttons}
+    page.index.sitemap_head.should == %w{title_column_header
+                                        status_column_header
+                                        modify_column_header}
+    page.index.node.should == %w{title_column status_column add_child_column
+                                  remove_column}
+    page.remove.should === page.index
+    page.children.should === page.index
+    page._part.should === page.edit
+  end
+
+  it "should load the default snippet regions" do
+    snippet = @admin.snippet
+    snippet.edit.should_not be_nil
+    snippet.edit.main.should == %w{edit_header edit_form}
+    snippet.edit.form.should == %w{edit_title edit_content edit_filter
+                                   edit_timestamp}
+    snippet.edit.form_bottom.should == %w{edit_buttons}
+  end
+
+  it "should load the default layout regions" do
+    layout = @admin.layout
+    layout.edit.should_not be_nil
+    layout.edit.main.should == %w{edit_header edit_form}
+    layout.edit.form.should == %w{edit_title edit_extended_metadata
+                                  edit_content edit_timestamp}
+    layout.edit.form_bottom.should == %w{edit_buttons}
+  end
+
+  it "should load the default user regions" do
+    user = @admin.user
+    user.edit.should_not be_nil
+    user.edit.main.should == %w{edit_header edit_form}
+    user.edit.form.should == %w{edit_name edit_email edit_username
+                                edit_password edit_roles edit_notes}
+    user.edit.form_bottom.should == %w{edit_timestamp edit_buttons}
-  end
-end
@@ -31 +87 @@
-    @tabs.class.included_modules.should include(Enumerable)
-  end
-
+
-  it "should have its tabs accessible by name using brackets" do
-    @tabs.should respond_to(:[])
@@ -39 +95 @@
-    end
-  end
-
+
-  it "should have its tabs accessible by index using brackets" do
-    @tab_names.each_with_index do |name, index|
-      @tabs[index].should be_instance_of(Radiant::AdminUI::Tab)
-      @tabs[index].name.should == name
- 
+
-  end
-
+
-  it "should add new tabs to the end by default" do
-    @tabs.size.should == 3
@@ -52 +108 @@
-    @tabs[3].name.should == "Test"
-  end
-
+
-  it "should add a new tab before the specified tab" do
-    @tabs[1].name.should == "Second"
@@ -59 +115 @@
-    @tabs[2].name.should == "Second"
-  end
-
+
-  it "should add a new tab after the specified tab" do
-    @tabs[1].name.should == "Second"
@@ -68 +124 @@
-    @tabs[3].name.should == "Third"
-  end
-
+
-  it "should remove a tab by name" do
-    @tabs.size.should == 3
@@ -75 +131 @@
-    @tabs[1].name.should == "Third"
-  end
-
+
-  it "should not allow adding a tab with the same name as an existing tab" do
-    lambda { @tabs.add "First", "/first" }.should raise_error(Radiant::AdminUI::DuplicateTabNameError)
-  end
-
+
-  it "should remove all tabs when cleared" do
-    @tabs.size.should == 3
@@ -100 +156 @@
-    end
-  end
-
+
-  it "should be shown only to admin users when visibility is admin" do
-    @tab.visibility = [:admin]
@@ -108 +164 @@
-    end
-  end
-
+
-  it "should be shown only to developer users when visibility is developer" do
-    @tab.visibility = [:developer]
@@ -114 +170 @@
-    [:existing, :another, :admin, :non_admin].each do |user|
-      @tab.should_not be_shown_for(users(user))
-    
+
-  end
-
+
-  it "should assign visibility from :for option when created" do
-    @tab = Radiant::AdminUI::Tab.new "Test", "/test", :for => :developer
-    @tab.visibility.should == [:developer]
-  end
-
+
-  it "should assign visibility from :visibility option when created" do
-    @tab = Radiant::AdminUI::Tab.new "Test", "/test", :visibility => :developer
-    @tab.visibility.should == [:developer]
-  end
-
+
-  it "should assign visibility from both :for and :visibility options when created" do
-    @tab = Radiant::AdminUI::Tab.new "Test", "/test", :for => :developer, :visibility => :admin