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
Léo-Paul Géneau
gitlab-ce
Commits
a2b3eb13
Commit
a2b3eb13
authored
May 29, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from ui-box to panels
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
38ff5d1a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
24 deletions
+32
-24
app/assets/javascripts/dashboard.js.coffee
app/assets/javascripts/dashboard.js.coffee
+1
-1
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+9
-0
app/assets/stylesheets/generic/ui_box.scss
app/assets/stylesheets/generic/ui_box.scss
+0
-9
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+8
-0
app/views/admin/background_jobs/show.html.haml
app/views/admin/background_jobs/show.html.haml
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+1
-1
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+9
-9
No files found.
app/assets/javascripts/dashboard.js.coffee
View file @
a2b3eb13
...
...
@@ -4,7 +4,7 @@ class Dashboard
$
(
".dash-filter"
).
keyup
->
terms
=
$
(
this
).
val
()
uiBox
=
$
(
this
).
parents
(
'.
ui-box
'
).
first
()
uiBox
=
$
(
this
).
parents
(
'.
panel
'
).
first
()
if
terms
==
""
||
terms
==
undefined
uiBox
.
find
(
".dash-list li"
).
show
()
else
...
...
app/assets/stylesheets/generic/lists.scss
View file @
a2b3eb13
...
...
@@ -72,6 +72,15 @@
font-size
:
14px
;
line-height
:
18px
;
}
.row_title
{
font-weight
:
500
;
color
:
#444
;
&
:hover
{
color
:
#444
;
text-decoration
:
underline
;
}
}
}
}
...
...
app/assets/stylesheets/generic/ui_box.scss
View file @
a2b3eb13
...
...
@@ -106,15 +106,6 @@
}
}
.row_title
{
font-weight
:
500
;
color
:
#444
;
&
:hover
{
color
:
#444
;
text-decoration
:
underline
;
}
}
.form-holder
{
padding-top
:
20px
;
form
{
...
...
app/assets/stylesheets/gl_bootstrap.scss
View file @
a2b3eb13
...
...
@@ -221,3 +221,11 @@ ul.breadcrumb {
position
:
relative
;
white-space
:
nowrap
;
}
/**
* Add some extra stuff to panels
*
*/
.panel
{
}
app/views/admin/background_jobs/show.html.haml
View file @
a2b3eb13
...
...
@@ -5,7 +5,7 @@
.panel.panel-default
.panel-heading
Sidekiq running processes
.body
.
panel-
body
-
if
@sidekiq_processes
.
empty?
%h4
.cred
%i
.icon-warning-sign
...
...
app/views/admin/groups/show.html.haml
View file @
a2b3eb13
...
...
@@ -48,7 +48,7 @@
.panel.panel-default
.panel-heading
Add user(s) to the group:
.body.form-holder
.
panel-
body.form-holder
%p
.light
Read more about project permissions
%strong
=
link_to
"here"
,
help_page_path
(
"permissions"
,
"permissions"
),
class:
"vlink"
...
...
app/views/admin/projects/show.html.haml
View file @
a2b3eb13
...
...
@@ -78,7 +78,7 @@
.panel.panel-default
.panel-heading
Transfer project
.body
.
panel-
body
=
form_for
@project
,
url:
transfer_admin_project_path
(
@project
),
method: :put
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
.form-group
=
f
.
label
:namespace_id
,
"Namespace"
,
class:
'control-label'
...
...
app/views/groups/edit.html.haml
View file @
a2b3eb13
...
...
@@ -84,9 +84,9 @@
.nothing-here-block
This group has no projects yet
.tab-pane
#tab-remove
.panel.panel-default.panel.panel-d
efault-d
anger
.panel.panel-default.panel.panel-danger
.panel-heading
Remove group
.body
.
panel-
body
%p
Removing group will cause all child projects and resources to be removed.
%p
...
...
app/views/projects/edit.html.haml
View file @
a2b3eb13
...
...
@@ -6,7 +6,7 @@
Project settings:
%p
.light
Some settings, such as "Transfer Project", are hidden inside the danger area below
%hr
.
form-holder
.
panel-body
=
form_for
@project
,
remote:
true
,
html:
{
class:
"edit_project form-horizontal"
}
do
|
f
|
%fieldset
.form-group.project_name_holder
...
...
@@ -106,13 +106,13 @@
.js-toggle-content.hide
-
if
can?
current_user
,
:archive_project
,
@project
.panel.panel-default.panel.panel-d
efault-d
anger
.panel.panel-default.panel.panel-danger
.panel-heading
-
if
@project
.
archived?
Unarchive project
-
else
Archive project
.body
.
panel-
body
-
if
@project
.
archived?
%p
Unarchiving the project will mark its repository as active.
...
...
@@ -137,10 +137,10 @@
.nothing-here-block
Only the project owner can archive a project
-
if
can?
(
current_user
,
:change_namespace
,
@project
)
.panel.panel-default.panel.panel-d
efault-d
anger
.panel.panel-default.panel.panel-danger
.panel-heading
Transfer project
.errors-holder
.
form-holder
.
panel-body
=
form_for
(
@project
,
url:
transfer_project_path
(
@project
),
method: :put
,
remote:
true
,
html:
{
class:
'transfer-project form-horizontal'
})
do
|
f
|
.form-group
=
f
.
label
:namespace_id
,
class:
'control-label'
do
...
...
@@ -157,10 +157,10 @@
-
else
.nothing-here-block
Only the project owner can transfer a project
.panel.panel-default.panel.panel-d
efault-d
anger
.panel.panel-default.panel.panel-danger
.panel-heading
Rename repository
.errors-holder
.
form-holder
.
panel-body
=
form_for
(
@project
,
html:
{
class:
'form-horizontal'
})
do
|
f
|
.form-group
=
f
.
label
:path
,
class:
'control-label'
do
...
...
@@ -177,9 +177,9 @@
=
f
.
submit
'Rename'
,
class:
"btn btn-remove"
-
if
can?
(
current_user
,
:remove_project
,
@project
)
.panel.panel-default.panel.panel-d
efault-d
anger
.panel.panel-default.panel.panel-danger
.panel-heading
Remove project
.body
.
panel-
body
%p
Removing the project will delete its repository and all related resources including issues, merge requests etc.
%br
...
...
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