SONAR-5169 Apply feedback

7 files changed, 29 insertions, 23 deletions

diff --git a/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee b/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee
index 663b2ba9a13..fad2d2da9ba 100644
--- a/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee
+++ b/sonar-server/src/main/coffee/navigator/filters/date-filter-view.coffee
@@ -8,4 +8,7 @@ define [
 
     render: ->
       super
-      @detailsView.$('input').prop('placeholder', '1970-01-31').datepicker dateFormat: 'yy-mm-dd'
+      @detailsView.$('input').prop('placeholder', '1970-01-31').datepicker
+        dateFormat: 'yy-mm-dd'
+        changeMonth: true
+        changeYear: true
diff --git a/sonar-server/src/main/js/navigator/filters/range-filters.js b/sonar-server/src/main/js/navigator/filters/range-filters.js
index 8883a9e4ed0..5d42e5f3d03 100644
--- a/sonar-server/src/main/js/navigator/filters/range-filters.js
+++ b/sonar-server/src/main/js/navigator/filters/range-filters.js
@@ -168,7 +168,11 @@ define(['navigator/filters/base-filters', 'common/handlebars-extensions'], funct
       RangeFilterView.prototype.render.apply(this, arguments);
       this.detailsView.$('input')
           .prop('placeholder', '1970-01-31')
-          .datepicker({ dateFormat: 'yy-mm-dd' });
+          .datepicker({
+            dateFormat: 'yy-mm-dd',
+            changeMonth: true,
+            changeYear: true
+          });
     },
 
 
diff --git a/sonar-server/src/main/js/third-party/jquery-ui.js b/sonar-server/src/main/js/third-party/jquery-ui.js
index 80509fff4aa..c5517d8448a 100755
--- a/sonar-server/src/main/js/third-party/jquery-ui.js
+++ b/sonar-server/src/main/js/third-party/jquery-ui.js
@@ -5378,7 +5378,7 @@ $.extend(Datepicker.prototype, {
 
 		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
 			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + t(prevText) + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + t(prevText) + "</span></a>" :
+			" title='" + t(prevText) + "'><i class='icon-arrow-" + ( isRTL ? "right" : "left") + "'></i> " + t(prevText) + "</a>" :
 			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ t(prevText) +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + t(prevText) + "</span></a>"));
 
 		nextText = this._get(inst, "nextText");
@@ -5388,7 +5388,7 @@ $.extend(Datepicker.prototype, {
 
 		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
 			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + t(nextText) + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + t(nextText) + "</span></a>" :
+			" title='" + t(nextText) + "'>" + t(nextText) + " <i class='icon-arrow-" + ( isRTL ? "left" : "right") + "'></i></a>" :
 			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ t(nextText) + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + t(nextText) + "</span></a>"));
 
 		currentText = this._get(inst, "currentText");
diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index e75e4c16e6b..b81f54df899 100644
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -9,9 +9,7 @@
   font-style: normal;
 }
 
-[class^="icon-"], [class*=" icon-"],
-.ui-icon-circle-triangle-e,
-.ui-icon-circle-triangle-w {
+[class^="icon-"], [class*=" icon-"] {
   font-family: 'sonar';
   speak: none;
   font-style: normal;
@@ -241,23 +239,11 @@ a[class^="icon-"], a[class*=" icon-"] {
   position: relative;
   top: -2px;
 }
-.icon-arrow-left:before,
-.ui-icon-circle-triangle-w:before {
-  position: relative;
-  top: 1px;
+.icon-arrow-left:before {
   content: "\f0d9";
 }
-.ui-icon-circle-triangle-w:before {
-  margin-right: 3px;
-}
-.icon-arrow-right:before,
-.ui-icon-circle-triangle-e:after {
+.icon-arrow-right:before {
   content: "\f0da";
-  position: relative;
-  top: 1px;
-}
-.ui-icon-circle-triangle-e:after {
-  margin-left: 3px;
 }
 .icon-dropdown:before {
   content: "\f0d7";
diff --git a/sonar-server/src/main/less/jquery-ui.less b/sonar-server/src/main/less/jquery-ui.less
index 6c03ea5cdd9..f5268fe87bd 100644
--- a/sonar-server/src/main/less/jquery-ui.less
+++ b/sonar-server/src/main/less/jquery-ui.less
@@ -398,7 +398,7 @@ button.ui-button::-moz-focus-inner {
   right: 2px;
 }
 .ui-datepicker .ui-datepicker-title {
-  margin: 0 2.3em;
+  margin: 0 48px;
   line-height: 1.8em;
   color: #444;
   text-align: center;
@@ -454,6 +454,10 @@ button.ui-button::-moz-focus-inner {
   float: left;
 }
 
+.ui-datepicker-today { background-color: @contextBackground; }
+.ui-datepicker-current-day { background-color: @highlighted; }
+.ui-datepicker-current-day a { color: #fff; }
+
 /* with multiple calendars */
 .ui-datepicker.ui-datepicker-multi {
   width: auto;
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb
index 738c5b8ff62..cb0b7984c73 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_create_form.html.erb
@@ -35,5 +35,10 @@
 
 <script>
   $j("#create-action-plan-form").modalForm();
+  $j("[name=deadline]").datepicker({
+    dateFormat: 'yy-mm-dd',
+    changeMonth: true,
+    changeYear: true
+  });
 </script>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
index 0eac8938444..0da20a1070f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/action_plans/_edit_form.html.erb
@@ -35,6 +35,10 @@
 
 <script>
   $j("#edit-action-plan-form").modalForm();
-  $j("[name=deadline]").datepicker({ dateFormat: 'yy-mm-dd' });
+  $j("[name=deadline]").datepicker({
+    dateFormat: 'yy-mm-dd',
+    changeMonth: true,
+    changeYear: true
+  });
 </script>