ActionItem19: updating system to use new version design plugin

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@918 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem19: updating system to use new version design plugin
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@918 3f533792-8f58-4932-b0fe-aaf55b0a4547
LeandroNunes
1 parent ef4b706c
Showing 22 changed files with 149 additions and 299 deletions Show diff stats
app/controllers/admin/edit_template_controller.rb
app/controllers/application.rb
app/controllers/my_profile/profile_editor_controller.rb
app/design_blocks/favorite_links_profile/controllers/favorite_links_profile_controller.rb
app/design_blocks/favorite_links_profile/models/favorite_links_profile.rb
app/design_blocks/favourite_links/controllers/favourite_links_controller.rb
app/design_blocks/favourite_links/models/favourite_links.rb
app/design_blocks/favourite_links/views/add_link.rhtml
app/design_blocks/favourite_links/views/edit.rhtml
app/design_blocks/favourite_links/views/index.rhtml
app/design_blocks/favourite_links/views/manage_links.rhtml
config/routes.rb
lib/noosfero.rb
public/designs/templates/default/stylesheets/style.css
public/designs/templates/leftbar/stylesheets/style.css
public/designs/templates/onecolumn/stylesheets/style.css
public/designs/templates/rightcolumn/stylesheets/editor.css
public/designs/templates/rightcolumn/stylesheets/style.css
public/designs/templates/threecolumn/stylesheets/style.css
public/designs/themes/default/style.css
@@ -2,11 +2,9 @@ class EditTemplateController &lt; AdminController
   design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
-  #FIXME This is wrong
-  #See the FavoriteLinksController considerations and choose the better way
   def block_types
     %w[
-       FavoriteLinks
+       FavoriteLinksProfile
      ]
   end
@@ -51,6 +51,8 @@ class ApplicationController &lt; ActionController::Base
   def load_profile
     @profile = Profile.find_by_identifier(params[:profile]) unless @profile
+#raise "bli %s" % @profile.inspect
+#    @profile = Profile.find_by_identifier(params[:profile]) unless @profile
     render_not_found unless @profile
   end
@@ -4,14 +4,12 @@ class ProfileEditorController &lt; MyProfileController
   helper :profile
-  
-
-  design_editor :holder => 'profile', :autosave => true, :block_types => :block_types
+  design_editor :holder => 'profile',:autosave => true, :block_types => :block_types
    def block_types
     %w[
-       FavouriteLinks
+       FavoriteLinksProfile
       ]
    end
