Merge branch 'master' into markdown

# Conflicts:
#	RIGS/templates/RIGS/event_detail.html
#	RIGS/test_unit.py
#	requirements.txt

templates/400.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Bad Request{% endblock %}
 

templates/401.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Unauthorized{% endblock %}
 

templates/403.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Forbidden{% endblock %}
 

templates/404.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Page Not Found{% endblock %}
 

templates/500.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Server error{% endblock %}
 

templates/base.html

@@ -43,61 +43,16 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">RIGS</a>
+            {% block titleheader %}
+            {% endblock %}
         </div>
         <div class="navbar-collapse">
             <ul class="nav navbar-nav">
-                {% if user.is_authenticated %}
-                    <li><a href="/">Home</a></li>
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
-                        <ul class="dropdown-menu">
-                            <li><a href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
-                                Rigboard</a></li>
-                            <li><a href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
-                                Archive</a></li>
-                            <li><a href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span>
-                                Calendar</a></li>
-                            {% if perms.RIGS.view_event %}
-                                <li><a href="{% url 'activity_table' %}"><span
-                                        class="glyphicon glyphicon-random"></span> Recent Changes</a></li>
-                            {% endif %}
-                            {% if perms.RIGS.add_event %}
-                                <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
-                                    New Event</a></li>
-                            {% endif %}
-
-                        </ul>
-                    </li>
-                {% endif %}
-                {% if perms.RIGS.view_invoice %}
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Invoices<b class="caret"></b></a>
-                        <ul class="dropdown-menu">
-                            {% if perms.RIGS.add_invoice %}
-                                <li><a href="{% url 'invoice_waiting' %}"><span
-                                        class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a></li>
-                            {% endif %}
-                            <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
-                            </li>
-                            <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
-                                Archive</a></li>
-                        </ul>
-                    </li>
-                {% endif %}
-                {% if perms.RIGS.view_person %}
-                    <li><a href="{% url 'person_list' %}">People</a></li>
-                {% endif %}
-                {% if perms.RIGS.view_organisation %}
-                    <li><a href="{% url 'organisation_list' %}">Organisations</a></li>
-                {% endif %}
-                {% if perms.RIGS.view_venue %}
-                    <li><a href="{% url 'venue_list' %}">Venues</a></li>
-                {% endif %}
-
+                {% block titleelements %}
+                {% endblock %}
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li class="dropdown">
+                <li class="dropdown" id="user">
                     {% if user.is_authenticated %}
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-user"></span>

templates/base_assets.html

