Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ced57b53
authored
Oct 17, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: make group list prettier
parent
4e3677ed
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
circle/dashboard/static/dashboard/dashboard.css
+10
-1
circle/dashboard/static/dashboard/group-list.js
+1
-0
circle/dashboard/tables.py
+3
-0
circle/dashboard/templates/dashboard/group-list.html
+1
-1
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
ced57b53
...
@@ -216,7 +216,7 @@ html {
...
@@ -216,7 +216,7 @@ html {
}
}
#vm-list-rename-name
,
#node-list-rename-name
,
#group-list-rename-name
{
#vm-list-rename-name
,
#node-list-rename-name
,
#group-list-rename-name
{
max-width
:
1
0
0px
;
max-width
:
1
5
0px
;
}
}
.label-tag
{
.label-tag
{
...
@@ -1016,3 +1016,12 @@ textarea[name="new_members"] {
...
@@ -1016,3 +1016,12 @@ textarea[name="new_members"] {
#vm-migrate-node-list
li
{
#vm-migrate-node-list
li
{
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.group-list-table
.actions
,
.group-list-table
.admin
,
.group-list-table
.number_of_users
,
.group-list-table
.pk
{
width
:
1px
;
white-space
:
nowrap
;
text-align
:
center
;
}
circle/dashboard/static/dashboard/group-list.js
View file @
ced57b53
...
@@ -3,6 +3,7 @@ $(function() {
...
@@ -3,6 +3,7 @@ $(function() {
$
(
"#group-list-rename-button, .group-details-rename-button"
).
click
(
function
()
{
$
(
"#group-list-rename-button, .group-details-rename-button"
).
click
(
function
()
{
$
(
"#group-list-column-name"
,
$
(
this
).
closest
(
"tr"
)).
hide
();
$
(
"#group-list-column-name"
,
$
(
this
).
closest
(
"tr"
)).
hide
();
$
(
"#group-list-rename"
,
$
(
this
).
closest
(
"tr"
)).
css
(
'display'
,
'inline'
);
$
(
"#group-list-rename"
,
$
(
this
).
closest
(
"tr"
)).
css
(
'display'
,
'inline'
);
$
(
"#group-list-rename"
).
find
(
"input"
).
select
();
});
});
/* rename ajax */
/* rename ajax */
...
...
circle/dashboard/tables.py
View file @
ced57b53
...
@@ -88,18 +88,21 @@ class GroupListTable(Table):
...
@@ -88,18 +88,21 @@ class GroupListTable(Table):
number_of_users
=
TemplateColumn
(
number_of_users
=
TemplateColumn
(
orderable
=
False
,
orderable
=
False
,
verbose_name
=
_
(
"Number of users"
),
template_name
=
'dashboard/group-list/column-users.html'
,
template_name
=
'dashboard/group-list/column-users.html'
,
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-admin'
}},
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-admin'
}},
)
)
admin
=
TemplateColumn
(
admin
=
TemplateColumn
(
orderable
=
False
,
orderable
=
False
,
verbose_name
=
_
(
"Admin"
),
template_name
=
'dashboard/group-list/column-admin.html'
,
template_name
=
'dashboard/group-list/column-admin.html'
,
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-admin'
}},
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-admin'
}},
)
)
actions
=
TemplateColumn
(
actions
=
TemplateColumn
(
orderable
=
False
,
orderable
=
False
,
verbose_name
=
_
(
"Actions"
),
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-thin'
}},
attrs
=
{
'th'
:
{
'class'
:
'group-list-table-thin'
}},
template_code
=
(
'{
%
include "dashboard/group-list/column-'
template_code
=
(
'{
%
include "dashboard/group-list/column-'
'actions.html" with btn_size="btn-xs"
%
}'
),
'actions.html" with btn_size="btn-xs"
%
}'
),
...
...
circle/dashboard/templates/dashboard/group-list.html
View file @
ced57b53
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<h3
class=
"no-margin"
><i
class=
"fa fa-group"
></i>
Your groups
</h3>
<h3
class=
"no-margin"
><i
class=
"fa fa-group"
></i>
{% trans "Groups" %}
</h3>
</div>
</div>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<div
id=
"table_container"
>
<div
id=
"table_container"
>
...
...
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