Skip to content

Gelencsér Szabolcs / circlestack

Go to a project
Commit 9cea6473 by Kálmán Viktor
Options

dashboard: more valid html

parent 2937f3c4
Showing with 56 additions and 46 deletions
circle/dashboard/static/dashboard/dashboard.js
...@@ -10,10 +10,11 @@ $(function () { ...@@ -10,10 +10,11 @@ $(function () {
$(".not-tab-pane").removeClass("not-tab-pane").addClass("tab-pane"); $(".not-tab-pane").removeClass("not-tab-pane").addClass("tab-pane");
$('.vm-create').click(function(e) { $('.vm-create').click(function(e) {
var template = $(this).data("template"); var url = $(this).data("href");
if(!url) url = $(this).prop("href");
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: $(this).attr('href'), url: url,
success: function(data) { success: function(data) {
$('body').append(data); $('body').append(data);
vmCreateLoaded(); vmCreateLoaded();
...@@ -140,7 +141,7 @@ $(function () { ...@@ -140,7 +141,7 @@ $(function () {
// success // success
}, },
error: function(xhr, textStatus, error) { error: function(xhr, textStatus, error) {
console.log("oh babám"); addMessage(gettext("An error occurred. (") + xhr.status + ")", 'danger');
} }
}); });
$(star).tooltip('destroy').tooltip({'placement': 'right'}); $(star).tooltip('destroy').tooltip({'placement': 'right'});
......
circle/dashboard/static/template.less
...@@ -55,6 +55,9 @@ html { ...@@ -55,6 +55,9 @@ html {
.bigbig { .bigbig {
font-size: 3em; font-size: 3em;
} }
.big-tag {
font-size: 1.2em;
}
/* small buttons for tags, copied from Bootstraps input-sm, bnt-sm */ /* small buttons for tags, copied from Bootstraps input-sm, bnt-sm */
.btn-tags, .btn-traits { .btn-tags, .btn-traits {
padding: 3px 6px; padding: 3px 6px;
...@@ -148,3 +151,7 @@ footer a, footer a:hover, footer a:visited { ...@@ -148,3 +151,7 @@ footer a, footer a:hover, footer a:visited {
.btn-toolbar { .btn-toolbar {
margin-bottom: 5px; margin-bottom: 5px;
} }
.vm-details-home-edit-description {
font-size: 85%; /* ~ small tag */
}
circle/dashboard/templates/base.html
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</div> </div>
{% endblock messages %} {% endblock messages %}
{% block content %} {% block content %}
<h1 class="alert alert-error">Please override "content" block.</h1> <h1 class="alert alert-error">Please override "content" block.</h1>
......
circle/dashboard/templates/dashboard/index-groups.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<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">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input id="dashboard-group-search-input" name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" /> <input name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" />
<div class="input-group-btn"> <div class="input-group-btn">
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button>
</div> </div>
......
circle/dashboard/templates/dashboard/index-nodes.html
...@@ -72,11 +72,15 @@ ...@@ -72,11 +72,15 @@
value="{% widthratio node_num.running sum_node_num 100 %}"> value="{% widthratio node_num.running sum_node_num 100 %}">
</p> </p>
<p> <p>
{% blocktrans with running=node_num.running missing=node_num.missing disabled=node_num.disabled offline=node_num.offline %}
<span class="big"> <span class="big">
<big>{{ node_num.running }}</big> running <span class="big-tag">{{ running }}</span> running
</span> </span> +
+ <big>{{ node_num.missing }}</big> <span class="big-tag">{{ missing }}</span> missing +
missing + <br><big>{{ node_num.disabled }}</big> disabled + <big>{{ node_num.offline }}</big> offline <br>
<span class="big-tag">{{ disabled }}</span> disabled +
<span class="big-tag">{{ offline }}</span> offline
{% endblocktrans %}
</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 %}
......
circle/dashboard/templates/dashboard/index-templates.html
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<i class="fa fa-{{ t.os_type }}"></i> {{ t.name }} <i class="fa fa-{{ t.os_type }}"></i> {{ t.name }}
</span> </span>
<small class="text-muted index-template-list-system">{{ t.system }}</small> <small class="text-muted index-template-list-system">{{ t.system }}</small>
<div href="{% url "dashboard.views.vm-create" %}?template={{ t.pk }}" class="pull-right vm-create"> <div data-href="{% url "dashboard.views.vm-create" %}?template={{ t.pk }}" class="pull-right vm-create">
<i data-container="body" title="{% trans "Start VM instance" %}" <i data-container="body" title="{% trans "Start VM instance" %}"
class="fa fa-play"></i> class="fa fa-play"></i>
</div> </div>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div class="col-xs-5 col-sm-6"> <div class="col-xs-5 col-sm-6">
<form action="{% url "dashboard.views.template-list" %}" method="GET" id="dashboard-template-search-form"> <form action="{% url "dashboard.views.template-list" %}" method="GET" id="dashboard-template-search-form">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input id="dashboard-group-search-input" name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" /> <input name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" />
<div class="input-group-btn"> <div class="input-group-btn">
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button>
</div> </div>
......
circle/dashboard/templates/dashboard/index-users.html
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="col-xs-5 col-sm-6"> <div class="col-xs-5 col-sm-6">
<form action="{% url "dashboard.views.user-list" %}" method="GET" id="dashboard-user-search-form"> <form action="{% url "dashboard.views.user-list" %}" method="GET" id="dashboard-user-search-form">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input id="dashboard-group-search-input" name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" /> <input name="s" type="text" class="form-control" placeholder="{% trans "Search..." %}" />
<div class="input-group-btn"> <div class="input-group-btn">
<button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button> <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i></button>
</div> </div>
......
circle/dashboard/templates/dashboard/index-vm.html
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,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>
<span class="bigbig">{% blocktrans with count=running_vm_num %}<big>{{ count }}</big> running{% endblocktrans %}</span> <span class="bigbig">{% blocktrans with count=running_vm_num %}<span class="big-tag">{{ count }}</span> 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;">
...@@ -111,7 +111,9 @@ ...@@ -111,7 +111,9 @@
<strong>{{ counter }}</strong> machines total <strong>{{ counter }}</strong> machines total
{% endblocktrans %} {% endblocktrans %}
</a> </a>
<p class="big text-warning">{% blocktrans with count=stopped_vm_num %}<big>{{ count }}</big> stopped{% endblocktrans %}</p> <p class="big text-warning">
{% blocktrans with count=stopped_vm_num %}{{ count }} stopped{% endblocktrans %}
</p>
</div> </div>
</div> </div>
</div> </div>
circle/dashboard/templates/dashboard/store/index-files.html
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<div class="text-right"> <div class="text-right">
<form class="pull-left" method="POST" action="{% url "dashboard.views.store-refresh-toplist" %}"> <form class="pull-left" method="POST" action="{% url "dashboard.views.store-refresh-toplist" %}">
{% csrf_token %} {% csrf_token %}
<button class="btn btn-success btn-xs" type="submit" title="{% trans "Refresh" %}"/> <button class="btn btn-success btn-xs" type="submit" title="{% trans "Refresh" %}">
<i class="fa fa-refresh"></i> <i class="fa fa-refresh"></i>
</button> </button>
</form> </form>
......
circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{{ s.finished|arrowfilter:LANGUAGE_CODE }} {{ s.finished|arrowfilter:LANGUAGE_CODE }}
</span> </span>
{% else %} {% else %}
<i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i> <i class="fa fa-refresh fa-spin"></i>
{% endif %} {% endif %}
{% if s.has_failed %} {% if s.has_failed %}
<div class="label label-danger">{% trans "failed" %}</div> <div class="label label-danger">{% trans "failed" %}</div>
......
circle/dashboard/templates/dashboard/vm-detail/console.html
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
<div id="vm-console-screenshot"> <div id="vm-console-screenshot">
<button class="btn btn-danger btn-sm pull-right">{% trans "Close" %}</button> <button class="btn btn-danger btn-sm pull-right">{% trans "Close" %}</button>
<h3>{% trans "Screenshot" %}</h3> <h3>{% trans "Screenshot" %}</h3>
<img /> <img alt="{% trans "Screenshot" %}"/>
<hr /> <hr />
</div> </div>
{% if perms.vm.access_console %} {% if perms.vm.access_console %}
<canvas id="noVNC_canvas" width="640px" height="20px">Canvas not supported. <canvas id="noVNC_canvas" width="640" height="20">Canvas not supported.
</canvas> </canvas>
<script> <script>
......
circle/dashboard/templates/dashboard/vm-detail/home.html
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<dd> <dd>
{% csrf_token %} {% csrf_token %}
<div class="vm-details-home-edit-description-click"> <div class="vm-details-home-edit-description-click">
<small class="vm-details-home-edit-description">{{ instance.description|linebreaks }}</small> <div class="vm-details-home-edit-description">{{ instance.description|linebreaks }}</div>
</div> </div>
<div id="vm-details-home-description" class="js-hidden"> <div id="vm-details-home-description" class="js-hidden">
<form method="POST"> <form method="POST">
...@@ -163,9 +163,12 @@ ...@@ -163,9 +163,12 @@
{% include "dashboard/_graph-time-buttons.html" %} {% include "dashboard/_graph-time-buttons.html" %}
</div> </div>
<div class="graph-images text-center"> <div class="graph-images text-center">
<img src="{% url "dashboard.views.vm-graph" instance.pk "cpu" graph_time %}"/> <img src="{% url "dashboard.views.vm-graph" instance.pk "cpu" graph_time %}"
<img src="{% url "dashboard.views.vm-graph" instance.pk "memory" graph_time %}"/> alt="{% trans "CPU usage" %}"/>
<img src="{% url "dashboard.views.vm-graph" instance.pk "network" graph_time %}"/> <img src="{% url "dashboard.views.vm-graph" instance.pk "memory" graph_time %}"
alt="{% trans "Memory usage" %}"/>
<img src="{% url "dashboard.views.vm-graph" instance.pk "network" graph_time %}"
alt="{% trans "Network usage" %}"/>
</div> </div>
{% endif %} {% endif %}
</div> </div>
......
circle/dashboard/templates/dashboard/vm-detail/network.html
{% load i18n %} {% load i18n %}
{% load network_tags %} {% load network_tags %}
<div id="vm-details-add-interface">
{% with op=op.add_interface %}{% if op %}
<a href="{{op.get_url}}" class="btn btn-{{op.effect}} operation pull-right"
{% if op.disabled %}disabled{% endif %}>
<i class="fa fa-{{op.icon}}"></i> {% trans "add interface" %}</a>
{% endif %}{% endwith %}
</div>
<h2> <h2>
<div id="vm-details-add-interface">
{% with op=op.add_interface %}{% if op %}
<a href="{{op.get_url}}" class="btn btn-{{op.effect}} operation pull-right"
{% if op.disabled %}disabled{% endif %}>
<i class="fa fa-{{op.icon}}"></i> {% trans "add interface" %}</a>
{% endif %}{% endwith %}
</div>
{% trans "Interfaces" %} {% trans "Interfaces" %}
</h2> </h2>
......
circle/dashboard/templates/dashboard/vm-detail/resources.html
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
<div id="vm-details-resources-disk"> <div id="vm-details-resources-disk">
<h3> <h3>
{% trans "Disks" %}
<div class="pull-right"> <div class="pull-right">
<div id="disk-ops"> <div id="disk-ops">
{% include "dashboard/vm-detail/_disk-operations.html" %} {% include "dashboard/vm-detail/_disk-operations.html" %}
</div> </div>
</div> </div>
{% trans "Disks" %}
</h3> </h3>
<div class="clearfix"></div> <div class="clearfix"></div>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{% if user.is_superuser %} {% if user.is_superuser %}
<hr/> <hr/>
<div class="row" id=""> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<h3> <h3>
{% trans "Required traits" %} {% trans "Required traits" %}
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<hr/> <hr/>
<div class="row" id=""> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<h3> <h3>
{% trans "Raw data" %} {% trans "Raw data" %}
......
circle/templates/registration/base.html
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
{% block navbar-brand %} {% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;"> <a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
<img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;"/> <img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;" alt="circle logo"/>
</a> </a>
{% endblock %} {% endblock %}
......
circle/templates/registration/login.html
...@@ -6,12 +6,6 @@ ...@@ -6,12 +6,6 @@
{% block title-page %}{% trans "Login" %}{% endblock %} {% block title-page %}{% trans "Login" %}{% endblock %}
{% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
<img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;"/>
</a>
{% endblock %}
{% block content_box %} {% block content_box %}
<div class="row"> <div class="row">
{% if form.password.errors or form.username.errors %} {% if form.password.errors or form.username.errors %}
...@@ -21,10 +15,7 @@ ...@@ -21,10 +15,7 @@
{% endif %} {% endif %}
<div class="col-xs-{% if saml2 %}6{% else %}12{% endif %}"> <div class="col-xs-{% if saml2 %}6{% else %}12{% endif %}">
<div class="login-form"> <div class="login-form">
<form action="" method="POST"> {% crispy form %}
{% csrf_token %}
{% crispy form %}
</form>
</div> </div>
</div> </div>
{% if saml2 %} {% if saml2 %}
...@@ -33,11 +24,12 @@ ...@@ -33,11 +24,12 @@
<a href="{% url "saml2_login" %}">{% trans "Click here!" %}</a> <a href="{% url "saml2_login" %}">{% trans "Click here!" %}</a>
</div> </div>
{% endif %} {% endif %}
</div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<a class="pull-right" href="{% url "accounts.password-reset" %}">{% trans "Forgot your password?" %}</a> <a class="pull-right" href="{% url "accounts.password-reset" %}" style="margin-right: 15px;">
{% trans "Forgot your password?" %}
</a>
</div> </div>
</div>
</div> </div>
</div>
{% endblock %} {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment