deac
/
gitlabhq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove old alert messages

4-2-stable
Dmitriy Zaporozhets 2013-01-30 16:53:18 +02:00
parent e2fb18a3ec
commit b742f47e89
35 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View File

@ -67,6 +67,7 @@
@extend .btn-primary;
}
&.btn-close,
&.btn-remove {
@extend .btn-danger;
border-color: #BD362F;

7
app/assets/stylesheets/gitlab_bootstrap/common.scss
View File

@ -86,9 +86,14 @@
/** ALERT MESSAGES **/
.alert-message { @extend .alert; }
.alert-messag.success { @extend .alert-success; }
.alert-message.error { @extend .alert-error; }
.alert.alert-disabled {
background: #EEE;
color: #777;
border-color: #DDD;
}
/** AVATARS **/
img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }

2
app/views/admin/groups/edit.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix.group_name_holder
= f.label :name do

2
app/views/admin/groups/new.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for [:admin, @group] do |f|
- if @group.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix
= f.label :name do

2
app/views/admin/hooks/index.html.haml
View File

@ -7,7 +7,7 @@
= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
-if @hook.errors.any?
.alert-message.block-message.error
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.clearfix

2
app/views/admin/projects/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_for [:admin, project] do |f|
-if project.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- project.errors.full_messages.each do |msg|
%li= msg

2
app/views/admin/projects/members/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
-if @team_member_relation.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @team_member_relation.errors.full_messages.each do |msg|
%li= msg

2
app/views/admin/teams/edit.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for @team, url: admin_team_path(@team), method: :put do |f|
- if @team.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @team.errors.full_messages.first
.clearfix.team_name_holder
= f.label :name do

2
app/views/admin/teams/members/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_tag admin_team_member_path(@team, @member), method: :put do
-if @member.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @member.errors.full_messages.each do |msg|
%li= msg

2
app/views/admin/teams/new.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for @team, url: admin_teams_path do |f|
- if @team.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @team.errors.full_messages.first
.clearfix
= f.label :name do

2
app/views/admin/teams/projects/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_tag admin_team_project_path(@team, @project), method: :put do
-if @project.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @project.errors.full_messages.each do |msg|
%li= msg

2
app/views/commit/huge_commit.html.haml
View File

@ -1,3 +1,3 @@
= render "commits/commit_box"
.alert-message.block-message.error
.alert.alert-error
%h4 Commit diffs are too big to be displayed

2
app/views/commits/_diffs.html.haml
View File

@ -1,5 +1,5 @@
- if @suppress_diff
.alert-message.block-message
.alert.alert-block
%p
%strong Warning! Large commit with more then #{Commit::DIFF_SAFE_SIZE} files changed.
%p To prevent performance issue we rejected diff information.

2
app/views/deploy_keys/_form.html.haml
View File

@ -1,7 +1,7 @@
%div
= form_for [@project, @key], url: project_deploy_keys_path do |f|
-if @key.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @key.errors.full_messages.each do |msg|
%li= msg

2
app/views/groups/new.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for @group do |f|
- if @group.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @group.errors.full_messages.first
.clearfix
= f.label :name do

2
app/views/hooks/index.html.haml
View File

@ -10,7 +10,7 @@
= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
-if @hook.errors.any?
.alert-message.block-message.error
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.clearfix

2
app/views/issues/_form.html.haml
View File

@ -2,7 +2,7 @@
%h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
= form_for [@project, @issue] do |f|
-if @issue.errors.any?
.alert-message.block-message.error
.alert.alert-error
- @issue.errors.full_messages.each do |msg|
%span= msg
%br

2
app/views/keys/_form.html.haml
View File

@ -1,7 +1,7 @@
%div
= form_for @key do |f|
-if @key.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @key.errors.full_messages.each do |msg|
%li= msg

2
app/views/merge_requests/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
-if @merge_request.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @merge_request.errors.full_messages.each do |msg|
%li= msg

6
app/views/merge_requests/show/_mr_accept.html.haml
View File

@ -1,5 +1,5 @@
- unless can?(current_user, :accept_mr, @project)
.alert-message
.alert
%strong Only masters can accept MR
@ -29,14 +29,14 @@
%strong This repository does not have satellite. Ask administrator to fix this issue
.automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-info
.alert.alert-disabled
%span
= link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
 
%strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
.alert-message
.alert
%strong
%i.icon-refresh
Checking for ability to automatically merge…

2
app/views/merge_requests/show/_mr_ci.html.haml
View File

@ -23,7 +23,7 @@
= link_to "Build page", ci_build_details_path(@merge_request)
.ci_widget
.alert-message
.alert
%strong
%i.icon-refresh
Checking for CI status for #{@merge_request.last_commit_short_sha}

2
app/views/merge_requests/show/_mr_title.html.haml
View File

@ -17,7 +17,7 @@
%li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
%li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
%i.icon-edit

2
app/views/milestones/_form.html.haml
View File

@ -7,7 +7,7 @@
= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
-if @milestone.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @milestone.errors.full_messages.each do |msg|
%li= msg

2
app/views/profiles/account.html.haml
View File

@ -35,7 +35,7 @@
.padded
%p.slead After successful password update you will be redirected to login page where you should login with new password
-if @user.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @user.errors.full_messages.each do |msg|
%li= msg

2
app/views/profiles/show.html.haml
View File

@ -15,7 +15,7 @@
= form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
-if @user.errors.any?
%div.alert-message.block-message.error
%div.alert.alert-error
%ul
- @user.errors.full_messages.each do |msg|
%li= msg

2
app/views/projects/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_for(@project, remote: true) do |f|
- if @project.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @project.errors.full_messages.each do |msg|
%li= msg

2
app/views/projects/_new_form.html.haml
View File

@ -1,6 +1,6 @@
= form_for(@project, remote: true) do |f|
- if @project.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @project.errors.full_messages.first
.clearfix.project_name_holder
= f.label :name do

2
app/views/protected_branches/index.html.haml
View File

@ -14,7 +14,7 @@
- if can? current_user, :admin_project, @project
= form_for [@project, @protected_branch] do |f|
-if @protected_branch.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @protected_branch.errors.full_messages.each do |msg|
%li= msg

2
app/views/services/_gitlab_ci.html.haml
View File

@ -16,7 +16,7 @@
%hr
= form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
- if @service.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @service.errors.full_messages.each do |msg|
%li= msg

2
app/views/snippets/_form.html.haml
View File

@ -4,7 +4,7 @@
.snippet-form-holder
= form_for [@project, @snippet] do |f|
-if @snippet.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @snippet.errors.full_messages.each do |msg|
%li= msg

2
app/views/team_members/_form.html.haml
View File

@ -3,7 +3,7 @@
%hr
= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
-if @user_project_relation.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @user_project_relation.errors.full_messages.each do |msg|
%li= msg

2
app/views/teams/edit.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for @team, url: teams_path do |f|
- if @team.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @team.errors.full_messages.first
.clearfix
= f.label :name do

2
app/views/teams/members/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_tag admin_team_member_path(@team, @member), method: :put do
-if @member.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @member.errors.full_messages.each do |msg|
%li= msg

2
app/views/teams/new.html.haml
View File

@ -2,7 +2,7 @@
%hr
= form_for @team, url: teams_path do |f|
- if @team.errors.any?
.alert-message.block-message.error
.alert.alert-error
%span= @team.errors.full_messages.first
.clearfix
= f.label :name do

2
app/views/teams/projects/_form.html.haml
View File

@ -1,6 +1,6 @@
= form_tag team_project_path(@team, @project), method: :put do
-if @project.errors.any?
.alert-message.block-message.error
.alert.alert-error
%ul
- @project.errors.full_messages.each do |msg|
%li= msg