diff options
| -rwxr-xr-x | bin/srt | 3 | ||||
| -rwxr-xr-x | lib/acme/urls.py | 1 | ||||
| -rw-r--r-- | lib/srtgui/templates/base.html | 32 | ||||
| -rwxr-xr-x | lib/srtgui/templates/srtool_metadata_include.html | 4 |
4 files changed, 21 insertions, 19 deletions
@@ -119,7 +119,8 @@ verify_prereq() { # expand version parts to 2 digits to support 1.10.x > 1.8 # (note:helper functions hard to insert in-line) exp=$exp'import sys,django;' - exp=$exp'version=["%02d" % int(n) for n in django.get_version().split(".")];' + # Allow for development versions like '2.2.dev20181217100344' + exp=$exp'version=["%02d" % int(n) for n in django.get_version().replace("dev","").split(".")];' exp=$exp'vmin=["%02d" % int(n) for n in "\2".split(".")];' exp=$exp'vmax=["%02d" % int(n) for n in "\4".split(".")];' exp=$exp'sys.exit(not (version \1 vmin and version \3 vmax))' diff --git a/lib/acme/urls.py b/lib/acme/urls.py index 39ad0ee6..5cbc3883 100755 --- a/lib/acme/urls.py +++ b/lib/acme/urls.py @@ -13,4 +13,5 @@ urlpatterns = [ tables.AcmeDefectsTable.as_view(template_name="acmedefects-toastertable.html"), name='acmedefects'), + url(r'^$', views.acme_hello, name='acme_default'), ] diff --git a/lib/srtgui/templates/base.html b/lib/srtgui/templates/base.html index 1c7c9ef2..71f9c0f9 100644 --- a/lib/srtgui/templates/base.html +++ b/lib/srtgui/templates/base.html @@ -164,7 +164,6 @@ window.onclick = function(event) { </div> <div class="collapse navbar-collapse" id="global-nav"> <ul class="nav navbar-nav"> - {% if user.is_authenticated %} <li id="navbar-home" {% if request.resolver_match.url_name == 'landing' %}class="active"{% endif %}> <a href="{% url 'landing' %}"> @@ -173,6 +172,7 @@ window.onclick = function(event) { </a> </li> + {% if user.is_authenticated %} {% if request.user.is_contributor %} <!-- greater than a Reader --> <li id="navbar-manage" {% if request.resolver_match.url_name == 'manage' %}class="active"{% endif %}> <a href="{% url 'manage' %}"> @@ -182,20 +182,6 @@ window.onclick = function(event) { </li> {% endif %} - <li id="navbar-docs"> - {% if srt_documentation_link %} - <a target="_blank" href="{{srt_documentation_link}}"><i class="glyphicon glyphicon-book"></i> Documentation</a> - {% endif %} - </li> - - <li id="navbar-export"> - {% if request.resolver_match.url_name == 'landing' %} - <a href="{% url 'report' request.resolver_match.url_name %}"><i class="glyphicon glyphicon-tasks"></i> Export</a> - {% else %} - <a id="report_link" href="{% url 'report' request.resolver_match.url_name %}"><i class="glyphicon glyphicon-tasks"></i> Export</a> - {% endif %} - </li> - {% if request.user.is_contributor %} <!-- greater than a Reader --> {% if request.resolver_match.url_name == 'cve' or request.resolver_match.url_name == 'cves' %} <li id="navbar-cve"> @@ -230,7 +216,21 @@ window.onclick = function(event) { {% endif %} - <div class="dropdown navbar-right"> + <li id="navbar-docs"> + {% if srt_documentation_link %} + <a target="_blank" href="{{srt_documentation_link}}"><i class="glyphicon glyphicon-book"></i> Documentation</a> + {% endif %} + </li> + + <li id="navbar-export"> + {% if request.resolver_match.url_name == 'landing' %} + <a href="{% url 'report' request.resolver_match.url_name %}"><i class="glyphicon glyphicon-tasks"></i> Export</a> + {% else %} + <a id="report_link" href="{% url 'report' request.resolver_match.url_name %}"><i class="glyphicon glyphicon-tasks"></i> Export</a> + {% endif %} + </li> + + <div class="dropdown navbar-right"> {% if user.is_authenticated %} <button onclick="myFunction()" class="dropbtn ">Hello '{{user.username}}'</button> {% else %} diff --git a/lib/srtgui/templates/srtool_metadata_include.html b/lib/srtgui/templates/srtool_metadata_include.html index 4703179c..7471f0f9 100755 --- a/lib/srtgui/templates/srtool_metadata_include.html +++ b/lib/srtgui/templates/srtool_metadata_include.html @@ -23,11 +23,11 @@ <p> {% endif %} <LI> - <i>Notes:</i> '{{object.comments}}' + <i>Public Notes:</i> {{object.comments}} </LI> {% if request.user.is_creator %} <LI> - <i>Private Notes:</i> '{{object.comments_private}}' + <i>Private Notes:</i> {{object.comments_private}} </LI> {% endif %} </UL> |