From df3abefe2af983e25900491192475f41b5cb927e Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Tue, 31 Jul 2007 13:10:41 +0000
Subject: [PATCH]  r251@sede:  terceiro | 2007-07-29 19:54:31 -0300  ActionItem0: adapting to new design plugin 

---
 app/controllers/application.rb               |  2 ++
 app/controllers/features_controller.rb       |  7 ++++++-
 app/controllers/home_controller.rb           |  2 +-
 app/helpers/application_helper.rb            | 21 ++++++++++++++-------
 app/models/virtual_community.rb              |  2 ++
 app/views/layouts/application.rhtml          |  8 +++-----
 db/migrate/001_create_virtual_communities.rb |  1 +
 db/migrate/005_add_design_support.rb         |  2 +-
 8 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index bb28b86..ca530a5 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,6 +2,8 @@
 # available in all controllers.
 class ApplicationController < ActionController::Base
 
+  design :holder => 'virtual_community'
+
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
 
diff --git a/app/controllers/features_controller.rb b/app/controllers/features_controller.rb
index ebeac69..905e9b6 100644
--- a/app/controllers/features_controller.rb
+++ b/app/controllers/features_controller.rb
@@ -1,7 +1,12 @@
 class FeaturesController < ApplicationController
 
-  uses_flexible_template :owner => 'owner'
 
+  # FIXME: temp test code, remove from here
+  design :holder => 'virtual_community'
+  def test
+    render :inline => '<%= design_display("bli") %>'
+  end
+  ################################
 
   acts_as_virtual_community_admin_controller
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index ee86b7a..9800738 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,5 +1,5 @@
 class HomeController < ApplicationController
 
-  uses_flexible_template :owner => 'virtual_community'
+  design :holder => 'virtual_community'
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c146d32..3c79db5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -77,17 +77,24 @@ module ApplicationHelper
     content_tag('div', @virtual_community.name, :id => 'virtual_community_identification')
   end
 
+  def link_to_cms(text, profile = nil, options = {})
+    profile ||= current_user.login
+    link_to text, "/cms/#{profile}", options
+  end
+
+  def link_to_profile(text, profile = nil, options = {})
+    profile ||= current_user.login
+    link_to text, "/#{profile}", options
+  end
+
   # TODO: add the actual links
   # TODO: test this helper
   def user_links
     links = [
-       [ _('My accont'), { :controller => 'account' } ],
-       [ _('My profile'), { :controller => 'ble'} ],
-       [ _('My groups'), { :controller => 'bli'} ],
-       [ _('My enterprises'), { :controller => 'enterprise'}]
-    ].map do |link|
-      link_to link[0], link[1]
-    end.join(' ')
+       [ link_to _('My accont'), { :controller => 'account' } ],
+       [ link_to_profile _('My home page') ],
+       [ link_to_cms _('Manage content') ],
+    ].join("\n")
     content_tag('div', links, :id => 'user_links')
   end
 
diff --git a/app/models/virtual_community.rb b/app/models/virtual_community.rb
index e271ccd..00b1366 100644
--- a/app/models/virtual_community.rb
+++ b/app/models/virtual_community.rb
@@ -16,6 +16,8 @@ class VirtualCommunity < ActiveRecord::Base
   # Relationships and applied behaviour
   # #################################################
 
+  acts_as_design
+
   # One VirtualCommunity can be reached by many domains
   has_many :domains, :as => :owner
 
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 5fc02fc..ffece21 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -1,9 +1,7 @@
 <html>
   <head>
     <%= javascript_include_tag :defaults %>
-    <%= javascript_include_tag_for_template %>
-    <%= stylesheet_link_tag_for_template %>
-    <%= stylesheet_link_tag_for_theme %>
+    <%= design_all_header_tags %>
 
   </head>
 
@@ -27,12 +25,12 @@
           <%= flash[:notice] %>
         </div>
         <a name='main_content'/>
-        <%= display_boxes(yield) %>
+        <%= design_display(yield) %>
 
         <div id="footer">
           <a name='footer'/>
           <%= footer %>
-          <%= display_icon('back')%>
+          <%= design_display_icon('back')%>
         </div>
       </div>
     </div>
diff --git a/db/migrate/001_create_virtual_communities.rb b/db/migrate/001_create_virtual_communities.rb
index db4a997..f93c8ad 100644
--- a/db/migrate/001_create_virtual_communities.rb
+++ b/db/migrate/001_create_virtual_communities.rb
@@ -4,6 +4,7 @@ class CreateVirtualCommunities < ActiveRecord::Migration
       t.column :name,       :string
       t.column :is_default, :boolean
       t.column :settings,   :text
+      t.column :design_data, :text
     end
     VirtualCommunity.create(:name => 'Default Virtual Community', :is_default => true)
   end
diff --git a/db/migrate/005_add_design_support.rb b/db/migrate/005_add_design_support.rb
index ce1569c..5cb45dc 100644
--- a/db/migrate/005_add_design_support.rb
+++ b/db/migrate/005_add_design_support.rb
@@ -1,4 +1,4 @@
-class ManageTemplateMigration < ActiveRecord::Migration
+class AddDesignSupport < ActiveRecord::Migration
   def self.up
 
     create_table :design_boxes do |t|
--
libgit2 0.21.2