@@ -0,0 +1,7 @@
+class FavoriteLinksProfileController < FavoriteLinksController
+
+  needs_profile
+
+  acts_as_design_block
+
+end
@@ -0,0 +1,7 @@
+class FavoriteLinksProfile < FavoriteLinks
+
+  def self.description
+    _('Favorite Links')
+  end
+
+end
@@ -1,73 +0,0 @@
-class FavouriteLinksController < ApplicationController
-
-
-  # The methods above are specific for noosfero application. I think 
-  # this it not the correct way to get this method. 
-  #
-  # We can create a method in the app/controllers/profile_admin folder
-  # the inherit this method and adds only the two lines above.
-  #
-  # With this way we can reuse this block on many others case and each case
-  # we follow the same way.
-  # 
-  # Specific for app
-  needs_profile
-  design :holder => 'profile'
-  # End specific for app
-
-
-  acts_as_design_block
-
-  CONTROL_ACTION_OPTIONS = {
-    'manage_links' => _('Manage Links'),
-    'edit' => _('Edit'),
-  }
-
-  def index
-    get_favourite_links
-    design_render
-  end
-
-  def edit
-    design_render_on_edit
-  end
-
-  def save
-    if @design_block.update_attributes(params[:design_block])
-      get_favourite_links
-      design_render_on_edit :action => 'manage_links'
-    else
-      design_render_on_edit :nothing => true
-    end
-  end
-
-  def manage_links
-    get_favourite_links
-    design_render_on_edit
-  end
-
-  def add_link
-    design_render_on_edit
-  end
-
-  def remove_link
-    @design_block.delete_link(params[:link])
-    get_favourite_links
-    design_render_on_edit :action => 'manage_links'
-  end
-
-  def get_favourite_links
-    favourite_links = @design_block.favourite_links
-    @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links
-  end
-
-  def paginate_by_collection(collection, options = {})
-    page = params[:page].blank? ?  1 : params[:page].to_i
-    items_per_page = @design_block.limit_number
-    offset = (page - 1) * items_per_page
-    link_pages = Paginator.new(self, collection.size, items_per_page, page)
-    collection = collection[offset..(offset + items_per_page - 1)]
-    return link_pages, collection
-  end
-
-end
@@ -1,37 +0,0 @@
-class FavouriteLinks < Design::Block
-
-  def self.description
-    _('Favourite Links')
-  end
-
-  def limit_number= value
-    self.settings[:limit_number] = value.to_i
-  end
-
-  def limit_number
-    self.settings[:limit_number] || 5
-  end
-
-  def favourite_links_limited
-    self.favourite_links.first(self.limit_number)
-  end
-
-  def favourite_links
-    self.settings[:favourite_links] ||= []
-  end
-
-  def delete_link link
-    self.settings[:favourite_links].reject!{ |item| item == link }
-    self.save
-  end
-
-  def favourite_link
-    nil
-  end
-
-  def favourite_link= link
-    self.favourite_links.push(link)
-    self.favourite_links.uniq!
-  end
-
-end
@@ -1,13 +0,0 @@
-<h2> <%= _('Editing Favourite Links') %> </h2>
-
-<% design_form_remote_tag( :url => {:action => 'save'}) do %>
-
-  <p>
-    <label for="design_block_title"> <%= _("Title") %> </label>
-    <%= text_field 'design_block', 'favourite_link'%>
-  </p>
-
-  <%= submit_tag _('Save') %>
-
-<% end %>
-
@@ -1,29 +0,0 @@
-
-<h2> <%= _('Editing Favourite Links') %> </h2>
-
- <% design_form_remote_tag( :url => {:action => 'save'}) do %>
-
-  <p>
-    <label for="design_block_title"> <%= _("Title") %> </label>
-    <%= text_field 'design_block', 'title'%>
-  </p>
-
-  <p>
-    <label for="design_block_display_header"> <%= _("Display header?") %> </label>
-    <%= check_box 'design_block', 'display_header', {}, 'true', 'false' %>
-  </p>
-
-  <p>
-    <label for="design_block_display_title"> <%= _("Display title?") %> </label>
-    <%= check_box 'design_block', 'display_title', {}, 'true', 'false' %>
-  </p>
-
-  <p>
-    <label for="design_block_limit_number"> <%= _("Max number of links") %> </label>
-    <%= text_field 'design_block', 'limit_number'%>
-  </p>
-
-  <%= submit_tag _('Save') %>
-
-<% end %>
-
@@ -1,16 +0,0 @@
-
-<% if @favourite_links_pages.current.previous%>
-  <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %>
-<% end %>
-<% if @favourite_links_pages.current.next %>
-  <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %>
-<% end %>
-
-<% @favourite_links.each do |link| %>
-  <ul>
-    <li>
-      <%= link_to link, link, :popup => true %>
-    </li>
-  </ul>
-<% end %>
-
@@ -1,21 +0,0 @@
-
-<h2> 
-  <%= _('Favourite Links') %> 
-  <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%>
-
-</h2>
-<% if @favourite_links_pages.current.previous%>
-  <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %>
-<% end %>
-<% if @favourite_links_pages.current.next %>
-  <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %>
-<% end %>
-
-<% @favourite_links.each do |link| %>
-  <ul>
-    <li> 
-      <%= link_to link, link, :popup => true %> 
-      <%= design_link_to_remote content_tag(:span,_('Remove')), :url => {:action => 'remove_link', :link => link } %> 
-    </li>
-  </ul>
-<% end %>
@@ -37,7 +37,9 @@ ActionController::Routing::Routes.draw do |map|
   map.category 'cat/*path', :controller => 'category', :action => 'view'
   ## controllers for blocks
