Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
This commit is contained in:
Dmitriy Zaporozhets
commit
1fdeb9e030
|
|
@ -17,6 +17,8 @@ $baseLineHeight: 18px !default;
|
||||||
@import "gitlab_bootstrap/variables.scss";
|
@import "gitlab_bootstrap/variables.scss";
|
||||||
@import "gitlab_bootstrap/fonts.scss";
|
@import "gitlab_bootstrap/fonts.scss";
|
||||||
@import "gitlab_bootstrap/mixins.scss";
|
@import "gitlab_bootstrap/mixins.scss";
|
||||||
|
@import "gitlab_bootstrap/avatar.scss";
|
||||||
|
@import "gitlab_bootstrap/nav.scss";
|
||||||
@import "gitlab_bootstrap/common.scss";
|
@import "gitlab_bootstrap/common.scss";
|
||||||
@import "gitlab_bootstrap/typography.scss";
|
@import "gitlab_bootstrap/typography.scss";
|
||||||
@import "gitlab_bootstrap/buttons.scss";
|
@import "gitlab_bootstrap/buttons.scss";
|
||||||
|
|
|
||||||
8
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
Normal file
8
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
/** AVATARS **/
|
||||||
|
img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
|
||||||
|
img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
|
||||||
|
img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
|
||||||
|
img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
|
||||||
|
img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
|
||||||
|
img.lil_av { padding-left: 4px; padding-right: 3px; }
|
||||||
|
img.small { width: 80px; }
|
||||||
|
|
@ -95,7 +95,7 @@
|
||||||
|
|
||||||
form {
|
form {
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
margin-top: 3px;
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-tiny {
|
.btn-tiny {
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@
|
||||||
@extend .btn-primary;
|
@extend .btn-primary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.btn-close,
|
||||||
&.btn-remove {
|
&.btn-remove {
|
||||||
@extend .btn-danger;
|
@extend .btn-danger;
|
||||||
border-color: #BD362F;
|
border-color: #BD362F;
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@
|
||||||
|
|
||||||
/** COMMON CLASSES **/
|
/** COMMON CLASSES **/
|
||||||
.left { float:left }
|
.left { float:left }
|
||||||
.right { float:right!important }
|
|
||||||
.append-bottom-10 { margin-bottom:10px }
|
.append-bottom-10 { margin-bottom:10px }
|
||||||
.append-bottom-20 { margin-bottom:20px }
|
.append-bottom-20 { margin-bottom:20px }
|
||||||
.prepend-top-10 { margin-top:10px }
|
.prepend-top-10 { margin-top:10px }
|
||||||
|
|
@ -22,82 +21,13 @@
|
||||||
.light { color: #888 }
|
.light { color: #888 }
|
||||||
.tiny { font-weight: normal }
|
.tiny { font-weight: normal }
|
||||||
|
|
||||||
/** PILLS & TABS**/
|
|
||||||
.nav-pills {
|
|
||||||
.active a {
|
|
||||||
background: $primary_color;
|
|
||||||
}
|
|
||||||
|
|
||||||
> li > a {
|
|
||||||
@include border-radius(0);
|
|
||||||
}
|
|
||||||
&.nav-stacked {
|
|
||||||
> li > a {
|
|
||||||
border-left: 4px solid #EEE;
|
|
||||||
padding: 12px;
|
|
||||||
}
|
|
||||||
> .active > a {
|
|
||||||
border-color: #29B;
|
|
||||||
border-radius: 0;
|
|
||||||
background: #F1F1F1;
|
|
||||||
color: $style_color;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* nav-tabs
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
|
|
||||||
.nav.nav-tabs {
|
|
||||||
li {
|
|
||||||
> a {
|
|
||||||
padding: 8px 20px;
|
|
||||||
margin-right: 7px;
|
|
||||||
line-height: 20px;
|
|
||||||
border-color: #EEE;
|
|
||||||
color: #888;
|
|
||||||
border-bottom: 1px solid #ddd;
|
|
||||||
.badge {
|
|
||||||
background-color: #eee;
|
|
||||||
color: #888;
|
|
||||||
text-shadow: 0 1px 1px #fff;
|
|
||||||
}
|
|
||||||
i[class^="icon-"] {
|
|
||||||
line-height: 14px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
&.active {
|
|
||||||
> a {
|
|
||||||
border-color: #CCC;
|
|
||||||
border-bottom: 1px solid #fff;
|
|
||||||
color: #333;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.nav-small-tabs > li > a { padding: 6px 9px; }
|
|
||||||
}
|
|
||||||
|
|
||||||
/** ALERT MESSAGES **/
|
/** ALERT MESSAGES **/
|
||||||
.alert-message { @extend .alert; }
|
.alert.alert-disabled {
|
||||||
.alert-messag.success { @extend .alert-success; }
|
background: #EEE;
|
||||||
.alert-message.error { @extend .alert-error; }
|
color: #777;
|
||||||
|
border-color: #DDD;
|
||||||
/** AVATARS **/
|
}
|
||||||
img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
|
|
||||||
img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
|
|
||||||
img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
|
|
||||||
img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
|
|
||||||
img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
|
|
||||||
img.lil_av { padding-left: 4px; padding-right: 3px; }
|
|
||||||
img.small { width: 80px; }
|
|
||||||
|
|
||||||
/** HELPERS **/
|
/** HELPERS **/
|
||||||
.nothing_here_message {
|
.nothing_here_message {
|
||||||
|
|
|
||||||
65
app/assets/stylesheets/gitlab_bootstrap/nav.scss
Normal file
65
app/assets/stylesheets/gitlab_bootstrap/nav.scss
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
/**
|
||||||
|
* nav-pills
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
.nav-pills {
|
||||||
|
.active a {
|
||||||
|
background: $primary_color;
|
||||||
|
}
|
||||||
|
|
||||||
|
> li > a {
|
||||||
|
@include border-radius(0);
|
||||||
|
}
|
||||||
|
&.nav-stacked {
|
||||||
|
> li > a {
|
||||||
|
border-left: 4px solid #EEE;
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
> .active > a {
|
||||||
|
border-color: #29B;
|
||||||
|
border-radius: 0;
|
||||||
|
background: #F1F1F1;
|
||||||
|
color: $style_color;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* nav-tabs
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
|
||||||
|
.nav.nav-tabs {
|
||||||
|
li {
|
||||||
|
> a {
|
||||||
|
padding: 8px 20px;
|
||||||
|
margin-right: 7px;
|
||||||
|
line-height: 20px;
|
||||||
|
border-color: #EEE;
|
||||||
|
color: #888;
|
||||||
|
border-bottom: 1px solid #ddd;
|
||||||
|
.badge {
|
||||||
|
background-color: #eee;
|
||||||
|
color: #888;
|
||||||
|
text-shadow: 0 1px 1px #fff;
|
||||||
|
}
|
||||||
|
i[class^="icon-"] {
|
||||||
|
line-height: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.active {
|
||||||
|
> a {
|
||||||
|
border-color: #CCC;
|
||||||
|
border-bottom: 1px solid #fff;
|
||||||
|
color: #333;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.nav-small-tabs > li > a { padding: 6px 9px; }
|
||||||
|
}
|
||||||
|
|
@ -127,7 +127,7 @@
|
||||||
.btn-new-mr {
|
.btn-new-mr {
|
||||||
@extend .btn-info;
|
@extend .btn-info;
|
||||||
@extend .small;
|
@extend .small;
|
||||||
@extend .right;
|
@extend .pull-right;
|
||||||
margin: -3px;
|
margin: -3px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ ul.notes {
|
||||||
}
|
}
|
||||||
|
|
||||||
.attachment {
|
.attachment {
|
||||||
@extend .right;
|
@extend .pull-right;
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 350px;
|
width: 350px;
|
||||||
height: 50px;
|
height: 50px;
|
||||||
|
|
@ -274,7 +274,7 @@ ul.notes {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.notify_options {
|
.notify_options {
|
||||||
@extend .right;
|
@extend .pull-right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.note_text_and_preview {
|
.note_text_and_preview {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.side {
|
.side {
|
||||||
@extend .right;
|
@extend .pull-right;
|
||||||
|
|
||||||
.projects_box {
|
.projects_box {
|
||||||
> .title {
|
> .title {
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ module ProjectsHelper
|
||||||
tm = project.team_member_by_id(author)
|
tm = project.team_member_by_id(author)
|
||||||
|
|
||||||
if tm
|
if tm
|
||||||
link_to author_html, project_team_member_path(project, tm), class: "author_link"
|
link_to author_html, project_team_member_path(project, tm.user_username), class: "author_link"
|
||||||
else
|
else
|
||||||
author_html
|
author_html
|
||||||
end.html_safe
|
end.html_safe
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class UsersProject < ActiveRecord::Base
|
||||||
validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
|
validates :project_access, inclusion: { in: [GUEST, REPORTER, DEVELOPER, MASTER] }, presence: true
|
||||||
validates :project, presence: true
|
validates :project, presence: true
|
||||||
|
|
||||||
delegate :name, :email, to: :user, prefix: true
|
delegate :name, :username, :email, to: :user, prefix: true
|
||||||
|
|
||||||
scope :guests, where(project_access: GUEST)
|
scope :guests, where(project_access: GUEST)
|
||||||
scope :reporters, where(project_access: REPORTER)
|
scope :reporters, where(project_access: REPORTER)
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
- @projects.each do |project|
|
- @projects.each do |project|
|
||||||
%p
|
%p
|
||||||
= link_to project.name_with_namespace, [:admin, project]
|
= link_to project.name_with_namespace, [:admin, project]
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= time_ago_in_words project.created_at
|
= time_ago_in_words project.created_at
|
||||||
ago
|
ago
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
%p
|
%p
|
||||||
= link_to [:admin, user] do
|
= link_to [:admin, user] do
|
||||||
= user.name
|
= user.name
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= time_ago_in_words user.created_at
|
= time_ago_in_words user.created_at
|
||||||
ago
|
ago
|
||||||
|
|
||||||
|
|
@ -51,25 +51,25 @@
|
||||||
%hr
|
%hr
|
||||||
%p
|
%p
|
||||||
Issues
|
Issues
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= Issue.count
|
= Issue.count
|
||||||
%p
|
%p
|
||||||
Merge Requests
|
Merge Requests
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= MergeRequest.count
|
= MergeRequest.count
|
||||||
%p
|
%p
|
||||||
Notes
|
Notes
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= Note.count
|
= Note.count
|
||||||
%p
|
%p
|
||||||
Snippets
|
Snippets
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= Snippet.count
|
= Snippet.count
|
||||||
%p
|
%p
|
||||||
SSH Keys
|
SSH Keys
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= Key.count
|
= Key.count
|
||||||
%p
|
%p
|
||||||
Milestones
|
Milestones
|
||||||
%span.light.right
|
%span.light.pull-right
|
||||||
= Milestone.count
|
= Milestone.count
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for [:admin, @group] do |f|
|
= form_for [:admin, @group] do |f|
|
||||||
- if @group.errors.any?
|
- if @group.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @group.errors.full_messages.first
|
%span= @group.errors.full_messages.first
|
||||||
.clearfix.group_name_holder
|
.clearfix.group_name_holder
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
allows you to keep projects organized.
|
allows you to keep projects organized.
|
||||||
Use groups for uniting related projects.
|
Use groups for uniting related projects.
|
||||||
|
|
||||||
= link_to 'New Group', new_admin_group_path, class: "btn btn-small right"
|
= link_to 'New Group', new_admin_group_path, class: "btn btn-small pull-right"
|
||||||
%br
|
%br
|
||||||
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
|
= form_tag admin_groups_path, method: :get, class: 'form-inline' do
|
||||||
= text_field_tag :name, params[:name], class: "xlarge"
|
= text_field_tag :name, params[:name], class: "xlarge"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for [:admin, @group] do |f|
|
= form_for [:admin, @group] do |f|
|
||||||
- if @group.errors.any?
|
- if @group.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @group.errors.full_messages.first
|
%span= @group.errors.full_messages.first
|
||||||
.clearfix
|
.clearfix
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
%td
|
%td
|
||||||
= @group.name
|
= @group.name
|
||||||
|
|
||||||
= link_to edit_admin_group_path(@group), class: "btn btn-small right" do
|
= link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Rename
|
Rename
|
||||||
%tr
|
%tr
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
Owner:
|
Owner:
|
||||||
%td
|
%td
|
||||||
= @group.owner_name
|
= @group.owner_name
|
||||||
.right
|
.pull-right
|
||||||
= link_to "#", class: "btn btn-small change-owner-link" do
|
= link_to "#", class: "btn btn-small change-owner-link" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Change owner
|
Change owner
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
|
= form_for @hook, as: :hook, url: admin_hooks_path, html: { class: 'form-inline' } do |f|
|
||||||
-if @hook.errors.any?
|
-if @hook.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
- @hook.errors.full_messages.each do |msg|
|
- @hook.errors.full_messages.each do |msg|
|
||||||
%p= msg
|
%p= msg
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
%td
|
%td
|
||||||
= link_to admin_hook_path(hook) do
|
= link_to admin_hook_path(hook) do
|
||||||
%strong= hook.url
|
%strong= hook.url
|
||||||
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small right"
|
= link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-small pull-right"
|
||||||
%td POST
|
%td POST
|
||||||
%td
|
%td
|
||||||
= link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small right"
|
= link_to 'Remove', admin_hook_path(hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small pull-right"
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
.file_title
|
.file_title
|
||||||
%i.icon-file
|
%i.icon-file
|
||||||
githost.log
|
githost.log
|
||||||
.right
|
.pull-right
|
||||||
= link_to '#', class: 'log-bottom' do
|
= link_to '#', class: 'log-bottom' do
|
||||||
%i.icon-arrow-down
|
%i.icon-arrow-down
|
||||||
Scroll down
|
Scroll down
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
.file_title
|
.file_title
|
||||||
%i.icon-file
|
%i.icon-file
|
||||||
application.log
|
application.log
|
||||||
.right
|
.pull-right
|
||||||
= link_to '#', class: 'log-bottom' do
|
= link_to '#', class: 'log-bottom' do
|
||||||
%i.icon-arrow-down
|
%i.icon-arrow-down
|
||||||
Scroll down
|
Scroll down
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
.file_title
|
.file_title
|
||||||
%i.icon-file
|
%i.icon-file
|
||||||
production.log
|
production.log
|
||||||
.right
|
.pull-right
|
||||||
= link_to '#', class: 'log-bottom' do
|
= link_to '#', class: 'log-bottom' do
|
||||||
%i.icon-arrow-down
|
%i.icon-arrow-down
|
||||||
Scroll down
|
Scroll down
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
.file_title
|
.file_title
|
||||||
%i.icon-file
|
%i.icon-file
|
||||||
sidekiq.log
|
sidekiq.log
|
||||||
.right
|
.pull-right
|
||||||
= link_to '#', class: 'log-bottom' do
|
= link_to '#', class: 'log-bottom' do
|
||||||
%i.icon-arrow-down
|
%i.icon-arrow-down
|
||||||
Scroll down
|
Scroll down
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_for [:admin, project] do |f|
|
= form_for [:admin, project] do |f|
|
||||||
-if project.errors.any?
|
-if project.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- project.errors.full_messages.each do |msg|
|
- project.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Projects
|
Projects
|
||||||
= link_to 'New Project', new_project_path, class: "btn btn-small right"
|
= link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
- else
|
- else
|
||||||
%i.icon-lock.cgreen
|
%i.icon-lock.cgreen
|
||||||
= link_to project.name_with_namespace, [:admin, project]
|
= link_to project.name_with_namespace, [:admin, project]
|
||||||
.right
|
.pull-right
|
||||||
= link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
|
= link_to 'Edit', edit_admin_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
|
||||||
= link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
|
= link_to 'Destroy', [:admin, project], confirm: "REMOVE #{project.name}? Are you sure?", method: :delete, class: "btn btn-small btn-remove"
|
||||||
- if @projects.blank?
|
- if @projects.blank?
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
|
= form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|
|
||||||
-if @team_member_relation.errors.any?
|
-if @team_member_relation.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @team_member_relation.errors.full_messages.each do |msg|
|
- @team_member_relation.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Project: #{@project.name_with_namespace}
|
Project: #{@project.name_with_namespace}
|
||||||
= link_to edit_admin_project_path(@project), class: "btn right" do
|
= link_to edit_admin_project_path(@project), class: "btn pull-right" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for @team, url: admin_team_path(@team), method: :put do |f|
|
= form_for @team, url: admin_team_path(@team), method: :put do |f|
|
||||||
- if @team.errors.any?
|
- if @team.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @team.errors.full_messages.first
|
%span= @team.errors.full_messages.first
|
||||||
.clearfix.team_name_holder
|
.clearfix.team_name_holder
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
%small
|
%small
|
||||||
simple Teams description
|
simple Teams description
|
||||||
|
|
||||||
= link_to 'New Team', new_admin_team_path, class: "btn btn-small right"
|
= link_to 'New Team', new_admin_team_path, class: "btn btn-small pull-right"
|
||||||
%br
|
%br
|
||||||
|
|
||||||
= form_tag admin_teams_path, method: :get, class: 'form-inline' do
|
= form_tag admin_teams_path, method: :get, class: 'form-inline' do
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_tag admin_team_member_path(@team, @member), method: :put do
|
= form_tag admin_team_member_path(@team, @member), method: :put do
|
||||||
-if @member.errors.any?
|
-if @member.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @member.errors.full_messages.each do |msg|
|
- @member.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for @team, url: admin_teams_path do |f|
|
= form_for @team, url: admin_teams_path do |f|
|
||||||
- if @team.errors.any?
|
- if @team.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @team.errors.full_messages.first
|
%span= @team.errors.full_messages.first
|
||||||
.clearfix
|
.clearfix
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_tag admin_team_project_path(@team, @project), method: :put do
|
= form_tag admin_team_project_path(@team, @project), method: :put do
|
||||||
-if @project.errors.any?
|
-if @project.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @project.errors.full_messages.each do |msg|
|
- @project.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
%td
|
%td
|
||||||
= @team.name
|
= @team.name
|
||||||
|
|
||||||
= link_to edit_admin_team_path(@team), class: "btn btn-small right" do
|
= link_to edit_admin_team_path(@team), class: "btn btn-small pull-right" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Rename
|
Rename
|
||||||
%tr
|
%tr
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
Owner:
|
Owner:
|
||||||
%td
|
%td
|
||||||
= @team.owner.name
|
= @team.owner.name
|
||||||
.right
|
.pull-right
|
||||||
= link_to "#", class: "btn btn-small change-owner-link" do
|
= link_to "#", class: "btn btn-small change-owner-link" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Change owner
|
Change owner
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
Members (#{@team.members.count})
|
Members (#{@team.members.count})
|
||||||
%span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small right", id: :add_members_to_team
|
%span= link_to 'Add members', new_admin_team_member_path(@team), class: "btn btn-primary btn-small pull-right", id: :add_members_to_team
|
||||||
- if @team.members.any?
|
- if @team.members.any?
|
||||||
%table#members_list
|
%table#members_list
|
||||||
%thead
|
%thead
|
||||||
|
|
@ -67,7 +67,7 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
Projects (#{@team.projects.count})
|
Projects (#{@team.projects.count})
|
||||||
%span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small right", id: :assign_projects_to_team
|
%span= link_to 'Add projects', new_admin_team_project_path(@team), class: "btn btn-primary btn-small pull-right", id: :assign_projects_to_team
|
||||||
- if @team.projects.any?
|
- if @team.projects.any?
|
||||||
%table#projects_list
|
%table#projects_list
|
||||||
%thead
|
%thead
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Users
|
Users
|
||||||
= link_to 'New User', new_admin_user_path, class: "btn btn-small right"
|
= link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
|
||||||
%br
|
%br
|
||||||
|
|
||||||
= form_tag admin_users_path, method: :get, class: 'form-inline' do
|
= form_tag admin_users_path, method: :get, class: 'form-inline' do
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
%small Blocked
|
%small Blocked
|
||||||
- if @admin_user.admin
|
- if @admin_user.admin
|
||||||
%small Administrator
|
%small Administrator
|
||||||
= link_to edit_admin_user_path(@admin_user), class: "btn right" do
|
= link_to edit_admin_user_path(@admin_user), class: "btn pull-right" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,5 @@
|
||||||
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
|
= render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]}
|
||||||
= nav_link(controller: :refs) do
|
= nav_link(controller: :refs) do
|
||||||
= link_to 'Source', project_tree_path(@project, @ref)
|
= link_to 'Source', project_tree_path(@project, @ref)
|
||||||
%li.right
|
%li.pull-right
|
||||||
= render "shared/clone_panel"
|
= render "shared/clone_panel"
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
= render "commits/commit_box"
|
= render "commits/commit_box"
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%h4 Commit diffs are too big to be displayed
|
%h4 Commit diffs are too big to be displayed
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= render "commits/commit_box"
|
= render "commits/commit_box"
|
||||||
|
|
||||||
%p.right.cgray
|
%p.pull-right.cgray
|
||||||
This commit has
|
This commit has
|
||||||
%span.cgreen #{@commit.stats.additions} additions
|
%span.cgreen #{@commit.stats.additions} additions
|
||||||
and
|
and
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
.ui-box.ui-box-show
|
.ui-box.ui-box-show
|
||||||
.ui-box-head
|
.ui-box-head
|
||||||
.right
|
.pull-right
|
||||||
- if @notes_count > 0
|
- if @notes_count > 0
|
||||||
%span.btn.disabled.grouped
|
%span.btn.disabled.grouped
|
||||||
%i.icon-comment
|
%i.icon-comment
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
- if @suppress_diff
|
- if @suppress_diff
|
||||||
.alert-message.block-message
|
.alert.alert-block
|
||||||
%p
|
%p
|
||||||
%strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
|
%strong Warning! Large commit with more than #{Commit::DIFF_SAFE_SIZE} files changed.
|
||||||
%p To prevent performance issue we rejected diff information.
|
%p To prevent performance issue we rejected diff information.
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
%span= diff.old_path
|
%span= diff.old_path
|
||||||
|
|
||||||
- if @commit.prev_commit
|
- if @commit.prev_commit
|
||||||
= link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn right view-file'} do
|
= link_to project_tree_path(@project, tree_join(@commit.prev_commit_id, diff.new_path)), {:class => 'btn pull-right view-file'} do
|
||||||
View file @
|
View file @
|
||||||
%span.commit-short-id= @commit.short_id(6)
|
%span.commit-short-id= @commit.short_id(6)
|
||||||
- else
|
- else
|
||||||
|
|
@ -33,7 +33,7 @@
|
||||||
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
|
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
|
||||||
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
|
%span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
|
||||||
|
|
||||||
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny right view-file'} do
|
= link_to project_tree_path(@project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do
|
||||||
View file @
|
View file @
|
||||||
%span.commit-short-id= @commit.short_id(6)
|
%span.commit-short-id= @commit.short_id(6)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
|
|
||||||
- if current_controller?(:commits) && current_user.private_token
|
- if current_controller?(:commits) && current_user.private_token
|
||||||
%li.right
|
%li.pull-right
|
||||||
%span.rss-icon
|
%span.rss-icon
|
||||||
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
|
= link_to project_commits_path(@project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Feed" do
|
||||||
= image_tag "rss_ui.png", title: "feed"
|
= image_tag "rss_ui.png", title: "feed"
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@
|
||||||
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
||||||
= link_to dashboard_filter_path(entity, project_id: project.id) do
|
= link_to dashboard_filter_path(entity, project_id: project.id) do
|
||||||
= project.name_with_namespace
|
= project.name_with_namespace
|
||||||
%small.right= entities_per_project(project, entity)
|
%small.pull-right= entities_per_project(project, entity)
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%hr
|
%hr
|
||||||
= link_to "Reset", dashboard_filter_path(entity), class: 'btn right'
|
= link_to "Reset", dashboard_filter_path(entity), class: 'btn pull-right'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
%small
|
%small
|
||||||
(#{groups.count})
|
(#{groups.count})
|
||||||
- if current_user.can_create_group?
|
- if current_user.can_create_group?
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to new_group_path, class: "btn btn-tiny info" do
|
= link_to new_group_path, class: "btn btn-tiny info" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Group
|
New Group
|
||||||
|
|
@ -13,6 +13,6 @@
|
||||||
%li
|
%li
|
||||||
= link_to group_path(id: group.path), class: dom_class(group) do
|
= link_to group_path(id: group.path), class: dom_class(group) do
|
||||||
%strong.well-title= truncate(group.name, length: 35)
|
%strong.well-title= truncate(group.name, length: 35)
|
||||||
%span.right.light
|
%span.pull-right.light
|
||||||
- if group.owner == current_user
|
- if group.owner == current_user
|
||||||
%i.icon-wrench
|
%i.icon-wrench
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
%small
|
%small
|
||||||
(#{@projects_count})
|
(#{@projects_count})
|
||||||
- if current_user.can_create_project?
|
- if current_user.can_create_project?
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to new_project_path, class: "btn btn-tiny info" do
|
= link_to new_project_path, class: "btn btn-tiny info" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Project
|
New Project
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Teams
|
Teams
|
||||||
%small
|
%small
|
||||||
(#{@teams.count})
|
(#{@teams.count})
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to new_team_path, class: "btn btn-tiny info" do
|
= link_to new_team_path, class: "btn btn-tiny info" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Team
|
New Team
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
%li
|
%li
|
||||||
= link_to team_path(id: team.path), class: dom_class(team) do
|
= link_to team_path(id: team.path), class: dom_class(team) do
|
||||||
%strong.well-title= truncate(team.name, length: 35)
|
%strong.well-title= truncate(team.name, length: 35)
|
||||||
%span.right.light
|
%span.pull-right.light
|
||||||
- if team.owner == current_user
|
- if team.owner == current_user
|
||||||
%i.icon-wrench
|
%i.icon-wrench
|
||||||
- tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
|
- tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Issues
|
Issues
|
||||||
%small (assigned to you)
|
%small (assigned to you)
|
||||||
%small.right #{@issues.total_count} issues
|
%small.pull-right #{@issues.total_count} issues
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Merge Requests
|
Merge Requests
|
||||||
%small (authored by or assigned to you)
|
%small (authored by or assigned to you)
|
||||||
%small.right #{@merge_requests.total_count} merge requests
|
%small.pull-right #{@merge_requests.total_count} merge requests
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
.row
|
.row
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
%span
|
%span
|
||||||
(#{@projects.total_count})
|
(#{@projects.total_count})
|
||||||
- if current_user.can_create_project?
|
- if current_user.can_create_project?
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to new_project_path, class: "btn btn-tiny info" do
|
= link_to new_project_path, class: "btn btn-tiny info" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Project
|
New Project
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
%small.light
|
%small.light
|
||||||
%strong Last activity:
|
%strong Last activity:
|
||||||
%span= project_last_activity(project)
|
%span= project_last_activity(project)
|
||||||
.right.light
|
.pull-right.light
|
||||||
- if project.owner == current_user
|
- if project.owner == current_user
|
||||||
%i.icon-wrench
|
%i.icon-wrench
|
||||||
- tm = project.team.get_tm(current_user.id)
|
- tm = project.team.get_tm(current_user.id)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%div
|
%div
|
||||||
= form_for [@project, @key], url: project_deploy_keys_path do |f|
|
= form_for [@project, @key], url: project_deploy_keys_path do |f|
|
||||||
-if @key.errors.any?
|
-if @key.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @key.errors.full_messages.each do |msg|
|
- @key.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,5 @@
|
||||||
= time_ago_in_words(key.created_at)
|
= time_ago_in_words(key.created_at)
|
||||||
ago
|
ago
|
||||||
%td
|
%td
|
||||||
= link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small right"
|
= link_to 'Remove', project_deploy_key_path(key.project, key), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key btn-small pull-right"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,5 @@
|
||||||
← To keys list
|
← To keys list
|
||||||
%hr
|
%hr
|
||||||
%pre= @key.key
|
%pre= @key.key
|
||||||
.right
|
.pull-right
|
||||||
= link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
|
= link_to 'Remove', project_deploy_key_path(@key.project, @key), confirm: 'Are you sure?', method: :delete, class: "btn-remove btn delete-key"
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@
|
||||||
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
|
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password"
|
||||||
%div
|
%div
|
||||||
= f.submit "Change my password", class: "btn btn-primary"
|
= f.submit "Change my password", class: "btn btn-primary"
|
||||||
.right= render partial: "devise/shared/links"
|
.pull-right= render partial: "devise/shared/links"
|
||||||
|
|
|
||||||
|
|
@ -25,5 +25,5 @@
|
||||||
%span Remember me
|
%span Remember me
|
||||||
%br/
|
%br/
|
||||||
= f.submit "Sign in", :class => "btn-primary btn"
|
= f.submit "Sign in", :class => "btn-primary btn"
|
||||||
.right
|
.pull-right
|
||||||
= render :partial => "devise/shared/links"
|
= render :partial => "devise/shared/links"
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
%span Remember me
|
%span Remember me
|
||||||
%br/
|
%br/
|
||||||
= f.submit "Sign in", :class => "btn-primary btn wide"
|
= f.submit "Sign in", :class => "btn-primary btn wide"
|
||||||
.right
|
.pull-right
|
||||||
= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
|
= link_to "Forgot your password?", new_password_path(resource_name), :class => "btn"
|
||||||
%br/
|
%br/
|
||||||
%br/
|
%br/
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
- if event.proper?
|
- if event.proper?
|
||||||
%div.event-item
|
%div.event-item
|
||||||
%span.cgray.right
|
%span.cgray.pull-right
|
||||||
#{time_ago_in_words(event.created_at)} ago.
|
#{time_ago_in_words(event.created_at)} ago.
|
||||||
|
|
||||||
= image_tag gravatar_icon(event.author_email), class: "avatar s24"
|
= image_tag gravatar_icon(event.author_email), class: "avatar s24"
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@
|
||||||
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
||||||
= link_to group_filter_path(entity, project_id: project.id) do
|
= link_to group_filter_path(entity, project_id: project.id) do
|
||||||
= project.name_with_namespace
|
= project.name_with_namespace
|
||||||
%small.right= entities_per_project(project, entity)
|
%small.pull-right= entities_per_project(project, entity)
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%hr
|
%hr
|
||||||
= link_to "Reset", group_filter_path(entity), class: 'btn right'
|
= link_to "Reset", group_filter_path(entity), class: 'btn pull-right'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,9 @@
|
||||||
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
%li{class: ("active" if params[:project_id] == project.id.to_s)}
|
||||||
= link_to people_group_path(@group, project_id: project.id) do
|
= link_to people_group_path(@group, project_id: project.id) do
|
||||||
= project.name_with_namespace
|
= project.name_with_namespace
|
||||||
%small.right= project.users.count
|
%small.pull-right= project.users.count
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%hr
|
%hr
|
||||||
= link_to "Reset", people_group_path(@group), class: 'btn right'
|
= link_to "Reset", people_group_path(@group), class: 'btn pull-right'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
%small
|
%small
|
||||||
(#{projects.count})
|
(#{projects.count})
|
||||||
- if can? current_user, :manage_group, @group
|
- if can? current_user, :manage_group, @group
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
|
= link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Project
|
New Project
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Issues
|
Issues
|
||||||
%small (assigned to you)
|
%small (assigned to you)
|
||||||
%small.right #{@issues.total_count} issues
|
%small.pull-right #{@issues.total_count} issues
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
.row
|
.row
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Merge Requests
|
Merge Requests
|
||||||
%small (authored by or assigned to you)
|
%small (authored by or assigned to you)
|
||||||
%small.right #{@merge_requests.total_count} merge requests
|
%small.pull-right #{@merge_requests.total_count} merge requests
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
.row
|
.row
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for @group do |f|
|
= form_for @group do |f|
|
||||||
- if @group.errors.any?
|
- if @group.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @group.errors.full_messages.first
|
%span= @group.errors.full_messages.first
|
||||||
.clearfix
|
.clearfix
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,5 @@
|
||||||
%strong= user.name
|
%strong= user.name
|
||||||
%span.cgray= user.email
|
%span.cgray= user.email
|
||||||
- if @group.owner == user
|
- if @group.owner == user
|
||||||
%span.btn.btn-small.disabled.right Group Owner
|
%span.btn.btn-small.disabled.pull-right Group Owner
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,5 +30,5 @@
|
||||||
%li
|
%li
|
||||||
%strong= link_to "Public Access", help_public_access_path
|
%strong= link_to "Public Access", help_public_access_path
|
||||||
|
|
||||||
.span9.right
|
.span9.pull-right
|
||||||
= yield
|
= yield
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
GITLAB
|
GITLAB
|
||||||
.right
|
.pull-right
|
||||||
%span= Gitlab::Version
|
%span= Gitlab::Version
|
||||||
%small= Gitlab::Revision
|
%small= Gitlab::Revision
|
||||||
%hr
|
%hr
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
|
= form_for [@project, @hook], as: :hook, url: project_hooks_path(@project), html: { class: 'form-inline' } do |f|
|
||||||
-if @hook.errors.any?
|
-if @hook.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
- @hook.errors.full_messages.each do |msg|
|
- @hook.errors.full_messages.each do |msg|
|
||||||
%p= msg
|
%p= msg
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
@ -37,6 +37,6 @@
|
||||||
→
|
→
|
||||||
%span.monospace= hook.url
|
%span.monospace= hook.url
|
||||||
%td
|
%td
|
||||||
.right
|
.pull-right
|
||||||
= link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
|
= link_to 'Test Hook', test_project_hook_path(@project, hook), class: "btn btn-small grouped"
|
||||||
= link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
|
= link_to 'Remove', project_hook_path(@project, hook), confirm: 'Are you sure?', method: :delete, class: "btn btn-remove btn-small grouped"
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,5 @@
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%hr
|
%hr
|
||||||
= link_to "Reset", project_issues_path(@project), class: 'btn right'
|
= link_to "Reset", project_issues_path(@project), class: 'btn pull-right'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
|
%h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
|
||||||
= form_for [@project, @issue] do |f|
|
= form_for [@project, @issue] do |f|
|
||||||
-if @issue.errors.any?
|
-if @issue.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
- @issue.errors.full_messages.each do |msg|
|
- @issue.errors.full_messages.each do |msg|
|
||||||
%span= msg
|
%span= msg
|
||||||
%br
|
%br
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
= link_to 'Milestones', project_milestones_path(@project), class: "tab"
|
= link_to 'Milestones', project_milestones_path(@project), class: "tab"
|
||||||
= nav_link(controller: :labels) do
|
= nav_link(controller: :labels) do
|
||||||
= link_to 'Labels', project_labels_path(@project), class: "tab"
|
= link_to 'Labels', project_labels_path(@project), class: "tab"
|
||||||
%li.right
|
%li.pull-right
|
||||||
%span.rss-icon
|
%span.rss-icon
|
||||||
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
|
= link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
|
||||||
= image_tag "rss_ui.png", title: "feed"
|
= image_tag "rss_ui.png", title: "feed"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
- if @issues.present?
|
- if @issues.present?
|
||||||
%li.bottom
|
%li.bottom
|
||||||
.left= paginate @issues, remote: true, theme: "gitlab"
|
.left= paginate @issues, remote: true, theme: "gitlab"
|
||||||
.right
|
.pull-right
|
||||||
%span.issue_counter #{@issues.total_count}
|
%span.issue_counter #{@issues.total_count}
|
||||||
issues for this filter
|
issues for this filter
|
||||||
- else
|
- else
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
- if controller.controller_name == 'issues'
|
- if controller.controller_name == 'issues'
|
||||||
.issue_check
|
.issue_check
|
||||||
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
|
= check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue)
|
||||||
.right
|
.pull-right
|
||||||
- if issue.notes.any?
|
- if issue.notes.any?
|
||||||
%span.btn.btn-small.disabled.grouped
|
%span.btn.btn-small.disabled.grouped
|
||||||
%i.icon-comment
|
%i.icon-comment
|
||||||
|
|
|
||||||
|
|
@ -3,16 +3,16 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Issues
|
Issues
|
||||||
%span (<span class=issue_counter>#{@issues.total_count}</span>)
|
%span (<span class=issue_counter>#{@issues.total_count}</span>)
|
||||||
.right
|
.pull-right
|
||||||
.span5
|
.span5
|
||||||
- if can? current_user, :write_issue, @project
|
- if can? current_user, :write_issue, @project
|
||||||
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "right btn btn-primary", title: "New Issue", id: "new_issue_link" do
|
= link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-primary pull-right", title: "New Issue", id: "new_issue_link" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Issue
|
New Issue
|
||||||
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: :right do
|
= form_tag search_project_issues_path(@project), method: :get, remote: true, id: "issue_search_form", class: 'pull-right' do
|
||||||
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
|
= hidden_field_tag :project_id, @project.id, { id: 'project_id' }
|
||||||
= hidden_field_tag :status, params[:status]
|
= hidden_field_tag :status, params[:status]
|
||||||
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 right neib search-text-input' }
|
= search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search span3 pull-right neib search-text-input' }
|
||||||
|
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
created at
|
created at
|
||||||
= @issue.created_at.stamp("Aug 21, 2011")
|
= @issue.created_at.stamp("Aug 21, 2011")
|
||||||
|
|
||||||
%span.right
|
%span.pull-right
|
||||||
- if can?(current_user, :admin_project, @project) || @issue.author == current_user
|
- if can?(current_user, :admin_project, @project) || @issue.author == current_user
|
||||||
- if @issue.closed
|
- if @issue.closed
|
||||||
= link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue"
|
= link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue"
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
.right
|
.pull-right
|
||||||
.span3#votes= render 'votes/votes_block', votable: @issue
|
.span3#votes= render 'votes/votes_block', votable: @issue
|
||||||
|
|
||||||
.back_link
|
.back_link
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
%cite.cgray and attached to milestone
|
%cite.cgray and attached to milestone
|
||||||
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
|
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
|
||||||
|
|
||||||
.right
|
.pull-right
|
||||||
- @issue.labels.each do |label|
|
- @issue.labels.each do |label|
|
||||||
%span.label
|
%span.label
|
||||||
%i.icon-tag
|
%i.icon-tag
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
%ul
|
%ul
|
||||||
= prev_page_tag unless current_page.first?
|
= prev_page_tag unless current_page.first?
|
||||||
- each_page do |page|
|
- each_page do |page|
|
||||||
- if page.left_outer? || page.right_outer? || page.inside_window?
|
- if page.left_outer? || page.pull-right_outer? || page.inside_window?
|
||||||
= page_tag page
|
= page_tag page
|
||||||
- elsif !page.was_truncated?
|
- elsif !page.was_truncated?
|
||||||
= gap_tag
|
= gap_tag
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
%nav.gitlab_pagination
|
%nav.gitlab_pagination
|
||||||
= prev_page_tag
|
= prev_page_tag
|
||||||
- each_page do |page|
|
- each_page do |page|
|
||||||
- if page.left_outer? || page.right_outer? || page.inside_window?
|
- if page.left_outer? || page.pull-right_outer? || page.inside_window?
|
||||||
= page_tag page
|
= page_tag page
|
||||||
- elsif !page.was_truncated?
|
- elsif !page.was_truncated?
|
||||||
= gap_tag
|
= gap_tag
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%div
|
%div
|
||||||
= form_for @key do |f|
|
= form_for @key do |f|
|
||||||
-if @key.errors.any?
|
-if @key.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @key.errors.full_messages.each do |msg|
|
- @key.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,5 @@
|
||||||
= time_ago_in_words(key.created_at)
|
= time_ago_in_words(key.created_at)
|
||||||
ago
|
ago
|
||||||
%td
|
%td
|
||||||
= link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key right"
|
= link_to 'Remove', key, confirm: 'Are you sure?', method: :delete, class: "btn btn-small btn-remove delete-key pull-right"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
SSH Keys
|
SSH Keys
|
||||||
= link_to "Add new", new_key_path, class: "btn right"
|
= link_to "Add new", new_key_path, class: "btn pull-right"
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
%p.slead
|
%p.slead
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,5 @@
|
||||||
%hr
|
%hr
|
||||||
|
|
||||||
%pre= @key.key
|
%pre= @key.key
|
||||||
.right
|
.pull-right
|
||||||
= link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
|
= link_to 'Remove', @key, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove delete-key"
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
%strong
|
%strong
|
||||||
%i.icon-tag
|
%i.icon-tag
|
||||||
= label.name
|
= label.name
|
||||||
.right
|
.pull-right
|
||||||
= link_to project_issues_path(label_name: label.name) do
|
= link_to project_issues_path(label_name: label.name) do
|
||||||
%strong
|
%strong
|
||||||
= pluralize(label.count, 'issue')
|
= pluralize(label.count, 'issue')
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,5 @@
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%hr
|
%hr
|
||||||
= link_to "Reset", project_merge_requests_path(@project), class: 'btn right'
|
= link_to "Reset", project_merge_requests_path(@project), class: 'btn pull-right'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
|
= form_for [@project, @merge_request], html: { class: "#{controller.action_name}-merge-request form-horizontal" } do |f|
|
||||||
-if @merge_request.errors.any?
|
-if @merge_request.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @merge_request.errors.full_messages.each do |msg|
|
- @merge_request.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
%li{ class: mr_css_classes(merge_request) }
|
%li{ class: mr_css_classes(merge_request) }
|
||||||
.right
|
.pull-right
|
||||||
.left
|
.left
|
||||||
- if merge_request.merged?
|
- if merge_request.merged?
|
||||||
%span.btn.btn-small.disabled.grouped
|
%span.btn.btn-small.disabled.grouped
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
- if can? current_user, :write_merge_request, @project
|
- if can? current_user, :write_merge_request, @project
|
||||||
= link_to new_project_merge_request_path(@project), class: "right btn btn-primary", title: "New Merge Request" do
|
= link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
New Merge Request
|
New Merge Request
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
- if @merge_requests.present?
|
- if @merge_requests.present?
|
||||||
%li.bottom
|
%li.bottom
|
||||||
.left= paginate @merge_requests, theme: "gitlab"
|
.left= paginate @merge_requests, theme: "gitlab"
|
||||||
.right
|
.pull-right
|
||||||
%span.cgray.right #{@merge_requests.total_count} merge requests for this filter
|
%span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(merge_requestsPage);
|
$(merge_requestsPage);
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
- unless can?(current_user, :accept_mr, @project)
|
- unless can?(current_user, :accept_mr, @project)
|
||||||
.alert-message
|
.alert
|
||||||
%strong Only masters can accept MR
|
%strong Only masters can accept MR
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -29,14 +29,14 @@
|
||||||
%strong This repository does not have satellite. Ask administrator to fix this issue
|
%strong This repository does not have satellite. Ask administrator to fix this issue
|
||||||
|
|
||||||
.automerge_widget.cannot_be_merged{style: "display:none"}
|
.automerge_widget.cannot_be_merged{style: "display:none"}
|
||||||
.alert.alert-info
|
.alert.alert-disabled
|
||||||
%span
|
%span
|
||||||
= link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
|
= link_to "Show how to merge", "#", class: "how_to_merge_link btn btn-small padded", title: "How To Merge"
|
||||||
|
|
||||||
%strong This request can't be merged with GitLab. You should do it manually
|
%strong This request can't be merged with GitLab. You should do it manually
|
||||||
|
|
||||||
.automerge_widget.unchecked
|
.automerge_widget.unchecked
|
||||||
.alert-message
|
.alert
|
||||||
%strong
|
%strong
|
||||||
%i.icon-refresh
|
%i.icon-refresh
|
||||||
Checking for ability to automatically merge…
|
Checking for ability to automatically merge…
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
= link_to "Build page", ci_build_details_path(@merge_request)
|
= link_to "Build page", ci_build_details_path(@merge_request)
|
||||||
|
|
||||||
.ci_widget
|
.ci_widget
|
||||||
.alert-message
|
.alert
|
||||||
%strong
|
%strong
|
||||||
%i.icon-refresh
|
%i.icon-refresh
|
||||||
Checking for CI status for #{@merge_request.last_commit_short_sha}
|
Checking for CI status for #{@merge_request.last_commit_short_sha}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
→
|
→
|
||||||
%span.label_branch= @merge_request.target_branch
|
%span.label_branch= @merge_request.target_branch
|
||||||
|
|
||||||
%span.right
|
%span.pull-right
|
||||||
- if can?(current_user, :modify_merge_request, @merge_request)
|
- if can?(current_user, :modify_merge_request, @merge_request)
|
||||||
- if @merge_request.open?
|
- if @merge_request.open?
|
||||||
.left.btn-group
|
.left.btn-group
|
||||||
|
|
@ -17,13 +17,13 @@
|
||||||
%li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
|
%li= link_to "Email Patches", project_merge_request_path(@project, @merge_request, format: :patch)
|
||||||
%li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
|
%li= link_to "Plain Diff", project_merge_request_path(@project, @merge_request, format: :diff)
|
||||||
|
|
||||||
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped danger", title: "Close merge request"
|
= link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {closed: true }, status_only: true), method: :put, class: "btn grouped btn-close", title: "Close merge request"
|
||||||
|
|
||||||
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
|
= link_to edit_project_merge_request_path(@project, @merge_request), class: "btn grouped" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
||||||
.right
|
.pull-right
|
||||||
.span3#votes= render 'votes/votes_block', votable: @merge_request
|
.span3#votes= render 'votes/votes_block', votable: @merge_request
|
||||||
|
|
||||||
.back_link
|
.back_link
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
|
= form_for [@project, @milestone], html: {class: "new_milestone form-horizontal"} do |f|
|
||||||
-if @milestone.errors.any?
|
-if @milestone.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @milestone.errors.full_messages.each do |msg|
|
- @milestone.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
%li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
|
%li{class: "milestone milestone-#{milestone.closed ? 'closed' : 'open'}", id: dom_id(milestone) }
|
||||||
.right
|
.pull-right
|
||||||
- if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
|
- if can?(current_user, :admin_milestone, milestone.project) and milestone.open?
|
||||||
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
|
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
Milestones
|
Milestones
|
||||||
- if can? current_user, :admin_milestone, @project
|
- if can? current_user, :admin_milestone, @project
|
||||||
= link_to "New Milestone", new_project_milestone_path(@project), class: "right btn btn-small", title: "New Milestone"
|
= link_to "New Milestone", new_project_milestone_path(@project), class: "pull-right btn btn-small", title: "New Milestone"
|
||||||
%br
|
%br
|
||||||
%div.ui-box
|
%div.ui-box
|
||||||
.title
|
.title
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
= link_to project_milestones_path(@project) do
|
= link_to project_milestones_path(@project) do
|
||||||
← To milestones list
|
← To milestones list
|
||||||
.span6
|
.span6
|
||||||
.right
|
.pull-right
|
||||||
- unless @milestone.closed
|
- unless @milestone.closed
|
||||||
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
|
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
|
||||||
%i.icon-plus
|
%i.icon-plus
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
#{@milestone.closed_items_count} closed
|
#{@milestone.closed_items_count} closed
|
||||||
–
|
–
|
||||||
#{@milestone.open_items_count} open
|
#{@milestone.open_items_count} open
|
||||||
%span.right= @milestone.expires_at
|
%span.pull-right= @milestone.expires_at
|
||||||
.progress.progress-info
|
.progress.progress-info
|
||||||
.bar{style: "width: #{@milestone.percent_complete}%;"}
|
.bar{style: "width: #{@milestone.percent_complete}%;"}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
= f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
|
= f.submit 'Add Comment', class: "btn comment-btn grouped js-comment-button"
|
||||||
%a.btn.grouped.js-close-discussion-note-form Cancel
|
%a.btn.grouped.js-close-discussion-note-form Cancel
|
||||||
.hint
|
.hint
|
||||||
.right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
.pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
|
||||||
.clearfix
|
.clearfix
|
||||||
|
|
||||||
.note_options
|
.note_options
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
- if note.attachment.url
|
- if note.attachment.url
|
||||||
- if note.attachment.image?
|
- if note.attachment.image?
|
||||||
= image_tag note.attachment.url, class: 'note-image-attach'
|
= image_tag note.attachment.url, class: 'note-image-attach'
|
||||||
.attachment.right
|
.attachment.pull-right
|
||||||
= link_to note.attachment.url, target: "_blank" do
|
= link_to note.attachment.url, target: "_blank" do
|
||||||
%i.icon-attachment
|
%i.icon-attachment
|
||||||
= note.attachment_identifier
|
= note.attachment_identifier
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
Private token
|
Private token
|
||||||
%span.cred.right
|
%span.cred.pull-right
|
||||||
keep it secret!
|
keep it secret!
|
||||||
.padded
|
.padded
|
||||||
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
|
= form_for @user, url: reset_private_token_profile_path, method: :put do |f|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
.padded
|
.padded
|
||||||
%p.slead After successful password update you will be redirected to login page where you should login with new password
|
%p.slead After successful password update you will be redirected to login page where you should login with new password
|
||||||
-if @user.errors.any?
|
-if @user.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @user.errors.full_messages.each do |msg|
|
- @user.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
%fieldset.update-username
|
%fieldset.update-username
|
||||||
%legend
|
%legend
|
||||||
Username
|
Username
|
||||||
%small.cred.right
|
%small.cred.pull-right
|
||||||
Changing your username can have unintended side effects!
|
Changing your username can have unintended side effects!
|
||||||
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
|
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
|
||||||
.padded
|
.padded
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
%small
|
%small
|
||||||
= @user.email
|
= @user.email
|
||||||
|
|
||||||
.right
|
.pull-right
|
||||||
= link_to destroy_user_session_path, class: "logout", method: :delete do
|
= link_to destroy_user_session_path, class: "logout", method: :delete do
|
||||||
%small
|
%small
|
||||||
%i.icon-signout
|
%i.icon-signout
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
= form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
|
= form_for @user, url: profile_path, method: :put, html: { class: "edit_user form-horizontal" } do |f|
|
||||||
-if @user.errors.any?
|
-if @user.errors.any?
|
||||||
%div.alert-message.block-message.error
|
%div.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @user.errors.full_messages.each do |msg|
|
- @user.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
|
= f.text_area :bio, rows: 6, class: "input-xlarge", maxlength: 250
|
||||||
%span.help-block Tell us about yourself in fewer than 250 characters.
|
%span.help-block Tell us about yourself in fewer than 250 characters.
|
||||||
|
|
||||||
.span5.right
|
.span5.pull-right
|
||||||
%fieldset.tips
|
%fieldset.tips
|
||||||
%legend Tips:
|
%legend Tips:
|
||||||
%ul
|
%ul
|
||||||
|
|
@ -76,7 +76,7 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
Personal projects:
|
Personal projects:
|
||||||
%small.right
|
%small.pull-right
|
||||||
%span= current_user.personal_projects.count
|
%span= current_user.personal_projects.count
|
||||||
of
|
of
|
||||||
%span= current_user.projects_limit
|
%span= current_user.projects_limit
|
||||||
|
|
@ -87,7 +87,7 @@
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
SSH public keys:
|
SSH public keys:
|
||||||
%span.right
|
%span.pull-right
|
||||||
= link_to pluralize(current_user.keys.count, 'key'), keys_path
|
= link_to pluralize(current_user.keys.count, 'key'), keys_path
|
||||||
.padded
|
.padded
|
||||||
= link_to "Add Public Key", new_key_path, class: "btn btn-small"
|
= link_to "Add Public Key", new_key_path, class: "btn btn-small"
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
.row
|
.row
|
||||||
.span7
|
.span7
|
||||||
.form-horizontal= render "shared/clone_panel"
|
.form-horizontal= render "shared/clone_panel"
|
||||||
.span4.right
|
.span4.pull-right
|
||||||
.right
|
.pull-right
|
||||||
- unless @project.empty_repo?
|
- unless @project.empty_repo?
|
||||||
- if can? current_user, :download_code, @project
|
- if can? current_user, :download_code, @project
|
||||||
= link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do
|
= link_to archive_project_repository_path(@project), class: "btn-small btn grouped" do
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_for(@project, remote: true) do |f|
|
= form_for(@project, remote: true) do |f|
|
||||||
- if @project.errors.any?
|
- if @project.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @project.errors.full_messages.each do |msg|
|
- @project.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
@ -81,5 +81,5 @@
|
||||||
= link_to 'Cancel', @project, class: "btn"
|
= link_to 'Cancel', @project, class: "btn"
|
||||||
- unless @project.new_record?
|
- unless @project.new_record?
|
||||||
- if can?(current_user, :remove_project, @project)
|
- if can?(current_user, :remove_project, @project)
|
||||||
.right
|
.pull-right
|
||||||
= link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
|
= link_to 'Remove Project', @project, confirm: 'Removed project can not be restored! Are you sure?', method: :delete, class: "btn btn-remove"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
= form_for(@project, remote: true) do |f|
|
= form_for(@project, remote: true) do |f|
|
||||||
- if @project.errors.any?
|
- if @project.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%span= @project.errors.full_messages.first
|
%span= @project.errors.full_messages.first
|
||||||
.clearfix.project_name_holder
|
.clearfix.project_name_holder
|
||||||
= f.label :name do
|
= f.label :name do
|
||||||
|
|
|
||||||
|
|
@ -13,19 +13,19 @@
|
||||||
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
|
= link_to 'Snippets', project_snippets_path(@project), class: "snippets-tab tab"
|
||||||
|
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= nav_link(controller: :deploy_keys, html_options: {class: 'right'}) do
|
= nav_link(controller: :deploy_keys, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_deploy_keys_path(@project) do
|
= link_to project_deploy_keys_path(@project) do
|
||||||
%span
|
%span
|
||||||
Deploy Keys
|
Deploy Keys
|
||||||
= nav_link(controller: :hooks, html_options: {class: 'right'}) do
|
= nav_link(controller: :hooks, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_hooks_path(@project) do
|
= link_to project_hooks_path(@project) do
|
||||||
%span
|
%span
|
||||||
Hooks
|
Hooks
|
||||||
= nav_link(controller: :services, html_options: {class: 'right'}) do
|
= nav_link(controller: :services, html_options: {class: 'pull-right'}) do
|
||||||
= link_to project_services_path(@project) do
|
= link_to project_services_path(@project) do
|
||||||
%span
|
%span
|
||||||
Services
|
Services
|
||||||
= nav_link(path: 'projects#edit', html_options: {class: 'right'}) do
|
= nav_link(path: 'projects#edit', html_options: {class: 'pull-right'}) do
|
||||||
= link_to edit_project_path(@project), class: "stat-tab tab " do
|
= link_to edit_project_path(@project), class: "stat-tab tab " do
|
||||||
%i.icon-edit
|
%i.icon-edit
|
||||||
Edit
|
Edit
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,4 @@
|
||||||
|
|
||||||
- if can? current_user, :remove_project, @project
|
- if can? current_user, :remove_project, @project
|
||||||
.prepend-top-20
|
.prepend-top-20
|
||||||
= link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove right"
|
= link_to 'Remove project', @project, confirm: 'Are you sure?', method: :delete, class: "btn btn-remove pull-right"
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
- if can? current_user, :admin_project, @project
|
- if can? current_user, :admin_project, @project
|
||||||
= form_for [@project, @protected_branch] do |f|
|
= form_for [@project, @protected_branch] do |f|
|
||||||
-if @protected_branch.errors.any?
|
-if @protected_branch.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @protected_branch.errors.full_messages.each do |msg|
|
- @protected_branch.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
%h5
|
%h5
|
||||||
%i.icon-share
|
%i.icon-share
|
||||||
= project.name_with_namespace
|
= project.name_with_namespace
|
||||||
.right
|
.pull-right
|
||||||
%pre.dark.tiny git clone #{project.http_url_to_repo}
|
%pre.dark.tiny git clone #{project.http_url_to_repo}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
= image_tag gravatar_icon(commit.author_email), class: "", width: 16
|
= image_tag gravatar_icon(commit.author_email), class: "", width: 16
|
||||||
= gfm escape_once(truncate(commit.title, length: 40))
|
= gfm escape_once(truncate(commit.title, length: 40))
|
||||||
%td
|
%td
|
||||||
%span.right.cgray
|
%span.pull-right.cgray
|
||||||
= time_ago_in_words(commit.committed_date)
|
= time_ago_in_words(commit.committed_date)
|
||||||
ago
|
ago
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
= image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
|
= image_tag gravatar_icon(author.email, 16), class: 'avatar s16'
|
||||||
= author.name
|
= author.name
|
||||||
%small.light= author.email
|
%small.light= author.email
|
||||||
.right
|
.pull-right
|
||||||
= author.commits
|
= author.commits
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%h3.page_title
|
%h3.page_title
|
||||||
GitLab CI
|
GitLab CI
|
||||||
%small Continuous integration server from GitLab
|
%small Continuous integration server from GitLab
|
||||||
.right
|
.pull-right
|
||||||
- if @service.active
|
- if @service.active
|
||||||
%small.cgreen Enabled
|
%small.cgreen Enabled
|
||||||
- else
|
- else
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
%hr
|
%hr
|
||||||
= form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
|
= form_for(@service, :as => :service, :url => project_service_path(@project, :gitlab_ci), :method => :put) do |f|
|
||||||
- if @service.errors.any?
|
- if @service.errors.any?
|
||||||
.alert-message.block-message.error
|
.alert.alert-error
|
||||||
%ul
|
%ul
|
||||||
- @service.errors.full_messages.each do |msg|
|
- @service.errors.full_messages.each do |msg|
|
||||||
%li= msg
|
%li= msg
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
= link_to edit_project_service_path(@project, :gitlab_ci) do
|
= link_to edit_project_service_path(@project, :gitlab_ci) do
|
||||||
GitLab CI
|
GitLab CI
|
||||||
%small Continuous integration server from GitLab
|
%small Continuous integration server from GitLab
|
||||||
.right
|
.pull-right
|
||||||
- if @gitlab_ci_service.try(:active)
|
- if @gitlab_ci_service.try(:active)
|
||||||
%small.cgreen
|
%small.cgreen
|
||||||
%i.icon-ok
|
%i.icon-ok
|
||||||
|
|
@ -21,11 +21,11 @@
|
||||||
%h4
|
%h4
|
||||||
Jenkins CI
|
Jenkins CI
|
||||||
%small An extendable open source continuous integration server
|
%small An extendable open source continuous integration server
|
||||||
.right
|
.pull-right
|
||||||
%small Not implemented yet
|
%small Not implemented yet
|
||||||
%li.disabled
|
%li.disabled
|
||||||
%h4
|
%h4
|
||||||
Campfire
|
Campfire
|
||||||
%small Web-based group chat tool
|
%small Web-based group chat tool
|
||||||
.right
|
.pull-right
|
||||||
%small Not implemented yet
|
%small Not implemented yet
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue