fix SONAR-6041 update navigator pages

diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs
index ae396827d7f6b574a6723da5f41e800b9ace1f26..01a9f34d8b4338df048e641f73e1f5687ecc7901 100644 (file)
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-layout.hbs
@@ -5,7 +5,7 @@
   </div>
 </div>
 
-<div class="container-main">
+<div class="container-main face-main">
   <div class="search-navigator-workspace-header"></div>
   <div class="search-navigator-workspace">
     <div class="search-navigator-workspace-list"></div>

diff --git a/server/sonar-web/src/main/hbs/issues/issues-layout.hbs b/server/sonar-web/src/main/hbs/issues/issues-layout.hbs
index e0399a5a2cec7e15f54330549f549d1df3cc8f95..782d2f517c10b26588f785db9d73f40945b28ad8 100644 (file)
--- a/server/sonar-web/src/main/hbs/issues/issues-layout.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-layout.hbs
@@ -6,7 +6,7 @@
   </div>
 </div>
 
-<div class="container-main">
+<div class="container-main face-main">
   <div class="search-navigator-workspace-header"></div>
   <div class="search-navigator-workspace">
     <div class="search-navigator-workspace-list"></div>

diff --git a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
index e29177268b750ca7be5384a7ac1e238bd3f1ec7c..09a852bd5503303a7928e9d477607cb3f9e9dd12 100644 (file)
--- a/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-workspace-header.hbs
@@ -1,12 +1,6 @@
 <div class="issues-header-component">
   {{#if state.component}}
     <a class="js-back">{{t 'issues.return_to_list'}}</a>&nbsp;&nbsp;&nbsp;
-
-    {{#with state.component}}
-      {{qualifierIcon 'TRK'}}&nbsp;<a href="{{dashboardUrl project}}" title="{{projectName}}">{{projectName}}</a>
-      &nbsp;&nbsp;
-      {{qualifierIcon qualifier}}&nbsp;<a href="{{dashboardUrl key}}" title="{{name}}">{{name}}</a>
-    {{/with}}
   {{else}}
     &nbsp;
   {{/if}}

diff --git a/server/sonar-web/src/main/js/coding-rules/controller.js b/server/sonar-web/src/main/js/coding-rules/controller.js
index f32b51332a661d25e26ee466b81defe3eb0a7734..1819c98c5a3b197d5c808b89e01555c89d8aef96 100644 (file)
--- a/server/sonar-web/src/main/js/coding-rules/controller.js
+++ b/server/sonar-web/src/main/js/coding-rules/controller.js
@@ -127,7 +127,6 @@ define([
       this.app.layout.workspaceDetailsRegion.reset();
       this.app.layout.hideDetails();
       this.app.workspaceListView.bindScrollEvents();
-      this.app.workspaceListView.scrollTo();
     }
 
   });

diff --git a/server/sonar-web/src/main/js/coding-rules/layout.js b/server/sonar-web/src/main/js/coding-rules/layout.js
index c9fa76c5769b01814ac9c260f33def0831512ee0..b71a89ad59aa52296aa8e6896695b3db57d364f1 100644 (file)
--- a/server/sonar-web/src/main/js/coding-rules/layout.js
+++ b/server/sonar-web/src/main/js/coding-rules/layout.js
@@ -16,25 +16,6 @@ define([
       workspaceDetailsRegion: '.search-navigator-workspace-details'
     },
 
-    initialize: function () {
-      var that = this;
-      $(window).on('scroll.search-navigator-layout', function () {
-        that.onScroll();
-      });
-    },
-
-    onClose: function () {
-      $(window).off('scroll.search-navigator-layout');
-    },
-
-    onScroll: function () {
-      var scrollTop = $(window).scrollTop();
-      $('.search-navigator').toggleClass('sticky', scrollTop >= this.topOffset);
-      this.$('.search-navigator-side').css({
-        top: Math.max(0, Math.min(this.topOffset - scrollTop, this.topOffset))
-      });
-    },
-
     showDetails: function () {
       this.scroll = $(window).scrollTop();
       $('.search-navigator').addClass('search-navigator-extended-view');

diff --git a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
index 95475fe7b5acdb50fba9f788d25e642edbfedfd5..ef550bb876d8f1d44d0331d21904052dc83f9f3c 100644 (file)
--- a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
@@ -73,7 +73,6 @@ define([
             app: this.options.app,
             model: this.model
           }));
-          this.$el.scrollParent().scrollTop(30);
         },
 
         onClose: function () {

diff --git a/server/sonar-web/src/main/less/components/issues.less b/server/sonar-web/src/main/less/components/issues.less
index e4029858dde3fce397999bba111e4427f78d2039..5bcac57320215b3dcfa8e3d8dd3096473b576bb5 100644 (file)
--- a/server/sonar-web/src/main/less/components/issues.less
+++ b/server/sonar-web/src/main/less/components/issues.less
@@ -24,7 +24,8 @@
 
 .issue-list,
 .issue {
-  max-width: 920px;
+  width: 780px;
+  .box-sizing(border-box);
 }
 
 .issue.selected {
@@ -62,6 +63,8 @@
   line-height: 1.5;
   font-size: @baseFontSize;
   font-weight: 500;
+  word-break: break-all;
+  word-break: break-word;
 }
 
 .issue-tags {

diff --git a/server/sonar-web/src/main/less/components/search-navigator.less b/server/sonar-web/src/main/less/components/search-navigator.less
index 9246d8442d30938bdfb9ba1eb7c27009ccb51b09..b2b74e936e07a305a255dd50b43d0653a1e130f7 100644 (file)
--- a/server/sonar-web/src/main/less/components/search-navigator.less
+++ b/server/sonar-web/src/main/less/components/search-navigator.less
@@ -6,41 +6,14 @@
 
 .search-navigator {
   .clearfix;
-
-//  &.sticky {
-//
-//    .search-navigator-workspace-header {
-//      position: fixed;
-//      z-index: 4;
-//      top: 0;
-//      left: @sideWidth;
-//      right: 0;
-//    }
-//
-//    .search-navigator-workspace-list,
-//    .search-navigator-workspace-details {
-//      padding-top: 22px + 5px + 5px + 1px + 10px;
-//    }
-//
-//    .search-navigator-side {
-//      position: fixed;
-//      z-index: 4;
-//      top: 0;
-//      bottom: 0;
-//      overflow-y: auto;
-//    }
-//
-//  }
 }
 
 .search-navigator-side {
   .box-sizing(border-box);
-  background-color: @barBorderColor;
   overflow-x: hidden;
 }
 
 .search-navigator-facet-box {
-  border-top: 1px solid @barBorderColor;
   background-color: @barBackgroundColor;
   font-size: @baseFontSize;
 }

diff --git a/server/sonar-web/src/main/less/issues.less b/server/sonar-web/src/main/less/issues.less
index e3a58587aadb9d192b7974f3c63eb9b4ae9a9957..88b13ff20aa0c125513533160660351895cce600 100644 (file)
--- a/server/sonar-web/src/main/less/issues.less
+++ b/server/sonar-web/src/main/less/issues.less
@@ -7,14 +7,6 @@
 
 .issues {
 
-//  &.sticky {
-//
-//    .issues-workspace-list,
-//    .issues-workspace-component-viewer {
-//      padding-top: 22px + 5px + 5px + 1px + 10px;
-//    }
-//
-//  }
 }
 
 .issues-workspace-list-component {
@@ -36,7 +28,6 @@
 
 .issues-workspace-component-viewer {
   display: none;
-  padding: 1px 10px;
   min-height: 100vh;
 
   .code-issue-modern {

diff --git a/server/sonar-web/src/main/less/layout-new.less b/server/sonar-web/src/main/less/layout-new.less
index a906046e4b333ace25558f2bc660e31845bc0695..4854ccdc00971b0a44b19c87fb2f573e0ba1412e 100644 (file)
--- a/server/sonar-web/src/main/less/layout-new.less
+++ b/server/sonar-web/src/main/less/layout-new.less
@@ -13,6 +13,7 @@ html {
 
 body {
   min-width: @pageWidth;
+  min-height: 100vh;
 }
 
 .container {
@@ -52,3 +53,17 @@ body {
   float: left;
   width: @containerWidth - @sideWidth;
 }
+
+.face-bar {
+  background-color: @barBackgroundColor;
+}
+
+.face-main {
+  margin: -10px;
+  padding: 10px;
+  background-color: #fff;
+}
+
+.container-side + .face-main {
+  box-shadow: -6px 0 10px 0 rgba(0, 0, 0, 0.075);
+}

diff --git a/server/sonar-web/src/main/less/layout.less b/server/sonar-web/src/main/less/layout.less
index bb3b65bef9bf10deac964f11845dc6de1a49430e..236075fc815bf2e943445872bef8c15e8073b573 100644 (file)
--- a/server/sonar-web/src/main/less/layout.less
+++ b/server/sonar-web/src/main/less/layout.less
@@ -131,13 +131,14 @@
 }
 
 #footer {
-  padding: 4px 0;
+  position: relative;
   clear: both;
 }
 
 #body {
   position: relative;
   padding-top: 10px;
+  padding-bottom: 10px;
 }
 
 .with_sidebar {

diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less
index 327357f513af604c240a051a9d035707cad3a626..11b53fbc9d1bf6df13420978509631b6aeb5a7bf 100644 (file)
--- a/server/sonar-web/src/main/less/style.less
+++ b/server/sonar-web/src/main/less/style.less
@@ -35,10 +35,10 @@
   FOOTER
 */
 #ftlinks {
-  background: #fff;
+  background: @barBackgroundColor;
   color: #262626;
   text-align: center;
-  border-top: 1px solid #fff;
+  border-top: 1px solid @barBackgroundColor;
   font-size: 85%;
   padding: 10px 0;
   line-height: 1.4;

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
index a7d9e3027b1c6b76a7f42c3b2b67b429c676b191..bd4e8d94197eecdb30d71372a50e3452e70f26fd 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/coding_rules/index.html.erb
@@ -2,5 +2,7 @@
   <script>require(['coding-rules/app']);</script>
 <% end %>
 
+<% content_for :body_class do %>face-bar<% end %>
+
 
 <div class="coding-rules search-navigator"></div>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
index 5741c2c169a46057f793d388b6bf679b82128608..d7cc60c36bd78f6c5abd3910b7a7843e6e9507ea 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/issues/search.html.erb
@@ -2,4 +2,6 @@
   <script>require(['issues/app-new']);</script>
 <% end %>
 
+<% content_for :body_class do %>face-bar<% end %>
+
 <div class="issues search-navigator"></div>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
index be7b6ade97e752c9ef16ac21731614d7f4c96589..95eb64911bd48548dbfcd62f83cac5cfa41cd5cd 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
@@ -43,4 +43,4 @@
   </script>
   <%= yield :script -%>
 </head>
-<body>
+<body class="<%= yield :body_class -%>">