From 93e161b2c63ba02637c950897ff2198fcf6a9448 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 1 Mar 2014 18:57:30 +0000 Subject: [PATCH] Merged in [7380] from bartosz.balazinski@interdigital.com: Changed the URL for some acoount settings from /cookies to /account/settings. Fixes ticket #806, - Legacy-Id: 7385 Note: SVN reference [7380] has been migrated to Git commit af302582b0a9f36941ef15b39bf52c2a51fbafe1 --- bin/mergedevbranch | 5 +++-- ietf/templates/cookies/settings.html | 28 +++++++++++++------------- ietf/templates/registration/index.html | 2 +- ietf/urls.py | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/bin/mergedevbranch b/bin/mergedevbranch index da7590c93..6d9f7cecd 100755 --- a/bin/mergedevbranch +++ b/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 "" diff --git a/ietf/templates/cookies/settings.html b/ietf/templates/cookies/settings.html index 24260a590..0a3975d1c 100644 --- a/ietf/templates/cookies/settings.html +++ b/ietf/templates/cookies/settings.html @@ -22,12 +22,12 @@ cookies disabled then you are not able to change the settings - {% if new_enough == 7 %}7 days{%else%}7 days{% endif %} - {% if new_enough == 14 %}14 days{%else%}14 days{% endif %} - {% if new_enough == 21 %}21 days{%else%}21 days{% endif %} - {% if new_enough == 30 %}30 days{%else%}30 days{% endif %} - {% if new_enough == 60 %}60 days{%else%}60 days{% endif %} - {% if new_enough == 90 %}90 days{%else%}90 days{% endif %} + {% if new_enough == 7 %}7 days{%else%}7 days{% endif %} + {% if new_enough == 14 %}14 days{%else%}14 days{% endif %} + {% if new_enough == 21 %}21 days{%else%}21 days{% endif %} + {% if new_enough == 30 %}30 days{%else%}30 days{% endif %} + {% if new_enough == 60 %}60 days{%else%}60 days{% endif %} + {% if new_enough == 90 %}90 days{%else%}90 days{% endif %} @@ -41,12 +41,12 @@ cookies disabled then you are not able to change the settings - {% if expires_soon == 7 %}7 days{%else%}7 days{% endif %} - {% if expires_soon == 14 %}14 days{%else%}14 days{% endif %} - {% if expires_soon == 21 %}21 days{%else%}21 days{% endif %} - {% if expires_soon == 30 %}30 days{%else%}30 days{% endif %} - {% if expires_soon == 60 %}60 days{%else%}60 days{% endif %} - {% if expires_soon == 90 %}90 days{%else%}90 days{% endif %} + {% if expires_soon == 7 %}7 days{%else%}7 days{% endif %} + {% if expires_soon == 14 %}14 days{%else%}14 days{% endif %} + {% if expires_soon == 21 %}21 days{%else%}21 days{% endif %} + {% if expires_soon == 30 %}30 days{%else%}30 days{% endif %} + {% if expires_soon == 60 %}60 days{%else%}60 days{% endif %} + {% if expires_soon == 90 %}90 days{%else%}90 days{% endif %} @@ -60,8 +60,8 @@ cookies disabled then you are not able to change the settings - {% if full_draft == "off" %}off{%else%}off{% endif %} - {% if full_draft == "on" %}on{%else%}on{% endif %} + {% if full_draft == "off" %}off{%else%}off{% endif %} + {% if full_draft == "on" %}on{%else%}on{% endif %} {% endblock %} diff --git a/ietf/templates/registration/index.html b/ietf/templates/registration/index.html index 15a47fb18..0f99a91b4 100644 --- a/ietf/templates/registration/index.html +++ b/ietf/templates/registration/index.html @@ -16,7 +16,7 @@ {% endif %}
  • Request an account
  • Request a password reset
    • -
  • Change your datatracker preferences for this browser
    • +
  • Change your datatracker preferences for this browser

    • diff --git a/ietf/urls.py b/ietf/urls.py index 3ab4e5221..a6bf9b429 100644 --- a/ietf/urls.py +++ b/ietf/urls.py @@ -33,7 +33,7 @@ urlpatterns = patterns('', (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')),