jro_apps/redmine Commit - r597:2d5ac54d2eb9

0

app/controllers/account_controller.rb +3 -3

                      end
                      redirect_back_or_default :controller => 'my', :action => 'page'
                    else
-                     flash.now[:notice] = l(:notice_account_invalid_creditentials)
+                     flash.now[:error] = l(:notice_account_invalid_creditentials)
                    end
                  end
                end
                    if request.post?
                      user = User.find_by_mail(params[:mail])
                      # user not found in db
-                     flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
+                     flash.now[:error] = l(:notice_account_unknown_email) and return unless user
                      # user uses an external authentification
-                     flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
+                     flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
                      # create a new token for password recovery
                      token = Token.new(:user => user, :action => "recovery")
                      if token.save

0

app/controllers/custom_fields_controller.rb +1 -1

                  @custom_field = CustomField.find(params[:id]).destroy
                  redirect_to :action => 'list', :tab => @custom_field.type
                rescue
-                 flash[:notice] = "Unable to delete custom field"
+                 flash[:error] = "Unable to delete custom field"
                  redirect_to :action => 'list'
                end
              end

0

app/controllers/enumerations_controller.rb +1 -1

                  flash[:notice] = l(:notice_successful_delete)
                  redirect_to :action => 'list'
                rescue
-                 flash[:notice] = "Unable to delete enumeration"
+                 flash[:error] = "Unable to delete enumeration"
                  redirect_to :action => 'list'
                end
              end

0

app/controllers/issue_categories_controller.rb +1 -1

                  @category.destroy
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
                rescue
-                 flash[:notice] = "Categorie can't be deleted"
+                 flash[:error] = "Categorie can't be deleted"
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
                end

0

app/controllers/issue_statuses_controller.rb +1 -1

                  IssueStatus.find(params[:id]).destroy
                  redirect_to :action => 'list'
                rescue
-                 flash[:notice] = "Unable to delete issue status"
+                 flash[:error] = "Unable to delete issue status"
                  redirect_to :action => 'list'
                end
              end

0

app/controllers/issues_controller.rb +2 -2

                      end
                    rescue ActiveRecord::StaleObjectError
                      # Optimistic locking exception
-                     flash[:notice] = l(:notice_locking_conflict)
+                     flash[:error] = l(:notice_locking_conflict)
                    end
                  end
                end
                      end
                    rescue ActiveRecord::StaleObjectError
                      # Optimistic locking exception
-                     flash[:notice] = l(:notice_locking_conflict)
+                     flash[:error] = l(:notice_locking_conflict)
                    end
                  end
                  @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }

0

app/controllers/my_controller.rb +2 -2

                # Change user's password
                def change_password
                  @user = self.logged_in_user
-                 flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
+                 flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
                  if @user.check_password?(params[:password])
                    @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                    if @user.save
                      return
                    end
                  else
-                   flash[:notice] = l(:notice_account_wrong_password)
+                   flash[:error] = l(:notice_account_wrong_password)
                  end
                  redirect_to :action => 'account'
                end

0

app/controllers/projects_controller.rb +1 -1

                  default_status = IssueStatus.default
                  unless default_status
-                   flash.now[:notice] = 'No default issue status defined. Please check your configuration.'
+                   flash.now[:error] = 'No default issue status defined. Please check your configuration.'
                    render :nothing => true, :layout => true
                    return
                  end

0

app/controllers/repositories_controller.rb +1 -1

                end
                def show_error
-                 flash.now[:notice] = l(:notice_scm_error)
+                 flash.now[:error] = l(:notice_scm_error)
                  render :nothing => true, :layout => true
                end

0

app/controllers/roles_controller.rb +1 -1

                def destroy
                  @role = Role.find(params[:id])
                  unless @role.members.empty?
-                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
+                   flash[:error] = 'Some members have this role. Can\'t delete it.'
                  else
                    @role.destroy
                  end

0

app/controllers/trackers_controller.rb +1 -1

                def destroy
                  @tracker = Tracker.find(params[:id])
                  unless @tracker.issues.empty?
-                   flash[:notice] = "This tracker contains issues and can\'t be deleted."
+                   flash[:error] = "This tracker contains issues and can\'t be deleted."
                  else
                    @tracker.destroy
                  end

0

app/controllers/users_controller.rb +1 -1

                  User.find(params[:id]).destroy
                  redirect_to :action => 'list'
                rescue
-                 flash[:notice] = "Unable to delete user"
+                 flash[:error] = "Unable to delete user"
                  redirect_to :action => 'list'
                end
              end

0

app/controllers/versions_controller.rb +1 -1

                  @version.destroy
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                rescue
-                 flash[:notice] = "Unable to delete version"
+                 flash[:error] = "Unable to delete version"
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                end

0

app/controllers/wiki_controller.rb +1 -1

                  end
                rescue ActiveRecord::StaleObjectError
                  # Optimistic locking exception
-                 flash[:notice] = l(:notice_locking_conflict)
+                 flash[:error] = l(:notice_locking_conflict)
                end
                # show page history

0

app/views/layouts/base.rhtml +4 -3

              	</div>
              	<div id="content">
-             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
-             		<%= yield %>
+             		<%= content_tag('div', flash[:error], :id => 'flash', :class => 'error') if flash[:error] %>
+             		<%= content_tag('div', flash[:notice], :id => 'flash', :class => 'notice') if flash[:notice] %>
+             		<%= yield %>
              	</div>
              	<div id="ajax-indicator" style="display:none;">
              </div>
              </body>
-             </html>
  No newline at end of file
+             </html>

0

public/stylesheets/application.css +22 0

		@@ -695,3 +695,25 background-image: url(../images/loading.gif);
695	695	padding-left: 26px;
696	696	vertical-align: bottom;
697	697	}
	698
	699	/*** Flash messages **/
	700	#flash {
	701	padding: 4px 4px 4px 30px;
	702	margin-bottom: 16px;
	703	font-size: 1.2em;
	704	border: 2px solid;
	705	}
	706
	707	#flash.error {
	708	background: url(../images/false.png) 8px 50% no-repeat;
	709	background-color: #ffe3e3;
	710	border-color: #dd0000;
	711	color: #550000;
	712	}
	713
	714	#flash.notice {
	715	background: url(../images/true.png) 8px 50% no-repeat;
	716	background-color: #dfffdf;
	717	border-color: #9fcf9f;
	718	color: #005f00;
	719	}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages