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
3706a11a
authored
Feb 18, 2014
by
Oláh István Gergely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix node traits css, cleanup views
parent
db8ae8b0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
circle/dashboard/static/dashboard/dashboard.css
+5
-5
circle/dashboard/templates/dashboard/node-detail-home.html
+2
-2
circle/dashboard/views.py
+1
-1
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
3706a11a
...
...
@@ -191,31 +191,31 @@ body {
/* pass */
}
#vm-details-tags-form
{
#vm-details-tags-form
,
#node-details-traits-form
{
margin-top
:
15px
;
max-width
:
250px
;
}
.vm-details-remove-tag
{
.vm-details-remove-tag
,
.node-details-remove-trait
{
color
:
white
;
padding-left
:
5px
;
}
.vm-details-remove-tag
:hover
{
.vm-details-remove-tag
:hover
,
.node-details-remove-trait
:hover
{
cursor
:
pointer
;
color
:
black
;
text-decoration
:
none
;
}
/* small buttons for tags, copied from Bootstraps input-sm, bnt-sm */
.btn-tags
{
.btn-tags
,
.btn-traits
{
padding
:
3px
6px
;
font-size
:
11px
;
line-height
:
1.5
;
border-radius
:
3px
;
}
.input-tags
{
.input-tags
,
.input-tratis
{
height
:
22px
;
padding
:
2px
8px
;
font-size
:
11px
;
...
...
circle/dashboard/templates/dashboard/node-detail-home.html
View file @
3706a11a
...
...
@@ -12,7 +12,7 @@
<div
id=
"node-details-traits-list"
>
{% if node.traits.all %}
{% for t in node.traits.all %}
<div
class=
"label label-
primary
label-tag"
style=
"display: inline-block"
>
<div
class=
"label label-
success
label-tag"
style=
"display: inline-block"
>
{{ t }}
<a
href=
"#"
class=
"node-details-remove-trait"
><i
class=
"icon-remove"
></i></a>
</div>
...
...
@@ -23,7 +23,7 @@
</div>
<form
action=
""
method=
"POST"
>
{% csrf_token %}
<div
class=
"input-group"
id=
"node-details-trait-form"
>
<div
class=
"input-group"
id=
"node-details-trait
s
-form"
>
<input
type=
"text"
class=
"form-control input-sm input-traits"
name=
"new_trait"
id=
"node-details-traits-input"
/>
<div
class=
"input-group-btn"
>
<input
type=
"submit"
class=
"btn btn-default btn-sm input-traits"
value=
"{% trans "
Add
trait
"
%}"
/>
...
...
circle/dashboard/views.py
View file @
3706a11a
...
...
@@ -34,7 +34,7 @@ from .tables import (VmListTable, NodeListTable, NodeVmListTable,
TemplateListTable
,
LeaseListTable
,
GroupListTable
,)
from
vm.models
import
(
Instance
,
InstanceTemplate
,
InterfaceTemplate
,
InstanceActivity
,
Node
,
instance_activity
,
Lease
,
Interface
,
NodeActivity
,
Trait
)
Interface
,
NodeActivity
,
)
from
firewall.models
import
Vlan
,
Host
,
Rule
from
storage.models
import
Disk
from
dashboard.models
import
Favourite
...
...
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