ui: Make the project a unit with 'Patchwork' in the menu bar

Both should be styled the same and be a link to the home page.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 05d9db93e61e1d0e6625f354a22b3e0617a05edc..e5c6600e7e78ae25e7de3b7b7a7876aeb34288b7 100644 (file)
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -21,6 +21,10 @@ pre {
        top: 17em;
 }
 
+.navbar-brand>a {
+       color: white;
+}
+
 .navbar-patchwork {
        border-radius: 0px;
        margin-bottom: 0px;

diff --git a/templates/base.html b/templates/base.html
index 2a1dca17ca0e3bdf59e614c96c433ee0f52080d2..8e101dde4ea67907b4ad725dbd53d52b97092bac 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -33,8 +33,8 @@
         <span class="icon-bar"></span>
       </button>
       <span class="navbar-brand">
-       <a href="{% url 'project-list' %}">Patchwork</a>
-       {% block heading %}{{project.name}}{% endblock %}
+        <a href="{% url 'project-list' %}">Patchwork{% if project %} {{project.name}}{% endif %}</a>
+        {% block heading %}{% endblock %}
       </span>
     </div>
     <div class="collapse navbar-collapse" id="navbar-collapse">