From 78226519efeecaef99fb49a548cf6f6b111428d3 Mon Sep 17 00:00:00 2001
From: Nikos Roussos <nikos@roussos.cc>
Date: Fri, 16 Mar 2018 14:33:24 +0200
Subject: [PATCH] Rename own user view to Dashboard

* Hide Observation button if no permissions
---
 network/templates/base.html              | 22 +++++++++++-----------
 network/templates/base/observations.html |  4 +++-
 network/templates/users/user_detail.html | 11 ++++++++---
 network/users/views.py                   | 16 +++++++++-------
 4 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/network/templates/base.html b/network/templates/base.html
index bef8054..5887015 100644
--- a/network/templates/base.html
+++ b/network/templates/base.html
@@ -51,16 +51,16 @@
             </ul>
             <ul class="nav navbar-nav navbar-right">
               {% if request.user.is_authenticated %}
-              {% if owner_vetting_count %}
-                <li data-toggle="tooltip"
-                    data-placement="bottom"
-                    title="{{ owner_vetting_count }} observations need vetting">
-                  <a href="{% url 'base:observations_list' %}?observer={{ request.user.id }}&future=0&good=0&bad=0&unvetted=1&failed=0">
-                    <span class="glyphicon glyphicon-check" aria-hidden="true"></span>
-                    <span class="badge badge-unvetted">{{ owner_vetting_count }}</span>
-                  </a>
-                </li>
-              {% endif %}
+                {% if owner_vetting_count %}
+                  <li data-toggle="tooltip"
+                      data-placement="bottom"
+                      title="{{ owner_vetting_count }} observations need vetting">
+                    <a href="{% url 'base:observations_list' %}?observer={{ request.user.id }}&future=0&good=0&bad=0&unvetted=1&failed=0">
+                      <span class="glyphicon glyphicon-check" aria-hidden="true"></span>
+                      <span class="badge badge-unvetted">{{ owner_vetting_count }}</span>
+                    </a>
+                  </li>
+                {% endif %}
               <li class="dropdown">
                 <a href="#"
                    class="dropdown-toggle"
@@ -69,7 +69,7 @@
                   <span class="caret"></span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
-                    <li><a href="{% url 'users:view_user' username=request.user.username %}">My Profile</a></li>
+                    <li><a href="{% url 'users:view_user' username=request.user.username %}">Dashboard</a></li>
                     <li role="separator" class="divider"></li>
                     {% if request.user.is_superuser %}
                       <li><a href="{% url 'base:settings_site' %}">Site Settings</a></li>
diff --git a/network/templates/base/observations.html b/network/templates/base/observations.html
index 4c6f3c4..76b1985 100644
--- a/network/templates/base/observations.html
+++ b/network/templates/base/observations.html
@@ -26,7 +26,9 @@
           <span class="glyphicon glyphicon-filter" aria-hidden="true"></span> Filters
         </a>
         {% if can_schedule %}
-          <a class="btn btn-primary" href="{% url 'base:observation_new' %}">New Observation</a>
+          <a class="btn btn-primary" href="{% url 'base:observation_new' %}">
+            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> New Observation
+          </a>
         {% endif %}
       </h1>
     </div>
diff --git a/network/templates/users/user_detail.html b/network/templates/users/user_detail.html
index 8451246..7594069 100644
--- a/network/templates/users/user_detail.html
+++ b/network/templates/users/user_detail.html
@@ -3,7 +3,9 @@
 {% load static %}
 {% load tags %}
 
-{% block title %} - User: {{ user.username }}{% endblock %}
+{% block title %}
+  {% if user == request.user %} - Dashboard{% else %} - User: {{ user.username }}{% endif %}
+{% endblock %}
 
 {% block content %}
   <div class="row">
@@ -195,10 +197,13 @@
     </div>
   {% endif %}
 
-  {% if user == request.user %}
+  {% if can_schedule %}
     <div class="row">
       <div class="col-md-12">
-        <a class="btn btn-default" href="{% url 'base:observation_new' %}">New Observation</a>
+        <a class="btn btn-default" href="{% url 'base:observation_new' %}">
+          <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+          New Observation
+        </a>
       </div>
     </div>
   {% endif %}
diff --git a/network/users/views.py b/network/users/views.py
index 532f467..ab250ec 100644
--- a/network/users/views.py
+++ b/network/users/views.py
@@ -11,6 +11,7 @@ from network.users.forms import UserForm
 from network.users.models import User
 from network.base.forms import StationForm
 from network.base.models import Station, Observation, Antenna, Rig
+from network.base.perms import schedule_perms
 
 
 class UserRedirectView(LoginRequiredMixin, RedirectView):
@@ -40,6 +41,11 @@ def view_user(request, username):
     user = get_object_or_404(User, username=username)
     observations = Observation.objects.filter(author=user)[0:10]
     stations = Station.objects.filter(owner=user)
+
+    can_schedule = False
+    if request.user.is_authenticated():
+        can_schedule = schedule_perms(request.user)
+
     try:
         token = Token.objects.get(user=user)
     except Token.DoesNotExist:
@@ -49,10 +55,6 @@ def view_user(request, username):
     rigs = Rig.objects.all()
 
     return render(request, 'users/user_detail.html',
-                  {'user': user,
-                   'observations': observations,
-                   'stations': stations,
-                   'token': token,
-                   'form': form,
-                   'antennas': antennas,
-                   'rigs': rigs})
+                  {'user': user, 'observations': observations, 'stations': stations,
+                   'token': token, 'form': form, 'antennas': antennas,
+                   'rigs': rigs, 'can_schedule': can_schedule})