Merge branch 'master' into timezone-fixes

RIGS/static/scss/screen.scss

@@ -51,4 +51,15 @@ textarea {
 
 .item-description {
   margin-left: 1em;
-}
+}
+
+.overflow-ellipsis {
+  text-overflow: ellipsis;
+  display: inline-block;
+  max-width: 100%;
+  overflow: hidden;
+}
+
+.modal-dialog {
+  z-index: inherit; // bug fix introduced in 52682ce
+}

RIGS/templates/RIGS/event_detail.html

@@ -7,7 +7,10 @@
     {% if not request.is_ajax %}
     <div class="col-sm-12">
         <div class="col-sm-8">
-            <h1>Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}</h1>
+            <h1>
+                {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
+                {{ object.name }}
+            </h1>
         </div>
     </div>
         <div class="col-sm-12 text-right">
@@ -53,7 +56,7 @@
                         <dt>Email</dt>
                         <dd>
                             <a href="mailto:{{object.person.email}}" target="_blank">
-                                {{ object.person.email }}
+                                <span class="overflow-ellipsis">{{ object.person.email }}</span>
                             </a>
                         </dd>
 
@@ -93,7 +96,7 @@
     {% endif %}
     <div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
         <div class="panel panel-info">
-            <div class="panel-heading">{{ object.name }}</div>
+            <div class="panel-heading">Event Info</div>
             <div class="panel-body">
                 <dl class="dl-horizontal">
                     <dt>Event Venue</dt>

RIGS/templates/RIGS/index.html

@@ -13,6 +13,9 @@
             {% endif %}
             <h3>There are currently {{ rig_count }} rigs coming up.</h3>
             <a class="btn btn-default" href="{% url 'rigboard' %}">View Rigboard</a>
+            <a class="btn btn-default" href="{% url 'event_create' %}">
+                New Event <span class="glyphicon glyphicon-plus"></span>
+            </a>
         </div>
     </div>
     <div class="col-sm-6">

RIGS/templates/RIGS/profile_detail.html

@@ -34,10 +34,10 @@
 			<dd>{{object.email}}</dd>
 
 			<dt>Last Login</dt>
-			<dd>{{object.last_login}}</dd>
+			<dd>{{object.last_login|date:"d/m/Y H:i"}}</dd>
 
 			<dt>Date Joined</dt>
-			<dd>{{object.date_joined}}</dd>
+			<dd>{{object.date_joined|date:"d/m/Y H:i"}}</dd>
 
 			<dt>Initials</dt>
 			<dd>{{object.initials}}</dd>

templates/base.html

@@ -11,6 +11,10 @@
 
     <meta name="viewport" content="initial-scale=1">
 
+    <link rel="icon" type="image/png" href="/static/imgs/pyrigs-avatar.png">
+    <link rel="apple-touch-icon" href="/static/imgs/pyrigs-avatar.png">
+
+
     <link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">
     {% block css %}
     {% endblock %}
@@ -44,6 +48,7 @@
                         <li><a href="{% url 'rigboard' %}">Rigboard</a></li>
                         <li><a href="{% url 'event_archive' %}">Archive</a></li>
                         <li><a href="{% url 'web_calendar' %}">Calendar</a></li>
+                        <li><a href="{% url 'event_create' %}">New</a></li>
                     </ul>
                 </li>
                 {% if perms.RIGS.view_invoice %}
@@ -135,7 +140,7 @@
     </div>
 </div>
 
-<div class="modal fade" id="modal"></div>
+<div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
 
 <script>
     Date.prototype.getISOString = function () {