-  map.controllers 'block/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks
+  # FIXME this path didn't works Leandro comments this line and the reference to the controller path on
+  # /lib/noosfero.rg file.
+  #map.controllers 'block/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_from_design_blocks
   ######################################################
   ## Controllers that are profile-specific (for profile admins )
@@ -9,18 +9,21 @@ module Noosfero
     Regexp.new(pattern)
   end
-  def self.pattern_for_controllers_from_design_blocks
-    items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')).map do |item|
-      item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1')
-    end.join('|')
-    Regexp.new(items.blank? ? '' : ('(' + items + ')'))
-  end
+#  FIXME This path is not working. I put a line deteach on the 'controllers_in_directory' method to meka the blocks
+#  works
+#  def self.pattern_for_controllers_from_design_blocks
+#    items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')).map do |item|
+#      item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1')
+#    end.join('|')
+#    Regexp.new(items.blank? ? '' : ('(' + items + ')'))
+#  end
   private
   def self.controllers_in_directory(dir)
     app_controller_path = Dir.glob(File.join(RAILS_ROOT, 'app', 'controllers', dir, '*_controller.rb'))
-    app_controller_path.map do |item|
+    items = Dir.glob(File.join(RAILS_ROOT, 'app', 'design_blocks', '*', 'controllers', '*_controller.rb')) # FIXME line added to blocks works
+    (app_controller_path + items).map do |item|
       item.gsub(/^.*\/([^\/]+)_controller.rb$/, '\1')
     end
   end
@@ -36,24 +36,24 @@ body {
 height: 145px;
 }
-#boxes {
+#design_boxes {
   position: relative;
   margin-left: 10px;
   margin-right: 10px;
   padding: 0em;
 }
-#box_3 {
+#design_box_3 {
   width: 210px;
   float: right;
 }
-#box_2 {
+#design_box_2 {
   float: left;
   width: 280px;
 }
-#box_1 {
+#design_box_1 {
   margin-left: 285px;
   margin-right: 215px;
 }
@@ -18,7 +18,7 @@ background: url(&quot;../images/bg_header.png&quot;) top center no-repeat;
 height: 135px;
 }
-#boxes {
+#design_boxes {
 position: relative;
 width: 780px;
 left: 50%;
@@ -26,12 +26,12 @@ margin-left: -390px;
 padding-top: 1em;
 }
-#box_2 {
+#design_box_2 {
 float: left;
 width: 200px;
 }
-#box_1 {
+#design_box_1 {
 margin-left: 205px;
 }
@@ -14,14 +14,14 @@ background: url(&quot;../images/bg_bgheader.png&quot;) top left repeat-x;
 height: 55px;
 }
-#boxes {
+#design_boxes {
   position: relative;
   width: auto;
   margin: 20px;
   padding: 10px;
 }
-#box_1 {
+#design_box_1 {
 }
 #spinner {
@@ -40,7 +40,7 @@ border: 1px inset #545454;
   border: 2px dotted #545454;
 }
-#design_editor .box {
+#design_editor .design_box {
   border: 2px solid transparent;
 }
@@ -36,19 +36,19 @@ body {
 height: 145px;
 }
-#boxes {
+#design_boxes {
   position: relative;
   margin-left: 10px;
   margin-right: 10px;
   padding: 0em;
 }
-#box_2 {
+#design_box_2 {
   width: 280px;
   float: right;
 }
-#box_1 {
+#design_box_1 {
   margin-right: 285px;
 }
@@ -16,7 +16,7 @@ background: url(&quot;../images/bg_header.png&quot;) top center no-repeat;
 height: 135px;
 }
-#boxes {
+#design_boxes {
   position: relative;
   width: 760px;
   left: 50%;
@@ -24,17 +24,17 @@ height: 135px;
   padding: 0em;
 }
