Move talk voting links into /admin/

diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py
index e03b1c5f28773b74862a31dd4e7629553c10172b..bf178dc926de00d3cdd9a96e632699e1b2fbe2ae 100644 (file)
--- a/postgresqleu/urls.py
+++ b/postgresqleu/urls.py
@@ -75,10 +75,6 @@ urlpatterns = [
        url(r'^events/([^/]+)/schedule/speaker/(\d+)(-.*)?/$', postgresqleu.confreg.views.speaker),
        url(r'^events/([^/]+)/sessions/speaker/(\d+)(-.*)?/$', postgresqleu.confreg.views.speaker),
        url(r'^events/(?P<urlname>[^/]+)/volunteer/', include(postgresqleu.confreg.volsched)),
-       url(r'^events/([^/]+)/talkvote/$', postgresqleu.confreg.views.talkvote),
-       url(r'^events/([^/]+)/talkvote/changestatus/$', postgresqleu.confreg.views.talkvote_status),
-       url(r'^events/([^/]+)/talkvote/vote/$', postgresqleu.confreg.views.talkvote_vote),
-       url(r'^events/([^/]+)/talkvote/comment/$', postgresqleu.confreg.views.talkvote_comment),
        url(r'^events/([^/]+)/sessions/$', postgresqleu.confreg.views.sessionlist),
        url(r'^events/speaker/(\d+)/photo/$', postgresqleu.confreg.views.speakerphoto),
        url(r'^events/([^/]+)/speakerprofile/$', postgresqleu.confreg.views.speakerprofile),
@@ -165,6 +161,10 @@ urlpatterns = [
        url(r'^events/admin/(\w+)/accesstokens/(.*/)?$', postgresqleu.confreg.backendviews.edit_accesstokens),
        url(r'^events/admin/(\w+)/pendinginvoices/$', postgresqleu.confreg.backendviews.pendinginvoices),
        url(r'^events/admin/(\w+)/purgedata/$', postgresqleu.confreg.backendviews.purge_personal_data),
+       url(r'^events/admin/([^/]+)/talkvote/$', postgresqleu.confreg.views.talkvote),
+       url(r'^events/admin/([^/]+)/talkvote/changestatus/$', postgresqleu.confreg.views.talkvote_status),
+       url(r'^events/admin/([^/]+)/talkvote/vote/$', postgresqleu.confreg.views.talkvote_vote),
+       url(r'^events/admin/([^/]+)/talkvote/comment/$', postgresqleu.confreg.views.talkvote_comment),
 
        url(r'^events/admin/(\w+)/tokendata/([a-z0-9]{64})/(\w+)\.(tsv|csv)$', postgresqleu.confreg.backendviews.tokendata),
 

diff --git a/template/confreg/admin_dashboard_single.html b/template/confreg/admin_dashboard_single.html
index 6e47008c83be7b5c63b54511a2007f992d0f54d4..ca731434356ca092f06fdca32be5b3ee6535bb3c 100644 (file)
--- a/template/confreg/admin_dashboard_single.html
+++ b/template/confreg/admin_dashboard_single.html
@@ -35,7 +35,7 @@
 <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-warning btn-block" href="/events/admin/{{c.urlname}}/sessionnotifyqueue/">Pending notifications</a></div>
 {%endif%}
 
-  <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-default btn-block" href="/events/{{c.urlname}}/talkvote/">View sessions and vote</a></div>
+  <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-default btn-block" href="/events/admin/{{c.urlname}}/talkvote/">View sessions and vote</a></div>
   <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-default btn-block" href="/events/admin/{{c.urlname}}/sessions/">Edit sessions</a></div>
   <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-default btn-block" href="/events/admin/{{c.urlname}}/schedule/create/">Create schedule</a></div>
   <div class="col-md-3 col-sm-6 col-xs-12 buttonrow"><a class="btn btn-default btn-block" href="/events/admin/{{c.urlname}}/volunteer/">Volunteer schedule</a></div>