ActionItem1047: better default formatting for CMS

Took the opportunity to do a general UI review of all templates that used tables (I had to check if they broke after my changes, after all).

ActionItem1047: better default formatting for CMS
Took the opportunity to do a general UI review of all templates that used tables (I had to check if they broke after my changes, after all).
Antonio Terceiro
1 parent a60056bb
Showing 15 changed files with 96 additions and 53 deletions Show diff stats
app/helpers/application_helper.rb
app/views/box_organizer/_link_list_block.rhtml
app/views/features/_features_table.rhtml
app/views/features/_manage_community_fields.rhtml
app/views/features/_manage_enterprise_fields.rhtml
app/views/features/_manage_person_fields.rhtml
app/views/features/index.rhtml
app/views/manage_products/index.rhtml
app/views/profile_editor/edit.rhtml
app/views/profile_members/index.rhtml
app/views/search/events.rhtml
app/views/themes/index.rhtml
po/pt_BR/noosfero.po
public/stylesheets/common.css
public/stylesheets/controller_themes.css
@@ -217,7 +217,7 @@ module ApplicationHelper
     if html_options.has_key?(:class)
       the_class << ' ' << html_options[:class]
     end
-    link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))
+    link_to(content_tag('span', label), url, html_options.merge(:class => the_class, :title => label))
   end
   def button_to_function(type, label, js_code, html_options = {}, &block)
-<p>
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
 <table id='links' class='noborder'>
@@ -11,7 +10,6 @@
   <% end %>
 </table>
 </div>
-</p>
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
       page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address'))) +
@@ -1,21 +0,0 @@
-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
-
-<table>
-  <%= hidden_field_tag('environment[enabled_features][]', '') %>
-  <% @features.each do |feature, text|   %>
-  <tr>
-    <td><%= text %></td>
-    <td><%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %></td>
-  </tr>
-  <% end %>
-</table>
-
-<%= labelled_form_field(_('Organization Approval Method'), select_organization_approval_method('environment', 'organization_approval_method')) %>
-
-<div>
-  <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
-  <% end %>
-</div>
-
-<% end %>
@@ -36,6 +36,7 @@
 <div>
   <% button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -36,6 +36,7 @@
 <div>
   <% button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
@@ -42,6 +42,7 @@
 <div>
   <% button_bar do %>
     <%= submit_button('save', _('Save changes')) %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
   <% end %>
 </div>
+<h1><%= _('System features') %></h1>
+
 <h2><%= _('Enable/Disable features') %></h2>
-<%= render :partial => 'features_table' %>
+<p>
+<%=  _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
+
+Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the <em>"Save changes" button</em> to confirm your changes.') %>
+</p>
+
+<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+
+<table>
+  <tr>
+    <th><%= _('Feature') %></th>
+    <th><%= _('Enabled?') %></th>
+  </tr>
+  <%= hidden_field_tag('environment[enabled_features][]', '') %>
+  <% @features.each do |feature, text|   %>
+  <tr>
+    <td><%= text %></td>
+    <td><%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %></td>
+  </tr>
+  <% end %>
+</table>
+
+<h2><%= _('Configure features') %></h2>
+
+<table>
+  <tr>
+    <th><%= _('Option') %></th>
+    <th><%= _('Choice') %></th>
+  </tr>
+  <tr>
+    <td><%= _('Organization Approval Method') %></td>
+    <td><%= select_organization_approval_method('environment', 'organization_approval_method') %></td>
+  </tr>
+</table>
+
-<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
+<div>
+  <% button_bar do %>
+    <%= submit_button('save', _('Save changes')) %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
+  <% end %>
+</div>
-Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the *"Save changes" button* to confirm your changes.'), _('Help'), :class => 'with-text' %>
+<% end %>
@@ -6,6 +6,11 @@
     <th><%= _('Price') %></th>
     <th><%= _('Actions') %></th>
   </tr>
+  <% if @products.empty? %>
+    <tr>
+      <td colspan='3' style='text-align: center; padding: 10px'><em><%= _('(no product registered yet)') %></em></td>
+    </tr>
+  <% end %>
   <% @products.each do |product| %>
     <tr>
       <td><strong><%= link_to product.name, :action => 'show', :id => product %></strong></td>
@@ -18,7 +23,10 @@
   <% end %>
 </table>
-<%= button :add, _('New product or service'), :action => 'new' %>
+<% button_bar do %>
+  <%= button :add, _('New product or service'), :action => 'new' %>
+  <%= button :back,  _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
+<% end %>
 <br /> &nbsp;
@@ -29,6 +37,11 @@
     <th><%= _('Raw material') %></th>
     <th><%= _('Actions') %></th>
   </tr>
+  <% if @consumptions.empty? %>
+    <tr>
+      <td colspan='3' style='text-align: center; padding: 10px'><em><%= _('(no raw material registered yet)') %></em></td>
+    </tr>
+  <% end %>
   <% @consumptions.each do |consumption| %>
     <tr>
       <td>
@@ -44,9 +57,9 @@
   <% end %>
 </table>
-<%= button :add, _('Add raw material'), :action => 'new_consumption' %>
+<% button_bar do %>
+  <%= button :add, _('Add raw material'), :action => 'new_consumption' %>
+  <%= button :back,  _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
+<% end %>
-<p>
-<%= link_to( '<span>'+ _('Back') +'</span>', { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' }, :class => 'button with-text icon-back' ) %>
-</p>
@@ -15,14 +15,13 @@
   <h2><%= _('Privacy options') %></h2>
-  <p>
-    <%= _('This profile is:') %>
-  </p>
   <% if profile.person? %>
   <table>
     <tr>
-      <th></th>
+      <th style='text-align: right;'>
+        <%= _('This profile is:') %>
+      </th>
       <th>
         <%= radio_button 'profile_data', 'public_profile', 'true' %>
         <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
@@ -48,7 +47,9 @@
   <% else %>
   <table>
     <tr>
-      <th></th>
+      <th style='text-align: right;'>
+        <%= _('This profile is:') %>
+      </th>
       <th>
         <%= radio_button 'profile_data', 'public_profile', 'true' %>
         <label for="profile_data_public_profile_true"><u><%= _('Public') %></u></label>
@@ -11,11 +11,13 @@
     <tr>
       <td><%= m.name %> </td>
       <td>
-        <%= button :edit, _('Edit'), :action => 'change_role', :id => m %>
-        <%= button :delete, _('Remove'), :action => 'unassociate', :id => m %>
+        <%= button_without_text :edit, _('Edit'), :action => 'change_role', :id => m %>
+        <%= button_without_text :delete, _('Remove'), :action => 'unassociate', :id => m %>
       </td>
     </tr>
   <% end %>
 </table>
-<%= link_to _('Back'), :controller => 'profile_editor' %>
+<% button_bar do %>
+  <%= button :back, _('Back'), :controller => 'profile_editor' %>
+<% end %>
@@ -13,7 +13,7 @@
   <%= link_to_next_month(params[:year], params[:month]) %>
 </div>
-<table align='center'>
+<table align='center' class='noborder'>
   <tr>
     <% @calendar.first(7).each do |day,event| %>
       <th style='width: 10%;'><%= show_day_of_week(day) %></th>
 <h1><%= _('Editing Appearance') %></h1>
-<table style='margin:auto'>
+<table class='noborder' style='width: auto; margin:auto'>
   <tr>
     <td colspan='6'>
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: noosfero 0.17.0\n"
 "POT-Creation-Date: 2009-05-18 19:12-0300\n"
-"PO-Revision-Date: 2009-05-18 19:49-0300\n"
+"PO-Revision-Date: 2009-05-20 15:36-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -5467,7 +5467,7 @@ msgstr &quot;Gerenciar campos de comunidade&quot;
 #: app/views/features/_features_table.rhtml:13
 msgid "Organization Approval Method"
-msgstr "Métode de Aprovação da Organização"
+msgstr "Método de Aprovação de Organização"
 #: app/views/themes/new.rhtml:1
 msgid "Create new theme"
@@ -242,25 +242,35 @@ div#notice {
 table {
   border-collapse: collapse;
+  width: 100%;
 }
 th, td {
   font-size: 14px;
   padding: 2px 10px;
+  height: 26px;
 }
 th {
   font-weight: bold;
+  border-bottom: 2px solid black;
 }
-
-table.cms-articles {
-  width: 100%;
+td {
+  border-bottom: 1px solid #e0e0e0;
 }
-table.cms-articles th, table.cms-articles td {
-  border: 1px solid #e0e0e0;
+tr:hover td {
+  background-color: #f0f0f0;
 }
 table.noborder th, table.noborder td{
   border: none;
 }
+table.noborder:hover td {
+  background: none;
+}
+table.noborder:hover td.selected,
+td.selected {
+  background: #ff9;
+  font-style: italic;
+}
 /* for fields with auto-completion */
 div.auto-complete {
@@ -114,7 +114,3 @@
   width: 500px;
 }
-td.selected {
-  background: #ff9;
-  font-style: italic;
-}
	@@ -217,7 +217,7 @@ module ApplicationHelper		@@ -217,7 +217,7 @@ module ApplicationHelper
217	if html_options.has_key?(:class)	217	if html_options.has_key?(:class)
218	the_class << ' ' << html_options[:class]	218	the_class << ' ' << html_options[:class]
219	end	219	end
220	- link_to(content_tag('span', label), url, html_options.merge(:class => the_class ))	220	+ link_to(content_tag('span', label), url, html_options.merge(:class => the_class, :title => label))
221	end	221	end
222		222
223	def button_to_function(type, label, js_code, html_options = {}, &block)	223	def button_to_function(type, label, js_code, html_options = {}, &block)
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do \|f\| %>
2	-
3	-<table>
4	- <%= hidden_field_tag('environment[enabled_features][]', '') %>
5	- <% @features.each do \|feature, text\| %>
6	- <tr>
7	- <td><%= text %></td>
8	- <td><%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %></td>
9	- </tr>
10	- <% end %>
11	-</table>
12	-
13	-<%= labelled_form_field(_('Organization Approval Method'), select_organization_approval_method('environment', 'organization_approval_method')) %>
14	-
15	-<div>
16	- <% button_bar do %>
17	- <%= submit_button('save', _('Save changes')) %>
18	- <% end %>
19	-</div>
20	-
21	-<% end %>
	@@ -36,6 +36,7 @@		@@ -36,6 +36,7 @@
36	<div>	36	<div>
37	<% button_bar do %>	37	<% button_bar do %>
38	<%= submit_button('save', _('Save changes')) %>	38	<%= submit_button('save', _('Save changes')) %>
		39	+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
39	<% end %>	40	<% end %>
40	</div>	41	</div>
41		42
	@@ -42,6 +42,7 @@		@@ -42,6 +42,7 @@
42	<div>	42	<div>
43	<% button_bar do %>	43	<% button_bar do %>
44	<%= submit_button('save', _('Save changes')) %>	44	<%= submit_button('save', _('Save changes')) %>
		45	+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
45	<% end %>	46	<% end %>
46	</div>	47	</div>
47		48
		1	+<h1><%= _('System features') %></h1>
		2	+
1	<h2><%= _('Enable/Disable features') %></h2>	3	<h2><%= _('Enable/Disable features') %></h2>
2		4
3	-<%= render :partial => 'features_table' %>	5	+<p>
		6	+<%= _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.
		7	+
		8	+Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the <em>"Save changes" button</em> to confirm your changes.') %>
		9	+</p>
		10	+
		11	+<% labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do \|f\| %>
		12	+
		13	+<table>
		14	+ <tr>
		15	+ <th><%= _('Feature') %></th>
		16	+ <th><%= _('Enabled?') %></th>
		17	+ </tr>
		18	+ <%= hidden_field_tag('environment[enabled_features][]', '') %>
		19	+ <% @features.each do \|feature, text\| %>
		20	+ <tr>
		21	+ <td><%= text %></td>
		22	+ <td><%= check_box_tag "environment[enabled_features][]", feature, @environment.enabled?(feature) %></td>
		23	+ </tr>
		24	+ <% end %>
		25	+</table>
		26	+
		27	+<h2><%= _('Configure features') %></h2>
		28	+
		29	+<table>
		30	+ <tr>
		31	+ <th><%= _('Option') %></th>
		32	+ <th><%= _('Choice') %></th>
		33	+ </tr>
		34	+ <tr>
		35	+ <td><%= _('Organization Approval Method') %></td>
		36	+ <td><%= select_organization_approval_method('environment', 'organization_approval_method') %></td>
		37	+ </tr>
		38	+</table>
		39	+
4		40
5	-<%= help_textile _('Here you can enable or disable several features of your environment. Each feature represents some funcionality that your environment can use if you enable it.	41	+<div>
		42	+ <% button_bar do %>
		43	+ <%= submit_button('save', _('Save changes')) %>
		44	+ <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
		45	+ <% end %>
		46	+</div>
6		47
7	-Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the "Save changes" button to confirm your changes.'), _('Help'), :class => 'with-text' %>	48	+<% end %>
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	<%= link_to_next_month(params[:year], params[:month]) %>	13	<%= link_to_next_month(params[:year], params[:month]) %>
14	</div>	14	</div>
15		15
16	-<table align='center'>	16	+<table align='center' class='noborder'>
17	<tr>	17	<tr>
18	<% @calendar.first(7).each do \|day,event\| %>	18	<% @calendar.first(7).each do \|day,event\| %>
19	<th style='width: 10%;'><%= show_day_of_week(day) %></th>	19	<th style='width: 10%;'><%= show_day_of_week(day) %></th>
1	<h1><%= _('Editing Appearance') %></h1>	1	<h1><%= _('Editing Appearance') %></h1>
2		2
3	-<table style='margin:auto'>	3	+<table class='noborder' style='width: auto; margin:auto'>
4		4
5	<tr>	5	<tr>
6	<td colspan='6'>	6	<td colspan='6'>
	@@ -13,7 +13,7 @@ msgid ""		@@ -13,7 +13,7 @@ msgid ""
13	msgstr ""	13	msgstr ""
14	"Project-Id-Version: noosfero 0.17.0\n"	14	"Project-Id-Version: noosfero 0.17.0\n"
15	"POT-Creation-Date: 2009-05-18 19:12-0300\n"	15	"POT-Creation-Date: 2009-05-18 19:12-0300\n"
16	-"PO-Revision-Date: 2009-05-18 19:49-0300\n"	16	+"PO-Revision-Date: 2009-05-20 15:36-0300\n"
17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"	17	"Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18	"Language-Team: LANGUAGE <LL@li.org>\n"	18	"Language-Team: LANGUAGE <LL@li.org>\n"
19	"MIME-Version: 1.0\n"	19	"MIME-Version: 1.0\n"
	@@ -5467,7 +5467,7 @@ msgstr "Gerenciar campos de comunidade"		@@ -5467,7 +5467,7 @@ msgstr "Gerenciar campos de comunidade"
5467		5467
5468	#: app/views/features/_features_table.rhtml:13	5468	#: app/views/features/_features_table.rhtml:13
5469	msgid "Organization Approval Method"	5469	msgid "Organization Approval Method"
5470	-msgstr "Métode de Aprovação da Organização"	5470	+msgstr "Método de Aprovação de Organização"
5471		5471
5472	#: app/views/themes/new.rhtml:1	5472	#: app/views/themes/new.rhtml:1
5473	msgid "Create new theme"	5473	msgid "Create new theme"
	@@ -114,7 +114,3 @@		@@ -114,7 +114,3 @@
114	width: 500px;	114	width: 500px;
115	}	115	}
116		116
117	-td.selected {
118	- background: #ff9;
119	- font-style: italic;
120	-}