-#box_3 {
+#design_box_3 {
   width: 200px;
   float: right;
 }
-#box_2 {
+#design_box_2 {
   float: left;
   width: 200px;
 }
-#box_1 {
+#design_box_1 {
   margin-left: 205px;
   margin-right: 205px;
 }
 /* MacStyle Theme for Blocks */
-div.block
+.design_block
 {
 	background: #FFFFFF;
 	border: 0px;
@@ -8,29 +8,24 @@ div.block
 /* FIXME: esta usando para flutuar */
-.button_block_remove {
-position: absolute;
-z-index: 999;
-} 
-
-ul.block_control_list
+ul.design_block_control_list
 {
         list-style: none;
 	margin: 0px;
 	padding: 0px;
 }
-div#design_editor h3.block_header {
+#design_editor h3.design_block_header {
 cursor:move;
 }
-h3.block_header
+.design_block h3
 {
 	position: relative;
 	background: url('images/h3bg.png') repeat-x;
 	font-family: Sans-serif;
 	font-size: 15px;
-        margin: 0px;
+   margin: 0px;
 	padding: 0px;
 	overflow: hidden;
 	color: #545454;
@@ -39,7 +34,7 @@ h3.block_header
 	vertical-align: top;
 }
-a.button_block span {
+a.design_button_block span {
 display: none;
 padding: 1px;
 color: #000;
@@ -50,44 +45,48 @@ font-weight: normal;
 border: 1px inset #545454;
 }
-a.button_block:hover span {
-display: inline;
+a.design_button_block:hover span {
+display: block;
 position: absolute;
 margin-top: -20px;
+z-index: 100;
+float: left;
 }
-a.button_block {
-display: block;
-float: right;
-position: absolute;
-width: 20px;
-height: 20px;
-text-decoration: none;
+.design_block a.design_button_block {
+  display: block !important;
+  width: 20px !important;
+  height: 20px !important;
+  margin-top: 5px !important;
+  margin-right: 5px !important;
+  float: right !important;
 }
-div.block a.button_block_hide {
-right: 5px;
+.design_block a.button_block_hide {
 background:url('images/button.png') no-repeat;
 background-position: 0px 0px;
 }
-div.block a:hover.button_block_hide {
+.design_block a:hover.button_block_hide {
 background: url('images/button.png') no-repeat;
 background-position: 0px -20px;
 }
-div.block a.button_block_remove {
-right: 5px;
+.design_block a.button_block_remove,
+.design_block a.button_block_item_options,
+.design_block a.button_block_options {
 background: url('images/button.png') no-repeat;
 background-position:-20px 0;
 }
-div.block a:hover.button_block_remove {
+.design_block a:hover.button_block_remove,
+.design_block a.hover.button_block_item_options,
+.design_block a.hover.button_block_options {
 background: url('images/button.png') no-repeat;
 background-position:-20px -20px;
 }
-div.block_content 
+.design_block_content 
 {
       margin: 0;
       padding: 5px 10px 9px 10px;
 /* Default Plain Theme for Blocks */
-div.block
+.design_block
 {
 	background: #FFFFFF;
 	border: 3px solid #000000;
 	margin-bottom: 10px;
 }
-div.block ul
+.design_block ul
 {
 	list-style: none;
 	margin-left: 15px;
 }
-div.block h3
+
+.design_block h3
 {
 	color: #FFFFFF;
 	background: #545454;
@@ -27,15 +28,22 @@ div.block h3
 	padding-left: 10px;
 }
-div.block span {
+a.design_button_block span {
 display: none;
+padding: 1px;
+color: #000;
+background: #dfdfdf;
+font-family: Sans-serif;
+font-size: 10px;
+font-weight: normal;
+border: 1px inset #545454;
 }
-div.block a.button_block_hide:hover span {
+.design_block a.desing_button_block:hover span {
 display: inline;
 position: absolute;
-color: #dfdfdf;
-background: #000000;
+color: white;
+background: #009900;
 font-family: Sans-serif;
 font-size: 13px;
 font-weight: normal;
@@ -44,47 +52,51 @@ padding-left: 5px;
 padding-right: 5px;
 }
-div.block a.button_block {
-display: block !important;
-width: 10px !important;
-height: 10px !important;
-margin-top: 10px !important;
-margin-right: 5px !important;
-float: right !important;
+.design_block a.design_button_block {
+  display: block !important;
+  width: 20px !important;
+  height: 20px !important;
+  margin-top: 3px !important;
+  margin-right: 5px !important;
+  float: right !important;
 }
-div.block a.button_block_hide {
+.design_block a.button_block_hide {
 border-bottom: 2px solid #dfdfdf;
 }
-div.block a:hover.button_block_hide {
+.design_block a:hover.button_block_hide {
 border-bottom: 2px solid #000000;
 }
-div.block a.button_block_remove {
-background: #dfdfdf;
+.design_block a.button_block_remove,
+.design_block a.button_block_item_options,
+.design_block a.button_block_options {
+  background: #dfdfdf;
 }
-div.block a:hover.button_block_remove {
-background: #000000;
+.design_block a:hover.button_block_remove,
+.design_block a.hover.button_block_item_options,
+.design_block a.hover.button_block_options {
+  background: #000000;
 }
-div.block_content 
+.design_block_content 
 {
 	padding: 5px;
 }
-div.block ul {
+.design_block ul {
   padding-left: 0px;
   margin: 0px;
 }
-div.block ul li a:link,
-div.block ul li a:hover {
+.design_block ul li a:link,
+.design_block ul li a:hover {
   display: block;
   color: #000;
 }
-div.block ul li a:hover {
+.design_block ul li a:hover {
   background: #ddd;
-  color: red;
 }
+
 /* Green Theme for Blocks */
-div.block
+.design_block
 {
 	background: #FFFFFF;
 	border: 3px solid #060;
 	margin-bottom: 10px;
 }
-div.block ul
+.design_block ul
 {
         list-style: none;
 	margin-left: 15px;
 }
-div.block h3
+.design_block h3
 {
 	color: #afa;
 	background: green;
@@ -27,11 +27,18 @@ div.block h3
 	padding-left: 10px;
 }
-div.block span {
+a.design_button_block span {
 display: none;
+padding: 1px;
+color: #000;
+background: #dfdfdf;
+font-family: Sans-serif;
+font-size: 10px;
+font-weight: normal;
+border: 1px inset #545454;
 }
-div.block a.button_block_hide:hover span {
+.design_block a.design_button_block:hover span {
 display: inline;
 position: absolute;
 color: white;
@@ -44,48 +51,52 @@ padding-left: 5px;
 padding-right: 5px;
 }
-div.block a.button_block {
-display: block;
-width: 10px;
-height: 10px;
-margin-top: 10px;
-margin-right: 5px;
-float: right;
-}
+.design_block a.design_button_block {
+  display: block !important;
+  width: 20px !important;
+  height: 20px !important;
+  margin-top: 3px !important;
+  margin-right: 5px !important;
+  float: right !important;
+}  
+
-div.block a.button_block_hide {
+.design_block a.button_block_hide {
 border-bottom: 2px solid #dfdfdf;
 }
-div.block a:hover.button_block_hide {
+.design_block a:hover.button_block_hide {
 border-bottom: 2px solid #000000;
 }
-div.block a.button_block_remove {
-background: #dfdfdf;
+.design_block a.button_block_remove,
+.design_block a.button_block_item_options,
+.design_block a.button_block_options {
+  background: #dfdfdf;
 }
-div.block a:hover.button_block_remove {
-background: #000000;
+.design_block a:hover.button_block_remove,
+.design_block a.hover.button_block_item_options,
+.design_block a.hover.button_block_options {
+  background: #000000;
 }
-div.block_content 
+.design_block_content 
 {
 	padding: 5px;
 }
-div.block ul {
+.design_block ul {
  padding-left: 0px;
  margin: 0px;
 }
-div.block ul li a:link,
-div.block ul li a:hover {
+.design_block ul li a:link,
+.design_block ul li a:hover {
  display: block;
  color: #000;
 }
-div.block ul li a:hover {
+.design_block ul li a:hover {
   background: #ddd;
-  color: red;
 }
	@@ -51,6 +51,8 @@ class ApplicationController < ActionController::Base		@@ -51,6 +51,8 @@ class ApplicationController < ActionController::Base
51		51
52	def load_profile	52	def load_profile
53	@profile = Profile.find_by_identifier(params[:profile]) unless @profile	53	@profile = Profile.find_by_identifier(params[:profile]) unless @profile
		54	+#raise "bli %s" % @profile.inspect
		55	+# @profile = Profile.find_by_identifier(params[:profile]) unless @profile
54	render_not_found unless @profile	56	render_not_found unless @profile
55	end	57	end
56		58
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class FavoriteLinksProfileController < FavoriteLinksController
	2	+
	3	+ needs_profile
	4	+
	5	+ acts_as_design_block
	6	+
	7	+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class FavoriteLinksProfile < FavoriteLinks
	2	+
	3	+ def self.description
	4	+ _('Favorite Links')
	5	+ end
	6	+
	7	+end
	@@ -1,73 +0,0 @@	@@ -1,73 +0,0 @@
1	-class FavouriteLinksController < ApplicationController
2	-
3	-
4	- # The methods above are specific for noosfero application. I think
5	- # this it not the correct way to get this method.
6	- #
7	- # We can create a method in the app/controllers/profile_admin folder
8	- # the inherit this method and adds only the two lines above.
9	- #
10	- # With this way we can reuse this block on many others case and each case
11	- # we follow the same way.
12	- #
13	- # Specific for app
14	- needs_profile
15	- design :holder => 'profile'
16	- # End specific for app
17	-
18	-
19	- acts_as_design_block
20	-
21	- CONTROL_ACTION_OPTIONS = {
22	- 'manage_links' => _('Manage Links'),
23	- 'edit' => _('Edit'),
24	- }
25	-
26	- def index
27	- get_favourite_links
28	- design_render
29	- end
30	-
31	- def edit
32	- design_render_on_edit
33	- end
34	-
35	- def save
36	- if @design_block.update_attributes(params[:design_block])
37	- get_favourite_links
38	- design_render_on_edit :action => 'manage_links'
39	- else
40	- design_render_on_edit :nothing => true
41	- end
42	- end
43	-
44	- def manage_links
45	- get_favourite_links
46	- design_render_on_edit
47	- end
48	-
49	- def add_link
50	- design_render_on_edit
51	- end
52	-
53	- def remove_link
54	- @design_block.delete_link(params[:link])
55	- get_favourite_links
56	- design_render_on_edit :action => 'manage_links'
57	- end
58	-
59	- def get_favourite_links
60	- favourite_links = @design_block.favourite_links
61	- @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links
62	- end
63	-
64	- def paginate_by_collection(collection, options = {})
65	- page = params[:page].blank? ? 1 : params[:page].to_i
66	- items_per_page = @design_block.limit_number
67	- offset = (page - 1) * items_per_page
68	- link_pages = Paginator.new(self, collection.size, items_per_page, page)
69	- collection = collection[offset..(offset + items_per_page - 1)]
70	- return link_pages, collection
71	- end
72	-
73	-end
	@@ -1,37 +0,0 @@	@@ -1,37 +0,0 @@
1	-class FavouriteLinks < Design::Block
2	-
3	- def self.description
4	- _('Favourite Links')
5	- end
6	-
7	- def limit_number= value
8	- self.settings[:limit_number] = value.to_i
9	- end
10	-
11	- def limit_number
12	- self.settings[:limit_number] \|\| 5
13	- end
14	-
15	- def favourite_links_limited
16	- self.favourite_links.first(self.limit_number)
17	- end
18	-
19	- def favourite_links
20	- self.settings[:favourite_links] \|\|= []
21	- end
22	-
23	- def delete_link link
24	- self.settings[:favourite_links].reject!{ \|item\| item == link }
25	- self.save
26	- end
27	-
28	- def favourite_link
29	- nil
30	- end
31	-
32	- def favourite_link= link
33	- self.favourite_links.push(link)
34	- self.favourite_links.uniq!
35	- end
36	-
37	-end
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-<h2> <%= _('Editing Favourite Links') %> </h2>
2	-
3	-<% design_form_remote_tag( :url => {:action => 'save'}) do %>
4	-
5	- <p>
6	- <label for="design_block_title"> <%= _("Title") %> </label>
7	- <%= text_field 'design_block', 'favourite_link'%>
8	- </p>
9	-
10	- <%= submit_tag _('Save') %>
11	-
12	-<% end %>
13	-
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-
2	-<h2> <%= _('Editing Favourite Links') %> </h2>
3	-
4	- <% design_form_remote_tag( :url => {:action => 'save'}) do %>
5	-
6	- <p>
7	- <label for="design_block_title"> <%= _("Title") %> </label>
8	- <%= text_field 'design_block', 'title'%>
9	- </p>
10	-
11	- <p>
12	- <label for="design_block_display_header"> <%= _("Display header?") %> </label>
13	- <%= check_box 'design_block', 'display_header', {}, 'true', 'false' %>
14	- </p>
15	-
16	- <p>
17	- <label for="design_block_display_title"> <%= _("Display title?") %> </label>
18	- <%= check_box 'design_block', 'display_title', {}, 'true', 'false' %>
19	- </p>
20	-
21	- <p>
22	- <label for="design_block_limit_number"> <%= _("Max number of links") %> </label>
23	- <%= text_field 'design_block', 'limit_number'%>
24	- </p>
25	-
26	- <%= submit_tag _('Save') %>
27	-
28	-<% end %>
29	-
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-
2	-<% if @favourite_links_pages.current.previous%>
3	- <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %>
4	-<% end %>
5	-<% if @favourite_links_pages.current.next %>
6	- <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %>
7	-<% end %>
8	-
9	-<% @favourite_links.each do \|link\| %>
10	- <ul>
11	- <li>
12	- <%= link_to link, link, :popup => true %>
13	- </li>
14	- </ul>
15	-<% end %>
16	-
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-
2	-<h2>
3	- <%= _('Favourite Links') %>
4	- <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%>
5	-
6	-</h2>
7	-<% if @favourite_links_pages.current.previous%>
8	- <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %>
9	-<% end %>
10	-<% if @favourite_links_pages.current.next %>
11	- <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %>
12	-<% end %>
13	-
14	-<% @favourite_links.each do \|link\| %>
15	- <ul>
16	- <li>
17	- <%= link_to link, link, :popup => true %>
18	- <%= design_link_to_remote content_tag(:span,_('Remove')), :url => {:action => 'remove_link', :link => link } %>
19	- </li>
20	- </ul>
21	-<% end %>
	@@ -36,24 +36,24 @@ body {		@@ -36,24 +36,24 @@ body {
36	height: 145px;	36	height: 145px;
37	}	37	}
38		38
39	-#boxes {	39	+#design_boxes {
40	position: relative;	40	position: relative;
41	margin-left: 10px;	41	margin-left: 10px;
42	margin-right: 10px;	42	margin-right: 10px;
43	padding: 0em;	43	padding: 0em;
44	}	44	}
45		45
46	-#box_3 {	46	+#design_box_3 {
47	width: 210px;	47	width: 210px;
48	float: right;	48	float: right;
49	}	49	}
50		50
51	-#box_2 {	51	+#design_box_2 {
52	float: left;	52	float: left;
53	width: 280px;	53	width: 280px;
54	}	54	}
55		55
56	-#box_1 {	56	+#design_box_1 {
57	margin-left: 285px;	57	margin-left: 285px;
58	margin-right: 215px;	58	margin-right: 215px;
59	}	59	}