btn-default -> btn-secondary

RIGS/rigboard.py

@@ -56,6 +56,7 @@ class WebCalendar(generic.TemplateView):
 
 
 class EventDetail(generic.DetailView):
+    template_name = 'event_detail.html'
     model = models.Event
 
 

RIGS/signals.py

@@ -34,7 +34,7 @@ def send_eventauthorisation_success_email(instance):
         'current_user': False,
     }
 
-    template = get_template('RIGS/event_print.xml')
+    template = get_template('event_print.xml')
     merger = PdfFileMerger()
 
     rml = template.render(context)
@@ -63,13 +63,13 @@ def send_eventauthorisation_success_email(instance):
 
     client_email = EmailMultiAlternatives(
         subject,
-        get_template("RIGS/eventauthorisation_client_success.txt").render(context),
+        get_template("eventauthorisation_client_success.txt").render(context),
         to=[instance.email],
         reply_to=[settings.AUTHORISATION_NOTIFICATION_ADDRESS],
     )
 
     css = staticfiles_storage.path('css/email.css')
-    html = Premailer(get_template("RIGS/eventauthorisation_client_success.html").render(context),
+    html = Premailer(get_template("eventauthorisation_client_success.html").render(context),
                      external_styles=css).transform()
     client_email.attach_alternative(html, 'text/html')
 
@@ -87,7 +87,7 @@ def send_eventauthorisation_success_email(instance):
 
     mic_email = EmailMessage(
         subject,
-        get_template("RIGS/eventauthorisation_mic_success.txt").render(context),
+        get_template("eventauthorisation_mic_success.txt").render(context),
         to=[mic_email_address]
     )
 
@@ -122,12 +122,12 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
 
             email = EmailMultiAlternatives(
                 "%s new users awaiting approval on RIGS" % (context['number_of_users']),
-                get_template("RIGS/admin_awaiting_approval.txt").render(context),
+                get_template("admin_awaiting_approval.txt").render(context),
                 to=[admin.email],
                 reply_to=[user.email],
             )
             css = staticfiles_storage.path('css/email.css')
-            html = Premailer(get_template("RIGS/admin_awaiting_approval.html").render(context),
+            html = Premailer(get_template("admin_awaiting_approval.html").render(context),
                              external_styles=css).transform()
             email.attach_alternative(html, 'text/html')
             email.send()

RIGS/static/css/email.css

@@ -1 +1,2 @@
 body{margin:0}.main-table{width:100%;border-collapse:collapse}.client-header{background-image:url(https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg);background-color:#222;background-repeat:no-repeat;background-position:center;width:100%;margin-bottom:28px}.client-header .logos{width:100%;max-width:640px}.client-header img{height:110px}.content-container{width:100%}.content-container .content{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;width:100%;max-width:600px;padding:10px;text-align:left}.content-container .content .button-container{width:100%}.content-container .content .button-container .button{padding:6px 12px;background-color:#357ebf;border-radius:4px}.content-container .content .button-container .button a{color:#fff;text-decoration:none}
+/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImVtYWlsLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsS0FDRSxRQUFRLENBR1YsWUFDRSxVQUFPLENBQ1Asd0JBQWlCLENBSW5CLGVBQ0Usd0VBQWtCLENBQ2xCLHFCQUFrQixDQUNsQiwyQkFBbUIsQ0FDbkIsMEJBQXFCLENBRXJCLFVBQU8sQ0FFUCxrQkFBZSxDQVJqQixzQkFXSSxVQUFPLENBQ1AsZUFBVyxDQVpmLG1CQWdCSSxZQUFRLENBSVosbUJBQ0UsVUFBTyxDQURULDRCQUlJLG1FQUFhLENBRWIsVUFBTyxDQUNQLGVBQVcsQ0FDWCxZQUFTLENBQ1QsZUFBWSxDQVRoQiw4Q0FZTSxVQUFPLENBWmIsc0RBZVEsZ0JBQVMsQ0FDVCx3QkFoRE8sQ0FpRFAsaUJBQWUsQ0FqQnZCLHdEQW9CVSxVQUFPLENBQ1Asb0JBQWlCIiwiZmlsZSI6ImVtYWlsLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIiRidXR0b25fY29sb3I6ICMzNTdlYmY7XG5cbmJvZHl7XG4gIG1hcmdpbjogMHB4O1xufVxuXG4ubWFpbi10YWJsZXtcbiAgd2lkdGg6IDEwMCU7XG4gIGJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7XG5cbn1cblxuLmNsaWVudC1oZWFkZXIge1xuICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoXCJodHRwczovL3d3dy5ub3R0aW5naGFtdGVjLmNvLnVrL2ltZ3Mvd29mMjAxNC0xLmpwZ1wiKTtcbiAgYmFja2dyb3VuZC1jb2xvcjogIzIyMjtcbiAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDtcbiAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyO1xuXG4gIHdpZHRoOiAxMDAlO1xuXG4gIG1hcmdpbi1ib3R0b206IDI4cHg7XG5cbiAgLmxvZ29ze1xuICAgIHdpZHRoOiAxMDAlO1xuICAgIG1heC13aWR0aDogNjQwcHg7XG4gIH1cblxuICBpbWcge1xuICAgIGhlaWdodDogMTEwcHg7XG4gIH1cbn1cblxuLmNvbnRlbnQtY29udGFpbmVye1xuICB3aWR0aDogMTAwJTtcblxuICAuY29udGVudCB7XG4gICAgZm9udC1mYW1pbHk6IFwiT3BlbiBTYW5zXCIsIFwiSGVsdmV0aWNhIE5ldWVcIiwgSGVsdmV0aWNhLCBBcmlhbCwgc2Fucy1zZXJpZjtcblxuICAgIHdpZHRoOiAxMDAlO1xuICAgIG1heC13aWR0aDogNjAwcHg7XG4gICAgcGFkZGluZzogMTBweDtcbiAgICB0ZXh0LWFsaWduOiBsZWZ0O1xuXG4gICAgLmJ1dHRvbi1jb250YWluZXJ7XG4gICAgICB3aWR0aDogMTAwJTtcblxuICAgICAgLmJ1dHRvbiB7XG4gICAgICAgIHBhZGRpbmc6IDZweCAxMnB4O1xuICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAkYnV0dG9uX2NvbG9yO1xuICAgICAgICBib3JkZXItcmFkaXVzOiA0cHg7XG5cbiAgICAgICAgYSB7XG4gICAgICAgICAgY29sb3I6ICNmZmY7XG4gICAgICAgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lO1xuICAgICAgICB9XG5cbiAgICAgIH1cblxuICAgIH1cblxuICB9XG59XG5cbiJdfQ== */

RIGS/static/css/ie.css

@@ -0,0 +1,2 @@
+
+/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJpZS5jc3MiLCJzb3VyY2VzQ29udGVudCI6W119 */

RIGS/templates/activity_feed.html

@@ -8,19 +8,7 @@
       window.location.href = $(this).attr('href');
     }
   });
