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
f5c999dc
authored
Jan 11, 2018
by
Barnabás Czémán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify tables
parent
95698a75
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
21 deletions
+21
-21
circle/dashboard/tables.py
+9
-9
circle/dashboard/templates/dashboard/group-detail.html
+2
-2
circle/network/tables.py
+4
-4
circle/network/templates/network/index.html
+2
-2
circle/network/templates/network/switch-port-edit.html
+1
-1
circle/request/tables.py
+3
-3
No files found.
circle/dashboard/tables.py
View file @
f5c999dc
...
...
@@ -105,7 +105,7 @@ class NodeListTable(Table):
class
Meta
:
model
=
Node
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover '
attrs
=
{
'class'
:
(
'table table-striped table-hover '
'node-list-table'
)}
fields
=
(
'pk'
,
'name'
,
'host'
,
'get_status_display'
,
'priority'
,
'minion_online'
,
'overcommit'
,
'number_of_VMs'
,
)
...
...
@@ -146,7 +146,7 @@ class GroupListTable(Table):
class
Meta
:
model
=
Group
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover '
attrs
=
{
'class'
:
(
'table table-striped table-hover '
'group-list-table'
)}
fields
=
(
'pk'
,
'name'
,
)
order_by
=
(
'pk'
,
)
...
...
@@ -174,7 +174,7 @@ class UserListTable(Table):
class
Meta
:
model
=
User
template
=
"django_tables2/with_pagination.html"
attrs
=
{
'class'
:
(
'table
table-bordered
table-striped table-hover'
)}
attrs
=
{
'class'
:
(
'table table-striped table-hover'
)}
fields
=
(
'username'
,
'last_name'
,
'first_name'
,
'profile__org_id'
,
'email'
,
'is_active'
,
'is_superuser'
)
order_by
=
(
'username'
,
)
...
...
@@ -225,7 +225,7 @@ class TemplateListTable(Table):
class
Meta
:
model
=
InstanceTemplate
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover'
attrs
=
{
'class'
:
(
'table table-striped table-hover'
' template-list-table'
)}
fields
=
(
'name'
,
'resources'
,
'system'
,
'access_method'
,
'lease'
,
'owner'
,
'created'
,
'running'
,
'actions'
,
)
...
...
@@ -255,7 +255,7 @@ class LeaseListTable(Table):
class
Meta
:
model
=
Lease
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover'
attrs
=
{
'class'
:
(
'table table-striped table-hover'
' lease-list-table'
)}
fields
=
(
'name'
,
'suspend_interval_seconds'
,
'delete_interval_seconds'
,
)
...
...
@@ -289,7 +289,7 @@ class UserKeyListTable(Table):
class
Meta
:
model
=
UserKey
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover'
),
attrs
=
{
'class'
:
(
'table table-striped table-hover'
),
'id'
:
"profile-key-list-table"
}
fields
=
(
'name'
,
'fingerprint'
,
'created'
,
'actions'
)
prefix
=
"key-"
...
...
@@ -319,7 +319,7 @@ class ConnectCommandListTable(Table):
class
Meta
:
model
=
ConnectCommand
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover'
),
attrs
=
{
'class'
:
(
'table table-striped table-hover'
),
'id'
:
"profile-command-list-table"
}
fields
=
(
'name'
,
'access_method'
,
'template'
,
'actions'
)
prefix
=
"cmd-"
...
...
@@ -347,7 +347,7 @@ class DiskListTable(Table):
class
Meta
:
model
=
Disk
attrs
=
{
'class'
:
"table table-
bordered table-
striped table-hover"
,
attrs
=
{
'class'
:
"table table-striped table-hover"
,
'id'
:
"disk-list-table"
}
fields
=
(
"pk"
,
"appliance"
,
"filename"
,
"size"
,
"is_ready"
)
prefix
=
"disk-"
...
...
@@ -366,7 +366,7 @@ class MessageListTable(Table):
class
Meta
:
template
=
"django_tables2/with_pagination.html"
model
=
Message
attrs
=
{
'class'
:
"table table-
bordered table-
striped table-hover"
,
attrs
=
{
'class'
:
"table table-striped table-hover"
,
'id'
:
"disk-list-table"
}
order_by
=
(
"-pk"
,
)
fields
=
(
'pk'
,
'message'
,
'enabled'
,
'effect'
)
...
...
circle/dashboard/templates/dashboard/group-detail.html
View file @
f5c999dc
...
...
@@ -84,7 +84,7 @@
{% endif %}
</h3>
<form
action=
""
method=
"post"
>
{% csrf_token %}
<table
class=
"table table-striped table-with-form-fields
table-bordered
"
id=
"group-detail-user-table"
>
<table
class=
"table table-striped table-with-form-fields"
id=
"group-detail-user-table"
>
<tbody>
<thead><tr><th></th><th>
{% trans "Who" %}
</th><th>
{% trans "Remove" %}
</th></tr></thead>
{% for i in users %}
...
...
@@ -138,7 +138,7 @@
<hr
/>
<script
type=
"text/javascript"
src=
"/static/admin/js/vendor/jquery/jquery.min.js"
></script>
<script
type=
"text/javascript"
src=
"/static/admin/js/jquery.init.js"
></script>
<script
type=
"text/javascript"
src=
"/static/admin/js/jquery.init.js"
></script>
<script
type=
"text/javascript"
src=
"/static/autocomplete_light/jquery.init.js"
></script>
<script
type=
"text/javascript"
src=
"/static/autocomplete_light/vendor/select2/dist/js/select2.js"
></script>
{{ group_perm_form.media }}
...
...
circle/network/tables.py
View file @
f5c999dc
...
...
@@ -105,7 +105,7 @@ class SmallRuleTable(Table):
class
Meta
:
model
=
Rule
attrs
=
{
'class'
:
'table table-striped table-
bordered table-
condensed'
,
attrs
=
{
'class'
:
'table table-striped table-condensed'
,
'id'
:
"small_rule_table"
}
fields
=
(
'rule'
,
'action'
,
)
...
...
@@ -118,7 +118,7 @@ class SmallGroupRuleTable(Table):
class
Meta
:
model
=
Rule
attrs
=
{
'class'
:
'table table-striped table-
bordered table-
condensed'
}
attrs
=
{
'class'
:
'table table-striped table-condensed'
}
fields
=
(
'rule'
,
)
...
...
@@ -168,7 +168,7 @@ class SmallRecordTable(Table):
class
Meta
:
model
=
Record
attrs
=
{
'class'
:
'table table-striped
table-bordered
'
}
attrs
=
{
'class'
:
'table table-striped'
}
fields
=
(
'type'
,
'fqdn'
,
'host'
,
'address'
,
)
sequence
=
(
'type'
,
'fqdn'
,
)
# order_by = '-type'
...
...
@@ -242,7 +242,7 @@ class HostRecordsTable(Table):
class
Meta
:
model
=
Record
attrs
=
{
'class'
:
"table table-striped
table-bordered
"
,
'class'
:
"table table-striped"
,
'id'
:
"host-detail-records-table"
,
}
fields
=
(
"type"
,
"fqdn"
)
...
...
circle/network/templates/network/index.html
View file @
f5c999dc
...
...
@@ -17,7 +17,7 @@
<h1>
{% trans "Latest modifications" %}
</h1>
</div>
<table
class=
"table table-striped
table-bordered
"
>
<table
class=
"table table-striped"
>
<tr>
<th>
{% trans "Action" %}
</th>
<th>
{% trans "Model" %}
</th>
...
...
@@ -39,7 +39,7 @@
<h1>
{% trans "Latest blacklists" %}
</h1>
</div>
<table
class=
"table table-striped
table-bordered
"
>
<table
class=
"table table-striped"
>
<tr>
<th>
{% trans "IP" %}
</th>
<th>
{% trans "Reason" %}
</th>
...
...
circle/network/templates/network/switch-port-edit.html
View file @
f5c999dc
...
...
@@ -25,7 +25,7 @@
<h3>
{% trans "Ethernet Devices" %}
</h3>
<hr
/>
{% if devices %}
<table
class=
"table table-condensed
table-bordered
ethernet-devices-mini-table"
>
<table
class=
"table table-condensed ethernet-devices-mini-table"
>
{% for i in devices %}
<tr>
<td>
{{ i }}
</td>
...
...
circle/request/tables.py
View file @
f5c999dc
...
...
@@ -47,7 +47,7 @@ class RequestTable(Table):
class
Meta
:
model
=
Request
template
=
"django_tables2/with_pagination.html"
attrs
=
{
'class'
:
(
'table table-
bordered table-
striped table-hover'
),
attrs
=
{
'class'
:
(
'table table-striped table-hover'
),
'id'
:
"request-list-table"
}
fields
=
(
"pk"
,
"status"
,
"type"
,
"created"
,
"user"
,
)
order_by
=
(
"-pk"
,
)
...
...
@@ -65,7 +65,7 @@ class LeaseTypeTable(Table):
class
Meta
:
model
=
LeaseType
attrs
=
{
'class'
:
"table table-
bordered table-
striped table-hover"
}
attrs
=
{
'class'
:
"table table-striped table-hover"
}
fields
=
(
'pk'
,
'name'
,
'lease'
,
)
prefix
=
"lease-"
template
=
"django_tables2/with_pagination.html"
...
...
@@ -84,7 +84,7 @@ class TemplateAccessTypeTable(Table):
class
Meta
:
model
=
TemplateAccessType
attrs
=
{
'class'
:
"table table-
bordered table-
striped table-hover"
}
attrs
=
{
'class'
:
"table table-striped table-hover"
}
fields
=
(
'pk'
,
'name'
,
'templates'
,
)
prefix
=
"template-"
template
=
"django_tables2/with_pagination.html"
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