x/tuskar-ui
Code Issues Proposed changes

Merge "Adds an option for linking to external help docs."

Browse Source
This commit is contained in:
Jenkins 2012-08-03 00:43:41 +00:00 committed by Gerrit Code Review
commit 2f0678db45
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/templates/_header.html
View File

@ -2,6 +2,9 @@
<div id="user_info" class="pull-right"> <div id="user_info" class="pull-right">
<span>{% trans "Logged in as" %}: {{ request.user.username }}</span> <span>{% trans "Logged in as" %}: {{ request.user.username }}</span>
<a href="{% url horizon:settings:user:index %}">{% trans "Settings" %}</a> <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> <a href="{% url logout %}">{% trans "Sign Out" %}</a>
{% include "horizon/common/_region_selector.html" %} {% include "horizon/common/_region_selector.html" %}
</div> </div>

3
horizon/tests/testsettings.py
View File

@ -115,7 +115,8 @@ HORIZON_CONFIG = {
"regex": '^.{8,18}$', "regex": '^.{8,18}$',
"help_text": _("Password must be between 8 and 18 characters.") "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 COMPRESS_ENABLED = False

3
openstack_dashboard/local/local_settings.py.example
View File

@ -17,7 +17,8 @@ TEMPLATE_DEBUG = DEBUG
# "password_validator": { # "password_validator": {
# "regex": '.*', # "regex": '.*',
# "help_text": _("Your password does not meet the requirements.") # "help_text": _("Your password does not meet the requirements.")
# } # },
# 'help_url': "http://docs.openstack.org"
# } # }
LOCAL_PATH = os.path.dirname(os.path.abspath(__file__)) LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))

3
openstack_dashboard/settings.py
View File

@ -52,7 +52,8 @@ HORIZON_CONFIG = {
'dashboards': ('nova', 'syspanel', 'settings',), 'dashboards': ('nova', 'syspanel', 'settings',),
'default_dashboard': 'nova', 'default_dashboard': 'nova',
'user_home': 'horizon.views.user_home', 'user_home': 'horizon.views.user_home',
'ajax_queue_limit': 10 'ajax_queue_limit': 10,
'help_url': "http://docs.openstack.org"
} }
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (