Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
b563312c
Commit
b563312c
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style project edit section
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1b5510a8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
17 deletions
+20
-17
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+4
-0
app/views/dashboard/show.html.haml
app/views/dashboard/show.html.haml
+1
-1
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+8
-8
app/views/projects/hooks/index.html.haml
app/views/projects/hooks/index.html.haml
+6
-7
No files found.
app/assets/stylesheets/generic/selects.scss
View file @
b563312c
...
...
@@ -56,3 +56,7 @@
.chosen-compact
{
max-width
:
170px
!
important
;
}
select
.select-wide
{
width
:
200px
;
}
app/views/dashboard/show.html.haml
View file @
b563312c
...
...
@@ -2,7 +2,7 @@
.dashboard.row
.activities.col-md-8
=
render
'activities'
.side.col-md-4
.side.col-md-4
.hidden-sm
=
render
'sidebar'
-
else
...
...
app/views/profiles/show.html.haml
View file @
b563312c
...
...
@@ -52,7 +52,7 @@
=
f
.
text_area
:bio
,
rows:
6
,
class:
"form-control"
,
maxlength:
250
%span
.help-block
Tell us about yourself in fewer than 250 characters.
.col-md-5
.pull-right
.col-md-5
.light-well
=
image_tag
avatar_icon
(
@user
.
email
,
160
),
alt:
''
,
class:
'avatar s160'
...
...
app/views/projects/edit.html.haml
View file @
b563312c
...
...
@@ -7,26 +7,26 @@
%p
.light
Some settings, such as "Transfer Project", are hidden inside the danger area below
%hr
.form-holder
=
form_for
(
@project
,
remote:
true
)
do
|
f
|
=
form_for
@project
,
remote:
true
,
html:
{
class:
"edit_project form-horizontal"
}
do
|
f
|
%fieldset
.form-group.project_name_holder
=
f
.
label
:name
do
=
f
.
label
:name
,
class:
'control-label'
do
Project name
.col-sm-10
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"
span5
"
=
f
.
text_field
:name
,
placeholder:
"Example Project"
,
class:
"
form-control
"
.form-group
=
f
.
label
:description
do
=
f
.
label
:description
,
class:
'control-label'
do
Project description
%span
.light
(optional)
.col-sm-10
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"
span5
"
,
rows:
3
,
maxlength:
250
=
f
.
text_area
:description
,
placeholder:
"Awesome project"
,
class:
"
form-control
"
,
rows:
3
,
maxlength:
250
-
if
@project
.
repository
.
exists?
&&
@project
.
repository
.
branch_names
.
any?
.form-group
=
f
.
label
:default_branch
,
"Default Branch"
.col-sm-10
=
f
.
select
(
:default_branch
,
@repository
.
branch_names
,
{},
{
class:
'chosen'
})
=
f
.
label
:default_branch
,
"Default Branch"
,
class:
'control-label'
.col-sm-10
=
f
.
select
(
:default_branch
,
@repository
.
branch_names
,
{},
{
class:
'chosen
select-wide
'
})
=
render
"visibility_level"
,
f:
f
,
visibility_level:
@project
.
visibility_level
,
can_change_visibility_level:
can?
(
current_user
,
:change_visibility_level
,
@project
)
...
...
@@ -37,7 +37,7 @@
.form-group
=
f
.
label
:label_list
,
"Labels"
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"
span5
"
=
f
.
text_field
:label_list
,
maxlength:
2000
,
class:
"
form-control
"
%p
.hint
Separate labels with commas.
%fieldset
.features
...
...
app/views/projects/hooks/index.html.haml
View file @
b563312c
...
...
@@ -7,19 +7,17 @@
%hr
.clearfix
=
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-
horizontal
'
}
do
|
f
|
-
if
@hook
.
errors
.
any?
.alert.alert-error
-
@hook
.
errors
.
full_messages
.
each
do
|
msg
|
%p
=
msg
.form-group
=
f
.
label
:url
,
"URL"
=
f
.
label
:url
,
"URL"
,
class:
'control-label'
.col-sm-10
=
f
.
text_field
:url
,
class:
"text_field input-lg input-xpadding"
,
placeholder:
'http://example.com/trigger-ci.json'
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
=
f
.
text_field
:url
,
class:
"form-control"
,
placeholder:
'http://example.com/trigger-ci.json'
.form-group
=
f
.
label
:url
,
"Trigger"
=
f
.
label
:url
,
"Trigger"
,
class:
'control-label'
.col-sm-10
%div
=
f
.
check_box
:push_events
,
class:
'pull-left'
...
...
@@ -42,7 +40,8 @@
%strong
Merge Request events
%p
.light
This url will be triggered for created merge requests
%hr
.form-actions
=
f
.
submit
"Add Web Hook"
,
class:
"btn btn-create"
-
if
@hooks
.
any?
.ui-box
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment