Download as
Browse Code »

Commit 7b716ef9f8e927e9a808f87da5001314d3193635

Authored by Antonio Terceiro
1 parent b314b6ea
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Use already-defined button names 

(ActionItem1488)
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/views/admin_panel/set_portal_community.rhtml
  Diff comments   View file @7b716ef
@@ -13,12 +13,12 @@ @@ -13,12 +13,12 @@
13 13
14 <% button_bar do %> 14 <% button_bar do %>
15 <%if @portal_community.environment.enabled?('use_portal_community') %> 15 <%if @portal_community.environment.enabled?('use_portal_community') %>
16 - <%= button 'disable', _('Disable'), {:action => 'manage_portal_community', :activate => 0} %> 16 + <%= button 'cancel', _('Disable'), {:action => 'manage_portal_community', :activate => 0} %>
17 <% else %> 17 <% else %>
18 - <%= button 'enable', _('Enable'), {:action => 'manage_portal_community', :activate => 1} %> 18 + <%= button 'ok', _('Enable'), {:action => 'manage_portal_community', :activate => 1} %>
19 <% end %> 19 <% end %>
20 <%= button 'folder', _('Select Portal Folders'), {:action => 'set_portal_folders'} %> 20 <%= button 'folder', _('Select Portal Folders'), {:action => 'set_portal_folders'} %>
21 - <%= button 'amount', _('Define Amount by Folder'), {:action => 'set_portal_news_amount'} %> 21 + <%= button 'edit', _('Define Amount by Folder'), {:action => 'set_portal_news_amount'} %>
22 <%= button 'delete', _('Remove'), { :action => 'unset_portal_community'} %> 22 <%= button 'delete', _('Remove'), { :action => 'unset_portal_community'} %>
23 <% end %> 23 <% end %>
24 <% end %> 24 <% end %>
public/designs/icons/tango/style.css
  Diff comments   View file @7b716ef
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } 5 .icon-new { background-image: url(Tango/16x16/actions/filenew.png) }
6 .icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) } 6 .icon-close { background-image: url(Tango/16x16/actions/gtk-cancel.png) }
7 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) } 7 .icon-newfolder { background-image: url(Tango/16x16/actions/folder-new.png) }
  8 +.icon-folder { background-image: url(Tango/16x16/places/folder.png) }
8 .icon-newblog { background-image: url(mod/16x16/apps/text-editor.png) } 9 .icon-newblog { background-image: url(mod/16x16/apps/text-editor.png) }
9 /*.icon-open { background-image: url(folder-open.gif) } UNUSED*/ 10 /*.icon-open { background-image: url(folder-open.gif) } UNUSED*/
10 /*.icon-cms { background-image: url(abiword_48.png) } UNUSED*/ 11 /*.icon-cms { background-image: url(abiword_48.png) } UNUSED*/