Update menus

diff --git a/templates/base.html b/templates/base.html
index e5034ee0439c42207e746a2475fe6bffbec0d736..2752169f59978b70ca2ea31893f189f27d8a2ba5 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -65,8 +65,7 @@
                 <li><a href="{{ link("venue/") }}">Venue</a></li>
                 {% if not cfp.closed %}<li><a href="{{ link("call-for-papers/") }}">Call for Papers</a></li>{% endif %}
                 {% if schedule and schedule.published %}<li><a href="{{ link("schedule/") }}">Schedule</a></li>{% endif %}
-                <!-- TODO: make feedback conditional -->
-                <li><a href="{{ link("f") }}">Feedback</a></li>
+                {%if conference.conferencefeedbackopen %}<li><a href="{{ link("f") }}">Feedback</a></li>{% endif %}
                 <li><a href="{{ link("sponsors/") }}">Sponsors</a></li>
                 {% if cfs.open %}<li><a href="{{ link("become-sponsor/") }}">Become a Sponsor</a></li>{% endif %}
                 <li><a href="{{ link("organisation/") }}">Organisation</a></li>
@@ -76,7 +75,7 @@
               </ul>
               <nav class="button-bar">
                 {% if cfr.open and not cfr.closed %}<a class="button primary" href="{{ link("registration/") }}">Register Now!</a>{% endif %}
-                {#-<a class="button" href="{{ syslink("register/") }}">Your Attendance</a>-#}
+                <a class="button" href="{{ syslink("register/") }}">Your Attendance</a>
               </nav>
             </div>
           </div>
@@ -186,7 +185,7 @@
         <div class="links">
           <ul>
             <li><a href="{{ link("") }}">Home</a></li>
-            {#-<li><a href="{{ syslink("register/") }}">Your Attendance</a></li>-#}
+            <li><a href="{{ syslink("register/") }}">Your Attendance</a></li>
             <li><a href="{{ link("about/") }}">About</a></li>
             <li><a href="{{ link("venue/") }}">Venue</a></li>
             <li><a href="{{ link("things-to-do/") }}">Things To Do</a></li>
@@ -195,8 +194,7 @@
             {% if not cfp.closed %}<li><a href="{{ link("call-for-papers/") }}">Call for Papers</a></li>{% endif %}
             {% if schedule and schedule.published %}<li><a href="{{ link("schedule/") }}">Schedule</a></li>{% endif %}
             {#<li><a href="{{ link("social/") }}">Social Event</a></li>#}
-            <!-- TODO: make feedback conditional -->
-            <li><a href="{{ link("f") }}">Feedback</a></li>
+            {%if conference.conferencefeedbackopen %}<li><a href="{{ link("f") }}">Feedback</a></li>{% endif %}
           </ul>
           <ul>
             <li><a href="{{ link("sponsors/") }}">Sponsors</a></li>