ActionItem1050: changes needed for better layout

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>

ActionItem1050: changes needed for better layout
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Aurelio A. Heckert · Antonio Terceiro
1 parent a5b17408
Showing 11 changed files with 27 additions and 26 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/profile_editor_helper.rb
app/views/friends/index.rhtml
app/views/memberships/index.rhtml
app/views/profile/enterprises.rhtml
app/views/profile/friends.rhtml
app/views/profile/members.rhtml
app/views/profile_editor/index.rhtml
app/views/search/index.rhtml
public/stylesheets/controller_memberships.css
public/stylesheets/manage_contacts_list.css
@@ -730,10 +730,10 @@ module ApplicationHelper
   def search_page_title(title, options={})
     title = "<h1>" + title + "</h1>"
-    title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
-    title += "<h2 align='center'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
-    title += "<h2 align='center'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
-    title += "<h2 align='center'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
+    title += "<h2 class='query'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank?
+    title += "<h2 class='query'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank?
+    title += "<h2 class='query'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank?
+    title += "<h2 class='query'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank?
     title
   end
@@ -135,8 +135,9 @@ module ProfileEditorHelper
   def control_panel(&block)
     concat(
-      content_tag('div',
-        content_tag('div', capture(&block) + '<br style="clear:left;"/>&nbsp;'),
+      content_tag(
+        'div',
+        capture(&block) + '<br style="clear:left;"/>&nbsp;',
         :class => 'control-panel'),
       block.binding)
   end
@@ -28,14 +28,12 @@
             :class => 'button icon-delete',
             :title => _('remove'),
             :help => __('Clicking on this button will remove your friend relation with %s.') % friend.name %>
-    </div><!-- end class="controll" -->
-    <div style='text-align: center; margin-top: 3px;'>
       <%= link_to content_tag('span',_('contact')),
             friend.url.merge(:controller => 'contact', :action => 'new'),
             :class => 'button icon-menu-mail',
             :title => _('contact'),
             :help => __('Clicking on this button will let you send a message to %s.') % friend.name %>
-    </div>
+    </div><!-- end class="controll" -->
     </li>
   <% end %>
 </ul>
@@ -26,6 +26,7 @@
           ].compact.join(', ')
       %>
     </span>
+    <br class="may-clear" />
   </li>
 <% end %>
 </ul>
@@ -5,7 +5,7 @@
 <ul class='profile-list'>
 <% @enterprises.each do |enterprise| %>
-  <li><%= profile_image_link(enterprise)%></li>
+  <%= profile_image_link(enterprise)%>
 <% end %>
 </ul>
@@ -6,7 +6,7 @@
 <% cache do%>
 <ul class='profile-list'>
   <% @friends.each do |friend| %>
-    <li><%= profile_image_link(friend) %></li>
+    <%= profile_image_link(friend) %>
   <% end%>
 </ul>
 <% end %>
@@ -5,7 +5,7 @@
 <ul class='profile-list'>
   <% @members.each do |member| %>
-    <li><%= profile_image_link(member) %></li>
+    <%= profile_image_link(member) %>
   <% end %>
 </ul>
@@ -8,8 +8,6 @@
 <%= render :partial => 'pending_tasks' %>
-<div class='control-panel'>
-
 <% control_panel do %>
   <%= control_panel_button(_('Profile Info and settings'), 'edit-profile', :controller => 'profile_editor', :action => 'edit') if profile.person? %>
@@ -65,6 +63,5 @@
 <% end %>
-</div>
 </div>
 <div id="search-page">
-<%= search_page_title('', :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>
+<%= search_page_title(_('Search Results'), :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>
 <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
@@ -11,9 +11,6 @@
   display: block;
   list-style: none;
   margin-bottom: 20px
-}
-
-#memberships-index li {
   background-color: #B8CFE7;
 }
@@ -21,6 +18,9 @@
   float: right;
   padding: 4% 20px 4% 0px;
 }
+#memberships-index li .may-clear {
+  clear: right;
+}
 #memberships-index li .profile-details {
   display: block;
@@ -6,13 +6,14 @@
 .profile-list li {
   float: left;
-  width: 100px;
-  height: 100px;
+  width: 90px;
+  height: 90px;
+  max-width: 80px;
+  max-height: 80px;
   margin: 5px;
   padding: 5px;
   border: 2px solid #B8CFE7;
   list-style: none;
-  overflow: hidden;
   position: relative;
 }
 .profile-list li:hover {
@@ -34,7 +35,7 @@
 }
 .profile-list .profile_link span {
-  width: 200px;
+  width: 80px;
   display: block;
   overflow: hidden;
 }
@@ -44,11 +45,14 @@
 }
 .profile-list .controll {
   position: absolute;
-  top: 5px;
-  right: 0px;
+  top: 7px;
+  right: -10px;
 }
-.msie6 .profile-list .controll a {
+.profile-list .controll a {
   display: block;
+  margin-bottom: 2px;
+}
+.msie6 .profile-list .controll a {
   width: 0px;
 }
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	<ul class='profile-list'>	6	<ul class='profile-list'>
7	<% @enterprises.each do \|enterprise\| %>	7	<% @enterprises.each do \|enterprise\| %>
8	- <li><%= profile_image_link(enterprise)%></li>	8	+ <%= profile_image_link(enterprise)%>
9	<% end %>	9	<% end %>
10	</ul>	10	</ul>
11		11
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	<% cache do%>	6	<% cache do%>
7	<ul class='profile-list'>	7	<ul class='profile-list'>
8	<% @friends.each do \|friend\| %>	8	<% @friends.each do \|friend\| %>
9	- <li><%= profile_image_link(friend) %></li>	9	+ <%= profile_image_link(friend) %>
10	<% end%>	10	<% end%>
11	</ul>	11	</ul>
12	<% end %>	12	<% end %>
1	<div id="search-page">	1	<div id="search-page">
2		2
3	-<%= search_page_title('', :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>	3	+<%= search_page_title(_('Search Results'), :query => @query, :category => @category ? @category.name : nil, :total_results => @total_results) %>
4		4
5	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>	5	<%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %>
6		6