From f20a5d0cfb2d3dd5a2afd1c2449fc1b14d6f92bd Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 31 Mar 2014 00:25:08 +0000 Subject: [PATCH] Changed URLs with explicit scheme from http to https. - Legacy-Id: 7555 --- ietf/iesg/views.py | 3 +++ ietf/templates/community/public/subscribe_email.txt | 2 +- ietf/templates/community/public/unsubscribe_email.txt | 2 +- ietf/templates/iesg/agenda.txt | 2 +- ietf/templates/iesg/scribe_conflict_doc.html | 2 +- ietf/templates/iesg/scribe_doc.html | 2 +- ietf/templates/iesg/scribe_doc_ballot.html | 2 +- ietf/templates/registration/add_email_email.txt | 2 +- ietf/templates/registration/creation_email.txt | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 2d9ba73ed..fbc2bd57a 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -47,6 +47,7 @@ from django.db import models from django.http import HttpResponse from django.shortcuts import render_to_response, render, redirect from django.template import RequestContext +from django.contrib.sites.models import Site from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent, DocEvent, IESG_BALLOT_ACTIVE_STATES @@ -189,6 +190,7 @@ def agenda_txt(request, date=None): return render_to_response("iesg/agenda.txt", { "date": data["date"], "sections": sorted(data["sections"].iteritems()), + "domain": Site.objects.get_current().domain, }, context_instance=RequestContext(request), content_type="text/plain") def agenda_scribe_template(request, date=None): @@ -203,6 +205,7 @@ def agenda_scribe_template(request, date=None): "date": data["date"], "sections": sections, "appendix_docs": appendix_docs, + "domain": Site.objects.get_current().domain, }, context_instance=RequestContext(request) ) @role_required('Area Director', 'Secretariat') diff --git a/ietf/templates/community/public/subscribe_email.txt b/ietf/templates/community/public/subscribe_email.txt index cdcae5dad..b0a8b3fc8 100644 --- a/ietf/templates/community/public/subscribe_email.txt +++ b/ietf/templates/community/public/subscribe_email.txt @@ -3,7 +3,7 @@ Hello, In order to complete your subscription for {% if significant %}significant {% endif %}changes on {{ clist.long_name }}, please follow this link or copy it and paste it in your web browser: -http://{{ domain }}{% if significant %}{% url "confirm_significant_subscription" clist.id to_email today auth %}{% else %}{% url "confirm_subscription" clist.id to_email today auth %}{% endif %} +https://{{ domain }}{% if significant %}{% url "confirm_significant_subscription" clist.id to_email today auth %}{% else %}{% url "confirm_subscription" clist.id to_email today auth %}{% endif %} Best regards, diff --git a/ietf/templates/community/public/unsubscribe_email.txt b/ietf/templates/community/public/unsubscribe_email.txt index 1acd569c9..7b93d2f30 100644 --- a/ietf/templates/community/public/unsubscribe_email.txt +++ b/ietf/templates/community/public/unsubscribe_email.txt @@ -3,7 +3,7 @@ Hello, In order to complete the cancelation of your subscription to {% if significant %}significant {% endif %}changes on {{ clist.long_name }}, please follow this link or copy it and paste it in your web browser: -http://{{ domain }}{% if significant %}{% url "confirm_significant_unsubscription" clist.id to_email today auth %}{% else %}{% url "confirm_unsubscription" clist.id to_email today auth %}{% endif %} +https://{{ domain }}{% if significant %}{% url "confirm_significant_unsubscription" clist.id to_email today auth %}{% else %}{% url "confirm_unsubscription" clist.id to_email today auth %}{% endif %} Best regards, diff --git a/ietf/templates/iesg/agenda.txt b/ietf/templates/iesg/agenda.txt index e6aa31a6e..228e4c9e9 100644 --- a/ietf/templates/iesg/agenda.txt +++ b/ietf/templates/iesg/agenda.txt @@ -4,7 +4,7 @@ Summarized Agenda for the {{ date }} IESG Teleconference This agenda was generated at {% now "Y-m-d H:i:s T" %} Up-to-date web version of this agenda can be found at: -http://datatracker.ietf.org/iesg/agenda/ +https://{{ domain }}/iesg/agenda/ {% for num, section in sections %} {% if num|sectionlevel == 1 %} diff --git a/ietf/templates/iesg/scribe_conflict_doc.html b/ietf/templates/iesg/scribe_conflict_doc.html index 6492ee121..55c572e0a 100644 --- a/ietf/templates/iesg/scribe_conflict_doc.html +++ b/ietf/templates/iesg/scribe_conflict_doc.html @@ -13,7 +13,7 @@ {% endif %} {% for ipr in doc.conflictdoc.ipr %} {% if ipr.ipr.status == 1 %} -
IPR: {{ ipr.ipr.title }} +
IPR: {{ ipr.ipr.title }} {% endif %} {% endfor %} diff --git a/ietf/templates/iesg/scribe_doc.html b/ietf/templates/iesg/scribe_doc.html index ef285f0c6..00eaa64f4 100644 --- a/ietf/templates/iesg/scribe_doc.html +++ b/ietf/templates/iesg/scribe_doc.html @@ -17,7 +17,7 @@ {% for ipr in doc.ipr %} {% if ipr.ipr.status == 1 %} -
IPR: {{ ipr.ipr.title }} +
IPR: {{ ipr.ipr.title }} {% endif %} {% endfor %} diff --git a/ietf/templates/iesg/scribe_doc_ballot.html b/ietf/templates/iesg/scribe_doc_ballot.html index 5faacab08..12b78ab15 100644 --- a/ietf/templates/iesg/scribe_doc_ballot.html +++ b/ietf/templates/iesg/scribe_doc_ballot.html @@ -1,6 +1,6 @@ {% with doc.active_ballot as ballot %} {% if ballot %} -
Discusses/comments [ballot]: +
Discusses/comments [ballot]: