[Git][noosfero/noosfero][stable-2.5] Merge branch 'issue-354' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-2.5 at Noosfero / noosfero


Commits:
031e3be1 by Rodrigo Souto at 2018-09-10T20:16:47Z
Merge branch 'issue-354' into 'master'

Improving navegability in admin pages

See merge request noosfero/noosfero!1611

(cherry picked from commit b6fc031040a70df69909a04e9d0b052a0f171047)

f7755620 Improving navegability in admin pages
- - - - -


8 changed files:

- app/views/admin_panel/message_for_disabled_enterprise.html.erb
- app/views/admin_panel/set_portal_community.html.erb
- app/views/admin_panel/site_info.html.erb
- app/views/admin_panel/string_templates.html.erb
- app/views/categories/index.html.erb
- app/views/email_templates/index.html.erb
- app/views/profile_quotas/index.html.erb
- app/views/region_validators/index.html.erb


Changes:

=====================================
app/views/admin_panel/message_for_disabled_enterprise.html.erb
=====================================
@@ -5,6 +5,7 @@
   <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%', :class => current_editor %>
 
   <%= button_bar do %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
     <%= submit_button(:save, _('Save')) %>
     <%= button(:cancel, _('Cancel'), :action => 'index') %>
   <% end %>


=====================================
app/views/admin_panel/set_portal_community.html.erb
=====================================
@@ -5,6 +5,7 @@
     <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
 
     <%= button_bar do %>
+      <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
       <%= submit_button :save, _('Save'), :cancel => { :action => 'index' }  %>
     <% end %>
   <% end %>


=====================================
app/views/admin_panel/site_info.html.erb
=====================================
@@ -19,6 +19,7 @@
     :content => (render :partial => 'signup_intro', :locals => {:f => f})} %>
   <%= render_tabs(tabs) %>
   <%= button_bar do %>
+    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
     <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
   <% end %>
 <% end %>


=====================================
app/views/admin_panel/string_templates.html.erb
=====================================
@@ -1,5 +1,7 @@
 <h1><%= _('Macros') %></h1>
 
+<%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+
 <p>
   <%= _('The following macros can be used to access the attributes of '\
         'the enclosing context. For blocks, macros are available in any '\


=====================================
app/views/categories/index.html.erb
=====================================
@@ -3,6 +3,7 @@
     <h1><%= category_name %></h1>
 
     <%= button_bar do %>
+      <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
       <%= button :add, _('New category'), :action => 'new', :type => category_type %>
     <% end %>
 


=====================================
app/views/email_templates/index.html.erb
=====================================
@@ -22,6 +22,7 @@
 
   <br />
 
+  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
   <%= button(:new, _('New template'), :action => :new) %>
   <%= button(:back, _('Back'), @back_to) %>
 </div>


=====================================
app/views/profile_quotas/index.html.erb
=====================================
@@ -10,3 +10,4 @@
              :content => (render :partial => 'quotas_by_profile', locals: { profiles: @profiles }) } %>
 
 <%= render_tabs(tabs) %>
+<%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>


=====================================
app/views/region_validators/index.html.erb
=====================================
@@ -3,3 +3,5 @@
 <ul class='tree'>
   <%= render :partial => 'region', :collection => @regions %>
 </ul>
+
+<%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/031e3be157afb62934799ff95bf8b6e1f6957aa9

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/031e3be157afb62934799ff95bf8b6e1f6957aa9
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180910/eca4bf00/attachment-0001.html>