@@ -0,0 +1,39 @@
+{% extends 'base.html' %}
+
+{% block extrahead %}
+<meta name="google" content="notranslate">
+{% endblock %}
+
+{% block titleheader %}
+    <a class="nav navbar-brand navbar-left" href="/"><i class="glyphicon glyphicon-circle-arrow-left" style="vertical-align: middle !important;"></i> RIGS</a>
+    <a class="nav navbar-brand" href="{% url 'asset_index' %}">Assets</a>
+{% endblock %}
+
+{% block titleelements %}
+    {# % if perms.assets.view_asset % #}
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Assets<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="{% url 'asset_list' %}"><span class="glyphicon glyphicon-list"></span> List Assets</a></li>
+                {% if perms.assets.add_asset %}
+                    <li><a href="{% url 'asset_create' %}"><span class="glyphicon glyphicon-plus"></span> Create Asset</a></li>
+                {% endif %}
+            </ul>
+        </li>
+    {# % endif % #}
+    {# % if perms.assets.view_supplier % #}
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"> Suppliers<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="{% url 'supplier_list' %}"><span class="glyphicon glyphicon-list"></span>
+                    List Suppliers</a></li>
+                {% if perms.assets.add_supplier %}
+                    <li><a href="{% url 'supplier_create' %}"><span class="glyphicon glyphicon-plus"></span> Create Supplier</a></li>
+                {% endif %}
+            </ul>
+        </li>
+    {# % endif % #}
+    {% if perms.assets.view_asset %}
+        <li><a href="{% url 'asset_activity_table' %}">Recent Changes</a></li>
+    {% endif %}
+{% endblock %}

templates/base_rigs.html

@@ -0,0 +1,54 @@
+{% extends 'base.html' %}
+{% block titleheader %}
+    <a class="navbar-brand" href="/">RIGS</a>
+{% endblock %}
+
+{% block titleelements %}
+    {% if user.is_authenticated %}
+        <li><a href="/">Home</a></li>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Rigboard<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                <li><a href="{% url 'rigboard' %}"><span class="glyphicon glyphicon-list"></span>
+                    Rigboard</a></li>
+                <li><a href="{% url 'event_archive' %}"><span class="glyphicon glyphicon-book"></span>
+                    Archive</a></li>
+                <li><a href="{% url 'web_calendar' %}"><span class="glyphicon glyphicon-calendar"></span>
+                    Calendar</a></li>
+                {% if perms.RIGS.view_event %}
+                    <li><a href="{% url 'activity_table' %}"><span
+                            class="glyphicon glyphicon-random"></span> Recent Changes</a></li>
+                {% endif %}
+                {% if perms.RIGS.add_event %}
+                    <li><a href="{% url 'event_create' %}"><span class="glyphicon glyphicon-plus"></span>
+                        New Event</a></li>
+                {% endif %}
+
+            </ul>
+        </li>
+    {% endif %}
+    {% if perms.RIGS.view_invoice %}
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Invoices<b class="caret"></b></a>
+            <ul class="dropdown-menu">
+                {% if perms.RIGS.add_invoice %}
+                    <li><a href="{% url 'invoice_waiting' %}"><span
+                            class="glyphicon glyphicon-briefcase text-danger"></span> Waiting</a></li>
+                {% endif %}
+                <li><a href="{% url 'invoice_list' %}"><span class="glyphicon glyphicon-gbp text-warning"></span> Outstanding</a>
+                </li>
+                <li><a href="{% url 'invoice_archive' %}"><span class="glyphicon glyphicon-book"></span>
+                    Archive</a></li>
+            </ul>
+        </li>
+    {% endif %}
+    {% if perms.RIGS.view_person %}
+        <li><a href="{% url 'person_list' %}">People</a></li>
+    {% endif %}
+    {% if perms.RIGS.view_organisation %}
+        <li><a href="{% url 'organisation_list' %}">Organisations</a></li>
+    {% endif %}
+    {% if perms.RIGS.view_venue %}
+        <li><a href="{% url 'venue_list' %}">Venues</a></li>
+    {% endif %}
+{% endblock %}

templates/form_errors.html

@@ -5,8 +5,10 @@
 		<dl class="dl-horizontal">
 			{% with form|nice_errors as qq %}
 				{% for error_name,desc in qq.items %}
+				<span>
 					<dt>{{error_name}}</dt>
 					<dd>{{desc}}</dd>
+				</span>
 				{% endfor %}
 			{% endwith %}
 		</dl>

templates/login_redirect.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load staticfiles %}
 {% block title %}Login Required{% endblock %}
 

templates/registration/activation_complete.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 
 {% block title %}Activation Complete{% endblock %}
 

templates/registration/logged_out.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 
 {% block title %}Logout Successful{% endblock %}
 

templates/registration/login.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 
 {% block title %}Login{% endblock %}
 

templates/registration/loginform.html

@@ -15,7 +15,7 @@
         <div class="text-right">
             <a href="{% url 'registration_register' %}" class="btn">Register</a>
             <a href="{% url 'password_reset' %}" class="btn">Forgotten Password</a>
-            <input type="submit" value="Login" class="btn btn-primary"/>
+            <input type="submit" id="id_submit" value="Login" class="btn btn-primary"/>
             <input type="hidden" name="next" value="{{ next }}"/>
         </div>
     </form>

templates/registration/password_change_done.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_rigs.html" %}
 {% load i18n %}
 
 

templates/registration/password_change_form.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_rigs.html" %}
 {% load widget_tweaks %}
 
 

templates/registration/password_reset_complete.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_rigs.html" %}
 {% load i18n %}
 
 

templates/registration/password_reset_confirm.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_rigs.html" %}
 {% load i18n %}
 {% load widget_tweaks %}
 

templates/registration/password_reset_done.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_rigs.html" %}
 {% load i18n %}
 
 

templates/registration/password_reset_form.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load i18n %}
 {% load widget_tweaks %}
 

templates/registration/registration_complete.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 
 {% block title %}Registration complete{% endblock %}
 

templates/registration/registration_form.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'base_rigs.html' %}
 {% load widget_tweaks %}
 {% block title %}Registration{% endblock %}