use ui-box as for all
This commit is contained in:
parent
14d0ef8f37
commit
c6298678f5
23 changed files with 151 additions and 314 deletions
|
@ -1,6 +1,6 @@
|
|||
= render "commits/commit_box"
|
||||
|
||||
%p.right
|
||||
%p.right.cgray
|
||||
This commit has
|
||||
%span.cgreen #{@commit.stats.additions} additions
|
||||
and
|
||||
|
|
|
@ -1,47 +1,50 @@
|
|||
.commit-box{class: @commit.parents_count > 1 ? "merge-commit" : ""}
|
||||
.commit-head
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
.right
|
||||
- if @notes_count > 0
|
||||
%span.btn.disabled.grouped
|
||||
%i.icon-comment
|
||||
= @notes_count
|
||||
.left.btn-group
|
||||
%a.btn.small.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
|
||||
%a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
|
||||
%i.icon-download-alt
|
||||
Download as
|
||||
%span.caret
|
||||
%ul.dropdown-menu
|
||||
%li= link_to "Email Patches", project_commit_path(@project, @commit, format: :patch)
|
||||
%li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
|
||||
= link_to project_tree_path(@project, @commit), class: "browse-button primary grouped" do
|
||||
%strong Browse Code »
|
||||
= link_to project_tree_path(@project, @commit), class: "btn primary grouped" do
|
||||
%span Browse Code »
|
||||
%h3.commit-title.page_title
|
||||
= gfm escape_once(@commit.title)
|
||||
- if @commit.description.present?
|
||||
%pre.commit-description
|
||||
= gfm escape_once(@commit.description)
|
||||
.commit-info
|
||||
.ui-box-body
|
||||
.row
|
||||
.span5
|
||||
.author
|
||||
%strong= @commit.author_link avatar: true, size: 40
|
||||
= @commit.author_link avatar: true, size: 32
|
||||
authored
|
||||
%time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
|
||||
#{time_ago_in_words(@commit.authored_date)} ago
|
||||
- if @commit.different_committer?
|
||||
.committer
|
||||
→
|
||||
%strong= @commit.committer_link
|
||||
= @commit.committer_link
|
||||
committed
|
||||
%time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
|
||||
#{time_ago_in_words(@commit.committed_date)} ago
|
||||
.span6.right
|
||||
.sha-block
|
||||
%span.cgray commit
|
||||
%code.label_commit= @commit.id
|
||||
.sha-block
|
||||
%span.cgray= pluralize(@commit.parents.count, "parent")
|
||||
- @commit.parents.each do |parent|
|
||||
= link_to parent.id[0...10], project_commit_path(@project, parent)
|
||||
.span6.pull-right
|
||||
.pull-right
|
||||
.sha-block
|
||||
%span.cgray commit
|
||||
%span.label_commit= @commit.id
|
||||
.clearfix
|
||||
.pull-right
|
||||
.sha-block
|
||||
%span.cgray= pluralize(@commit.parents.count, "parent")
|
||||
- @commit.parents.each do |parent|
|
||||
= link_to parent.id[0...10], project_commit_path(@project, parent)
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
- @commits.group_by { |c| c.committed_date.to_date }.each do |day, commits|
|
||||
%div.ui-box
|
||||
%h5.small
|
||||
%h6.title
|
||||
%i.icon-calendar
|
||||
= day.stamp("28 Aug, 2010")
|
||||
%ul.well-list= render commits
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.groups_box
|
||||
%h5
|
||||
%h5.title
|
||||
Groups
|
||||
%small
|
||||
(#{groups.count})
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.projects_box
|
||||
%h5
|
||||
%h5.title
|
||||
Projects
|
||||
%small
|
||||
(#{projects.total_count})
|
||||
|
|
|
@ -6,26 +6,27 @@
|
|||
- @issue.errors.full_messages.each do |msg|
|
||||
%span= msg
|
||||
%br
|
||||
.issue_form_box
|
||||
.issue_title
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
.clearfix
|
||||
= f.label :title do
|
||||
%strong= "Subject *"
|
||||
.input
|
||||
= f.text_field :title, maxlength: 255, class: "xxlarge js-gfm-input", autofocus: true, required: true
|
||||
.issue_middle_block
|
||||
.issue_assignee
|
||||
= f.label :assignee_id do
|
||||
%i.icon-user
|
||||
Assign to
|
||||
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
|
||||
.issue_milestone
|
||||
= f.label :milestone_id do
|
||||
%i.icon-time
|
||||
Milestone
|
||||
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
|
||||
.ui-box-body
|
||||
.clearfix
|
||||
.issue_assignee.pull-left
|
||||
= f.label :assignee_id do
|
||||
%i.icon-user
|
||||
Assign to
|
||||
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select a user" }, {class: 'chosen'})
|
||||
.issue_milestone.pull-left
|
||||
= f.label :milestone_id do
|
||||
%i.icon-time
|
||||
Milestone
|
||||
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
|
||||
|
||||
.issue_description
|
||||
.ui-box-bottom
|
||||
.clearfix
|
||||
= f.label :label_list do
|
||||
%i.icon-tag
|
||||
|
|
|
@ -24,14 +24,14 @@
|
|||
← To issues list
|
||||
|
||||
|
||||
.main_box
|
||||
.top_box_content
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
%h4.box-title
|
||||
- if @issue.closed
|
||||
.error.status_info Closed
|
||||
= gfm escape_once(@issue.title)
|
||||
|
||||
.middle_box_content
|
||||
.ui-box-body
|
||||
%cite.cgray
|
||||
Created by #{link_to_member(@project, @issue.author)}
|
||||
- if @issue.assignee
|
||||
|
@ -44,13 +44,13 @@
|
|||
|
||||
.right
|
||||
- @issue.labels.each do |label|
|
||||
%span.label.label-issue
|
||||
%span
|
||||
%i.icon-tag
|
||||
= label.name
|
||||
|
||||
|
||||
- if @issue.description.present?
|
||||
.bottom_box_content
|
||||
.ui-box-bottom
|
||||
= preserve do
|
||||
= markdown @issue.description
|
||||
|
||||
|
|
|
@ -5,45 +5,47 @@
|
|||
- @merge_request.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
%h4.cdark 1. Select Branches
|
||||
%br
|
||||
%fieldset
|
||||
%legend 1. Select Branches
|
||||
|
||||
.row
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 From (Head Branch)
|
||||
.body
|
||||
.padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
|
||||
.mr_source_commit
|
||||
.row
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 From (Head Branch)
|
||||
.body
|
||||
.padded= f.select(:source_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
|
||||
.mr_source_commit
|
||||
|
||||
.span2
|
||||
%center= image_tag "merge.png", class: 'mr_direction_tip'
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 To (Base Branch)
|
||||
.body
|
||||
.padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
|
||||
.mr_target_commit
|
||||
.span2
|
||||
%center= image_tag "merge.png", class: 'mr_direction_tip'
|
||||
.span5
|
||||
.mr_branch_box
|
||||
%h5 To (Base Branch)
|
||||
.body
|
||||
.padded= f.select(:target_branch, @repository.heads.map(&:name), { include_blank: "Select branch" }, {class: 'chosen span4'})
|
||||
.mr_target_commit
|
||||
|
||||
%h4.cdark 2. Fill info
|
||||
%fieldset
|
||||
%legend 2. Fill info
|
||||
|
||||
.clearfix
|
||||
.merge_requests_form_box
|
||||
.top_box_content
|
||||
= f.label :title do
|
||||
%strong= "Title *"
|
||||
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
|
||||
.merge_requests_middle_box
|
||||
.merge_requests_assignee
|
||||
= f.label :assignee_id do
|
||||
%i.icon-user
|
||||
Assign to
|
||||
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
|
||||
.merge_requests_milestone
|
||||
= f.label :milestone_id do
|
||||
%i.icon-time
|
||||
Milestone
|
||||
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
.clearfix
|
||||
= f.label :title do
|
||||
%strong= "Title *"
|
||||
.input= f.text_field :title, class: "input-xxlarge pad js-gfm-input", maxlength: 255, rows: 5, required: true
|
||||
.ui-box-body
|
||||
.clearfix
|
||||
.left
|
||||
= f.label :assignee_id do
|
||||
%i.icon-user
|
||||
Assign to
|
||||
.input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { include_blank: "Select user" }, {class: 'chosen span3'})
|
||||
.left
|
||||
= f.label :milestone_id do
|
||||
%i.icon-time
|
||||
Milestone
|
||||
.input= f.select(:milestone_id, @project.milestones.active.all.collect {|p| [ p.title, p.id ] }, { include_blank: "Select milestone" }, {class: 'chosen'})
|
||||
|
||||
.control-group
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
- if @commits.present?
|
||||
.ui-box
|
||||
%h5
|
||||
%h6.title
|
||||
%i.icon-list
|
||||
Commits (#{@commits.count})
|
||||
.merge-request-commits
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
.main_box
|
||||
.top_box_content
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
%h4.box-title
|
||||
- if @merge_request.merged
|
||||
.error.status_info
|
||||
|
@ -9,7 +9,7 @@
|
|||
.error.status_info Closed
|
||||
= gfm escape_once(@merge_request.title)
|
||||
|
||||
.middle_box_content
|
||||
.ui-box-body
|
||||
%div
|
||||
%cite.cgray
|
||||
Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
|
||||
- if @merge_request.closed
|
||||
.bottom_box_content
|
||||
.ui-box-bottom
|
||||
- if @merge_request.merged?
|
||||
%span
|
||||
Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
%span All issues for this milestone are closed. You may close milestone now.
|
||||
= link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {closed: true }), method: :put, class: "btn small danger"
|
||||
|
||||
.main_box
|
||||
.top_box_content
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
%h4.box-title
|
||||
- if @milestone.closed
|
||||
.error.status_info Closed
|
||||
|
@ -37,7 +37,7 @@
|
|||
|
||||
= gfm escape_once(@milestone.title)
|
||||
|
||||
.middle_box_content
|
||||
.ui-box-body
|
||||
%h5
|
||||
Progress:
|
||||
%small
|
||||
|
|
|
@ -30,4 +30,10 @@
|
|||
Download
|
||||
|
||||
- else
|
||||
%h3 No tags
|
||||
%h3.nothing_here_message
|
||||
Repository has no tags yet.
|
||||
%br
|
||||
%small
|
||||
Use git tag command to add a new one:
|
||||
%br
|
||||
%span.monospace git tag -a v1.4 -m 'version 1.4'
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
- @wiki.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.main_box
|
||||
.top_box_content
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
= f.label :title
|
||||
.input= f.text_field :title, class: 'span8'
|
||||
= f.hidden_field :slug
|
||||
.middle_box_content
|
||||
.ui-box-body
|
||||
.input
|
||||
%span.cgray
|
||||
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||
|
@ -19,7 +19,7 @@
|
|||
%code [Link Title](page-slug)
|
||||
\.
|
||||
|
||||
.bottom_box_content
|
||||
.ui-box-bottom
|
||||
= f.label :content
|
||||
.input= f.text_area :content, class: 'span8 js-gfm-input'
|
||||
.actions
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue