Commit 1bcc750debdeb00540683fde7094198fe9e8a710
Committed by
Antonio Terceiro
1 parent
a5b17408
Exists in
master
and in
29 other branches
ActionItem1050: changes needed for better layout
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Showing
11 changed files
with
27 additions
and
26 deletions
Show diff stats
app/helpers/application_helper.rb
... | ... | @@ -730,10 +730,10 @@ module ApplicationHelper |
730 | 730 | |
731 | 731 | def search_page_title(title, options={}) |
732 | 732 | title = "<h1>" + title + "</h1>" |
733 | - title += "<h2 align='center'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank? | |
734 | - title += "<h2 align='center'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank? | |
735 | - title += "<h2 align='center'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank? | |
736 | - title += "<h2 align='center'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank? | |
733 | + title += "<h2 class='query'>" + _("Searched for '%s'") % options[:query] + "</h2>" if !options[:query].blank? | |
734 | + title += "<h2 class='query'>" + _("In category %s") % options[:category] + "</h2>" if !options[:category].blank? | |
735 | + title += "<h2 class='query'>" + _("within %d km from %s") % [options[:distance], options[:region]] + "</h2>" if !options[:distance].blank? && !options[:region].blank? | |
736 | + title += "<h2 class='query'>" + _("%d results found") % options[:total_results] + "</h2>" if !options[:total_results].blank? | |
737 | 737 | title |
738 | 738 | end |
739 | 739 | ... | ... |
app/helpers/profile_editor_helper.rb
... | ... | @@ -135,8 +135,9 @@ module ProfileEditorHelper |
135 | 135 | |
136 | 136 | def control_panel(&block) |
137 | 137 | concat( |
138 | - content_tag('div', | |
139 | - content_tag('div', capture(&block) + '<br style="clear:left;"/> '), | |
138 | + content_tag( | |
139 | + 'div', | |
140 | + capture(&block) + '<br style="clear:left;"/> ', | |
140 | 141 | :class => 'control-panel'), |
141 | 142 | block.binding) |
142 | 143 | end | ... | ... |
app/views/friends/index.rhtml
... | ... | @@ -28,14 +28,12 @@ |
28 | 28 | :class => 'button icon-delete', |
29 | 29 | :title => _('remove'), |
30 | 30 | :help => __('Clicking on this button will remove your friend relation with %s.') % friend.name %> |
31 | - </div><!-- end class="controll" --> | |
32 | - <div style='text-align: center; margin-top: 3px;'> | |
33 | 31 | <%= link_to content_tag('span',_('contact')), |
34 | 32 | friend.url.merge(:controller => 'contact', :action => 'new'), |
35 | 33 | :class => 'button icon-menu-mail', |
36 | 34 | :title => _('contact'), |
37 | 35 | :help => __('Clicking on this button will let you send a message to %s.') % friend.name %> |
38 | - </div> | |
36 | + </div><!-- end class="controll" --> | |
39 | 37 | </li> |
40 | 38 | <% end %> |
41 | 39 | </ul> | ... | ... |
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
... | ... | @@ -8,8 +8,6 @@ |
8 | 8 | |
9 | 9 | <%= render :partial => 'pending_tasks' %> |
10 | 10 | |
11 | -<div class='control-panel'> | |
12 | - | |
13 | 11 | <% control_panel do %> |
14 | 12 | |
15 | 13 | <%= control_panel_button(_('Profile Info and settings'), 'edit-profile', :controller => 'profile_editor', :action => 'edit') if profile.person? %> |
... | ... | @@ -65,6 +63,5 @@ |
65 | 63 | |
66 | 64 | <% end %> |
67 | 65 | |
68 | -</div> | |
69 | 66 | |
70 | 67 | </div> | ... | ... |
app/views/search/index.rhtml
1 | 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 | 5 | <%= render :partial => 'search_form', :locals => { :form_title => _("Refine your search"), :simple_search => true } %> |
6 | 6 | ... | ... |
public/stylesheets/controller_memberships.css
... | ... | @@ -11,9 +11,6 @@ |
11 | 11 | display: block; |
12 | 12 | list-style: none; |
13 | 13 | margin-bottom: 20px |
14 | -} | |
15 | - | |
16 | -#memberships-index li { | |
17 | 14 | background-color: #B8CFE7; |
18 | 15 | } |
19 | 16 | |
... | ... | @@ -21,6 +18,9 @@ |
21 | 18 | float: right; |
22 | 19 | padding: 4% 20px 4% 0px; |
23 | 20 | } |
21 | +#memberships-index li .may-clear { | |
22 | + clear: right; | |
23 | +} | |
24 | 24 | |
25 | 25 | #memberships-index li .profile-details { |
26 | 26 | display: block; | ... | ... |
public/stylesheets/manage_contacts_list.css
... | ... | @@ -6,13 +6,14 @@ |
6 | 6 | |
7 | 7 | .profile-list li { |
8 | 8 | float: left; |
9 | - width: 100px; | |
10 | - height: 100px; | |
9 | + width: 90px; | |
10 | + height: 90px; | |
11 | + max-width: 80px; | |
12 | + max-height: 80px; | |
11 | 13 | margin: 5px; |
12 | 14 | padding: 5px; |
13 | 15 | border: 2px solid #B8CFE7; |
14 | 16 | list-style: none; |
15 | - overflow: hidden; | |
16 | 17 | position: relative; |
17 | 18 | } |
18 | 19 | .profile-list li:hover { |
... | ... | @@ -34,7 +35,7 @@ |
34 | 35 | } |
35 | 36 | |
36 | 37 | .profile-list .profile_link span { |
37 | - width: 200px; | |
38 | + width: 80px; | |
38 | 39 | display: block; |
39 | 40 | overflow: hidden; |
40 | 41 | } |
... | ... | @@ -44,11 +45,14 @@ |
44 | 45 | } |
45 | 46 | .profile-list .controll { |
46 | 47 | position: absolute; |
47 | - top: 5px; | |
48 | - right: 0px; | |
48 | + top: 7px; | |
49 | + right: -10px; | |
49 | 50 | } |
50 | -.msie6 .profile-list .controll a { | |
51 | +.profile-list .controll a { | |
51 | 52 | display: block; |
53 | + margin-bottom: 2px; | |
54 | +} | |
55 | +.msie6 .profile-list .controll a { | |
52 | 56 | width: 0px; |
53 | 57 | } |
54 | 58 | ... | ... |