Merge branch 'feature-titles' into 'master'

Feature Titles

Closes #283

.gitignore

@@ -39,3 +39,4 @@ circle/static_collected
 
 # jsi18n files
 jsi18n
+scripts.rc

circle/dashboard/templates/dashboard/group-detail.html

@@ -2,6 +2,8 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
+{% block title-page %}{{ group.name }} | {% trans "group" %}{% endblock %}
+
 {% block content %}
 <div class="body-content">
   <div class="page-header">

circle/dashboard/templates/dashboard/template-edit.html

@@ -3,7 +3,7 @@
 {% load sizefieldtags %}
 {% load crispy_forms_tags %}
 
-{% block title-page %}{% trans "Edit template" %}{% endblock %}
+{% block title-page %}{{ form.name.value }} | {% trans "template" %}{% endblock %}
 
 {% block content %}
 

circle/locale/hu/LC_MESSAGES/djangojs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-03 18:49+0200\n"
+"POT-Creation-Date: 2014-09-16 12:15+0200\n"
 "PO-Revision-Date: 2014-09-03 12:51+0200\n"
 "Last-Translator: Mate Ory <ory.mate@ik.bme.hu>\n"
 "Language-Team: Hungarian <cloud@ik.bme.hu>\n"

circle/manager/scheduler.py

@@ -48,7 +48,7 @@ class NotEnoughMemoryException(SchedulerError):
 class TraitsUnsatisfiableException(SchedulerError):
     message = ugettext_noop(
         "No node can satisfy the required traits of the "
-        "new vitual machine currently.")
+        "new virtual machine currently.")
 
 
 def select_node(instance, nodes):

circle/network/templates/network/base.html

@@ -4,6 +4,8 @@
 {% load staticfiles %}
 {% get_current_language as lang %}
 
+{% block title-site %}{% trans "Network" %} | CIRCLE{% endblock %}
+
 {% block extra_link %}
   <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:200,400&amp;subset=latin,latin-ext' rel='stylesheet' type='text/css'>
   <link href="{% static "network/network.css" %}" rel="stylesheet">

circle/network/templates/network/blacklist-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "blacklist" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a blacklist item" %}</h2>

circle/network/templates/network/blacklist-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.ipv4.value }} - {{ form.type.value }} | {% trans "blacklist" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.blacklist_delete" pk=blacklist_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this blaclist item" %}</a>

circle/network/templates/network/blacklist-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Blacklist" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.blacklist_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new blacklist item" %}</a>

circle/network/templates/network/domain-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "domain" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new domain" %}<small></small></h2>

circle/network/templates/network/domain-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.name.value }} | {% trans "domain" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.domain_delete" pk=domain_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this domain" %}</a>

circle/network/templates/network/domain-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Domains" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.domain_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new domain" %}</a>

circle/network/templates/network/group-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "host group" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new host group" %}</h2>

circle/network/templates/network/group-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.name.value }} | {% trans "host group" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.group_delete" pk=group.pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this group" %}</a>

circle/network/templates/network/group-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Host groups" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.group_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new host group" %}</a>

circle/network/templates/network/host-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "host" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new host" %}</h2>

circle/network/templates/network/host-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.hostname.value }} | {% trans "host" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
   <a href="{% url "network.host_delete" pk=host_pk%}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this host" %}</a>

circle/network/templates/network/host-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Hosts" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.host_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new host" %}</a>

circle/network/templates/network/index.html

@@ -3,6 +3,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Index" %}{% endblock %}
+
 {% block content %}
 
 <div class="page-header">

circle/network/templates/network/record-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "record" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new record" %}</h2>

circle/network/templates/network/record-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ record.fqdn }} | {% trans "record" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.record_delete" pk=record_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this record" %}</a>

circle/network/templates/network/record-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Records" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.record_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new record" %}</a>

circle/network/templates/network/rule-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "rule" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new rule" %}</h2>

circle/network/templates/network/rule-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ rule.pk }} | {% trans "rule" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.rule_delete" pk=rule.pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this rule" %}</a>

circle/network/templates/network/rule-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Rules" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.rule_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new rule" %}</a>

circle/network/templates/network/switch-port-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "switch port" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new switch port" %}</h2>

circle/network/templates/network/switch-port-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ switch_port_pk }} | {% trans "switch port" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
   <a href="{% url "network.switch_port_delete" pk=switch_port_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this switchport" %}</a>

circle/network/templates/network/switch-port-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Switch ports" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.switch_port_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new switch port" %}</a>

circle/network/templates/network/vlan-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "vlan" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new vlan" %}</h2>

circle/network/templates/network/vlan-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.name.value }} | {% trans "vlan" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.vlan_delete" vid=vlan_vid %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this vlan" %}</a>

circle/network/templates/network/vlan-group-create.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{% trans "Create" %} | {% trans "vlan group" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <h2>{% trans "Create a new vlan group" %}</h2>

circle/network/templates/network/vlan-group-edit.html

@@ -5,6 +5,8 @@
 {% load staticfiles %}
 {% load crispy_forms_tags %}
 
+{% block title-page %}{{ form.name.value }} | {% trans "vlan group" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.vlan_group_delete" pk=vlangroup_pk %}" class="btn btn-danger pull-right"><i class="fa fa-times-circle"></i> {% trans "Delete this group" %}</a>

circle/network/templates/network/vlan-group-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Vlan groups" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.vlan_group_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new vlan group" %}</a>

circle/network/templates/network/vlan-list.html

@@ -4,6 +4,8 @@
 {% load l10n %}
 {% load staticfiles %}
 
+{% block title-page %}{% trans "Vlans" %}{% endblock %}
+
 {% block content %}
 <div class="page-header">
     <a href="{% url "network.vlan_create" %}" class="btn btn-success pull-right"><i class="fa fa-plus-circle"></i> {% trans "Create a new vlan" %}</a>