Added in bar containing service name, user name/link to profile and sign out

app/assets/stylesheets/components/navigation.scss

@@ -1,6 +1,6 @@
 .navigation {
 
-  padding: $gutter 0 0 0;
+  padding: $gutter-half 0 0 0;
 
   li {
     @include core-16();

app/assets/stylesheets/components/switcher.scss

@@ -0,0 +1,43 @@
+
+#user-bar {
+  border-bottom: 1px solid #bfc1c3;
+  max-width: 960px;
+  margin: 0 15px;
+  @include core-19();
+  padding: 10px 0 8px 0; 
+
+  a:link,
+  a:visited {
+    text-decoration: none;
+  }
+
+  span a:hover {
+    color: $link-hover-colour;
+  }
+
+  }
+  @media (min-width: 641px) {
+    #user-bar {
+      margin: 0 30px;
+      line-height: 1.25; } }
+  @media (min-width: 1020px) {
+    #user-bar {
+      margin: 0 auto; } }
+
+
+#service-switcher {
+}
+
+#user-name {
+
+  margin: 0 20px 0 0;
+}
+
+#user-admin {
+
+}
+@media (min-width: 641px) {
+  #user-admin {
+  display: block;
+  float: right;
+  } }

app/assets/stylesheets/main.scss

@@ -42,6 +42,7 @@
 @import 'components/banner';
 @import 'components/textbox';
 @import 'components/browse-list';
+@import 'components/switcher';
 
 @import 'views/job';
 

app/templates/admin_template.html

@@ -31,13 +31,6 @@
       <div class="phase-banner-beta">
         <strong class="phase-tag">BETA</strong>
       </div>
-      {% if current_user.is_authenticated() %}
-      <nav id='proposition-menu'>
-        <p id='proposition-link'>
-          <a href="{{ url_for('main.sign_out')}}">Sign out</a>
-        </p>
-      </nav>
-      {% endif %}
     </div>
   </div>
 {% endblock %}
@@ -53,6 +46,9 @@
 {% endif %}
 
 {% block content %}
+{% if current_user.is_authenticated() %}
+    <nav id="user-bar"><span id="service-switcher">Service name</span> <div id="user-admin"><span id="user-name"><a href="{{ url_for('.userprofile') }}">User name</a></span> <span id="sign-out"><a href="{{ url_for('main.sign_out')}}">Sign out</a></span></div></nav>    
+{% endif %}
 <main id="content" role="main" class="page-container">
     {% with messages = get_flashed_messages() %}
     {% if messages %}

app/templates/main_nav.html

@@ -1,5 +1,7 @@
 <nav class="navigation">
-  <h3><a href="{{ url_for('.dashboard') }}">Service name</a></h3>
+  <ul>
+    <li><a href="{{ url_for('.dashboard') }}">Dashboard</a></li>
+  </ul>
   <ul>
     <li><a href="{{ url_for('.sendsms') }}">Send text messages</a></li>
     <li><a href="{{ url_for('.sendemail') }}">Send emails</a></li>
@@ -12,7 +14,4 @@
     <li><a href="{{ url_for('.manageusers') }}">Manage users</a></li>
     <li><a href="{{ url_for('.service_settings') }}">Service settings</a></li>
   </ul>
-  <ul>
-    <li><a href="/user-profile">Your details</a></li>
-  </ul>
 </nav>