diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-28 13:54:11 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-28 13:54:11 +0400 |
commit | c7933d7a78433f026bd4344667f6d4b270bfef15 (patch) | |
tree | 874e799b3ec3ecdcc2ea8784804880ea648ed9e4 /app/views/layouts | |
parent | 1afd93ee1a91232a14353c0fdcecd6ee7d4b3402 (diff) |
Bootstrap: team
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/_flash.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_project_side_right.html.haml | 65 |
2 files changed, 36 insertions, 31 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index 4011485c55d..5139aed498c 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -10,7 +10,7 @@ $("#flash_container").click(function(){ $(this).slideUp("slow"); }); - setTimeout("hideFlash()",2000); + setTimeout("hideFlash()",3000); }); function hideFlash(){ diff --git a/app/views/layouts/_project_side_right.html.haml b/app/views/layouts/_project_side_right.html.haml index a8793976b4d..79e1b6680b8 100644 --- a/app/views/layouts/_project_side_right.html.haml +++ b/app/views/layouts/_project_side_right.html.haml @@ -1,38 +1,43 @@ %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 |