Download as
Browse Code »

Commit 445e5140c2b62cab2e66cbb8442b5c9146f4f580

Authored by Aurelio A. Heckert
Committed by Daniela Feitosa
1 parent 49e8f6bf
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1075: the MSIE was hidding links with hidden content, so, i add a &nbs… 

…p; before the button span
Showing 3 changed files with 5 additions and 14 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @445e514
... ... @@ -202,7 +202,7 @@ module ApplicationHelper
202 202 if html_options.has_key?(:class)
203 203 the_class << ' ' << html_options[:class]
204 204 end
205   - link_to(content_tag('span', label), url, html_options.merge(:class => the_class, :title => label))
  205 + link_to('&nbsp;'+content_tag('span', label), url, html_options.merge(:class => the_class, :title => label))
206 206 end
207 207  
208 208 def button_to_function(type, label, js_code, html_options = {}, &block)
... ...
app/views/cms/view.rhtml
  Diff comments   View file @445e514
... ... @@ -55,7 +55,7 @@
55 55 <td>
56 56 <%= folder.class.short_description %>
57 57 </td>
58   - <td>
  58 + <td class="article-controls">
59 59 <%= button_without_text :edit, _('Properties'), :action => 'edit', :id => folder.id %>
60 60 <%= button_without_text :eyes, _('Public view'), folder.url %>
61 61 <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => folder.id }, :method => :post %>
... ... @@ -74,7 +74,7 @@
74 74 <td>
75 75 <%= item.class.short_description %>
76 76 </td>
77   - <td>
  77 + <td class="article-controls">
78 78 <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => item.id %>
79 79 <%= button_without_text :eyes, _('Public view'), item.url %>
80 80 <% if profile.person? %>
... ...
public/stylesheets/controller_cms.css
  Diff comments   View file @445e514
... ... @@ -28,17 +28,8 @@
28 28 border: 1px solid #d3d7cf;
29 29 }
30 30  
31   -#article-controls {
32   - background: white;
33   - border: 1px solid gray;
34   - padding-top: 0px;
35   - padding-bottom: 4px;
36   - margin-bottom: 1em;
37   -}
38   -
39   -#article-controls .button {
40   - position: relative;
41   - top: -5px;
  31 +.article-controls {
  32 + white-space: nowrap;
42 33 }
43 34  
44 35 .categorie_box .button {
... ...