Commit 69ef8140 authored by randx's avatar randx

UI improved, .main_box css class for show pages

parent 88d9569a
...@@ -1010,15 +1010,16 @@ p.time { ...@@ -1010,15 +1010,16 @@ p.time {
} }
} }
.project_box, /**
.issue_box, * UI box element
.commit_box, * contains top, middle, bottom blocks
.merge_request_box{ *
@extend .padded; */
.main_box {
@extend .borders; @extend .borders;
@extend .prepend-top-20; @extend .prepend-top-20;
@extend .append-bottom-20; @extend .append-bottom-20;
border-width:2px; border-width:1px;
img { max-width: 100%; } img { max-width: 100%; }
...@@ -1027,21 +1028,32 @@ p.time { ...@@ -1027,21 +1028,32 @@ p.time {
background: none !important; background: none !important;
} }
} }
}
.project_box .project_descr, .top_box_content,
.merge_request_box .middle_area, .middle_box_content,
.issue_box .middle_area, .bottom_box_content {
.commit_box .commit_message { padding:20px;
margin: -20px;
padding: 20px; pre {
margin-top:10px; background: none !important;
border-radius:0; margin:0;
border:none; border:none;
font-size:12px; padding:0;
background-color:#f5f5f5; }
border:none; }
border-top:1px solid #eee;
.middle_box_content {
border-radius:0;
border:none;
font-size:12px;
background-color:#f5f5f5;
border:none;
border-top:1px solid #eee;
}
.bottom_box_content {
border-top:1px solid #eee;
}
} }
.highlight_word { .highlight_word {
...@@ -1058,10 +1070,6 @@ p.time { ...@@ -1058,10 +1070,6 @@ p.time {
margin-right:20px; margin-right:20px;
} }
.merge_request_status_holder {
margin-bottom:20px;
}
.arrow{ .arrow{
float: right; float: right;
background: #E3E5EA; background: #E3E5EA;
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#commits_list= render "commits" #commits_list= render "commits"
.clear .clear
.loading{ :style => "display:none;"} .loading{ :style => "display:none;"}
%center= image_tag "ajax-loader.gif"
- if @commits.count == @limit - if @commits.count == @limit
:javascript :javascript
......
.commit_box .main_box
.commit .top_box_content
.right .right
- unless @notes_count.zero? - unless @notes_count.zero?
%span.btn.small.disabled.padded= pluralize @notes_count, 'note' %span.btn.small.disabled.padded= pluralize @notes_count, 'note'
...@@ -17,8 +17,9 @@ ...@@ -17,8 +17,9 @@
= @commit.committer_name = @commit.committer_name
%small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm") %small= @commit.committed_date.stamp("Aug 21, 2011 9:23pm")
%pre.commit_message .middle_box_content
= commit_msg_with_link_to_issues(@project, @commit.safe_message) %pre.commit_message
= commit_msg_with_link_to_issues(@project, @commit.safe_message)
%br %br
%p.cgray %p.cgray
Showing #{pluralize(@commit.diffs.count, "changed file")} Showing #{pluralize(@commit.diffs.count, "changed file")}
......
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
Add Deploy Key Add Deploy Key
- if @keys.any? - if @keys.any?
%table.zebra-striped.borders %table
- @keys.each do |key| - @keys.each do |key|
= render(:partial => 'show', :locals => {:key => key}) = render(:partial => 'show', :locals => {:key => key})
%h3 Web hooks
%br
%p Application will send POST request with some data like example below:
%h5 Hooks request example:
.borders= render "hooks/data_ex"
...@@ -6,16 +6,14 @@ ...@@ -6,16 +6,14 @@
= link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
Add Post Receive Hook Add Post Receive Hook
%p Read more about web hooks #{link_to "here", help_web_hooks_path, :class => "vlink"}
-if @hooks.any? -if @hooks.any?
%table.zebra-striped.borders %table
- @hooks.each do |hook| - @hooks.each do |hook|
%tr %tr
%td %td
= link_to project_hook_path(@project, hook) do = link_to project_hook_path(@project, hook) do
= hook.url = hook.url
%td %td
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small" = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
.ui-box
%h5 Hooks request example
.data= render "data_ex"
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
= link_to project_issues_path(@project) do = link_to project_issues_path(@project) do
← To issues list ← To issues list
.issue_box .main_box
.merge_request_status_holder .top_box_content
%h5 %h5
- if @issue.closed - if @issue.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @issue.title = @issue.title
%div.middle_area .middle_box_content
%cite.cgray Created by %cite.cgray Created by
= image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_author(@issue) %strong.author= link_to_issue_author(@issue)
...@@ -40,9 +40,8 @@ ...@@ -40,9 +40,8 @@
= image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_assignee(@issue) %strong.author= link_to_issue_assignee(@issue)
%div - if @issue.description.present?
- if @issue.description.present? .bottom_box_content
%hr
= markdown @issue.description = markdown @issue.description
......
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
%br %br
%table#keys-table.zebra-striped.borders %table#keys-table
- @keys.each do |key| - @keys.each do |key|
= render(:partial => 'show', :locals => {:key => key}) = render(:partial => 'show', :locals => {:key => key})
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
← To merge requests ← To merge requests
.merge_request_box .main_box
.merge_request_status_holder .top_box_content
%h5 %h5
- if @merge_request.closed - if @merge_request.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @merge_request.title = @merge_request.title
.middle_box_content
%div.middle_area
%div %div
%cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
...@@ -44,17 +43,15 @@ ...@@ -44,17 +43,15 @@
- if @merge_request.closed - if @merge_request.closed
%hr .bottom_box_content
- if @merge_request.merged? - if @merge_request.merged?
%span %span
Merged by #{@merge_request.merge_event.author_name} Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event - elsif @merge_request.closed_event
%span %span
Closed by #{@merge_request.closed_event.author_name} Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
%br
= render "merge_requests/commits" = render "merge_requests/commits"
......
%ul.unstyled.ui-box .ui-box
- @project.users_projects.each do |up| %h5
= render(:partial => 'team_members/show', :locals => {:member => up}) .cgray Team Members (#{@project.users_projects.count})
%ul.unstyled
- @project.users_projects.each do |up|
= render(:partial => 'team_members/show', :locals => {:member => up})
:javascript :javascript
$(function(){ $(function(){
......
= render "project_head" = render "project_head"
.project_box .main_box
%h3 .top_box_content
= @project.name %h3
%span.right = @project.name
- if can? current_user, :download_code, @project %span.right
= link_to "Download", archive_project_repository_path(@project), :class => "btn small padded" - if can? current_user, :download_code, @project
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded"
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
Merge Request = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
- if @project.issues_enabled && can?(current_user, :write_issue, @project) Merge Request
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do - if @project.issues_enabled && can?(current_user, :write_issue, @project)
Issue = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
.back_link Issue
= link_to projects_path do .back_link
← To projects list = link_to projects_path do
%br ← To projects list
.alert-message.block-message.warning .middle_box_content
.input .input
.input-prepend .input-prepend
%span.add-on git clone %span.add-on git clone
= text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url" = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
- if @project.description.present? - if @project.description.present?
.markdown.project_descr= markdown @project.description .bottom_box_content
.markdown= markdown @project.description
- unless @events.blank? - unless @events.blank?
%br %br
%h5.cgray %h5.cgray
......
...@@ -8,6 +8,7 @@ Gitlab::Application.routes.draw do ...@@ -8,6 +8,7 @@ Gitlab::Application.routes.draw do
get 'help' => 'help#index' get 'help' => 'help#index'
get 'help/permissions' => 'help#permissions' get 'help/permissions' => 'help#permissions'
get 'help/workflow' => 'help#workflow' get 'help/workflow' => 'help#workflow'
get 'help/web_hooks' => 'help#web_hooks'
namespace :admin do namespace :admin do
resources :users do resources :users do
......
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