Merge pull request #6763 from edx/db/tender-http
Tender is only accessible via HTTP, not HTTPS
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
<ul class="list-actions">
|
<ul class="list-actions">
|
||||||
% if settings.TENDER_DOMAIN:
|
% if settings.TENDER_DOMAIN:
|
||||||
<li class="action-item">
|
<li class="action-item">
|
||||||
<a href="//${settings.TENDER_DOMAIN}/discussion/new" class="action action-primary show-tender">
|
<a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="action action-primary show-tender">
|
||||||
${_('Contact {platform_name} Support').format(platform_name=settings.PLATFORM_NAME)}
|
${_('Contact {platform_name} Support').format(platform_name=settings.PLATFORM_NAME)}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
if settings.TENDER_DOMAIN:
|
if settings.TENDER_DOMAIN:
|
||||||
help_link_start = '<a href="//{domain}/discussion/new" class="show-tender" title="{title}">'.format(
|
help_link_start = '<a href="http://{domain}/discussion/new" class="show-tender" title="{title}">'.format(
|
||||||
domain=settings.TENDER_DOMAIN,
|
domain=settings.TENDER_DOMAIN,
|
||||||
title=_("Use our feedback tool, Tender, to share your feedback")
|
title=_("Use our feedback tool, Tender, to share your feedback")
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -102,7 +102,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
%if libraries_enabled:
|
%if libraries_enabled:
|
||||||
<div class="wrapper-create-element wrapper-create-library">
|
<div class="wrapper-create-element wrapper-create-library">
|
||||||
<form class="form-create create-library library-info" id="create-library-form" name="create-library-form">
|
<form class="form-create create-library library-info" id="create-library-form" name="create-library-form">
|
||||||
@@ -464,7 +464,7 @@
|
|||||||
</li>
|
</li>
|
||||||
% if settings.TENDER_DOMAIN:
|
% if settings.TENDER_DOMAIN:
|
||||||
<li class="action-item">
|
<li class="action-item">
|
||||||
<a href="//${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_("Use our feedback tool, Tender, to request help")}">
|
<a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_("Use our feedback tool, Tender, to request help")}">
|
||||||
${_("Request help with {studio_name}").format(studio_name=settings.STUDIO_NAME)}
|
${_("Request help with {studio_name}").format(studio_name=settings.STUDIO_NAME)}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
@@ -497,7 +497,7 @@
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
if settings.TENDER_DOMAIN:
|
if settings.TENDER_DOMAIN:
|
||||||
help_link_start = '<a href="//{domain}/discussion/new" class="show-tender">'.format(
|
help_link_start = '<a href="http://{domain}/discussion/new" class="show-tender">'.format(
|
||||||
domain=settings.TENDER_DOMAIN,
|
domain=settings.TENDER_DOMAIN,
|
||||||
)
|
)
|
||||||
help_link_end = '</a>'
|
help_link_end = '</a>'
|
||||||
@@ -543,7 +543,7 @@ else:
|
|||||||
<ol class='list-actions'>
|
<ol class='list-actions'>
|
||||||
% if settings.TENDER_DOMAIN:
|
% if settings.TENDER_DOMAIN:
|
||||||
<li class="action-item">
|
<li class="action-item">
|
||||||
<a href="//${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_("Use our feedback tool, Tender, to request help")}">
|
<a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_("Use our feedback tool, Tender, to request help")}">
|
||||||
${_("Request help with your {studio_name} account").format(studio_name=settings.STUDIO_NAME)}
|
${_("Request help with your {studio_name} account").format(studio_name=settings.STUDIO_NAME)}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ from django.utils.translation import ugettext as _
|
|||||||
<div class="bit">
|
<div class="bit">
|
||||||
<h3 class="title-3">${_("Need Help?")}</h3>
|
<h3 class="title-3">${_("Need Help?")}</h3>
|
||||||
<p>${_('Having trouble with your account? Use {link_start}our support center{link_end} to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.').format(
|
<p>${_('Having trouble with your account? Use {link_start}our support center{link_end} to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.').format(
|
||||||
link_start='<a href="//{domain}" rel="external">'.format(domain=settings.TENDER_DOMAIN),
|
link_start='<a href="http://{domain}" rel="external">'.format(domain=settings.TENDER_DOMAIN),
|
||||||
link_end='</a>',
|
link_end='</a>',
|
||||||
)}</p>
|
)}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
</li>
|
</li>
|
||||||
% if settings.TENDER_DOMAIN and user.is_authenticated():
|
% if settings.TENDER_DOMAIN and user.is_authenticated():
|
||||||
<li class="nav-item nav-peripheral-feedback">
|
<li class="nav-item nav-peripheral-feedback">
|
||||||
<a href="//${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_('Use our feedback tool, Tender, to share your feedback')}">${_("Contact Us")}</a>
|
<a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="show-tender" title="${_('Use our feedback tool, Tender, to share your feedback')}">${_("Contact Us")}</a>
|
||||||
</li>
|
</li>
|
||||||
% endif
|
% endif
|
||||||
</ol>
|
</ol>
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
% if settings.TENDER_DOMAIN:
|
% if settings.TENDER_DOMAIN:
|
||||||
<li class="action-item">
|
<li class="action-item">
|
||||||
<a href="//${settings.TENDER_DOMAIN}" rel="external" class="action action-primary">${_("{studio_name} Author Support").format(studio_name=settings.STUDIO_NAME)}</a>
|
<a href="http://${settings.TENDER_DOMAIN}" rel="external" class="action action-primary">${_("{studio_name} Author Support").format(studio_name=settings.STUDIO_NAME)}</a>
|
||||||
<span class="tip">${_("{studio_name} Author Support").format(studio_name=settings.STUDIO_NAME)}</span>
|
<span class="tip">${_("{studio_name} Author Support").format(studio_name=settings.STUDIO_NAME)}</span>
|
||||||
</li>
|
</li>
|
||||||
% endif
|
% endif
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
<ul class="list-actions">
|
<ul class="list-actions">
|
||||||
<li class="action-item">
|
<li class="action-item">
|
||||||
|
|
||||||
<a href="//${settings.TENDER_DOMAIN}/discussion/new" class="action action-primary show-tender" title="${_("Use our feedback tool, Tender, to share your feedback")}"><i class="icon fa fa-comments"></i>${_("Contact Us")}</a>
|
<a href="http://${settings.TENDER_DOMAIN}/discussion/new" class="action action-primary show-tender" title="${_("Use our feedback tool, Tender, to share your feedback")}"><i class="icon fa fa-comments"></i>${_("Contact Us")}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user