Add new rule and tags

computes/templatetags/tags_activebtn.py

@@ -0,0 +1,11 @@
+from django import template
+import re
+
+register = template.Library()
+
+
+@register.simple_tag
+def class_activebtn(request, pattern):
+    if re.search(pattern, request.path):
+        return 'btn-primary'
+    return ''

instances/templatetags/tags_active.py

@@ -5,7 +5,7 @@ register = template.Library()
 
 
 @register.simple_tag
-def active(request, pattern):
+def class_active(request, pattern):
     if re.search(pattern, request.path):
-        return 'class="active"'
+        return 'active'
     return ''

networks/views.py

@@ -18,7 +18,7 @@ def networks(request, compute_id):
     if not request.user.is_authenticated():
         return HttpResponseRedirect(reverse('index'))
 
-    if not request.user.is_superuser():
+    if not request.user.is_superuser:
         return HttpResponseRedirect(reverse('index'))
 
     error_messages = []

templates/compute.html

@@ -15,6 +15,8 @@
 
             {% include 'errors_block.html' %}
 
+            {% include 'compute_block_link.html' %}
+
             <h4>{% trans "Basic details" %}</h4>
 
             <div class="table-responsive">

templates/compute_block_link.html

@@ -0,0 +1,8 @@
+{% load i18n %}
+{% load tags_activebtn %}
+<a href="{% url 'storages' compute.id %}" class="btn btn-default {% class_activebtn request "^/storage" %}">{% trans "Storages" %}</a>
+<a href="{% url 'networks' compute.id %}" class="btn btn-default {% class_activebtn request "^/network" %}">{% trans "Networks" %}</a>
+<a href="{% url 'interfaces' compute.id %}" class="btn btn-default {% class_activebtn request "^/interface" %}">{% trans "Interface" %}</a>
+<a href="{% url 'secrets' compute.id %}" class="btn btn-default {% class_activebtn request "^/secret" %}">{% trans "Secrets" %}</a>
+
+<hr>

templates/interfaces.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
+{% block content %}
+<div class="container-fluid">
+    <div class="row">
+
+        {% include 'sidebar.html' %}
+
+        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+
+            {% include "create_stg_block.html" %}
+
+            <h1 class="page-header">{{ compute.name }}</h1>
+
+            {% include 'compute_block_link.html' %}
+
+            {% include 'errors_block.html' %}
+
+            <div class="row">
+
+            </div>
+
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/networks.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Network" %} - {{ compute.name }}{% endblock %}
+{% block content %}
+<div class="container-fluid">
+    <div class="row">
+
+        {% include 'sidebar.html' %}
+
+        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+
+            {% include "create_stg_block.html" %}
+
+            <h1 class="page-header">{{ compute.name }}</h1>
+
+            {% include 'compute_block_link.html' %}
+
+            {% include 'errors_block.html' %}
+
+            <div class="row">
+
+            </div>
+
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/secrets.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Secrets" %} - {{ compute.name }}{% endblock %}
+{% block content %}
+<div class="container-fluid">
+    <div class="row">
+
+        {% include 'sidebar.html' %}
+
+        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+
+            {% include "create_stg_block.html" %}
+
+            <h1 class="page-header">{{ compute.name }}</h1>
+
+            {% include 'compute_block_link.html' %}
+
+            {% include 'errors_block.html' %}
+
+            <div class="row">
+
+            </div>
+
+        </div>
+    </div>
+</div>
+{% endblock %}

templates/sidebar.html

@@ -4,14 +4,14 @@
     <a class="logo" href="{% url 'instances' %}">WebVirtCloud</a>
     <hr>
     <ul class="nav nav-sidebar">
-                <li {% active request "^/instance" %}><a href="{% url 'instances' %}"><span class="glyphicon glyphicon-th" aria-hidden="true"></span></a></li>
+        <li class="{% class_active request "^/instance" %}"><a href="{% url 'instances' %}"><span class="glyphicon glyphicon-th" aria-hidden="true"></span></a></li>
         {% if request.user.is_superuser %}
-                    <li {% active request "^/compute" %}><a href="{% url 'computes' %}"><span class="glyphicon glyphicon-tasks" aria-hidden="true"></span></a></li>
+            <li class="{% class_active request "^/compute" %}"><a href="{% url 'computes' %}"><span class="glyphicon glyphicon-tasks" aria-hidden="true"></span></a></li>
-                    <li {% active request "^/user" %}><a href="{% url 'users' %}"><span class="glyphicon glyphicon-user" aria-hidden="true"></span></a></li>
+            <li class="{% class_active request "^/user" %}"><a href="{% url 'users' %}"><span class="glyphicon glyphicon-user" aria-hidden="true"></span></a></li>
-                    <li {% active request "^/showlogs" %}><a href="{% url 'showlogs' %}"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span></a></li>
+            <li class="{% class_active request "^/log" %}"><a href="{% url 'showlogs' %}"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span></a></li>
         {% endif %}
         <li class="bottom-sticky">
-                    <a href="#"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a>
+            <a class="{% class_active request "^/account" %}" href="#"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a>
             <a href="{% url 'logout' %}"><span class="glyphicon glyphicon-log-out" aria-hidden="true"></span></a>
         </li>
     </ul>

templates/storages.html

@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% trans "Storages" %} - {{ compute.name }}{% endblock %}
+{% block content %}
+<div class="container-fluid">
+    <div class="row">
+
+        {% include 'sidebar.html' %}
+
+        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+
+            {% include "create_stg_block.html" %}
+
+            <h1 class="page-header">{{ compute.name }}</h1>
+
+            {% include 'compute_block_link.html' %}
+
+            {% include 'errors_block.html' %}
+
+            <div class="row">
+
+            </div>
+
+        </div>
+    </div>
+</div>
+{% endblock %}

webvirtcloud/urls.py

@@ -15,16 +15,16 @@ urlpatterns = patterns('',
     url(r'^computes/$', 'computes.views.computes', name='computes'),
     url(r'^compute/(\d+)/$', 'computes.views.compute', name='compute'),
 
-    url(r'^storages/(\d+)/$', 'storages.views.storages', name='storages'),
+    url(r'^compute/stgs/(\d+)/$', 'storages.views.storages', name='storages'),
-    url(r'^storage/(\d+)/([\w\-\.]+)/$', 'storages.views.storage', name='storage'),
+    url(r'^compute/stg/(\d+)/([\w\-\.]+)/$', 'storages.views.storage', name='storage'),
 
-    url(r'^networks/(\d+)/$', 'networks.views.networks', name='networks'),
+    url(r'^compute/nets/(\d+)/$', 'networks.views.networks', name='networks'),
-    url(r'^network/(\d+)/([\w\-\.]+)/$', 'networks.views.network', name='network'),
+    url(r'^compute/net/(\d+)/([\w\-\.]+)/$', 'networks.views.network', name='network'),
 
-    url(r'^interfaces/(\d+)/$', 'interfaces.views.interfaces', name='interfaces'),
+    url(r'^compute/ifaces/(\d+)/$', 'interfaces.views.interfaces', name='interfaces'),
-    url(r'^interface/(\d+)/([\w\.]+)$', 'interfaces.views.interface', name='interface'),
+    url(r'^compute/iface/(\d+)/([\w\.]+)$', 'interfaces.views.interface', name='interface'),
 
-    url(r'^secret/(\d+)/$', 'secrets.views.secrets', name='secrets'),
+    url(r'^compute/secret/(\d+)/$', 'secrets.views.secrets', name='secrets'),
 
     url(r'^users/$', 'users.views.users', name='users'),
     url(r'^user/(\d+)/$', 'users.views.user', name='user'),