Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8865ab59
authored
Jan 01, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix invalid html
parent
3b99558c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
12 deletions
+13
-12
circle/dashboard/templates/base.html
+1
-1
circle/dashboard/templates/branding.html
+2
-2
circle/dashboard/templates/dashboard/index-groups.html
+2
-2
circle/dashboard/templates/dashboard/index-nodes.html
+2
-0
circle/dashboard/templates/dashboard/index-templates.html
+4
-4
circle/dashboard/templates/dashboard/index-vm.html
+2
-3
No files found.
circle/dashboard/templates/base.html
View file @
8865ab59
...
@@ -64,7 +64,6 @@
...
@@ -64,7 +64,6 @@
<a
href=
"{% url "
info
.
support
"
%}"
>
{% trans "Support" %}
</a>
<a
href=
"{% url "
info
.
support
"
%}"
>
{% trans "Support" %}
</a>
<span
class=
"pull-right"
>
{{ COMPANY_NAME }}
</span>
<span
class=
"pull-right"
>
{{ COMPANY_NAME }}
</span>
</footer>
</footer>
</body>
<script
src=
"{% static "
jquery
/
dist
/
jquery
.
min
.
js
"
%}"
></script>
<script
src=
"{% static "
jquery
/
dist
/
jquery
.
min
.
js
"
%}"
></script>
<script
src=
"{{ STATIC_URL }}jsi18n/{{ LANGUAGE_CODE }}/djangojs.js"
></script>
<script
src=
"{{ STATIC_URL }}jsi18n/{{ LANGUAGE_CODE }}/djangojs.js"
></script>
...
@@ -78,4 +77,5 @@
...
@@ -78,4 +77,5 @@
{% block extra_etc %}
{% block extra_etc %}
{% endblock %}
{% endblock %}
</body>
</html>
</html>
circle/dashboard/templates/branding.html
View file @
8865ab59
<img
src=
"{{ STATIC_URL}}dashboard/img/logo.png"
style=
"height: 25px;"
/>
<img
src=
"{{ STATIC_URL}}dashboard/img/logo.png"
alt=
"circle logo"
style=
"height: 25px;"
/>
<img
src=
"{{ STATIC_URL}}local-logo.png"
style=
"padding-left: 2px; height: 25px;"
/>
<img
src=
"{{ STATIC_URL}}local-logo.png"
alt=
"local logo"
style=
"padding-left: 2px; height: 25px;"
/>
circle/dashboard/templates/dashboard/index-groups.html
View file @
8865ab59
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
</div>
</div>
<h3
class=
"no-margin"
><i
class=
"fa fa-group"
></i>
{% trans "Groups" %}
</h3>
<h3
class=
"no-margin"
><i
class=
"fa fa-group"
></i>
{% trans "Groups" %}
</h3>
</div>
</div>
<div
class=
"list-group"
id=
"
vm
-list-view"
>
<div
class=
"list-group"
id=
"
group
-list-view"
>
<div
id=
"dashboard-group-list"
>
<div
id=
"dashboard-group-list"
>
{% for i in groups %}
{% for i in groups %}
<a
href=
"{% url "
dashboard
.
views
.
group-detail
"
pk=
i.pk
%}"
class=
"list-group-item real-link
<a
href=
"{% url "
dashboard
.
views
.
group-detail
"
pk=
i.pk
%}"
class=
"list-group-item real-link
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</a>
</a>
{% endfor %}
{% endfor %}
</div>
</div>
<div
href=
"#"
class=
"list-group-item list-group-footer text-right"
>
<div
class=
"list-group-item list-group-footer text-right"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-6"
>
<div
class=
"col-xs-6"
>
<form
action=
"{% url "
dashboard
.
views
.
group-list
"
%}"
method=
"GET"
id=
"dashboard-group-search-form"
>
<form
action=
"{% url "
dashboard
.
views
.
group-list
"
%}"
method=
"GET"
id=
"dashboard-group-search-form"
>
...
...
circle/dashboard/templates/dashboard/index-nodes.html
View file @
8865ab59
...
@@ -46,8 +46,10 @@
...
@@ -46,8 +46,10 @@
</p>
</p>
<ul
class=
"list-inline"
id=
"dashboard-node-taglist"
>
<ul
class=
"list-inline"
id=
"dashboard-node-taglist"
>
{% for i in nodes %}
{% for i in nodes %}
<li>
<a
href=
"{{ i.get_absolute_url }}"
class=
"label {{i.get_status_label}}"
>
<a
href=
"{{ i.get_absolute_url }}"
class=
"label {{i.get_status_label}}"
>
<i
class=
"fa {{ i.get_status_icon }}"
title=
"{{ i.get_status_display }}"
></i>
{{ i.name }}
</a>
<i
class=
"fa {{ i.get_status_icon }}"
title=
"{{ i.get_status_display }}"
></i>
{{ i.name }}
</a>
</li>
{% endfor %}
{% endfor %}
</ul>
</ul>
...
...
circle/dashboard/templates/dashboard/index-templates.html
View file @
8865ab59
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<h3
class=
"no-margin"
><i
class=
"fa fa-puzzle-piece"
></i>
{% trans "Templates" %}
<h3
class=
"no-margin"
><i
class=
"fa fa-puzzle-piece"
></i>
{% trans "Templates" %}
</h3>
</h3>
</div>
</div>
<div
class=
"list-group"
id=
"
dashboard-template-list
"
>
<div
class=
"list-group"
id=
"
template-list-view
"
>
<div
id=
"dashboard-template-list"
>
<div
id=
"dashboard-template-list"
>
{% for t in templates %}
{% for t in templates %}
<a
href=
"{% url "
dashboard
.
views
.
template-detail
"
pk=
t.pk
%}"
class=
"list-group-item
<a
href=
"{% url "
dashboard
.
views
.
template-detail
"
pk=
t.pk
%}"
class=
"list-group-item
...
@@ -32,15 +32,15 @@
...
@@ -32,15 +32,15 @@
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
<div
href=
"#"
class=
"list-group-item list-group-footer text-right
"
>
<div
class=
"list-group-item list-group-footer
"
>
<
p
>
<
div
class=
"text-right"
>
<a
href=
"{% url "
dashboard
.
views
.
template-list
"
%}"
class=
"btn btn-primary btn-xs"
>
<a
href=
"{% url "
dashboard
.
views
.
template-list
"
%}"
class=
"btn btn-primary btn-xs"
>
<i
class=
"fa fa-chevron-circle-right"
></i>
{% trans "show all" %}
<i
class=
"fa fa-chevron-circle-right"
></i>
{% trans "show all" %}
</a>
</a>
<a
href=
"{% url "
dashboard
.
views
.
template-choose
"
%}"
class=
"btn btn-success btn-xs template-choose"
>
<a
href=
"{% url "
dashboard
.
views
.
template-choose
"
%}"
class=
"btn btn-success btn-xs template-choose"
>
<i
class=
"fa fa-plus-circle"
></i>
{% trans "new" %}
<i
class=
"fa fa-plus-circle"
></i>
{% trans "new" %}
</a>
</a>
</
p
>
</
div
>
</div>
</div>
</div>
</div>
</div>
</div>
circle/dashboard/templates/dashboard/index-vm.html
View file @
8865ab59
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
</div>
</div>
{% endfor %}
{% endfor %}
</div>
</div>
<div
href=
"#"
class=
"list-group-item list-group-footer"
>
<div
class=
"list-group-item list-group-footer"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-6"
>
<div
class=
"col-xs-6"
>
<form
action=
"{% url "
dashboard
.
views
.
vm-list
"
%}"
method=
"GET"
id=
"dashboard-vm-search-form"
>
<form
action=
"{% url "
dashboard
.
views
.
vm-list
"
%}"
method=
"GET"
id=
"dashboard-vm-search-form"
>
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<p
class=
"pull-right"
>
<p
class=
"pull-right"
>
<input
class=
"knob"
data-fgColor=
"chartreuse"
data-thickness=
".4"
data-max=
"{{ request.user.profile.instance_limit }}"
data-width=
"100"
data-height=
"100"
data-readOnly=
"true"
value=
"{{ instances|length|add:more_instances }}"
>
<input
class=
"knob"
data-fgColor=
"chartreuse"
data-thickness=
".4"
data-max=
"{{ request.user.profile.instance_limit }}"
data-width=
"100"
data-height=
"100"
data-readOnly=
"true"
value=
"{{ instances|length|add:more_instances }}"
>
</p>
</p>
<
p><
span
class=
"bigbig"
>
{% blocktrans with count=running_vm_num %}
<big>
{{ count }}
</big>
running{% endblocktrans %}
</span>
<span
class=
"bigbig"
>
{% blocktrans with count=running_vm_num %}
<big>
{{ count }}
</big>
running{% endblocktrans %}
</span>
<ul
class=
"list-inline"
style=
"max-height: 95px; overflow: hidden;"
>
<ul
class=
"list-inline"
style=
"max-height: 95px; overflow: hidden;"
>
{% for vm in running_vms %}
{% for vm in running_vms %}
<li
style=
"display: inline-block; padding: 2px;"
>
<li
style=
"display: inline-block; padding: 2px;"
>
...
@@ -89,7 +89,6 @@
...
@@ -89,7 +89,6 @@
</li>
</li>
{% endfor %}
{% endfor %}
</ul>
</ul>
</p>
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
<div>
<div>
...
...
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