Skip to content
Browse files

Merge pull request #846 from FinalAngel/bugfixes/https

fixing some https issues and use https whenever possible
  • Loading branch information...
2 parents dc9a182 + 5c50b1a commit 0f8dfb9fac91f2002c464837be29e4bbd91ddb83 @ojii ojii committed Jun 9, 2011
View
2 cms/templates/admin/cms/mail/base.html
@@ -53,7 +53,7 @@
<tr>
<td class="content">
<p>{% blocktrans %}Log in to administration <a href="{{ login_url }}">here</a>.{% endblocktrans %}</p>
- <p>Generated by <a href="http://www.django-cms.org">django cms</a> {% now "d.m.Y H:i:s" %}.</p>
+ <p>Generated by <a href="https://www.django-cms.org">django cms</a> {% now "d.m.Y H:i:s" %}.</p>
</td>
</tr>
</table>
View
4 cms/templates/admin/cms/page/change_form.html
@@ -93,11 +93,11 @@ <h1 class="moderation-approve-deletion">{% trans "Approve page deletion" %}</h1>
{% if moderation_delete_request %}<li><a href="remove-delete-state/" class="approvelink">{% trans "Remove delete request" %}</a></li>{% endif %}
{% if moderator_should_approve %}
<li><a href="approve/" class="approvelink">{% if moderation_delete_request %}{% trans "Approve delete" %}{% else %}{% trans "Approve" %} {% trans "draft" %}{% endif %}</a></li>
- <li><a href="{% if current_site_id %}{% ifnotequal current_site_id page.site.id %}http://{{ page.site.domain }}{% endifnotequal %}{% endif %}{{ page.get_absolute_url }}?preview&draft=1" class="previewdraftlink">{% trans "Preview" %} {% trans "draft" %}</a></li>
+ <li><a href="{% if current_site_id %}{% ifnotequal current_site_id page.site.id %}http{% if request.is_secure %}s{% endif %}://{{ page.site.domain }}{% endifnotequal %}{% endif %}{{ page.get_absolute_url }}?preview&draft=1" class="previewdraftlink">{% trans "Preview" %} {% trans "draft" %}</a></li>
{% endif %}
<li><a href="history/" class="historylink">{% trans "History" %}</a></li>
- {% if has_absolute_url %}<li><a href="{% if current_site_id %}{% ifnotequal current_site_id page.site.id %}http://{{ page.site.domain }}{% endifnotequal %}{% endif %}{{ page|preview_link:language }}?preview" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
+ {% if has_absolute_url %}<li><a href="{% if current_site_id %}{% ifnotequal current_site_id page.site.id %}http{% if request.is_secure %}s{% endif %}://{{ page.site.domain }}{% endifnotequal %}{% endif %}{{ page|preview_link:language }}?preview" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
</ul>
{% endif %}{% endif %}
{% endblock %}
View
2 cms/templates/cms/new.html
@@ -52,7 +52,7 @@
<p class="info">Make sure you publish them.</p>
<p>&nbsp;</p>
<p class="padding-top">
- <a href="http://www.django-cms.org/" class="link-inverted">Django-CMS.org</a>
+ <a href="https://www.django-cms.org/" class="link-inverted">Django-CMS.org</a>
<a href="http://docs.django-cms.org/" class="link">Documentation</a>
</p>
</div>
View
2 setup.py
@@ -41,7 +41,7 @@
version=cms.__version__,
description='An Advanced Django CMS',
long_description=open(os.path.join(os.path.dirname(__file__), 'README.rst')).read(),
- url='http://www.django-cms.org/',
+ url='https://www.django-cms.org/',
license='BSD License',
platforms=['OS Independent'],
classifiers=CLASSIFIERS,

0 comments on commit 0f8dfb9

Please sign in to comment.
Something went wrong with that request. Please try again.