Merged in [7380] from bartosz.balazinski@interdigital.com:

    Changed the URL for some acoount settings from /cookies to /account/settings.

Fixes ticket ietf-tools#806,
 - Legacy-Id: 7385
Note: SVN reference [7380] has been migrated to Git commit af30258

Author: levkowetz

bin/mergedevbranch

@@ -149,11 +149,12 @@ read -p "Continue with diff? [Y/n] "
 note "Diff:"
 svn diff -c $rev $repo/$branch | less
 
+echo ""
 read -p "Additional descriptive text (hit return for none): "
-if [ $REPLY != "" ]; then
+if [ "$REPLY" != "" ]; then
     comment="$REPLY
 
-$comment"
+    $comment"
 fi
 
 echo ""

ietf/templates/cookies/settings.html

@@ -22,12 +22,12 @@ <h2 class="ietf-divider">How many days is considered new</h2>
     </td>
   </tr>
   <tr class="settings-values">
-    <td>{% if new_enough == 7 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/7">7 days</a></span>{%else%}<a href="/cookies/new_enough/7">7 days</a>{% endif %}</td></td>
-    <td>{% if new_enough == 14 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/14">14 days</a></span>{%else%}<a href="/cookies/new_enough/14">14 days</a>{% endif %}</td>
-    <td>{% if new_enough == 21 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/21">21 days</a></span>{%else%}<a href="/cookies/new_enough/21">21 days</a>{% endif %}</td>
-    <td>{% if new_enough == 30 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/30">30 days</a></span>{%else%}<a href="/cookies/new_enough/30">30 days</a>{% endif %}</td>
-    <td>{% if new_enough == 60 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/60">60 days</a></span>{%else%}<a href="/cookies/new_enough/60">60 days</a>{% endif %}</td>
-    <td>{% if new_enough == 90 %}<span class="ietf-highlight-y"><a href="/cookies/new_enough/90">90 days</a></span>{%else%}<a href="/cookies/new_enough/90">90 days</a>{% endif %}</td>
+    <td>{% if new_enough == 7 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/7">7 days</a></span>{%else%}<a href="/accounts/settings/new_enough/7">7 days</a>{% endif %}</td></td>
+    <td>{% if new_enough == 14 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/14">14 days</a></span>{%else%}<a href="/accounts/settings/new_enough/14">14 days</a>{% endif %}</td>
+    <td>{% if new_enough == 21 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/21">21 days</a></span>{%else%}<a href="/accounts/settings/new_enough/21">21 days</a>{% endif %}</td>
+    <td>{% if new_enough == 30 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/30">30 days</a></span>{%else%}<a href="/accounts/settings/new_enough/30">30 days</a>{% endif %}</td>
+    <td>{% if new_enough == 60 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/60">60 days</a></span>{%else%}<a href="/accounts/settings/new_enough/60">60 days</a>{% endif %}</td>
+    <td>{% if new_enough == 90 %}<span class="ietf-highlight-y"><a href="/accounts/settings/new_enough/90">90 days</a></span>{%else%}<a href="/accounts/settings/new_enough/90">90 days</a>{% endif %}</td>
   </tr>
 
   <tr class="setting-header">
@@ -41,12 +41,12 @@ <h2 class="ietf-divider">How many days is considered soon</h2>
     </td>
   </tr>
   <tr class="settings-values">
-    <td>{% if expires_soon == 7 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/7">7 days</a></span>{%else%}<a href="/cookies/expires_soon/7">7 days</a>{% endif %}</td></td>
-    <td>{% if expires_soon == 14 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/14">14 days</a></span>{%else%}<a href="/cookies/expires_soon/14">14 days</a>{% endif %}</td>
-    <td>{% if expires_soon == 21 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/21">21 days</a></span>{%else%}<a href="/cookies/expires_soon/21">21 days</a>{% endif %}</td>
-    <td>{% if expires_soon == 30 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/30">30 days</a></span>{%else%}<a href="/cookies/expires_soon/30">30 days</a>{% endif %}</td>
-    <td>{% if expires_soon == 60 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/60">60 days</a></span>{%else%}<a href="/cookies/expires_soon/60">60 days</a>{% endif %}</td>
-    <td>{% if expires_soon == 90 %}<span class="ietf-highlight-y"><a href="/cookies/expires_soon/90">90 days</a></span>{%else%}<a href="/cookies/expires_soon/90">90 days</a>{% endif %}</td>
+    <td>{% if expires_soon == 7 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/7">7 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/7">7 days</a>{% endif %}</td></td>
+    <td>{% if expires_soon == 14 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/14">14 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/14">14 days</a>{% endif %}</td>
+    <td>{% if expires_soon == 21 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/21">21 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/21">21 days</a>{% endif %}</td>
+    <td>{% if expires_soon == 30 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/30">30 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/30">30 days</a>{% endif %}</td>
+    <td>{% if expires_soon == 60 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/60">60 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/60">60 days</a>{% endif %}</td>
+    <td>{% if expires_soon == 90 %}<span class="ietf-highlight-y"><a href="/accounts/settings/expires_soon/90">90 days</a></span>{%else%}<a href="/accounts/settings/expires_soon/90">90 days</a>{% endif %}</td>
   </tr>
 
   <tr class="setting-header">
@@ -60,8 +60,8 @@ <h2 class="ietf-divider">Show full document text in document page</h2>
     </td>
   </tr>
   <tr class="settings-values">
-    <td>{% if full_draft == "off" %}<span class="ietf-highlight-y"><a href="/cookies/full_draft/off">off</a></span>{%else%}<a href="/cookies/full_draft/off">off</a>{% endif %}</td></td>
-    <td>{% if full_draft == "on" %}<span class="ietf-highlight-y"><a href="/cookies/full_draft/on">on</a></span>{%else%}<a href="/cookies/full_draft/on">on</a>{% endif %}</td></td>
+    <td>{% if full_draft == "off" %}<span class="ietf-highlight-y"><a href="/accounts/settings/full_draft/off">off</a></span>{%else%}<a href="/accounts/settings/full_draft/off">off</a>{% endif %}</td></td>
+    <td>{% if full_draft == "on" %}<span class="ietf-highlight-y"><a href="/accounts/settings/full_draft/on">on</a></span>{%else%}<a href="/accounts/settings/full_draft/on">on</a>{% endif %}</td></td>
   </tr>
 </table>
 {% endblock %}

ietf/templates/registration/index.html

@@ -16,7 +16,7 @@ <h1>Account Management</h1>
       {% endif %}
       <li><a href="/accounts/create/">Request an account</a></li>
       <li><a href="/accounts/reset/">Request a password reset </a></li>
-      <li><a href="/cookies/">Change your datatracker preferences for this browser</a></li>
+      <li><a href="/accounts/settings/">Change your datatracker preferences for this browser</a></li>
    </ul>
 </p>
 

ietf/urls.py

@@ -33,7 +33,7 @@
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^ann/', include('ietf.nomcom.redirect_ann_urls')),
     (r'^community/', include('ietf.community.urls')),
-    (r'^cookies/', include('ietf.cookies.urls')),
+    (r'^accounts/settings/', include('ietf.cookies.urls')),
     (r'^doc/', include('ietf.doc.urls')),
     (r'^drafts/', include('ietf.doc.redirect_drafts_urls')),
     (r'^feed/', include('ietf.feed_urls')),