diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2015-06-22 11:38:07 +0200 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2015-06-22 11:38:07 +0200 |
| commit | 5c3f2459d6bf246b0a4d2ddccf7136ac864ab8a6 (patch) | |
| tree | 1d0712c04369024d4e01338e0040920f3d7c23fd /server/sonar-web/src/main/webapp | |
| parent | 4c899142d0af52e729e2a3903fbe23e09c309276 (diff) | |
| download | sonarqube-5c3f2459d6bf246b0a4d2ddccf7136ac864ab8a6.tar.gz sonarqube-5c3f2459d6bf246b0a4d2ddccf7136ac864ab8a6.zip | |
SONAR-6507 apply ui feedback
Diffstat (limited to 'server/sonar-web/src/main/webapp')
3 files changed, 20 insertions, 16 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_change_password_form.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_change_password_form.html.erb index 87bd160850c..c62a514c98e 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_change_password_form.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_change_password_form.html.erb @@ -6,15 +6,15 @@ <div class="modal-body"> <div class="modal-field"> <label for="old_password"><%= message('my_profile.password.old') -%>:</label> - <%= password_field_tag 'old_password', nil, {:autocomplete => 'off'} %> + <%= password_field_tag 'old_password', nil, {:autocomplete => 'off', :required => ''} %> </div> <div class="modal-field"> <label for="password"><%= message('my_profile.password.new') -%>:</label> - <%= password_field_tag 'password', nil, {:autocomplete => 'off'} %> + <%= password_field_tag 'password', nil, {:autocomplete => 'off', :required => ''} %> </div> <div class="modal-field"> <label for="password_confirmation"><%= message('my_profile.password.confirm') -%>:</label> - <%= password_field_tag 'password_confirmation', nil, {:autocomplete => 'off'} %> + <%= password_field_tag 'password_confirmation', nil, {:autocomplete => 'off', :required => ''} %> </div> </div> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_favorites.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_favorites.html.erb index 629abb7f285..3f70a93fd58 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_favorites.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/_favorites.html.erb @@ -1,9 +1,16 @@ +<% max_favorites = 5 %> + <h2 class="spacer-bottom"><%= message('my_profile.favorites.title') -%></h2> -<table class="data"> - <% for f in current_user.favourites %> - <tr> +<table class="data js-account-favorites"> + <% current_user.favourites.each_with_index do |f, index | %> + <tr <% if index >= max_favorites %>class="hidden"<% end %>> <td class="thin"><%= link_to_favourite f -%></td> <td><%= qualifier_icon f %> <%= link_to_resource f %></td> </tr> <% end %> </table> +<% if current_user.favourites.size > max_favorites %> +<div class="spacer-top little-spacer-left"> + <a class="js-show-all-favorites" href="#">Show All</a> +</div> +<% end %> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb index 34b20b53303..283cc21e1f8 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/index.html.erb @@ -69,13 +69,10 @@ </div> </div> -<script> - (function ($) { - $('html').addClass('dashboard-page'); - - <% if configuration('sonar.lf.enableGravatar', true) %> - var avatarHtml = Handlebars.helpers.avatarHelper('<%= current_user.email %>', 100).string; - $('.js-avatar').html(avatarHtml); - <% end %> - })(window.jQuery); -</script> +<% content_for :extra_script do %> + <script> + require(['apps/account/app'], function (App) { + App.start(); + }); + </script> +<% end %> |