From 06b86ea17261a6126c369b5b9a9b8a21e80e8682 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 3 Dec 2013 16:21:54 +0100 Subject: SONAR-4750 Add introduction paragraph on each admin page --- .../main/resources/org/sonar/l10n/core.properties | 34 +++++++++++++++++----- .../WEB-INF/app/views/action_plans/index.html.erb | 5 ++-- .../app/views/admin_dashboards/index.html.erb | 12 ++++---- .../app/views/bulk_deletion/ghosts.html.erb | 19 ++++++------ .../WEB-INF/app/views/bulk_deletion/index.html.erb | 3 +- .../webapp/WEB-INF/app/views/groups/index.html.erb | 5 ++-- .../app/views/manual_measures/index.html.erb | 7 +++-- .../WEB-INF/app/views/manual_rules/index.html.erb | 5 ++-- .../WEB-INF/app/views/metrics/index.html.erb | 5 ++-- .../app/views/permission_templates/index.html.erb | 3 +- .../WEB-INF/app/views/project/deletion.html.erb | 9 +++--- .../WEB-INF/app/views/project/history.html.erb | 7 ++--- .../webapp/WEB-INF/app/views/project/key.html.erb | 11 ++++--- .../WEB-INF/app/views/project/links.html.erb | 25 ++++++++-------- .../WEB-INF/app/views/project/profile.html.erb | 3 +- .../WEB-INF/app/views/project_roles/index.html.erb | 3 +- .../WEB-INF/app/views/provisioning/index.html.erb | 4 +-- .../webapp/WEB-INF/app/views/roles/global.html.erb | 3 +- .../WEB-INF/app/views/roles/projects.html.erb | 3 +- .../WEB-INF/app/views/settings/_settings.html.erb | 4 +-- .../webapp/WEB-INF/app/views/system/index.html.erb | 5 ++-- .../app/views/updatecenter/available.html.erb | 3 +- .../WEB-INF/app/views/updatecenter/index.html.erb | 3 +- .../app/views/updatecenter/system_updates.html.erb | 3 +- .../app/views/updatecenter/updates.html.erb | 3 +- .../webapp/WEB-INF/app/views/users/index.html.erb | 5 ++-- .../src/main/webapp/stylesheets/dashboard.css | 5 ---- sonar-server/src/main/webapp/stylesheets/style.css | 12 ++++++++ 28 files changed, 126 insertions(+), 83 deletions(-) diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index 9b2a8dc8f36..a299d9f14a4 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -348,48 +348,72 @@ sidebar.tools=Tools #------------------------------------------------------------------------------ # -# PAGE TITLES, sorted alphabetically +# PAGE TITLES and descriptions # #------------------------------------------------------------------------------ action_plans.page=Action Plans +action_plans.page.description=Create and administer Action Plans for this project. Action Plans allow you to prioritize and group issues, and to monitor progress on those groups. + global_permissions.page=Global Permissions +global_permissions.page.description=Grant and revoke permissions to make changes at the global level. These permissions include editing quality profiles, sharing dashboards, and performing global system administration. + clouds.page=Clouds components.page=Components coverage.page=Coverage default_dashboards.page=Default Dashboards + dependencies.page=Dependencies duplications.page=Duplications email_configuration.page=Email Settings event_categories.page=Event Categories filters.page=Filters manual_metrics.page=Manual Metrics +manual_metrics.page.description=These metrics are available for all projects. Manual measures can be set at project level via the configuration interface. manual_measures.page=Manual Measures +manual_measures.page.description=Update the values of manual metrics for this project. Changes will take effect at the project's next analysis. Manual Metrics must be created at the global level. manual_rules.page=Manual Rules +manual_rules.page.description=These rules are available for all projects. Manual issues can be created at project level via the component code viewer. my_profile.page=My Profile roles.page=Project Permissions +roles.page.description=Grant and revoke project-level permissions to Browse (view a project's metrics), See Source Code, and Administer individual projects. Permissions can be granted to groups or individual users. permissions.page=Permissions project_settings.page=Settings -project_links.page=Links +project_settings.page.description=Edit project settings. +project_links.page=Project Links +project_links.page.description=Edit some links associated with this project. project_history.page=History +project_history.page.description=Edit snapshot metadata, or delete snapshots from the project history. +project_roles.page=Project Permissions +project_roles.page.description=Grant and revoke permissions to this project to Browse (view a project's metrics), See Source Code, and Administer. Permissions can be granted to groups or individual users. quality_profiles.page=Quality Profiles issues.page=Issues issues_drilldown.page=Issues Drilldown settings.page=General Settings +settings.page.description=Edit global settings for this SonarQube instance. source.page=Source system_info.page=System Info +system_info.page.description=This page provides system statistics, including plugin versions, environmental variables, and data on SonarQube itself. timemachine.page=Time Machine user_groups.page=Groups +user_groups.page.description=Create and administer groups of users. users.page=Users +users.page.description=Create and administer individual users. violations.page=Violations update_center.page=Update Center +update_center.page.description=Install, uninstall and delete plugins. You can also download SonarQube updates from the System Updates tab on this page. deletion.page=Deletion update_key.page=Update Key project_quality_profiles.page=Quality Profiles +project_quality_profiles.page.description=Choose which profile is associated with this project on a language-by-language basis. (Note that you will only need to select profiles for multiple languages for multi-language projects.) provisioning.page=Provisioning bulk_deletion.page=Bulk Deletion +bulk_deletion.page.description=Use this page to delete multiple projects at once. comparison.page=Compare - +update_key.page=Update Key +update_key.page.description=Edit the keys of a project and/or its modules. Key changes must be made here BEFORE analyzing the project with the new keys, otherwise the analysis will simply create another project with the new key, rather than updating the existing project. +project_deletion.page=Delete {0} +project_deletion.page.description=Delete this project from the SonarQube database. # GWT pages org.sonar.plugins.design.ui.page.DesignPage.page=Design @@ -1350,7 +1374,6 @@ manual_rules.should_provide_real_description=Rule created on the fly. A descript # #------------------------------------------------------------------------------ -project_history.description=Handle events and delete quality snapshots from history. project_history.col.year=Year project_history.col.month=Month project_history.col.day=Day @@ -1387,8 +1410,6 @@ project_history.event_already_exists=Event "{0}" already exists. # PROJECT / MODULE "UPDATE KEY" PAGE # #------------------------------------------------------------------------------ -update_key.update_resource_key=Update Key -update_key.description=This administration page allows to change the key of a project and of its modules. Those changes must be done BEFORE analyzing the project with the new keys otherwise this operation will fail. update_key.bulk_update=Bulk Update update_key.fine_grained_key_update=Fine-grained Update update_key.old_key=Old key @@ -1430,7 +1451,6 @@ project_quality_profile.default_profile=Default # #------------------------------------------------------------------------------ -project_deletion.delete_resource=Delete {0} project_deletion.operation_cannot_be_undone=This operation can not be undone. project_deletion.delete_resource_confirmation=Are you sure you want to delete this {0}? diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb index 41779bac8a3..c8b6bc01b79 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/index.html.erb @@ -1,4 +1,4 @@ -
+
<% if profiles_administrator? %>
  • @@ -6,7 +6,8 @@
<% end %> -

<%= message('action_plans.page_title') -%>

+

<%= message('action_plans.page_title') -%>

+

<%= message('action_plans.page.description') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb index 2a6c7dabc78..74bbd6309ba 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_dashboards/index.html.erb @@ -1,16 +1,16 @@
-

<%= message('dashboard.global_dashboards') -%>

-

<%= message('dashboard.global_dashboards.description') -%>

+

<%= message('dashboard.global_dashboards') -%>

+

<%= message('dashboard.global_dashboards.description') -%>

<%= render :partial => 'list', :locals => {:active_dashboards => @actives.select(&:global?), :group => 'activeGlobal'} %> -

<%= message('dashboard.project_dashboards') -%>

-

<%= message('dashboard.project_dashboards.description') -%>

+

<%= message('dashboard.project_dashboards') -%>

+

<%= message('dashboard.project_dashboards.description') -%>

<%= render :partial => 'list', :locals => {:active_dashboards => @actives.reject(&:global?), :group => 'activeProject'} %> -

<%= message('dashboard.shared_dashboards') -%>

-

<%= message('dashboard.shared_dashboards.description') -%>

+

<%= message('dashboard.shared_dashboards') -%>

+

<%= message('dashboard.shared_dashboards.description') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb index 1bc7b10e9e3..61bea1fb837 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb @@ -1,4 +1,5 @@ -

<%= message('bulk_deletion.page') -%>

+

<%= message('bulk_deletion.page') -%>

+

<%= message('bulk_deletion.page.description') -%>

