diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2011-08-01 10:56:27 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2011-08-01 10:56:27 +0200 |
| commit | 67fe723d894ac406fe7b859bdcd13d5ea35e6f6e (patch) | |
| tree | 73bba27ed0a7e2ee08c431ed1263cbed8ca91e9c | |
| parent | 8b1ee3cccfaff3852d44b84588e13c2bb90f0ce1 (diff) | |
| download | sonarqube-67fe723d894ac406fe7b859bdcd13d5ea35e6f6e.tar.gz sonarqube-67fe723d894ac406fe7b859bdcd13d5ea35e6f6e.zip | |
SONAR-2547 add legend of pending measures
| -rw-r--r-- | plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties | 3 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/manual_measures/index.html.erb | 18 |
2 files changed, 16 insertions, 5 deletions
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties index eca2bc256e9..ba9f2dfe8cd 100644 --- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -547,7 +547,8 @@ manual_measures.col.last_change=Last change manual_measures.col.last_change_label=By {0} at {1} manual_measures.add_measure_title=Add manual measure manual_measures.save_button=Save -manual_measures.save_and_add_button=Save & Add new again +manual_measures.save_and_add_button=Save & Add new +manual_measures.pending_message=Pending measures are marked with orange box. Their values will be integrated to project during next analysis. #------------------------------------------------------------------------------ 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 b6d5665f784..83ad8e38e64 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 @@ -5,7 +5,6 @@ #manualMeasures td.pendingMeasure { background-color: orange; - cursor: help; padding: 0 2px; width: 2px; } @@ -21,7 +20,7 @@ <h1><%= message('manual_measures.page') -%></h1> </div> - +<% has_pendings=false %> <table class="width100 data sortable" id="manualMeasures"> <thead> <tr> @@ -44,8 +43,10 @@ %> <a name="<%= measure.metric.key -%>"></a> <tr> - <% if measure.pending?(@snapshot) %> - <td class="pendingMeasure" title="Pending. New value will be available during next project analysis."></td> + <% if measure.pending?(@snapshot) + has_pendings=true + %> + <td class="pendingMeasure"></td> <% else %> <td style="padding: 0"></td> <% end %> @@ -67,3 +68,12 @@ </tbody> </table> <script>TableKit.Sortable.init('manualMeasures');</script> + +<% if has_pendings %> + <div class="doc"> + <p> + <span style="background-color: orange;width: 8px;height: 8px;display: inline-block;vertical-align: middle;margin-right: 5px"> </span> + <%= message('manual_measures.pending_message') -%> + </p> + </div> +<% end %>
\ No newline at end of file |