tr.line_notes_row {
border-bottom:1px solid #DDD;
}
+
+/** FLASH **/
+#flash_container {
+ height:45px;
+ position:fixed;
+ z-index:10001;
+ top:0px;
+ width:100%;
+ margin-bottom:15px;
+ overflow:hidden;
+ background:white;
+ cursor:pointer;
+ border-bottom:1px solid #777;
+
+ h4 {
+ color:#444;
+ font-size:22px;
+ padding-top:5px;
+ margin:2px;
+ }
+}
padding-right:5px;
}
+.media-grid {
+ h3, h2 , h4 {
+ &.media_h {
+ padding-left:10px;
+ float:left;
+ }
+ }
+}
+
@import "reset_bootstrap.scss";
@import "top_panel.scss";
@import "projects.css.scss";
border-width: 1px;
}
-/** FLASH **/
-#flash_container {
- height:45px;
- position:fixed;
- z-index:10001;
- top:0px;
- width:100%;
- margin-bottom:15px;
- overflow:hidden;
- background:white;
- cursor:pointer;
- border-bottom:1px solid #777;
-
- h4 {
- color:#444;
- font-size:22px;
- padding-top:5px;
- margin:2px;
- }
-}
.errors_holder {
@team_member.destroy
respond_to do |format|
- format.html { redirect_to root_path }
+ format.html { redirect_to team_project_path(@project) }
format.js { render :nothing => true }
end
end
.commit
%span.commit-info
- = link_to tree_project_ref_path(@project, @commit.id), :class => "btn" do
+ = link_to tree_project_ref_path(@project, @commit.id), :class => "btn right" do
Browse Code »
- if @commit.author_email
= image_tag gravatar_icon(@commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
-- if can? current_user, :write_issue, @project
- = content_for :sidebar_top_block do
- - if current_user.can_create_project?
- .alert-message.block-message.error
- You are able to create an issue. Click on button to add a new one
- = link_to new_project_issue_path(@project), :class => "btn small", :title => "New Issue", :remote => true do
- New Issue
-
- if current_user.private_token
= content_for :rss_icon do
.rss-icon
.issues_content
- %h3 Issues
+ %h3
+ Issues
+ - if can? current_user, :write_issue, @project
+ = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
+ New Issue
%hr
%div#issues-table-holder
%ul.pills.left
$("#flash_container").click(function(){
$(this).slideUp("slow");
});
- setTimeout("hideFlash()",2000);
+ setTimeout("hideFlash()",3000);
});
function hideFlash(){
%aside.project-right
- - if content_for? :sidebar_top_block
- = yield :sidebar_top_block
+ - if content_for? :sidebar_all
+ = render :sidebar_all
- else
- - if current_user.can_create_project?
- .alert-message.block-message.info
- You can create at least
- = current_user.projects_limit
- projects. Click on button to add a new one
- = link_to new_project_path, :class => "btn small" do
- New Project
+ - if content_for? :sidebar_top_block
+ = yield :sidebar_top_block
+ - else
+ - if can? current_user, :write_project, @project
+ %h4 Report
+ %ul
+ %li
+ = link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do
+ New Issue »
+ %li
+ = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do
+ New Merge Request »
- %h4
- Recent Projects:
- %ul
- - current_user.projects.order("id DESC").limit(5).each do |project|
- %li
- = link_to project_path(project) do
- = project.name
+ %h4
+ Recent Projects:
+ %ul
+ - current_user.projects.order("id DESC").limit(5).each do |project|
+ %li
+ = link_to project_path(project) do
+ = project.name
- %h4
- Recent Issues:
- %ul
- - current_user.assigned_issues.order("id DESC").limit(5).each do |issue|
- %li
- = link_to project_issue_path(issue.project, issue) do
- = truncate issue.title
+ %h4
+ Recent Issues:
+ %ul
+ - current_user.assigned_issues.order("id DESC").limit(5).each do |issue|
+ %li
+ = link_to project_issue_path(issue.project, issue) do
+ = truncate issue.title
- %h4
- Recent Requests:
- %ul
- - current_user.assigned_merge_requests.order("id DESC").limit(5).each do |issue|
- %li
- = link_to project_merge_request_path(issue.project, issue) do
- = truncate issue.title
+ %h4
+ Recent Requests:
+ %ul
+ - current_user.assigned_merge_requests.order("id DESC").limit(5).each do |issue|
+ %li
+ = link_to project_merge_request_path(issue.project, issue) do
+ = truncate issue.title
%table{:style => "display:none;"}
%tr.per_line_form
%td{:colspan => 3 }
- %div
+ %div.well
= form_for [@project, @note], :remote => "true", :multipart => true do |f|
+ %h3 Leave a note
-if @note.errors.any?
- .errors.error
+ .alert-message.block-message.error
- @note.errors.full_messages.each do |msg|
%div= msg
= f.hidden_field :noteable_id
= f.hidden_field :noteable_type
= f.hidden_field :line_code
-
- %div
- = f.label :note
- %cite.cgray markdown supported
- %br
- %br
- = f.text_area :note, :size => 255
-
- .clear
- %br
- = f.submit 'Add note', :class => "positive-button", :id => "submit_note"
- .right
- = link_to "Close", "#", :class => "grey-button hide-button"
+ = f.text_area :note, :size => 255
+ .prepend-top-10
+ = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
+ .right
+ = link_to "Close", "#", :class => "btn hide-button"
:javascript
$(function(){
-%table.no-borders#team-table
- %thead
- %th Name
- %th Project
- %th Repository
- - if can? current_user, :admin_team_member, @project
- %th Actions
+%ul.media-grid
- @project.users_projects.each do |up|
= render(:partial => 'team_members/show', :locals => {:member => up})
});
})
+ /*
$('.delete-team-member').live('ajax:success', function() {
$(this).closest('tr').fadeOut(); });
+ */
- user = member.user
- allow_admin = can? current_user, :admin_project, @project
-%tr{:id => dom_id(member)}
- %td
- = link_to image_tag(gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding:0 5px;"), project_team_member_path(@project, member)
+%li{:id => dom_id(member)}
+ = link_to project_team_member_path(@project, member) do
+ = image_tag gravatar_icon(user.email, 90), :class => "thumbnail"
+ .row
+ .span6
+ %h4
+ = truncate(user.name, :lenght => 24)
+ %small= truncate user.email, :lenght => 24
- = link_to truncate(user.name, :lenght => 24), project_team_member_path(@project, member)
- %br
- .cgray{:style => "padding-top:10px;"}= truncate user.email, :lenght => 24
- %td
+ .span3
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
- = f.select :project_access, options_for_select(Project.access_options, member.project_access), {}, :class => "project-access-select", :disabled => !allow_admin
- %td
+ = f.select :project_access, options_for_select(Project.access_options, member.project_access), {}, :class => "medium project-access-select", :disabled => !allow_admin
+ .span3
= form_for(member, :as => :team_member, :url => project_team_member_path(@project, member)) do |f|
- = f.select :repo_access, options_for_select(Repository.access_options, member.repo_access), {}, :class => "repo-access-select", :disabled => !allow_admin
- - if allow_admin
- %td
- = 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
-
+ = f.select :repo_access, options_for_select(Repository.access_options, member.repo_access), {}, :class => "medium repo-access-select", :disabled => !allow_admin
+ - if @project.owner == user
+ %span.label Project Owner
- allow_admin = can? current_user, :admin_project, @project
- user = @team_member.user
%div
- %span.entity-info
- = link_to team_project_path(@project) do
- .entity-button
- Team
- %i
+ = link_to team_project_path(@project), :class => "btn right" do
+ Team »
- = image_tag gravatar_icon(user.email), :class => "left", :width => 40, :style => "padding-right:5px;"
- %span.commit-title
- %strong
- = user.name
- %span.commit-author
- %strong
- = user.email
- %hr
- %br
+ .media-grid
+ = link_to "#" do
+ = image_tag gravatar_icon(user.email, 90), :class => "thumbnail"
+ %h3.media_h= user.name
%table.no-borders
%tr
%td= user.twitter
- if can? current_user, :admin_project, @project
- .merge-tabs
- .right
- = link_to 'Remove from team', [@project, @issue], :confirm => 'Are you sure?', :method => :delete, :class => "red-button"
+ .actions
+ = link_to 'Remove from team', project_team_member_path(:project_id => @project, :id => @team_member.id), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger"
:javascript
$(function(){
OSDN Git Service
