ActionItem93: cosmetic stuff, adding links

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

ActionItem93: cosmetic stuff, adding links
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1031 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent c0a5f9dd
Showing 12 changed files with 52 additions and 35 deletions Show diff stats
app/helpers/application_helper.rb
app/models/person.rb
app/models/profile.rb
app/views/cms/text_html_new.rhtml
app/views/enterprise_registration/basic_information.rhtml
app/views/layouts/application.rhtml
app/views/profile_editor/index.rhtml
public/images/icons-app/README
public/images/icons-app/enterprise-registration.png
public/images/icons-app/gnome-settings-theme.png
public/stylesheets/button.css
public/stylesheets/common.css
@@ -268,21 +268,7 @@ module ApplicationHelper
   end
   def text_editor(object, method, filter_type_method = nil, options = {})
-    filter_type = 
-      if filter_type_method.blank?
-        ''
-      else
-        instance_variable_get("@#{object}").send(filter_type_method)
-      end
-    if filter_type == '[No Filter]' || filter_type.blank?
-      html_class = "tiny_mce_editor"
-      if options[:class]
-        html_class << " #{options[:class]}"
-      end
-      text_area(object, method, { :size => '72x12' }.merge(options).merge({:class => html_class})) 
-    else
-      text_area(object, method, { :size => '72x12' }.merge(options))
-    end
+    text_area(object, method, { :rows => 10, :cols => 64 }.merge(options))
   end
   def file_manager(&block)
@@ -318,6 +304,10 @@ module ApplicationHelper
     design_display_button(type, label, url, { :class => 'with_text' }.merge(html_options))
   end
+  def submit_button(type, label, html_options = {})
+    design_display_button_submit(type, label, { :class => 'with_text' }.merge(html_options))
+  end
+
   def button_to_function(type, label, js_code, html_options = {})
     #design_display_function_button(type, label, js_code, { :class => 'with_text' }.merge(html_options))
     html_options[:class] = "" unless html_options[:class]
@@ -330,7 +320,7 @@ module ApplicationHelper
   end
   def button_bar(options = {}, &block)
-    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), options), block.binding)
+    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)), block.binding)
   end
   def link_to_category(category)
@@ -53,7 +53,4 @@ class Person &lt; Profile
     end
   end
-  def person?
-    true
-  end
 end
@@ -143,7 +143,17 @@ class Profile &lt; ActiveRecord::Base
     environment
   end
+  # returns +false+
   def person?
-    false
+    self.kind_of?(Person) 
   end
+
+  def enterprise?
+    self.kind_of?(Enterprise)
+  end
+
+  def organization?
+    self.kind_of?(Organization)
+  end
+
 end
@@ -8,10 +8,10 @@
   <%= f.text_field('name', :size => '64') %>
-  <%= f.text_area('abstract', :cols => 64, :rows => 5) %>
-
   <%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %>
+  <%= f.text_area('abstract', :cols => 64, :rows => 5) %>
+
   <%= f.text_area('body', :cols => 64) %>
   <%= design_display_button_submit('save', _('Save')) %>
@@ -28,9 +28,9 @@
   <%= f.select('region_id', @regions) %>
-  <div>
-    <%= submit_tag _('Register') %>
-    <%= link_to _('Cancel'), :action => 'index' %>
-  </div>
+  <% button_bar do %>
+    <%= submit_button('save', _('Register')) %>
+    <%= button 'cancel', _('Cancel'), :action => 'index' %>
+  <% end %>
 <% end %>
@@ -42,6 +42,7 @@
         </div><!-- accessibility_menu -->
         <div id='top_bar' class='category<%= category_color %>'>
+          <%= image_tag 'noosfero.png', :style => 'float: left;' %>
           <div id='path_category'>
             <% if @category %>
               <%= @category.full_name %>
@@ -13,15 +13,16 @@
   <%= file_manager_button(_('Manage Content'), 'icons-app/cms.png', :controller => 'cms') %>
-  <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') %>
+  <%= file_manager_button(_('Change Password'), 'icons-app/change-password.png', :controller => 'account', :action => 'change_password') if profile.person? %>
-  <%= file_manager_button(_('Manage Products'), 'icons-app/products.png', :controller => 'manage_products') if @profile.kind_of?(Enterprise) %>
+  <%= file_manager_button(_('Manage Products'), 'icons-app/products.png', :controller => 'manage_products') if profile.enterprise? %>
 <% end %>
-<!--
-<p> <%= link_to _('Edit Visual Design'), :action => 'design_editor' %> </p>
-<p> <%= link_to _('Menage content'), :controller => 'cms' %> </p>
--->
-
 <h2><%= _('My organizations') %></h2>
+
+<% file_manager do %>
+
+  <%= file_manager_button(_('Register a new Enterprise'), 'icons-app/enterprise-registration.png', :controller => 'enterprise_registration') %>
+
+<% end %>
 dlg-neu icons in Noosfero
 =========================
-The icons in this directory are taken from the dlg-neu icon theme for GNOME,
+The icons in this directory are taken from the icon themes for GNOME,
 section "apps/". We take the SVG files and convert to 64x64 PNG images, so
 these icons are in fact derived works based on dlg-neu's SVG files.
 Structure
 =========
-To keep a trace back to dlg-neu theme, when rasterizing the SVG files we keep
+To keep a trace back to the theme theme, when rasterizing the SVG files we keep
 the original filenames (replacing .svg by .png, obviously) and create symbolic
 links with names more sensible for Noosfero.
+Source for icons
+================
+
+Icon                           Theme
+------------------------------ -------
+gnome-settings-background.png  dlg-neu
+gnome-settings-theme.png       Nuovo
+password.png                   dlg-neu
+abiword_48.png                 dlg-neu
+gnome-other.png                Nuovo
+user_icon.png                  dlg-neu
+
 Icons rasterization
 ===================
@@ -0,0 +1 @@
+gnome-settings-theme.png
 \ No newline at end of file
+.button-bar {
+  margin-top: 1em;
+}
+
 .button {
   border: none;
   margin-left: 5px;
@@ -123,6 +123,7 @@ div.file-manager-button a {
   padding: 3px;
   height: 80px;
   overflow: hidden;
+  background: white;
 }
 div.file-manager
	@@ -53,7 +53,4 @@ class Person < Profile		@@ -53,7 +53,4 @@ class Person < Profile
53	end	53	end
54	end	54	end
55		55
56	- def person?
57	- true
58	- end
59	end	56	end
	@@ -143,7 +143,17 @@ class Profile < ActiveRecord::Base		@@ -143,7 +143,17 @@ class Profile < ActiveRecord::Base
143	environment	143	environment
144	end	144	end
145		145
		146	+ # returns +false+
146	def person?	147	def person?
147	- false	148	+ self.kind_of?(Person)
148	end	149	end
		150	+
		151	+ def enterprise?
		152	+ self.kind_of?(Enterprise)
		153	+ end
		154	+
		155	+ def organization?
		156	+ self.kind_of?(Organization)
		157	+ end
		158	+
149	end	159	end
	@@ -42,6 +42,7 @@		@@ -42,6 +42,7 @@
42	</div><!-- accessibility_menu -->	42	</div><!-- accessibility_menu -->
43		43
44	<div id='top_bar' class='category<%= category_color %>'>	44	<div id='top_bar' class='category<%= category_color %>'>
		45	+ <%= image_tag 'noosfero.png', :style => 'float: left;' %>
45	<div id='path_category'>	46	<div id='path_category'>
46	<% if @category %>	47	<% if @category %>
47	<%= @category.full_name %>	48	<%= @category.full_name %>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+gnome-settings-theme.png
0	\ No newline at end of file	2	\ No newline at end of file
		1	+.button-bar {
		2	+ margin-top: 1em;
		3	+}
		4	+
1	.button {	5	.button {
2	border: none;	6	border: none;
3	margin-left: 5px;	7	margin-left: 5px;
	@@ -123,6 +123,7 @@ div.file-manager-button a {		@@ -123,6 +123,7 @@ div.file-manager-button a {
123	padding: 3px;	123	padding: 3px;
124	height: 80px;	124	height: 80px;
125	overflow: hidden;	125	overflow: hidden;
		126	+ background: white;
126	}	127	}
127		128
128	div.file-manager	129	div.file-manager