-
+  moment().twitter();
-      // This keeps timeago values correct, but uses an insane amount of resources
-      // $(function () {
-      //     setInterval(function() {
-      //         $('.date').each(function (index, dateElem) {
-      //           var $dateElem = $(dateElem);
-      //           var formatted = moment($dateElem.attr('data-date')).fromNow();
-      //           $dateElem.text(formatted);
-      //          })
-      //        });
-      //     }, 10000);
-        moment().twitter();
-
 })
   $(document).ready(function() {
     $(function () {
@@ -44,12 +32,11 @@
 </script>
 {% endblock %}
 
-<div class="card card-default">
+<div class="card">
-  <div class="card-heading">
+  <div class="card-header">
-    <h4 class="card-title">Recent Changes</h4>
+    <h4>Recent Changes</h4>
   </div>
-
+  <div class="list-group list-group-flush">
-  <div class="list-group">
     <div id="activity_loading" class="list-group-item loading-animation">
       <div class="circle"></div>
       <div class="circle1"></div>

RIGS/templates/event_detail_buttons.html

@@ -19,7 +19,7 @@
                 class="hidden-xs">Print</span></a>
     {% endif %}
     <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
-            class="fas fa-duplicate"></span> <span
+            class="fas fa-copy"></span> <span
             class="hidden-xs">Duplicate</span></a>
     {% if event.is_rig %}
         {% if event.internal %}
@@ -58,7 +58,7 @@
                             btn-danger
                         {% endif %}
                         " title="Invoice Rig"><span
-                    class="fas fa-gbp"></span>
+                    class="fas fa-pound-sign"></span>
                 <span class="hidden-xs">Invoice</span></a>
         {% endif %}
     {% endif %}

RIGS/templates/index.html

@@ -10,28 +10,38 @@
 {% endblock %}
 
 {% block content %}
-    <div class="col-sm-12">
+<h1 class="bd-title">R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
-        <h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
+<h4 class="list-group-item-heading" style="margin:0;">Welcome back {{ user.get_full_name }}, there are {{ rig_count }} rigs coming up.</h4>
-    </div>
+<div class="row">
-    <div class="col-sm-12">
+    <div class="col-sm-4">
-        <p><h4 class="list-group-item-heading" style="margin:0;">Welcome back {{ user.get_full_name }}, there are {{ rig_count }} rigs coming up.</h4>
+        <div class="card bg-primary">
-        </p>
+            <div class="card-header">
-    </div>
+                <h4 class="list-group-item-heading">RIGS</h4>
-    <div class="row">
-    <div class="col-sm-{% if perms.RIGS.view_event %}6{% else %}12{% endif %}">
-
-        <div class="card card-default">
-            <div class="card-heading">
-                 <h4 class="list-group-item-heading">Quick Links</h4>
             </div>
-            <div class="list-group">
+            <div class="list-group list-group-flush">
-                    <a class="list-group-item" href="{% url 'rigboard' %}"><span class="fas fa-list"></span> Rigboard</a>
+                <a class="list-group-item" href="{% url 'rigboard' %}"><span class="fas fa-list"></span> Rigboard</a>
-                    <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="fas fa-calendar"></span> Calendar</a>
+                <a class="list-group-item" href="{% url 'web_calendar' %}"><span class="fas fa-calendar"></span> Calendar</a>
-                    {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span> New Event</a>{% endif %}
+                {% if perms.RIGS.add_event %}<a class="list-group-item" href="{% url 'event_create' %}"><span class="fas fa-plus"></span> New Event</a>{% endif %}
-                    <a class="list-group-item" href="{% url 'asset_index' %}"><span class="fas fa-tag"></span> Asset Database </a>
-
-                    <div class="list-group-item default"></div>
                 
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-4">
+        <div class="card bg-warning">
+            <div class="card-header">
+                <h4 class="list-group-item-heading">Asset Database</h4>
+            </div>
+            <div class="list-group list-group-flush">
+                <a class="list-group-item" href="{% url 'asset_index' %}"><span class="fas fa-tag"></span> Asset Database </a>
+            </div>
+        </div>
+    </div>
+    <div class="col-sm-4">
+        <div class="card">
+            <div class="card-header">
+                    <h4 class="list-group-item-heading">Quick Links</h4>
+            </div>
+            <div class="list-group list-group-flush">
                     <a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="fas fa-link"></span> TEC Forum</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="fas fa-link"></span> TEC Wiki</a>
                     {% if perms.RIGS.view_event %}
@@ -42,8 +52,10 @@
             </div>
         </div>
     </div>
+</div>
+<div class="row">
     {% if perms.RIGS.view_event %}
-    <div class="col-sm-6">
+    <div class="col-sm-12">
         {% include 'activity_feed.html' %}
     </div>
     {% endif %}

RIGS/templates/rigboard.html

@@ -4,7 +4,7 @@
 
 {% block content %}
     <div>
-        <h1 class="bd-title" id="content">Rigboard</h1>
+        <h1 class="bd-title">Rigboard</h1>
         {% if perms.RIGS.add_event %}
         <a href="{% url 'event_create' %}" class="btn btn-lg btn-outline-primary float-right">New <span class="fas fa-plus"></span></a>
         {% endif %}

RIGS/urls.py

@@ -80,7 +80,7 @@ urlpatterns = [
         permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
         name='activity_feed'),
 
-    url(r'^event/(?P<pk>\d+)/$', has_oembed(oembed_view="event_oembed")(
+    path('event/<pk>/', has_oembed(oembed_view="event_oembed")(
             rigboard.EventDetail.as_view()),
         name='event_detail'),
     url(r'^event/(?P<pk>\d+)/embed/$',

templates/base.html

@@ -28,14 +28,13 @@
 
     {% block extra-head %}{% endblock %}
 </head>
-
 <body>
 {% include "analytics.html" %}
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark" role="navigation">
+<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark" role="navigation">
   {% block titleheader %}
   {% endblock %}
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
+  <span class="navbar-toggler-icon"></span>
   </button>
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav mr-auto">
@@ -63,24 +62,24 @@
   </div>
 </nav>
 
-<div class="container">
+<div class="container" style="padding-top: 1rem;">
-        {% block content-header %}
+    {% block content-header %}
-            {% if error %}
+        {% if error %}
-                <div class="error">{{ error }}</div>{% endif %}
+            <div class="error">{{ error }}</div>{% endif %}
-            {% if info %}
+        {% if info %}
-                <div class="info">{{ info }}</div>{% endif %}
+            <div class="info">{{ info }}</div>{% endif %}
-            {% if messages %}
+        {% if messages %}
-                {% for message in messages %}
+            {% for message in messages %}
-                    <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
+                <div class="alert alert-{{ message.level_tag }} alert-dismissible" role="alert">
-                        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
-                                aria-hidden="true">&times;</span></button>
+                            aria-hidden="true">&times;</span></button>
-                        {{ message }}
+                    {{ message }}
-                    </div>
+                </div>
-                {% endfor %}
+            {% endfor %}
-            {% endif %}
+        {% endif %}
-        {% endblock %}
+    {% endblock %}
 
-        {% block content %}{% endblock %}
+    {% block content %}{% endblock %}
 </div>
 
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>