Commit 31e51dd1 authored by gitlabhq's avatar gitlabhq

button common style + flash messages fix

parent 46bebac9
...@@ -178,7 +178,7 @@ input.ssh_project_url { ...@@ -178,7 +178,7 @@ input.ssh_project_url {
position:fixed; position:fixed;
z-index:10001; z-index:10001;
top:0px; top:0px;
width:980px; width:100%;
margin-bottom:15px; margin-bottom:15px;
overflow:hidden; overflow:hidden;
background:white; background:white;
...@@ -368,3 +368,6 @@ body.dashboard.project-page .news-feed .project-updates a.project-update span.up ...@@ -368,3 +368,6 @@ body.dashboard.project-page .news-feed .project-updates a.project-update span.up
body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;} body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;} body.dashboard.project-page .news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
/* eo Dashboard Page */ /* eo Dashboard Page */
body.project-page .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
%br %br
= f.text_area :description = f.text_area :description
.clear .clear
%hr %br
.actions .actions
= f.submit 'Save', :class => "lbutton" = f.submit 'Save', :class => "grey-button"
:javascript :javascript
$(function(){ $(function(){
......
%h2= @admin_project.name %h2= @admin_project.name
= render 'form' = render 'form'
= link_to 'Back', admin_projects_path, :class => "right lbutton" %br
= link_to 'Show', [:admin, @admin_project], :class => "right lbutton" = link_to 'Back', admin_projects_path, :class => ""
\ No newline at end of file |
= link_to 'Show', [:admin, @admin_project], :class => ""
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
%th Last Commit %th Last Commit
%th %th
%th %th
%th
- @admin_projects.each do |project| - @admin_projects.each do |project|
%tr %tr
...@@ -16,9 +15,8 @@ ...@@ -16,9 +15,8 @@
%td= project.path %td= project.path
%td= project.users_projects.count %td= project.users_projects.count
%td= last_commit(project) %td= last_commit(project)
%td= link_to 'Show', [:admin, project]
%td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}" %td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}"
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
= paginate @admin_projects = paginate @admin_projects
= link_to 'New Project', new_admin_project_path, :class => "lbutton" = link_to 'New Project', new_admin_project_path, :class => "grey-button"
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
= render 'form' = render 'form'
= link_to 'Back', admin_projects_path, :class => 'right lbutton' %br
\ No newline at end of file = link_to 'Back', admin_projects_path, :class => ''
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
= @admin_project.description = @admin_project.description
%tr %tr
%td{:colspan => 2} %td{:colspan => 2}
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "lbutton" = link_to 'Edit', edit_admin_project_path(@admin_project), :class => "grey-button"
= link_to 'Back', admin_projects_path, :class => "right lbutton"
.span-14 .span-14
...@@ -58,4 +57,4 @@ ...@@ -58,4 +57,4 @@
%td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled %td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "lbutton" = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "grey-button"
...@@ -6,29 +6,32 @@ ...@@ -6,29 +6,32 @@
- @admin_team_member.errors.full_messages.each do |msg| - @admin_team_member.errors.full_messages.each do |msg|
%li= msg %li= msg
.span-10
- if @admin_team_member.new_record? - if @admin_team_member.new_record?
.field .span-6
= f.label :user_id = f.label :user_id
%br .span-6
= f.select :user_id, User.all.map { |user| [user.name, user.id] } = f.select :user_id, User.all.map { |user| [user.name, user.id] }
.field .span-6
= f.label :project_id = f.label :project_id
%br .span-6
= f.select :project_id, Project.all.map { |user| [user.name, user.id] } = f.select :project_id, Project.all.map { |user| [user.name, user.id] }
.span-10
.span-6 .span-6
%b Access: %b Access:
.span-8 .span-6
= f.check_box :read = f.check_box :read
Web Access (Browse Repo) Web Access (Browse Repo)
.span-8 .span-6
= f.check_box :write = f.check_box :write
Git Access (User will be added to commiters list) Git Access (User will be added to commiters list)
.span-6.append-bottom .span-6
= f.check_box :admin = f.check_box :admin
Admin (Can manage project) Admin (Can manage project)
%hr %br
.actions .actions
= f.submit 'Save' = f.submit 'Save', :class => "grey-button"
:javascript
$('select#team_member_user_id').selectmenu({width:300});
$('select#team_member_project_id').selectmenu({width:300});
= render 'form' = render 'form'
%br
= link_to 'Show', admin_team_member_path(@admin_team_member) = link_to 'Show', admin_team_member_path(@admin_team_member)
\| \|
= link_to 'Back', admin_team_members_path = link_to 'Back', admin_team_members_path
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
%th Added %th Added
%th %th
%th %th
%th
- members.each do |tm| - members.each do |tm|
- user = tm.user - user = tm.user
%tr %tr
...@@ -20,11 +19,10 @@ ...@@ -20,11 +19,10 @@
%td.span-1= check_box_tag "commit", 1, project.writers.include?(user), :disabled => :disabled %td.span-1= check_box_tag "commit", 1, project.writers.include?(user), :disabled => :disabled
%td.span-2= check_box_tag "admin", 1, project.admins.include?(user), :disabled => :disabled %td.span-2= check_box_tag "admin", 1, project.admins.include?(user), :disabled => :disabled
%td.span-3= time_ago_in_words(tm.updated_at) + " ago" %td.span-3= time_ago_in_words(tm.updated_at) + " ago"
%td= link_to 'Show', admin_team_member_path(tm)
%td= link_to 'Edit', edit_admin_team_member_path(tm), :id => "edit_#{dom_id(tm)}" %td= link_to 'Edit', edit_admin_team_member_path(tm), :id => "edit_#{dom_id(tm)}"
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
%br %br
= paginate @admin_team_members = paginate @admin_team_members
= link_to 'New Team Member', new_admin_team_member_path = link_to 'New Team Member', new_admin_team_member_path, :class => "grey-button"
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
= render 'form' = render 'form'
%br
= link_to 'Back', admin_team_members_path = link_to 'Back', admin_team_members_path
%p#notice= notice
#infoblock #infoblock
%p %p
%b Name: %b Name:
...@@ -9,22 +7,25 @@ ...@@ -9,22 +7,25 @@
= @admin_team_member.project.name = @admin_team_member.project.name
%p %p
%b Since: %b Since:
= @admin_team_member.updated_at = @admin_team_member.updated_at.stamp("Nov 11, 2010")
#infoblock #infoblock
.span-6 .span-6
%b Access: %b Access:
.span-8 %br
.span-6
= check_box_tag "read", 1, @admin_team_member.read, :disabled => :disabled = check_box_tag "read", 1, @admin_team_member.read, :disabled => :disabled
Web Access (Browse Repo) Web Access (Browse Repo)
.span-8 %br
.span-6
= check_box_tag "commit", 1, @admin_team_member.write, :disabled => :disabled = check_box_tag "commit", 1, @admin_team_member.write, :disabled => :disabled
Git Access (User will be added to commiters list) Git Access (User will be added to commiters list)
%br
.span-6.append-bottom .span-6.append-bottom
= check_box_tag "admin", 1, @admin_team_member.admin, :disabled => :disabled = check_box_tag "admin", 1, @admin_team_member.admin, :disabled => :disabled
Admin (Can manage project) Admin (Can manage project)
%hr %br
= link_to 'Edit', edit_admin_team_member_path(@admin_project) = link_to 'Edit', edit_admin_team_member_path(@admin_project)
\| \|
......
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
%br %br
= f.text_field :twitter = f.text_field :twitter
.clear .clear
%hr %br
.actions .actions
= f.submit 'Save', :class => "lbutton" = f.submit 'Save', :class => "grey-button"
= render 'form' = render 'form'
= link_to 'Back', admin_users_path, :class => "right lbutton" %br
= link_to 'Show', [:admin, @admin_user], :class => "right lbutton" = link_to 'Back', admin_users_path, :class => ""
|
= link_to 'Show', [:admin, @admin_user], :class => ""
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
%th Projects %th Projects
%th %th
%th %th
%th
- @admin_users.each do |user| - @admin_users.each do |user|
%tr %tr
...@@ -14,9 +13,9 @@ ...@@ -14,9 +13,9 @@
%td= link_to user.name, [:admin, user] %td= link_to user.name, [:admin, user]
%td= user.email %td= user.email
%td= user.users_projects.count %td= user.users_projects.count
%td= link_to 'Show', [:admin, user]
%td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}" %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
%td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete %td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
= paginate @admin_users = paginate @admin_users
= link_to 'New User', new_admin_user_path, :class => "lbutton" %br
= link_to 'New User', new_admin_user_path, :class => "grey-button"
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
= render 'form' = render 'form'
= link_to 'Back', admin_users_path, :class => "right lbutton" %br
= link_to 'Back', admin_users_path, :class => ""
...@@ -44,8 +44,7 @@ ...@@ -44,8 +44,7 @@
= @admin_user.twitter = @admin_user.twitter
%tr %tr
%td{:colspan => 2} %td{:colspan => 2}
= link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton" = link_to 'Edit', edit_admin_user_path(@admin_user), :class => "grey-button"
= link_to 'Back', admin_users_path, :class => "right lbutton"
.span-14 .span-14
%h2 Projects %h2 Projects
...@@ -59,6 +58,7 @@ ...@@ -59,6 +58,7 @@
%th Git %th Git
%th Admin %th Admin
%th %th
%th
- @admin_user.users_projects.each do |tm| - @admin_user.users_projects.each do |tm|
- project = tm.project - project = tm.project
...@@ -71,4 +71,4 @@ ...@@ -71,4 +71,4 @@
%td= link_to 'Edit', edit_admin_team_member_path(tm) %td= link_to 'Edit', edit_admin_team_member_path(tm)
%td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete %td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton" = link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "grey-button"
- content_for(:body_class, "project-page commits-page") - content_for(:body_class, "project-page commits-page")
-#%a.right.button{:href => "#"} Download
-#-if can? current_user, :admin_project, @project
%a.right.button.blue{:href => "#"} EDIT
%h2.icon %h2.icon
%span %span
%d %d
= "#{truncate(@commit.safe_message, :length => 50)}" = "#{truncate(@commit.safe_message, :length => 50)}"
.right .right
= link_to 'Browse Code', tree_project_ref_path(@project, @commit.id), :class => "button" = link_to 'Browse Code', tree_project_ref_path(@project, @commit.id), :class => "browse-code button yellow"
-#= link_to 'Back', project_commits_path(@project), :class => "button"
%table.round-borders %table.round-borders
%thead %thead
%th{:colspan => 2} Details %th{:colspan => 2} Details
......
...@@ -20,6 +20,5 @@ ...@@ -20,6 +20,5 @@
= f.label :closed = f.label :closed
%br %br
= f.check_box :closed = f.check_box :closed
%hr
.form-row .form-row
= f.submit 'Save', :class => "lbutton vm" = f.submit 'Save', :class => "grey-button"
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
- if can? current_user, :write_issue, issue - if can? current_user, :write_issue, issue
= link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true
- if can?(current_user, :admin_issue, @project) || issue.author == current_user - if can?(current_user, :admin_issue, @project) || issue.author == current_user
= link_to 'Destroy', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}" = link_to 'Remove', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}"
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.top_panel_issues .top_panel_issues
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
%div{:class => "left", :style => "margin-right: 10px;" } %div{:class => "left", :style => "margin-right: 10px;" }
= link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm" = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "grey-button", :style => "margin-top:5px;"
= form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
= hidden_field_tag :project_id, @project.id, { :id => 'project_id' } = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' } = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body{ :class => body_class('project-page'), :id => yield(:boyd_id)} %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
#container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
#container
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
.project-container .project-container
.project-sidebar .project-sidebar
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body{ :class => body_class, :id => yield(:boyd_id)} %body{ :class => body_class, :id => yield(:boyd_id)}
#container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
#container
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
= render :partial => "layouts/page_title" = render :partial => "layouts/page_title"
= yield = yield
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body{ :class => body_class('project-page'), :id => yield(:boyd_id)} %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
#container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
#container
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
.project-container .project-container
.project-sidebar .project-sidebar
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_URI = "#{request.env["REQUEST_URI"]}";
REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
%body{ :class => body_class('project-page'), :id => yield(:boyd_id)} %body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
#container
= render :partial => "layouts/flash" = render :partial => "layouts/flash"
#container
= render :partial => "layouts/head_panel" = render :partial => "layouts/head_panel"
.project-container .project-container
.project-sidebar .project-sidebar
......
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
.clear .clear
%br %br
= f.submit 'Add note', :class => "button", :id => "submit_note" = f.submit 'Add note', :class => "grey-button", :id => "submit_note"
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
%div#new-member-holder %div#new-member-holder
= link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "lbutton vm" = link_to "Add new", new_project_team_member_path(@project), :remote => true, :class => "grey-button"
%br
%table.round-borders#team-table %table.round-borders#team-table
%thead %thead
%th Name %th Name
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.span-6.append-bottom .span-6.append-bottom
%b Name %b Name
%br .span-6
= f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }) = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" })
.span-6 .span-6
%b Access: %b Access:
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
.span-6.append-bottom .span-6.append-bottom
= f.check_box :admin = f.check_box :admin
Admin Admin
%hr %br
.span-6 .span-6
= f.submit 'Save', :class => "lbutton vm" = f.submit 'Save', :class => "grey-button"
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
%td= check_box_tag "admin", 1, member.admin, :disabled => :disabled %td= check_box_tag "admin", 1, member.admin, :disabled => :disabled
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
%td %td
= link_to 'Cancel', project_team_member_path(:project_id => @project, :id => member.id), :confirm => 'Are you sure?', :method => :delete, :class => "lbutton negative delete-team-member", :remote => true = link_to 'Cancel', project_team_member_path(:project_id => @project, :id => member.id), :confirm => 'Are you sure?', :method => :delete, :class => "grey-button negative delete-team-member", :remote => true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment