kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed AR error messages style (same as flash errors). 

Fixed flash styles for IE6.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@610 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-08-12 11:25:25 +00:00
parent 58ea44a462
commit e9ba8a4494
5 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -211,7 +211,7 @@ module ApplicationHelper
end end
content_tag("div", content_tag("div",
content_tag( content_tag(
options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :" options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
) + ) +
content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }), content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
"id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation" "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"

6
app/views/layouts/base.rhtml
View File

@ -138,8 +138,10 @@
</div> </div>
<div id="content"> <div id="content">
<%= content_tag('div', flash[:error], :id => 'flash', :class => 'error') if flash[:error] %> <div id="flash">
<%= content_tag('div', flash[:notice], :id => 'flash', :class => 'notice') if flash[:notice] %> <%= content_tag('div', flash[:error], :class => 'error') if flash[:error] %>
<%= content_tag('div', flash[:notice], :class => 'notice') if flash[:notice] %>
</div>
<%= yield %> <%= yield %>
</div> </div>

BIN
public/images/alert.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 581 B

BIN
public/images/false.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 588 B

47
public/stylesheets/application.css
View File

@ -315,36 +315,6 @@ table.list tbody th {
color: #777; color: #777;
} }
/********** Validation error messages *************/
#errorExplanation {
width: 400px;
border: 0;
padding: 7px;
padding-bottom: 3px;
margin-bottom: 0px;
}
#errorExplanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 10px 26px;
font-size: 1em;
margin: -7px;
background: url(../images/alert.png) no-repeat 6px 6px;
}
#errorExplanation p {
color: #333;
margin-bottom: 0;
padding: 5px;
}
#errorExplanation ul li {
font-size: 1em;
list-style: none;
margin-left: -16px;
}
/*========== Drop down menu ==============*/ /*========== Drop down menu ==============*/
div.menu { div.menu {
background-color: #FFFFFF; background-color: #FFFFFF;
@ -696,24 +666,27 @@ padding-left: 26px;
vertical-align: bottom; vertical-align: bottom;
} }
/***** Flash messages ****/ /***** Flash & error messages ****/
#flash { #flash div, #errorExplanation {
padding: 4px 4px 4px 30px; padding: 4px 4px 4px 30px;
margin-bottom: 16px; margin-bottom: 16px;
font-size: 1.2em; font-size: 1.1em;
border: 2px solid; border: 2px solid;
} }
#flash.error { #flash div.error, #errorExplanation {
background: url(../images/false.png) 8px 50% no-repeat; background: url(../images/false.png) 8px 5px no-repeat;
background-color: #ffe3e3; background-color: #ffe3e3;
border-color: #dd0000; border-color: #dd0000;
color: #550000; color: #550000;
} }
#flash.notice { #flash div.notice {
background: url(../images/true.png) 8px 50% no-repeat; background: url(../images/true.png) 8px 5px no-repeat;
background-color: #dfffdf; background-color: #dfffdf;
border-color: #9fcf9f; border-color: #9fcf9f;
color: #005f00; color: #005f00;
} }
#errorExplanation ul { margin-bottom: 0px; }
#errorExplanation ul li { list-style: none; margin-left: -16px;}