- <% + <% @tabs.each do |qualifier| ghosts = @ghosts_by_qualifier[qualifier] if ghosts @@ -43,16 +44,16 @@ ghosts.sort {|x,y| x.name <=> y.name}.each do |resource| %>
  • <%= h resource.name -%> ( <%= h resource.key -%> )
    • - <% + <% end %> <% end - end + end %>
    - +

    diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb index a4982762bd1..26ba7d8afc7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb @@ -1,4 +1,5 @@ -

    <%= message('bulk_deletion.page') -%>

    +

    <%= message('bulk_deletion.page') -%>

    +

    <%= message('bulk_deletion.page.description') -%>

      <% @tabs.each do |tab| %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb index d85a780728b..19b2ba6acb2 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb @@ -1,4 +1,4 @@ -
      +
      <% if profiles_administrator? %>
      • @@ -6,7 +6,8 @@
      <% end %> -

      Groups

      +

      <%= message('user_groups.page') -%>

      +

      <%= message('user_groups.page.description') -%>

      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb index a75fa06299a..37fef076e42 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb @@ -10,7 +10,7 @@ } -
      +
      • @@ -18,7 +18,8 @@
      -

      <%= message('manual_measures.page') -%>

      +

      <%= message('manual_measures.page') -%>

      +

      <%= message('manual_measures.page.description') -%>

      <% has_pendings=false %> @@ -85,4 +86,4 @@ <%= message('manual_measures.pending_message') -%>

      -<% end %> \ No newline at end of file +<% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb index 47222c38803..da667469921 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb @@ -1,4 +1,4 @@ -
      +
      <% if profiles_administrator? %>
      • @@ -6,7 +6,8 @@
      <% end %> -

      <%= message('manual_rules.page') -%>

      +

      <%= message('manual_rules.page') -%>

      +

      <%= message('manual_rules.page.description') -%>

      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb index e166f7de746..cf33b999538 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb @@ -1,4 +1,4 @@ -
      +
      <% if profiles_administrator? %>
      • @@ -6,7 +6,8 @@
      <% end %> -

      <%= message('manual_metrics.page') -%>

      +

      <%= message('manual_metrics.page') -%>

      +

      <%= message('manual_metrics.page.description') -%>

      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb index c57272cfeb4..ef7a6574fae 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb @@ -1,4 +1,5 @@ -

      <%= message 'roles.page' -%>

      +

      <%= message 'roles.page' -%>

      +

      <%= message('roles.page.description') -%>

      <%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Permission templates'} %>
      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb index 8644fb5769e..fb694f6e376 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/deletion.html.erb @@ -1,9 +1,10 @@ <% if !@snapshot || @snapshot.root? - resource_name = message('qualifier.' + @project.qualifier) - delete_resource_message = message('project_deletion.delete_resource', :params => resource_name) + resource_qualifier = message('qualifier.' + @project.qualifier) + delete_resource_message = message('project_deletion.page', :params => resource_qualifier) %> -

      <%= delete_resource_message -%>

      +

      <%= delete_resource_message -%>

      +

      <%= message('project_deletion.page.description') -%>


      @@ -23,7 +24,7 @@ <%= message('project_deletion.operation_cannot_be_undone') -%>
      <%= submit_tag delete_resource_message, :id => 'delete_resource', :class => 'action red-button', - :confirm => message('project_deletion.delete_resource_confirmation', :params => resource_name) %> + :confirm => message('project_deletion.delete_resource_confirmation', :params => resource_qualifier) %>
      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb index 58b91d434ed..1815d10ee92 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb @@ -1,4 +1,5 @@ -

      <%= message('project_history.page') -%>

      +

      <%= message('project_history.page') -%>

      +

      <%= message('project_history.page.description') -%>

      <% if !@snapshot %> @@ -22,10 +23,6 @@ } -

      - <%= message('project_history.description') -%> -

      -
      diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb index 3cee3d75a7e..45035d8778f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/key.html.erb @@ -1,4 +1,4 @@ -<% +<% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'updatable_key') has_modules = !@project.modules.empty? reset_cycle 'modules_tree' @@ -11,10 +11,9 @@ }); } - -

      <%= message('update_key.update_resource_key') -%>

      -

      <%= message('update_key.description') -%>

      +

      <%= message('update_key.page') -%>

      +

      <%= message('update_key.page.description') -%>

      <% if has_modules %>

      <%= message('update_key.bulk_update') -%>

      @@ -44,7 +43,7 @@ - +
      <% end %>
      @@ -64,5 +63,5 @@ <%= render :partial => 'key_modules', :locals => {:current_module => @project, :module_depth => 0, :id_prefix => "0"} -%> - + <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb index e3bd566ee78..578cb0af786 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/links.html.erb @@ -1,4 +1,5 @@ -

      Project Links

      +

      <%= message('project_links.page') -%>

      +

      <%= message('project_links.page.description') -%>