Merge "Adds an option for linking to external help docs."
This commit is contained in:
commit
2f0678db45
@ -2,6 +2,9 @@
|
||||
<div id="user_info" class="pull-right">
|
||||
<span>{% trans "Logged in as" %}: {{ request.user.username }}</span>
|
||||
<a href="{% url horizon:settings:user:index %}">{% trans "Settings" %}</a>
|
||||
{% if HORIZON_CONFIG.help_url %}
|
||||
<a href="{{ HORIZON_CONFIG.help_url }}" target="_new">{% trans "Help" %}</a>
|
||||
{% endif %}
|
||||
<a href="{% url logout %}">{% trans "Sign Out" %}</a>
|
||||
{% include "horizon/common/_region_selector.html" %}
|
||||
</div>
|
||||
|
@ -115,7 +115,8 @@ HORIZON_CONFIG = {
|
||||
"regex": '^.{8,18}$',
|
||||
"help_text": _("Password must be between 8 and 18 characters.")
|
||||
},
|
||||
'user_home': None
|
||||
'user_home': None,
|
||||
'help_url': "http://docs.openstack.org"
|
||||
}
|
||||
|
||||
COMPRESS_ENABLED = False
|
||||
|
@ -17,7 +17,8 @@ TEMPLATE_DEBUG = DEBUG
|
||||
# "password_validator": {
|
||||
# "regex": '.*',
|
||||
# "help_text": _("Your password does not meet the requirements.")
|
||||
# }
|
||||
# },
|
||||
# 'help_url': "http://docs.openstack.org"
|
||||
# }
|
||||
|
||||
LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
|
||||
|
@ -52,7 +52,8 @@ HORIZON_CONFIG = {
|
||||
'dashboards': ('nova', 'syspanel', 'settings',),
|
||||
'default_dashboard': 'nova',
|
||||
'user_home': 'horizon.views.user_home',
|
||||
'ajax_queue_limit': 10
|
||||
'ajax_queue_limit': 10,
|
||||
'help_url': "http://docs.openstack.org"
|
||||
}
|
||||
|
||||
MIDDLEWARE_CLASSES = (
|
||||
|
Loading…
Reference in New Issue
Block a user