Download as
Browse Code »

Commit d52a3281dccefa5fcb774b9f0314abba7edfc820

Authored by Dmitriy Zaporozhets
2 parents 2e8f4bf3 1a4c9118
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'small-ui-improvements' into 'master' 

Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
Showing 2 changed files with 4 additions and 5 deletions   Show diff stats
app/views/admin/users/_form.html.haml
  Diff comments   View file @d52a328
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 = form_for [:admin, @user], html: { class: 'form-horizontal' } do |f| 2 = form_for [:admin, @user], html: { class: 'form-horizontal' } do |f|
3 -if @user.errors.any? 3 -if @user.errors.any?
4 #error_explanation 4 #error_explanation
5 - %ul.unstyled.alert.alert-danger 5 + .alert.alert-danger
6 - @user.errors.full_messages.each do |msg| 6 - @user.errors.full_messages.each do |msg|
7 - %li= msg 7 + %p= msg
8 8
9 %fieldset 9 %fieldset
10 %legend Account 10 %legend Account
app/views/projects/wikis/_form.html.haml
  Diff comments   View file @d52a328
1 = form_for [@project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f| 1 = form_for [@project, @page], method: @page.persisted? ? :put : :post, html: { class: 'form-horizontal' } do |f|
2 -if @page.errors.any? 2 -if @page.errors.any?
3 #error_explanation 3 #error_explanation
4 - %h2= "#{pluralize(@page.errors.count, "error")} prohibited this wiki from being saved:"  
5 - %ul 4 + .alert.alert-danger
6 - @page.errors.full_messages.each do |msg| 5 - @page.errors.full_messages.each do |msg|
7 - %li= msg 6 + %p= msg
8 7
9 = f.hidden_field :title, value: @page.title 8 = f.hidden_field :title, value: @page.title
10 .form-group 9 .form-group