From 10a703bcebec2356aaeb33212cccfd14f502fea8 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 29 Jul 2014 14:44:23 +0200 Subject: [PATCH] SONAR-5498 Make all links consistent --- .../src/main/coffee/widgets/treemap.coffee | 1 - .../src/main/hbs/common/_markdown-tips.hbs | 2 +- .../hbs/component-viewer/cw-more-actions.hbs | 10 ++-- .../header/cw-coverage-header.hbs | 2 +- .../component-viewer/header/cw-scm-header.hbs | 2 +- .../header/cw-tests-header.hbs | 4 +- server/sonar-web/src/main/hbs/issue/issue.hbs | 4 +- .../src/main/less/api-documentation.less | 6 +-- .../sonar-web/src/main/less/coding-rules.less | 6 +-- .../component-viewer-source-colorizer.less | 2 +- .../src/main/less/component-viewer.less | 9 +++- server/sonar-web/src/main/less/dashboard.less | 8 +-- server/sonar-web/src/main/less/icons.less | 7 +-- server/sonar-web/src/main/less/layout.less | 24 +++------ server/sonar-web/src/main/less/mixins.less | 2 +- server/sonar-web/src/main/less/navigator.less | 4 +- .../src/main/less/quality-gates.less | 8 +-- .../src/main/less/select2-sonar.less | 4 +- server/sonar-web/src/main/less/style.less | 51 +++++++++++-------- server/sonar-web/src/main/less/ui.less | 46 +++++++++++++---- .../WEB-INF/app/helpers/application_helper.rb | 4 +- .../WEB-INF/app/helpers/measures_helper.rb | 4 +- .../app/views/admin_dashboards/_list.html.erb | 4 +- .../app/views/comparison/index.html.erb | 2 +- .../views/components/_list_table_header.rhtml | 2 +- .../app/views/components/index.html.erb | 2 +- .../app/views/dashboard/_header.html.erb | 10 ++-- .../dashboards/_available_dashboards.html.erb | 2 +- .../views/dashboards/_my_dashboards.html.erb | 2 +- .../app/views/drilldown/_severity.html.erb | 2 +- .../app/views/drilldown/issues.html.erb | 9 ++-- .../app/views/drilldown/measures.html.erb | 6 +-- .../WEB-INF/app/views/groups/index.html.erb | 8 +-- .../app/views/layouts/_footer.html.erb | 2 +- .../app/views/measures/_display_list.html.erb | 4 +- .../WEB-INF/app/views/metrics/index.html.erb | 12 ++--- .../views/permission_templates/index.html.erb | 14 ++--- .../WEB-INF/app/views/profiles/index.html.erb | 14 ++--- .../widgets/issues/_issues_list.html.erb | 2 +- .../app/views/project_roles/index.html.erb | 12 ++--- .../WEB-INF/app/views/roles/projects.html.erb | 14 +++-- .../WEB-INF/app/views/users/index.html.erb | 10 ++-- 42 files changed, 179 insertions(+), 164 deletions(-) diff --git a/server/sonar-web/src/main/coffee/widgets/treemap.coffee b/server/sonar-web/src/main/coffee/widgets/treemap.coffee index f205fb1c486..72cff1254f3 100644 --- a/server/sonar-web/src/main/coffee/widgets/treemap.coffee +++ b/server/sonar-web/src/main/coffee/widgets/treemap.coffee @@ -101,7 +101,6 @@ class Treemap extends window.SonarWidgets.BaseWidget breadcrumbsEnter.append('i').attr 'class', (d) -> if d.qualifier? then "icon-qualifier-#{d.qualifier.toLowerCase()}" else '' breadcrumbsEnterLinks = breadcrumbsEnter.append 'a' - breadcrumbsEnterLinks.classed 'underlined-link', (d, i) -> i > 0 breadcrumbsEnterLinks.html (d) -> d.name breadcrumbsEnterLinks.on 'click', (d) => @updateTreemap d.components, d.maxResultsReached diff --git a/server/sonar-web/src/main/hbs/common/_markdown-tips.hbs b/server/sonar-web/src/main/hbs/common/_markdown-tips.hbs index fe5edc9fc35..51ebaa00ae5 100644 --- a/server/sonar-web/src/main/hbs/common/_markdown-tips.hbs +++ b/server/sonar-web/src/main/hbs/common/_markdown-tips.hbs @@ -1,4 +1,4 @@
- {{t 'markdown.helplink'}} : + {{t 'markdown.helplink'}} :   *{{t 'bold'}}*    ``{{t 'code'}}``    * {{t 'bulleted_point'}}
diff --git a/server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs index 354436d5cdb..4fe8ed7400c 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/cw-more-actions.hbs @@ -1,10 +1,10 @@ -{{t 'component_viewer.new_window'}} +{{t 'component_viewer.new_window'}}
-{{t 'component_viewer.show_full_source'}} +{{t 'component_viewer.show_full_source'}}
-{{t 'component_viewer.show_raw_source'}} +{{t 'component_viewer.show_raw_source'}} {{#each state.extensions}}
- {{this.[1]}} -{{/each}} \ No newline at end of file + {{this.[1]}} +{{/each}} diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs index 8b656730ef7..9b0966ce4c3 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-coverage-header.hbs @@ -1,6 +1,6 @@ {{#if state.hasSource}}
- + {{#if period}}Δ {{period.label}}{{else}} {{t 'component_viewer.time_changes'}}{{/if}}
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs index 599f9f71e33..2cf3da9e995 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-scm-header.hbs @@ -1,5 +1,5 @@
- + {{#if period}}Δ {{period.label}}{{else}} {{t 'component_viewer.time_changes'}}{{/if}}
diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs index 19f904c1b3b..c11d69bc279 100644 --- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs +++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs @@ -47,9 +47,9 @@ {{t 'component_viewer.measure_section.test_cases'}} {{t 'component_viewer.tests.ordered_by'}} - {{t 'component_viewer.tests.test_name'}} + {{t 'component_viewer.tests.test_name'}} / - {{t 'component_viewer.tests.duration'}} + {{t 'component_viewer.tests.duration'}} {{#if hasCoveragePerTestData}} {{t 'component_viewer.covered_lines'}} diff --git a/server/sonar-web/src/main/hbs/issue/issue.hbs b/server/sonar-web/src/main/hbs/issue/issue.hbs index ac3a80fd69e..de7379aa2c5 100644 --- a/server/sonar-web/src/main/hbs/issue/issue.hbs +++ b/server/sonar-web/src/main/hbs/issue/issue.hbs @@ -105,10 +105,10 @@
diff --git a/server/sonar-web/src/main/less/api-documentation.less b/server/sonar-web/src/main/less/api-documentation.less index 98041a07289..d73a319aec8 100644 --- a/server/sonar-web/src/main/less/api-documentation.less +++ b/server/sonar-web/src/main/less/api-documentation.less @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins"; -@import "navigator/config"; +@import (reference) "variables"; +@import (reference) "mixins"; +@import (reference) "navigator/config"; @apiDocumentationSidebarWidth: 230px; diff --git a/server/sonar-web/src/main/less/coding-rules.less b/server/sonar-web/src/main/less/coding-rules.less index e562f811700..10551963557 100644 --- a/server/sonar-web/src/main/less/coding-rules.less +++ b/server/sonar-web/src/main/less/coding-rules.less @@ -1,6 +1,6 @@ -@import 'mixins'; -@import 'variables'; -@import 'navigator/config'; +@import (reference) 'mixins'; +@import (reference) 'variables'; +@import (reference) 'navigator/config'; @facetsHeight: 40px; diff --git a/server/sonar-web/src/main/less/component-viewer-source-colorizer.less b/server/sonar-web/src/main/less/component-viewer-source-colorizer.less index c3a56f66f40..f80ebe3fd83 100644 --- a/server/sonar-web/src/main/less/component-viewer-source-colorizer.less +++ b/server/sonar-web/src/main/less/component-viewer-source-colorizer.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import (reference) 'variables'; .component-viewer-source { diff --git a/server/sonar-web/src/main/less/component-viewer.less b/server/sonar-web/src/main/less/component-viewer.less index 84ce9a28f63..e0d468fd115 100644 --- a/server/sonar-web/src/main/less/component-viewer.less +++ b/server/sonar-web/src/main/less/component-viewer.less @@ -1,5 +1,6 @@ -@import "variables"; -@import "mixins"; +@import (reference) "variables"; +@import (reference) "mixins"; +@import (reference) "ui"; @headerHeight: 60px; @workspaceWidth: 250px; @@ -354,6 +355,7 @@ position: relative; top: -2px; margin-left: 4px; + .link-no-underline; } .component-viewer-header-measures { @@ -375,6 +377,7 @@ border-left: 1px solid @barBackgroundColor; .box-sizing(border-box); background-color: lighten(@blue, 30%); + .link-no-underline; .transform-origin(0 0); .trans; @@ -399,6 +402,7 @@ display: block; padding: 11px 20px; white-space: nowrap; + .link-no-underline; a& { .trans(background); @@ -481,6 +485,7 @@ display: block; padding: 20px 10px; font-size: @iconFontSize; + .link-no-underline; } .component-viewer-header-more-actions { diff --git a/server/sonar-web/src/main/less/dashboard.less b/server/sonar-web/src/main/less/dashboard.less index aa181d7791e..97fdda25b68 100644 --- a/server/sonar-web/src/main/less/dashboard.less +++ b/server/sonar-web/src/main/less/dashboard.less @@ -1,6 +1,6 @@ -@import "mixins"; -@import "variables"; -@import "ui"; +@import (reference) "mixins"; +@import (reference) "variables"; +@import (reference) "ui"; .dashboard-page { background-color: @barBackgroundColor; @@ -74,7 +74,7 @@ } #dashboard .widget-title a { - .highlighted-link; + .link-no-underline; } /*CONFIGURATION*/ diff --git a/server/sonar-web/src/main/less/icons.less b/server/sonar-web/src/main/less/icons.less index 08b7cccc175..bf494eed3ee 100644 --- a/server/sonar-web/src/main/less/icons.less +++ b/server/sonar-web/src/main/less/icons.less @@ -1,5 +1,6 @@ -@import "variables"; -@import "mixins"; +@import (reference) "variables"; +@import (reference) "mixins"; +@import (reference) "ui"; @font-face { font-family: 'sonar'; @@ -28,7 +29,7 @@ } a[class^="icon-"], a[class*=" icon-"] { - text-decoration: none !important; + .link-no-underline; } diff --git a/server/sonar-web/src/main/less/layout.less b/server/sonar-web/src/main/less/layout.less index 8f4c36156a8..75579aa28af 100644 --- a/server/sonar-web/src/main/less/layout.less +++ b/server/sonar-web/src/main/less/layout.less @@ -1,6 +1,6 @@ -@import "mixins"; -@import "variables"; -@import "ui"; +@import (reference) "mixins"; +@import (reference) "variables"; +@import (reference) "ui"; @media print { /* ------------------- PRINT ------------------- */ @@ -70,8 +70,8 @@ body, a { } #hd a { - .base-link; - color: #e5e5e5; + color: #fff; + .link-no-underline; &.selected { color: @blue; } } @@ -145,11 +145,7 @@ body, a { } #bc li a { - text-decoration: none; -} - -#bc li a:hover, #bc li a:focus { - text-decoration: underline; + .link-no-underline; } #crumbs-ops { @@ -163,11 +159,7 @@ body, a { } #crumbs-ops li a { - text-decoration: none; -} - -#crumbs-ops li a:hover, #crumbs-ops li a:focus { - text-decoration: underline; + .link-no-underline; } #hd .dropdown-menu a { @@ -224,7 +216,7 @@ ul.sidebar li { } ul.sidebar li > a { - .highlighted-link; + .link-no-underline; } ul.sidebar li.active { diff --git a/server/sonar-web/src/main/less/mixins.less b/server/sonar-web/src/main/less/mixins.less index ef2dc10a7b5..66349f4b655 100644 --- a/server/sonar-web/src/main/less/mixins.less +++ b/server/sonar-web/src/main/less/mixins.less @@ -1,4 +1,4 @@ -@import "variables"; +@import (reference) "variables"; .clearfix() { &:before, &:after { display: table; content: ""; line-height: 0; } diff --git a/server/sonar-web/src/main/less/navigator.less b/server/sonar-web/src/main/less/navigator.less index ab9401b0478..ddb1478deaa 100644 --- a/server/sonar-web/src/main/less/navigator.less +++ b/server/sonar-web/src/main/less/navigator.less @@ -1,5 +1,5 @@ -@import "mixins"; -@import "variables"; +@import (reference) "mixins"; +@import (reference) "variables"; @import "navigator/config"; @import "navigator/base"; diff --git a/server/sonar-web/src/main/less/quality-gates.less b/server/sonar-web/src/main/less/quality-gates.less index fb56fbc7be7..070216d1b21 100644 --- a/server/sonar-web/src/main/less/quality-gates.less +++ b/server/sonar-web/src/main/less/quality-gates.less @@ -1,6 +1,6 @@ -@import "variables"; -@import "mixins"; -@import "navigator/config"; +@import (reference) "variables"; +@import (reference) "mixins"; +@import (reference) "navigator/config"; @qualityGateSidebarWidth: 230px; @@ -125,4 +125,4 @@ border-left: none !important; border-right: none !important; } -} \ No newline at end of file +} diff --git a/server/sonar-web/src/main/less/select2-sonar.less b/server/sonar-web/src/main/less/select2-sonar.less index fed92898f3d..d6b89c29cc1 100644 --- a/server/sonar-web/src/main/less/select2-sonar.less +++ b/server/sonar-web/src/main/less/select2-sonar.less @@ -1,5 +1,5 @@ -@import "mixins"; -@import "variables"; +@import (reference) "mixins"; +@import (reference) "variables"; @imagesPath: '../images/select2.png'; @imagesPath2x: '../images/select2x2.png'; diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less index 8a607cfa136..db1329484a0 100644 --- a/server/sonar-web/src/main/less/style.less +++ b/server/sonar-web/src/main/less/style.less @@ -1,6 +1,6 @@ -@import "mixins"; -@import "variables"; -@import "ui"; +@import (reference) "mixins"; +@import (reference) "variables"; +@import (reference) "ui"; /* * SonarQube, open source software quality management tool. @@ -40,6 +40,7 @@ border-top: 1px solid #fff; font-size: 85%; padding: 10px 0; + line-height: 1.4; } .ie-warn { @@ -53,10 +54,6 @@ text-decoration: underline; } -#ftlinks a { - color: #444; -} - /* GENERAL */ @@ -64,6 +61,11 @@ a { cursor: pointer; } +a.icon-favorite, +a.icon-not-favorite { + .link-no-underline; +} + .loading { background: url("../images/loading.gif") no-repeat 4px 2px; color: #444; @@ -386,6 +388,7 @@ table.data > thead > tr > th { vertical-align: top; font-size: 93%; padding: 4px 7px 4px 3px; + line-height: 1.4; text-transform: uppercase; & > .small { @@ -471,7 +474,6 @@ table.sortable .sortcol { padding-left: 15px; background-repeat: no-repeat; background-position: right center; - text-decoration: underline; } table.sortable .sortasc { @@ -1792,10 +1794,6 @@ ul.bullet li { padding: 0; } -.tabs li a { - outline: none; -} - .tabs2 li a, .tabs li a { float: left; color: #777; @@ -1803,6 +1801,7 @@ ul.bullet li { height: 17px; margin: 0 1px 0 0; padding: 1px 5px; + .link-no-underline; } .tabs2 li a.selected, .tabs li a.selected, .tabs .ui-tabs-active a { @@ -1864,6 +1863,14 @@ ul.bullet li { color: #fff; margin: 0; padding: 0 3px; + + a > & { + margin-bottom: -1px; + border-bottom: 1px solid @orange; + .trans; + + &:hover { opacity: 0.8; } + } } .alert_ERROR { @@ -1871,6 +1878,14 @@ ul.bullet li { color: #fff; margin: 0; padding: 0 3px; + + a > & { + margin-bottom: -1px; + border-bottom: 1px solid @red; + .trans; + + &:hover { opacity: 0.8; } + } } #comparison span.best { @@ -2076,11 +2091,7 @@ table.matrix tbody td.title { } a.nolink { - text-decoration: none; -} - -a.nolink:hover { - text-decoration: underline; + .link-no-underline; } h1 strong, .dashbox .title, .gwt-SourcePanel .sources .msg li strong { @@ -2222,11 +2233,6 @@ table.nowrap td.small, td.nowrap.small, th.nowrap.small { background: #FFFBCC; } -.action { - text-decoration: underline; - cursor: pointer; -} - /* Used on links which are located inside a dense text place or in tables */ /* in order to rapidly identify them */ .link-action { @@ -2850,6 +2856,7 @@ div.rule-title { line-height: @iconSmallFontSize; color: #fff; opacity: 0.5; + .link-no-underline; &:hover { opacity: 1; } } diff --git a/server/sonar-web/src/main/less/ui.less b/server/sonar-web/src/main/less/ui.less index 571f245e061..374bb140db2 100644 --- a/server/sonar-web/src/main/less/ui.less +++ b/server/sonar-web/src/main/less/ui.less @@ -1,5 +1,5 @@ -@import "variables"; -@import "mixins"; +@import (reference) "variables"; +@import (reference) "mixins"; @@ -107,12 +107,12 @@ select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner { .link; } -.highlighted-link { +.highlighted-link() { color: @darkBlue; .link; } -.underlined-link { +.underlined-link() { .highlighted-link; border-bottom: 1px solid @lightBlue; @@ -139,14 +139,19 @@ select::-moz-focus-inner, input::-moz-focus-inner, button::-moz-focus-inner { } } -.active-link { +.link-no-underline() { border-bottom: none; - font-weight: 500; } + a { cursor: pointer; - .highlighted-link; + .underlined-link; + + &.active-link { + border-bottom: none; + font-weight: 500; + } } @@ -238,6 +243,8 @@ input[type=button] { } } +.button { line-height: 22px; } + .button-red { &:hover, &:focus { border-color: #900; @@ -267,7 +274,8 @@ input[type=button] { font-size: 0; white-space: nowrap; - & > button { + & > button, + & > .button { position: relative; z-index: 2; display: inline-block; @@ -283,11 +291,16 @@ input[type=button] { } } - & > button + button { + & > .button { line-height: 16px; } + + & > button + button, + & > button + .button, + & > .button + button, + & > .button + .button { margin-left: -1px; } - & > a { + & > a:not(.button) { vertical-align: middle; margin: 0 8px; font-size: @smallFontSize; @@ -325,25 +338,38 @@ input[type=button] { color: #fff; font-weight: 300; text-align: center; + + a > & { + margin-bottom: -1px; + border-bottom: 1px solid; + .trans; + + &:hover { opacity: 0.8; } + } } .rating-A { background-color: #00AA00; + a & { border-bottom-color: #00AA00; } } .rating-B { background-color: #80CC00; + a & { border-bottom-color: #80CC00; } } .rating-C { background-color: #FFEE00; color: @baseFontColor; + a & { border-bottom-color: #FFEE00; } } .rating-D { background-color: #F77700; + a & { border-bottom-color: #F77700; } } .rating-E { background-color: #EE0000; + a & { border-bottom-color: #EE0000; } } diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb index 9a58a14981d..5ea88ea1f96 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb @@ -129,7 +129,7 @@ module ApplicationHelper def boolean_icon(boolean_value, options={}) if boolean_value - image_tag('tick.png', options) + "" elsif options[:display_false] image_tag('cross.png', options) else @@ -947,7 +947,7 @@ module ApplicationHelper total = pagination.total.to_i page_index = pagination.pageIndex() ? pagination.pageIndex().to_i : 1 pages = pagination.pages().to_i - results_html = options[:url_results] ? message('x_results', :params => "#{total}") : message('x_results', :params => [total]) + results_html = options[:url_results] ? message('x_results', :params => "#{total}") : message('x_results', :params => [total]) html = ' 'dashboard', :id => row.snapshot.resource_id}, {:title => h(row.snapshot.resource.key), :class => 'underlined-link'})}" + "#{qualifier_icon(row.snapshot)} #{link_to(h(row.snapshot.resource.name(true)), {:controller => 'dashboard', :id => row.snapshot.resource_id}, {:title => h(row.snapshot.resource.key)})}" elsif column.key=='short_name' - "#{qualifier_icon(row.snapshot)} #{link_to(h(row.snapshot.resource.name(false)), {:controller => 'dashboard', :id => row.snapshot.resource_id}, {:title => h(row.snapshot.resource.key), :class => 'highlighted-link'})}" + "#{qualifier_icon(row.snapshot)} #{link_to(h(row.snapshot.resource.name(false)), {:controller => 'dashboard', :id => row.snapshot.resource_id}, {:title => h(row.snapshot.resource.key)})}" elsif column.key=='date' human_short_date(row.snapshot.created_at) elsif column.key=='project_creation_date' diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb index 5490789acc7..4f474906a13 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/admin_dashboards/_list.html.erb @@ -24,12 +24,12 @@ <% if index > 0 %> - <%= link_to image_tag('blue-up.png'), {:action => :up, :id => active.id}, :method => :post, :id => "up-#{u active.name}" %> + <%= link_to '', {:action => :up, :id => active.id}, :method => :post, :id => "up-#{u active.name}", :class => 'icon-move-up' %> <% else %> <%= image_tag('transparent_16.gif') %> <% end %> <% if index < active_dashboards.size-1 %> - <%= link_to image_tag('blue-down.png'), {:action => :down, :id => active.id}, :method => :post, :id => "down-#{u active.name}" %> + <%= link_to '', {:action => :down, :id => active.id}, :method => :post, :id => "down-#{u active.name}", :class => 'icon-move-down' %> <% else %> <%= image_tag('transparent_16.gif') %> <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb index 9a3b6e3d548..71a1b4463a1 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb @@ -196,7 +196,7 @@ %> - <%= h s.resource.name(true) -%> + <%= h s.resource.name(true) -%>
<%= event ? event.name : message('comparison.version.latest') -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml index 17838c3e097..5d74204a211 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/_list_table_header.rhtml @@ -16,7 +16,7 @@ <% if logged_in? %><%= link_to_favourite(@snapshot.project) -%><% end %> <%= qualifier_icon(@snapshot) -%> - "><%= h @snapshot.project.name -%> + "><%= h @snapshot.project.name -%> <% @columns.each do |column| %> <%= get_header_content(column, @snapshot) -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb index f85b44f48f2..f24a454aa46 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/components/index.html.erb @@ -53,7 +53,7 @@ <%= qualifier_icon(snapshot) %> <% if snapshot.display_dashboard? %> - <%= link_to_resource(project, h(snapshot.project.name), :class => 'underlined-link') %> + <%= link_to_resource(project, h(snapshot.project.name)) %> <% else %> <%= h snapshot.project.name %> <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb index 1dab108bcc4..900075c19f0 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb @@ -2,16 +2,16 @@
<% if logged_in? %> -
    +
    <% if back %> -
  • <%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index) -%>
  • + <%= link_to message('dashboard.back_to_dashboard'), dashboard_action(:index), :class => 'button' -%> <% else %> <% if @dashboard.editable_by?(current_user) %> -
  • <%= link_to message('dashboard.configure_widgets'), dashboard_action(:configure) -%>
  • + <%= link_to message('dashboard.configure_widgets'), dashboard_action(:configure), :class => 'button' -%> <% end %> <% end %> -
  • <%= link_to message('dashboard.manage_dashboards'), {:controller => :dashboards, :action => :index, :resource => (@resource.id if @resource) } -%>
  • -
+ <%= link_to message('dashboard.manage_dashboards'), {:controller => :dashboards, :action => :index, :resource => (@resource.id if @resource) }, :class => 'button' -%> +
<% end %> <% if @snapshot %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb index 073f91dc35a..5737650fb80 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb @@ -19,7 +19,7 @@ <%= link_to h(dashboard.name(true)), {:controller => :dashboard, :action => :index, :did => dashboard.id, :id => (resource_id unless dashboard.global?)}, - :id => "view-#{u dashboard.name}", :class => 'underlined-link' %> + :id => "view-#{u dashboard.name}" %>
<%= h dashboard.description -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb index 6a36cbe0706..68240dea729 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb @@ -19,7 +19,7 @@ <%= link_to h(dashboard.name(true)), {:controller => :dashboard, :action => :index, :did => dashboard.id, :id => (resource_id unless dashboard.global?)}, - :id => "view-#{u dashboard.name}", :class => 'underlined-link' %> + :id => "view-#{u dashboard.name}" %>
<%= h dashboard.description -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb index cb890b1cf7a..8625066e0c4 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/_severity.html.erb @@ -2,7 +2,7 @@ - <%= link_to message("severity.#{severity}"), {:controller => :drilldown, :action => :issues, :id => @resource.id, :severity => (selected ? nil : severity), :period => @period}, :class => 'underlined-link' %> + <%= link_to message("severity.#{severity}"), {:controller => :drilldown, :action => :issues, :id => @resource.id, :severity => (selected ? nil : severity), :period => @period} %> <%= @period ? format_variation(measure, :index => @period, :style => 'light') : format_measure(measure) -%> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb index 8aef0011a5e..7c588467e66 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/issues.html.erb @@ -100,8 +100,7 @@ {:controller => :drilldown, :action => :issues, :id => @resource.id, :rule => (selected ? nil : rule.key), :rule_sev => (selected ? nil : rule_measure.severity), :sid => nil, :severity => @severity, :period => @period, :rids => (selected ? nil : @selected_rids)}, - :title => "#{rule.plugin_name}: #{rule.plugin_rule_key}", - :class => 'underlined-link' + :title => "#{rule.plugin_name}: #{rule.plugin_rule_key}" ) -%> @@ -153,7 +152,7 @@ <% else %> <%= link_to(image_tag('zoom.png'), {:id => resource.id}, {:class => 'nolink'}) %> @@ -161,9 +160,9 @@ <%= qualifier_icon(resource) -%>  <% if resource.source_code? %> <%= h resource.name(false) %> + class="js-drilldown-link"><%= h resource.name(false) %> <% else %> - <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}, :class => 'underlined-link') -%> + <%= link_to(h(resource.name), {:only_path => true, :overwrite_params => {:rids => (selected ? rids-[resource.id] : rids+[resource.id])}}) -%> <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb index 0bea2a00709..453e9e8ba65 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/drilldown/measures.html.erb @@ -77,7 +77,7 @@ <% if resource.source_code? %> <% else %> <%= link_to(image_tag('zoom.png'), {:id => resource.id, :metric => @metric.id}, {:class => 'nolink'}) -%> @@ -85,9 +85,9 @@ <%= qualifier_icon(resource) -%>  <% if resource.source_code? %> <%= h resource.name(false) %> + class="js-drilldown-link"><%= h resource.name(false) %> <% else %> - <%= link_to(h(resource.name), params.merge({:only_path => true, :rids => (selected ? rids-[resource.id] : rids+[resource.id])}), :class => 'underlined-link') -%> + <%= link_to(h(resource.name), params.merge({:only_path => true, :rids => (selected ? rids-[resource.id] : rids+[resource.id])})) -%> <% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb index 671e29f1ab2..3d75fcbfdba 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/groups/index.html.erb @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb index 1512e0ea45a..e4985adb843 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_footer.html.erb @@ -2,7 +2,7 @@
The web interface cannot be displayed because your browser is not supported.
- Please switch to a supported version or another supported browser.
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb index 8a63f3807dd..3dae12f9a0e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb @@ -222,11 +222,11 @@ <% if widget_id %> <%= table_pagination(filter.pagination, :colspan => colspan, :id => "measure_filter_foot#{widget_id}", :include_loading_icon => true) { |label, page_id| - link_to_function label, "refreshList#{widget_id}('#{filter.criteria[:sort]}', #{filter.criteria[:asc]}, #{page_id})", :class => 'underlined-link' + link_to_function label, "refreshList#{widget_id}('#{filter.criteria[:sort]}', #{filter.criteria[:asc]}, #{page_id})" } -%> <% else %> <%= table_pagination(filter.pagination, :colspan => colspan, :id => "measure_filter_foot#{widget_id}", :include_loading_icon => true) { |label, page_id| - link_to(label, filter.criteria.merge({:page => page_id}), :class => 'underlined-link') + link_to(label, filter.criteria.merge({:page => page_id})) } -%> <% end %>
NameDescriptionMembersOperationsNameDescriptionMembersOperations
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb index 05f02a80d92..d308a1f9161 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb @@ -19,12 +19,12 @@ - - - - - - + + + + + + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb index 1a4f834e45b..fa44944563a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/permission_templates/index.html.erb @@ -8,15 +8,11 @@ <%= render :partial => 'roles/tabs', :locals => {:selected_tab=>'Permission templates'} %>
-
    -
  • - <%= link_to message('permission_template.set_default_templates'), {:action => :default_templates_form, :qualifiers => @root_qualifiers}, - :id => 'configure-defaults-permission-template', :class => 'open-modal link-action' %> -
  • -
  • - <%= link_to message('create'), {:action => :create_form}, :id => 'create-link-permission-template', :class => 'open-modal link-action' %> -
  • -
+
+ <%= link_to message('permission_template.set_default_templates'), {:action => :default_templates_form, :qualifiers => @root_qualifiers}, + :id => 'configure-defaults-permission-template', :class => 'open-modal link-action button' %> + <%= link_to message('create'), {:action => :create_form}, :id => 'create-link-permission-template', :class => 'open-modal link-action button' %> +
KeyNameDescriptionDomainTypeOperationsKeyNameDescriptionDomainTypeOperations
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index e8a77e22cd9..536e6eb445e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -1,17 +1,11 @@ <% diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb index 141d250d491..15719704de4 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project/widgets/issues/_issues_list.html.erb @@ -71,7 +71,7 @@ <%= paginate_java(paging, :colspan => 3, :id => "issue-filter-foot-#{widget_id}", :include_loading_icon => true, :url_results => url_for_issues(search_options.except('pageSize', 'pageIndex', 'table_limit', 'widget_id')) ) { |label, page_id| <#{label} +#{label} EOF } -%>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb index 93a78829954..5aee7f30416 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb @@ -3,13 +3,11 @@ <% end %>
-
    -
  • - <%= link_to message('projects_role.apply_template'), {:controller => :roles, :action => :apply_template_form, :components => [@project.key], :names => @project.name, - :results_count => 1}, - :id => "apply-template-#{u @project.kee}", :class => 'open-modal link-action' %> -
  • -
+
+ <%= link_to message('projects_role.apply_template'), {:controller => :roles, :action => :apply_template_form, :components => [@project.key], :names => @project.name, + :results_count => 1}, + :id => "apply-template-#{u @project.kee}", :class => 'open-modal link-action button' %> +

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

<%= message('project_roles.page.description2') -%>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb index 200b74e46e4..64e2f4483fd 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb @@ -36,14 +36,12 @@
- +
+ <%= link_to message('projects_role.bulk_change'), {:action => :apply_template_form, :names => @components_names, + :keys => @components_keys, :qualifiers => @components_qualifiers, + :results_count => @query_result.paging.total}, + :id => 'apply-template-modal', :class => 'open-modal link-action button' %> +
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb index 2fd4e5045eb..131c2491982 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/users/index.html.erb @@ -20,11 +20,11 @@
- - - - - + + + + + -- 2.39.5
LoginNameEmailGroupsOperationsLoginNameEmailGroupsOperations