Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0faa1d73
authored
Mar 25, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: add title to dashboards pages
parent
f068fe84
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
88 additions
and
97 deletions
+88
-97
circle/dashboard/templates/base.html
+52
-12
circle/dashboard/templates/dashboard/base.html
+3
-82
circle/dashboard/templates/dashboard/group-list.html
+3
-0
circle/dashboard/templates/dashboard/index.html
+1
-1
circle/dashboard/templates/dashboard/lease-create.html
+3
-0
circle/dashboard/templates/dashboard/lease-edit.html
+3
-1
circle/dashboard/templates/dashboard/node-detail.html
+3
-0
circle/dashboard/templates/dashboard/node-list.html
+3
-0
circle/dashboard/templates/dashboard/profile_form.html
+3
-0
circle/dashboard/templates/dashboard/template-create.html
+3
-1
circle/dashboard/templates/dashboard/template-edit.html
+3
-0
circle/dashboard/templates/dashboard/template-list.html
+3
-0
circle/dashboard/templates/dashboard/vm-detail.html
+2
-0
circle/dashboard/templates/dashboard/vm-list.html
+3
-0
No files found.
circle/dashboard/templates/base.html
View file @
0faa1d73
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<meta
name=
"description"
content=
""
>
<meta
name=
"description"
content=
""
>
<meta
name=
"author"
content=
""
>
<meta
name=
"author"
content=
""
>
<title>
{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}C
ircle
{% endblock %}{% endblock %}
</title>
<title>
{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}C
IRCLE
{% endblock %}{% endblock %}
</title>
<script
src=
"//code.jquery.com/jquery-1.10.2.min.js"
></script>
<script
src=
"//code.jquery.com/jquery-1.10.2.min.js"
></script>
<script
src=
"//code.jquery.com/jquery-migrate-1.2.1.min.js"
></script>
<script
src=
"//code.jquery.com/jquery-migrate-1.2.1.min.js"
></script>
...
@@ -22,21 +22,61 @@
...
@@ -22,21 +22,61 @@
</head>
</head>
<body>
<body>
<div
class=
"navbar navbar-inverse navbar-fixed-top"
>
<div
class=
"navbar navbar-inverse navbar-fixed-top"
>
<a
class=
"navbar-brand"
href=
"/dashboard/"
>
{% block header-site %}Circle{% endblock %}
</a>
<div
class=
"navbar-header"
>
</div>
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
>
CIRCLE
</a>
<button
type=
"button"
class=
"navbar-toggle"
data-toggle=
"collapse"
data-target=
".navbar-collapse"
>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
</button>
</div>
<!-- .navbar-header -->
<div
class=
"collapse navbar-collapse"
>
<ul
class=
"nav navbar-nav pull-right"
>
<li
class=
"dropdown"
id=
"notification-button"
>
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
style=
"color: white; font-size: 12px;"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
{% trans "Notifications" %}{% if NEW_NOTIFICATIONS_COUNT > 0 %}
<span
class=
"badge"
>
{{ NEW_NOTIFICATIONS_COUNT }}
</span>
{% endif %}
</a>
<ul
class=
"dropdown-menu notification-messages"
>
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
</ul>
{% if user.is_authenticated %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-signout icon-sign-out"
></i>
{% trans "Log out" %}
</a>
<a
class=
"navbar-brand pull-right"
href=
"{% url "
dashboard
.
views
.
profile
"
%}"
title=
"{% trans "
User
profile
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-user "
></i>
{{user}}
</a>
{% if user.is_superuser %}
<a
class=
"navbar-brand pull-right"
href=
"/network/"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-globe"
></i>
{% trans "Network" %}
</a>
<a
class=
"navbar-brand pull-right"
href=
"/admin/"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-cogs"
></i>
{% trans "Admin" %}
</a>
{% endif %}
{% else %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
login
"
%}?
next=
{%
url
"
dashboard
.
index
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-sign-in"
></i>
{% trans "Log in " %}
</a>
{% endif %}
</div>
<!-- .collapse .navbar-collapse -->
</div>
<!-- navbar navbar-inverse navbar-fixed-top -->
<div
class=
"container"
>
<div
class=
"container"
>
{% block content %}
{% block messages %}
<h1
class=
"alert alert-error"
>
Please override "content" block.
</h1>
<div
class=
"messagelist"
>
{% endblock %}
{% if messages %}
<hr
/>
{% for message in messages %}
<footer>
<div
class=
"alert
<p>
©
Company 2013
</p>
{% if message.tags %} alert-{% if message.tags == "
error
"
%}
danger
{%
else
%}{{
message
.
tags
}}{%
endif
%}{%
endif
%}"
>
</footer>
{{ message|safe }}
</div>
{% endfor %}
{% endif %}
</div>
{% endblock messages %}
{% block content %}
<h1
class=
"alert alert-error"
>
Please override "content" block.
</h1>
{% endblock %}
</div>
<!-- /container -->
</div>
<!-- /container -->
<footer>
<a
href=
"#"
>
{% trans "Legal notice" %}
</a>
|
<a
href=
"#"
>
{% trans "Policy" %}
</a>
|
<a
href=
"#"
>
{% trans "Help" %}
</a>
|
<a
href=
"#"
>
{% trans "Support" %}
</a>
<span
class=
"pull-right"
>
{{ COMPANY_NAME }}
</span>
</footer>
</body>
</body>
{% block extra_js %}
{% block extra_js %}
{% endblock %}
{% endblock %}
...
...
circle/dashboard/templates/dashboard/base.html
View file @
0faa1d73
{% load i18n %}
<!DOCTYPE html>
{% extends "base.html" %}
<html
lang=
"{{lang}}"
>
{% load i18n %}
<head>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0"
>
<meta
name=
"description"
content=
""
>
<meta
name=
"author"
content=
""
>
<title>
{% block title %}{% block title-page %}{% endblock %} | {% block title-site %}Circle{% endblock %}{% endblock %}
</title>
{% block title-site %}Dashboard | CIRCLE{% endblock %}
<script
src=
"//code.jquery.com/jquery-1.10.2.min.js"
></script>
<script
src=
"//code.jquery.com/jquery-migrate-1.2.1.min.js"
></script>
<link
rel=
"stylesheet"
href=
"//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css"
>
<script
src=
"//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"
></script>
<link
rel=
"stylesheet"
href=
"//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css"
>
<link
href=
"//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css"
rel=
"stylesheet"
>
<script
src=
"{{ STATIC_URL }}dashboard/js/jquery.knob.js"
></script>
<script
src=
"{{ STATIC_URL}}dashboard/bootstrap-slider/bootstrap-slider.js"
></script>
<link
rel=
"stylesheet"
href=
"{{ STATIC_URL }}dashboard/bootstrap-slider/slider.css"
/>
<link
href=
"{{ STATIC_URL }}dashboard/dashboard.css"
rel=
"stylesheet"
>
<script
src=
"{{ STATIC_URL }}dashboard/dashboard.js"
></script>
</head>
<body>
<div
class=
"navbar navbar-inverse navbar-fixed-top"
>
<div
class=
"navbar-header"
>
<a
class=
"navbar-brand"
href=
"{% url "
dashboard
.
index
"
%}"
>
CIRCLE
</a>
<button
type=
"button"
class=
"navbar-toggle"
data-toggle=
"collapse"
data-target=
".navbar-collapse"
>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
<span
class=
"icon-bar"
></span>
</button>
</div>
<!-- .navbar-header -->
<div
class=
"collapse navbar-collapse"
>
<ul
class=
"nav navbar-nav pull-right"
>
<li
class=
"dropdown"
id=
"notification-button"
>
<a
href=
"{% url "
dashboard
.
views
.
notifications
"
%}"
style=
"color: white; font-size: 12px;"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
>
{% trans "Notifications" %}{% if NEW_NOTIFICATIONS_COUNT > 0 %}
<span
class=
"badge"
>
{{ NEW_NOTIFICATIONS_COUNT }}
</span>
{% endif %}
</a>
<ul
class=
"dropdown-menu notification-messages"
>
<li>
{% trans "Loading..." %}
</li>
</ul>
</li>
</ul>
{% if user.is_authenticated %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
logout
"
%}?
next=
{%
url
"
login
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-signout icon-sign-out"
></i>
{% trans "Log out" %}
</a>
<a
class=
"navbar-brand pull-right"
href=
"{% url "
dashboard
.
views
.
profile
"
%}"
title=
"{% trans "
User
profile
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-user "
></i>
{{user}}
</a>
{% if user.is_superuser %}
<a
class=
"navbar-brand pull-right"
href=
"/network/"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-globe"
></i>
{% trans "Network" %}
</a>
<a
class=
"navbar-brand pull-right"
href=
"/admin/"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-cogs"
></i>
{% trans "Admin" %}
</a>
{% endif %}
{% else %}
<a
class=
"navbar-brand pull-right"
href=
"{% url "
login
"
%}?
next=
{%
url
"
dashboard
.
index
"
%}"
style=
"color: white; font-size: 10px;"
><i
class=
"icon-sign-in"
></i>
{% trans "Log in " %}
</a>
{% endif %}
</div>
<!-- .collapse .navbar-collapse -->
</div>
<!-- navbar navbar-inverse navbar-fixed-top -->
<div
class=
"container"
>
{% block messages %}
<div
class=
"messagelist"
>
{% if messages %}
{% for message in messages %}
<div
class=
"alert
{% if message.tags %} alert-{% if message.tags == "
error
"
%}
danger
{%
else
%}{{
message
.
tags
}}{%
endif
%}{%
endif
%}"
>
{{ message|safe }}
</div>
{% endfor %}
{% endif %}
</div>
{% endblock messages %}
{% block content %}
<h1
class=
"alert alert-error"
>
Please override "content" block.
</h1>
{% endblock %}
</div>
<!-- /container -->
<footer>
<a
href=
"#"
>
{% trans "Legal notice" %}
</a>
|
<a
href=
"#"
>
{% trans "Policy" %}
</a>
|
<a
href=
"#"
>
{% trans "Help" %}
</a>
|
<a
href=
"#"
>
{% trans "Support" %}
</a>
<span
class=
"pull-right"
>
{{ COMPANY_NAME }}
</span>
</footer>
</body>
{% block extra_js %}
{% endblock %}
</html>
circle/dashboard/templates/dashboard/group-list.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load render_table from django_tables2 %}
{% load render_table from django_tables2 %}
{% block title-page %}{% trans "Group list" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"alert alert-info"
>
<div
class=
"alert alert-info"
>
...
...
circle/dashboard/templates/dashboard/index.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% block title-page %}{% trans "
Dashboard
" %}{% endblock %}
{% block title-page %}{% trans "
Index
" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"body-content dashboard-index"
>
<div
class=
"body-content dashboard-index"
>
...
...
circle/dashboard/templates/dashboard/lease-create.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load crispy_forms_tags %}
{% load crispy_forms_tags %}
{% block title-page %}{% trans "Create lease" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
circle/dashboard/templates/dashboard/lease-edit.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load crispy_forms_tags %}
{% load crispy_forms_tags %}
{% block content %}
{% block title-page %}{% trans "Edit lease" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
...
...
circle/dashboard/templates/dashboard/node-detail.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% block title-page %}{{ node.name }} | {% trans "Node" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"body-content"
>
<div
class=
"body-content"
>
<div
class=
"page-header"
>
<div
class=
"page-header"
>
...
...
circle/dashboard/templates/dashboard/node-list.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load render_table from django_tables2 %}
{% load render_table from django_tables2 %}
{% block title-page %}{% trans "Nodes" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
circle/dashboard/templates/dashboard/profile_form.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load crispy_forms_tags %}
{% load crispy_forms_tags %}
{% block title-page %}{% trans "Profile" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
circle/dashboard/templates/dashboard/template-create.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load crispy_forms_tags %}
{% load crispy_forms_tags %}
{% block content %}
{% block title-page %}{% trans "Create base VM" %}{% endblock %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
...
...
circle/dashboard/templates/dashboard/template-edit.html
View file @
0faa1d73
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
{% load i18n %}
{% load i18n %}
{% load sizefieldtags %}
{% load sizefieldtags %}
{% load crispy_forms_tags %}
{% load crispy_forms_tags %}
{% block title-page %}{% trans "Edit template" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
circle/dashboard/templates/dashboard/template-list.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% load render_table from django_tables2 %}
{% load render_table from django_tables2 %}
{% block title-page %}{% trans "Templates" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
circle/dashboard/templates/dashboard/vm-detail.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% block title-page %}{{ instance.name }} | vm{% endblock %}
{% block content %}
{% block content %}
<div
class=
"body-content"
>
<div
class=
"body-content"
>
<div
class=
"page-header"
>
<div
class=
"page-header"
>
...
...
circle/dashboard/templates/dashboard/vm-list.html
View file @
0faa1d73
{% extends "dashboard/base.html" %}
{% extends "dashboard/base.html" %}
{% load i18n %}
{% load i18n %}
{% block title-page %}{% trans "Virtual machines" %}{% endblock %}
{% block content %}
{% block content %}
<div
class=
"row"
>
<div
class=
"row"
>
...
...
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