Remove username from profile page URLs

5 files changed, 42 insertions, 44 deletions

diff --git a/servo/templates/accounts/calendars.html b/servo/templates/accounts/calendars.html
index c10276c..72a83f9 100755
--- a/servo/templates/accounts/calendars.html
+++ b/servo/templates/accounts/calendars.html
@@ -4,26 +4,26 @@
 
 {% block toolbar %}
 <div class="btn-group">
-    <a href="{% url 'calendars-create' username=request.user.username %}" data-modal="#modal" class="btn"><i class="icon-plus"></i> {% trans "New Calendar" %}</a>
-{% if calendar %}
-    <a href="{% url 'calendars.event.edit' username=request.user.username cal_pk=calendar.pk %}" class="btn">{% trans "New Event" %}</a>
-{% endif %}
+  <a href="{% url 'calendars-create' %}" data-modal="#modal" class="btn"><i class="icon-plus"></i> {% trans "New Calendar" %}</a>
+  {% if calendar %}
+  <a href="{% url 'calendars.event.edit' cal_pk=calendar.pk %}" class="btn">{% trans "New Event" %}</a>
+  {% endif %}
 </div>
 
 <div class="btn-group">
-{% if calendar %}
-    <a href="print/" class="btn window"><i class="icon-print"></i> {% trans "Print" %}</a>
-    <a href="{% url 'calendars-edit' request.user.username calendar.pk view %}" data-modal="#modal" class="btn"><i class="icon-pencil"></i> {% trans "Edit" %}</a>
-    {% if perms.servo.delete_calendar %}
-    <a href="{{ calendar.get_absolute_url }}delete/" data-modal="#modal" class="btn"><i class="icon-trash"></i> {% trans "Delete" %}</a>
-    {% else %}
-    <a href="" class="btn disabled">{% trans "Delete" %}</a>
-    {% endif %}
-{% endif %}
+  {% if calendar %}
+  <a href="print/" class="btn window"><i class="icon-print"></i> {% trans "Print" %}</a>
+  <a href="{% url 'calendars-edit' calendar.pk view %}" data-modal="#modal" class="btn"><i class="icon-pencil"></i> {% trans "Edit" %}</a>
+  {% if perms.servo.delete_calendar %}
+  <a href="{{ calendar.get_absolute_url }}delete/" data-modal="#modal" class="btn"><i class="icon-trash"></i> {% trans "Delete" %}</a>
+  {% else %}
+  <a href="" class="btn disabled">{% trans "Delete" %}</a>
+  {% endif %}
+  {% endif %}
 </div>
 
 <div class="btn-group">
-    <a href="download/" class="btn {% if not calendar %}disabled{% endif %}"><i class="icon-download"></i> {% trans "Download" %}</a>
+  <a href="download/" class="btn {% if not calendar %}disabled{% endif %}"><i class="icon-download"></i> {% trans "Download" %}</a>
 </div>
 
 {% endblock toolbar %}
@@ -31,25 +31,25 @@
 {% block second_row %}
 
 <div class="row-fluid">
-    <div class="span3">
-        <ul class="nav nav-list">
-            <li class="nav-header">{% trans "Calendars" %}</li>
-        {% for c in calendars %}
-            <li class="{% active request c.pk '/' %}">
-                <a href="{% url 'calendars.view' pk=c.pk username=request.user.username view='week' %}">{{ c.title }}<span class="badge pull-right">{{ c.get_unfinished_count }}</span></a>
-            </li>
-        {% endfor %}
-        </ul>
-    </div>
-
-    <div class="span9">
+  <div class="span3">
+    <ul class="nav nav-list">
+      <li class="nav-header">{% trans "Calendars" %}</li>
+      {% for c in calendars %}
+      <li class="{% active request c.pk '/' %}">
+        <a href="{% url 'calendars.view' pk=c.pk view='week' %}">{{ c.title }}<span class="badge pull-right">{{ c.get_unfinished_count }}</span></a>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+
+  <div class="span9">
     {% block detail_view %}
-        <h1 class="muted text-center">{% trans "No calendar selected" %}</h1>
+    <h1 class="muted text-center">{% trans "No calendar selected" %}</h1>
     {% endblock detail_view %}
-    </div>
+  </div>
 </div>
 {% endblock second_row %}
 
 {% block crumbs %}
-    <li class="active"><a href="{% url 'calendars-list' username=request.user.username %}">{% trans "Calendars" %}</a></li>
+<li class="active"><a href="{% url 'calendars-list' %}">{% trans "Calendars" %}</a></li>
 {% endblock crumbs %}
diff --git a/servo/templates/accounts/orders.html b/servo/templates/accounts/orders.html
index 8420ad8..c26e07d 100755
--- a/servo/templates/accounts/orders.html
+++ b/servo/templates/accounts/orders.html
@@ -23,7 +23,7 @@
 
 <div class="row-fluid">
   <div class="span12">
-    {% include "accounts/tabs.html" %}
+  {% include "accounts/tabs.html" %}
   </div>
 </div>
 
@@ -32,15 +32,15 @@
 <div id="collapsable" class="collapse out">
   <div class="well clearfix">
     <form action="" method="get" class="form-inline">
-      {% for field in form %}
+    {% for field in form %}
       <div class="control-group pull-left">
         <label class="control-label">{{ field.label }}</label>
         <div class="controls">{{ field }}</div>
       </div>
-      {% endfor %}
+    {% endfor %}
       <p class="clearfix"><hr/></p>
       <div class="pull-right">
-        <a class="btn" href="{% url 'accounts-list_orders' username=request.user.username %}?user=state=1&amp;user={{ request.user.pk }}"><i class="icon-refresh"></i> {% trans "Reset" %}</a>
+        <a class="btn" href="{% url 'accounts-list_orders' %}?user=state=1&amp;user={{ request.user.pk }}"><i class="icon-refresh"></i> {% trans "Reset" %}</a>
         <button class="btn btn-primary" type="submit"><i class="icon-search icon-white"></i> {% trans "Search" %}</button>
       </div>
     </form>
diff --git a/servo/templates/accounts/tabs.html b/servo/templates/accounts/tabs.html
index 4444ab8..e570241 100755
--- a/servo/templates/accounts/tabs.html
+++ b/servo/templates/accounts/tabs.html
@@ -2,21 +2,19 @@
 {% load servo_tags %}
 
 <ul class="nav nav-tabs">
-{% with request.user.username as username %}
   <li class="{% active request "orders" %}">
-    <a href="{% url 'accounts-list_orders' username=username %}">{% trans "Orders" %}</a>
+    <a href="{% url 'accounts-list_orders' %}">{% trans "Orders" %}</a>
   </li>
   <li class="{% active request "updates" %}">
-    <a href="{% url 'accounts-updates' username=username %}">{% trans "Updates" %}</a>
+    <a href="{% url 'accounts-updates' %}">{% trans "Updates" %}</a>
   </li>
   <li class="{% active request "calendars" %}">
-    <a href="{% url 'calendars-list' username=username %}">{% trans "Calendars" %}</a>
+    <a href="{% url 'calendars-list' %}">{% trans "Calendars" %}</a>
   </li>
   <li class="{% active request "stats" %}">
-    <a href="{% url 'accounts-stats' username=username %}">{% trans "Statistics" %}</a>
+    <a href="{% url 'accounts-stats' %}">{% trans "Statistics" %}</a>
   </li>
   <li class="{% active request "settings" %}">
-    <a href="{% url 'accounts-settings' username=username %}">{% trans "Settings" %}</a>
+    <a href="{% url 'accounts-settings' %}">{% trans "Settings" %}</a>
   </li>
-{% endwith %}
 </ul>
diff --git a/servo/templates/accounts/updates.html b/servo/templates/accounts/updates.html
index 121aea9..08644ba 100644
--- a/servo/templates/accounts/updates.html
+++ b/servo/templates/accounts/updates.html
@@ -4,7 +4,7 @@
 
 {% block toolbar %}
 {% if perms.servo.add_order %}
-  <a href="{% url 'accounts-clear_notifications' request.user.username %}?t={% now "Y/m/d/H/i" %}" class="btn"><i class="icon-ok"></i> {% trans "Clear all" %}</a>
+  <a href="{% url 'accounts-clear_notifications' %}?t={% now "Y/m/d/H/i" %}" class="btn"><i class="icon-ok"></i> {% trans "Clear all" %}</a>
 {% endif %}
 {% endblock toolbar %}
 
diff --git a/servo/templates/accounts/view_calendar.html b/servo/templates/accounts/view_calendar.html
index 2b063e2..7eece46 100755
--- a/servo/templates/accounts/view_calendar.html
+++ b/servo/templates/accounts/view_calendar.html
@@ -15,9 +15,9 @@
 
 {% block browse_block %}
 <div class="btn-group pull-right">
-    <a href="{% url 'calendars-view_calendar' username=request.user.username pk=calendar.pk view=view start_date=previous|date:'Y-m-d' %}" class="btn"><i class="icon-chevron-left"></i></a>
+    <a href="{% url 'calendars-view_calendar' pk=calendar.pk view=view start_date=previous|date:'Y-m-d' %}" class="btn"><i class="icon-chevron-left"></i></a>
     <a href="{{ base_url }}" class="btn">{% trans "Today" %}</a>
-    <a href="{% url 'calendars-view_calendar' username=request.user.username pk=calendar.pk view=view start_date=next|date:'Y-m-d' %}" class="btn"><i class="icon-chevron-right"></i></a>
+    <a href="{% url 'calendars-view_calendar' pk=calendar.pk view=view start_date=next|date:'Y-m-d' %}" class="btn"><i class="icon-chevron-right"></i></a>
 </div>
 {% endblock browse_block %}
 </div>
@@ -61,6 +61,6 @@
 {% endblock detail_view %}
 
 {% block crumbs %}
-    <li><a href="{% url 'calendars-list' username=request.user.username %}">{% trans "Calendars" %}</a> <span class="divider">/</span></li>
+    <li><a href="{% url 'calendars-list' %}">{% trans "Calendars" %}</a> <span class="divider">/</span></li>
     <li class="active">{{ calendar.title }}</li>
 {% endblock crumbs %}