redirect to current recording

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 1307647947122484b7fdef0282ee3b80e4d2bb17..41e63e220b84ca44d0949b1ce8b8771b34afcfae 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -83,7 +83,7 @@ alt="logo" />
 <ul id="nav">
 
  {% if user.is_authenticated %}
-   <li><a href="{% url teleforma-conference-record %}" class="red">{% trans "Record" %}</a></li>
+   <li><a href="{% url teleforma-home %}" class="red">{% trans "Record" %}</a></li>
  {% else %}
   <li><a href="{% url teleforma-login %}" class="red">{% trans "Login" %}</a></li>
  {% endif %}
@@ -102,15 +102,9 @@ alt="logo" />
     <li><a href="{% url teleforma-home %}" class="orange">{% trans "Desk" %}</a></li>
   {% endif %}
 
- {% if user.is_staff %}
-  <li><a href="{% url teleforma-users 0 0 0 %}" class="yellow">{% trans "Users" %}</a></li>
- {% else %}
-  <li><a href="{% url teleforma-annals %}" class="yellow">{% trans "Annals" %}</a></li>
- {% endif %}
-
  {% if user.is_authenticated %}
   {% if user.is_staff %}
-   <li><a href="#archives#" class="green">{% trans "Archives" %}</a>
+   <li><a href="#archives#" class="yellow">{% trans "Archives" %}</a>
  <ul>
  <li><a href="{% url telemeta-search-criteria %}">{% trans "Search" %}</a></li>
  <li><a href="{% url telemeta-collections %}">{% trans "Collections" %}</a></li>
@@ -118,7 +112,7 @@ alt="logo" />
  <li><a href="{% url teleforma-annals %}">{% trans "Annals" %}</a></li>
  </ul>
  </li>
- <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
+ <li><a href="{% url telemeta-admin-general %}" class="green">{% trans "Admin" %}</a></li>
   {% else %}
    <li><a href="{% url teleforma-help %}" class="green">{% trans "Help" %}</a></li>
  {% endif %}

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 55f08831b3c10ec21032964236c1d502e9406260..25a8a9518cd855e002e8286ded4e8cf740856e06 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -176,8 +176,19 @@ class HomeRedirectView(View):
 
     def get(self, request):
         if request.user.is_authenticated():
-            periods = get_periods(request.user)
-            return HttpResponseRedirect(reverse('teleforma-desk-period-list', kwargs={'period_id': periods[0].id}))
+            conferences = Conference.objects.filter(streaming=True)
+            if conferences:
+                return HttpResponseRedirect(
+                    reverse('teleforma-conference-detail',
+                    kwargs={'period_id': self.conferences[0].period.id,
+                    'pk':self.conferences[0].id}
+                    )
+                )
+            else:
+                return HttpResponseRedirect(
+                    reverse('teleforma-conference-record',
+                    )
+                )
         else:
             return HttpResponseRedirect(reverse('teleforma-login'))