From e5d9d9f9cb4d8a708b1f0c7e9e801b36b80d2344 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 5 Nov 2015 19:17:05 -0500
Subject: [PATCH 1/6] add new fontcustom icons

---
 .../assets/fontcustom/fontcustom-preview.html |  65 ++++++++++--
 .../client/assets/fontcustom/fontcustom.css   |  20 ++--
 ...ustom_037607f2fd8b86abb9de4b13a05fde60.eot | Bin 2194 -> 0 bytes
 ...ustom_037607f2fd8b86abb9de4b13a05fde60.svg |  47 ---------
 ...ustom_037607f2fd8b86abb9de4b13a05fde60.ttf | Bin 2008 -> 0 bytes
 ...stom_037607f2fd8b86abb9de4b13a05fde60.woff | Bin 1436 -> 0 bytes
 ...ustom_fbf6cfce71d2c35351b84596defbfd01.eot | Bin 0 -> 2946 bytes
 ...ustom_fbf6cfce71d2c35351b84596defbfd01.svg |  72 +++++++++++++
 ...ustom_fbf6cfce71d2c35351b84596defbfd01.ttf | Bin 0 -> 2760 bytes
 ...stom_fbf6cfce71d2c35351b84596defbfd01.woff | Bin 0 -> 2016 bytes
 .../new_icons/.fontcustom-manifest.json       |  28 +++--
 .../fontcustom/new_icons/activity-stream.svg  |  15 +++
 .../fontcustom/new_icons/fontcustom.yml       |  96 ------------------
 .../assets/fontcustom/new_icons/launch.svg    |  28 +++++
 .../assets/fontcustom/new_icons/user.svg      |  11 ++
 15 files changed, 214 insertions(+), 168 deletions(-)
 delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot
 delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg
 delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf
 delete mode 100644 awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff
 create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot
 create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg
 create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf
 create mode 100644 awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff
 create mode 100644 awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg
 delete mode 100644 awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml
 create mode 100644 awx/ui/client/assets/fontcustom/new_icons/launch.svg
 create mode 100644 awx/ui/client/assets/fontcustom/new_icons/user.svg

diff --git a/awx/ui/client/assets/fontcustom/fontcustom-preview.html b/awx/ui/client/assets/fontcustom/fontcustom-preview.html
index 385f401107..48cb53f8af 100644
--- a/awx/ui/client/assets/fontcustom/fontcustom-preview.html
+++ b/awx/ui/client/assets/fontcustom/fontcustom-preview.html
@@ -141,11 +141,11 @@
 
       @font-face {
   font-family: "fontcustom";
-  src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot");
-  src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot?#iefix") format("embedded-opentype"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff") format("woff"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf") format("truetype"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg");
+  src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot");
+  src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -153,15 +153,18 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: "fontcustom";
-    src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg");
+    src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg");
   }
 }
 
       [data-icon]:before { content: attr(data-icon); }
 
       [data-icon]:before,
-      .icon-google:before,
-.icon-saml-02:before {
+      .icon-activity-stream:before,
+.icon-google:before,
+.icon-launch:before,
+.icon-saml-02:before,
+.icon-user:before {
         display: inline-block;
   font-family: "fontcustom";
   font-style: normal;
@@ -176,8 +179,11 @@
   font-smoothing: antialiased;
       }
 
-      .icon-google:before { content: "\f100"; }
+      .icon-activity-stream:before { content: "\f102"; }
+.icon-google:before { content: "\f100"; }
+.icon-launch:before { content: "\f103"; }
 .icon-saml-02:before { content: "\f101"; }
+.icon-user:before { content: "\f104"; }
     </style>
 
     <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -193,11 +199,24 @@
   <body class="characters-off">
     <div id="page" class="container">
       <header>
-        <h1>fontcustom contains 2 glyphs:</h1>
+        <h1>fontcustom contains 5 glyphs:</h1>
         <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
       </header>
 
       
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-activity-stream" class="icon-activity-stream"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-activity-stream" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf102;" />
+        </div>
+      </div>
+      
       <div class="glyph">
         <div class="preview-glyphs">
           <span class="step size-12"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-google" class="icon-google"></i></span>
@@ -211,6 +230,19 @@
         </div>
       </div>
       
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-launch" class="icon-launch"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-launch" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf103;" />
+        </div>
+      </div>
+      
       <div class="glyph">
         <div class="preview-glyphs">
           <span class="step size-12"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-saml-02" class="icon-saml-02"></i></span>
@@ -224,6 +256,19 @@
         </div>
       </div>
       
+      <div class="glyph">
+        <div class="preview-glyphs">
+          <span class="step size-12"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="icon-user" class="icon-user"></i></span>
+        </div>
+        <div class="preview-scale">
+          <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+        </div>
+        <div class="usage">
+          <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".icon-user" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf104;" />
+        </div>
+      </div>
+      
 
       <footer>
         Made with love using <a href="http://fontcustom.com">Font Custom</a>.
diff --git a/awx/ui/client/assets/fontcustom/fontcustom.css b/awx/ui/client/assets/fontcustom/fontcustom.css
index 1fead6332d..996fef5fe0 100644
--- a/awx/ui/client/assets/fontcustom/fontcustom.css
+++ b/awx/ui/client/assets/fontcustom/fontcustom.css
@@ -4,11 +4,11 @@
 
 @font-face {
   font-family: "fontcustom";
-  src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot");
-  src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot?#iefix") format("embedded-opentype"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff") format("woff"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf") format("truetype"),
-       url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg");
+  src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot");
+  src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot?#iefix") format("embedded-opentype"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff") format("woff"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf") format("truetype"),
+       url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg");
   font-weight: normal;
   font-style: normal;
 }
@@ -16,15 +16,18 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: "fontcustom";
-    src: url("./fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg#fontcustom") format("svg");
+    src: url("./fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg#fontcustom") format("svg");
   }
 }
 
 [data-icon]:before { content: attr(data-icon); }
 
 [data-icon]:before,
+.icon-activity-stream:before,
 .icon-google:before,
-.icon-saml-02:before {
+.icon-launch:before,
+.icon-saml-02:before,
+.icon-user:before {
   display: inline-block;
   font-family: "fontcustom";
   font-style: normal;
@@ -39,5 +42,8 @@
   font-smoothing: antialiased;
 }
 
+.icon-activity-stream:before { content: "\f102"; }
 .icon-google:before { content: "\f100"; }
+.icon-launch:before { content: "\f103"; }
 .icon-saml-02:before { content: "\f101"; }
+.icon-user:before { content: "\f104"; }
diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot
deleted file mode 100644
index 2bdff030a74a071579052ebbb3736356feca6128..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2194
zcmds2U1%It6h3!nXYTCmB-zRSCEM+Gl5Ka}G}%sOv%78F)@tLnl!m6&RuMs$?fyZM
z4ar6u5D^jdMJPVR3W5beL`7)uL5X0V#D{`b`rt!f#5bX!5A~_-`rX;d4_dL$p39x{
zd(S=h+%xyQs}lXpi5PiEfQMwsAt1TJ1a)S{K}3PBT-bKu{>u7|P1!aMQH@$OPi?Bu
zGA#kOXb$RLI!{%qLpDogT7<-;i;yhBrs=FO$-)??jDs!ciT=$SR3eNXdYvSiDV3g?
zUcUNHiHLs#Y5eTdhwQU|zVJ1So&*0<Wv;yN%iVAX{EwKYD=)WAGT0Q66o=khFE1^0
zI`BmNOYmxacBOXe+iOUPWFaSdqguWsFW=k)-EGW#0|M!H_8okM!0&C$wJ&?e$N>Kp
z_{eOlQfAMK03{Qj-nsJS1)8Qepg#=WoG;H+Kc4;}MI;yDzp&6+Y9I4_(8T_2=#M#P
z!}1&JEB9aQE8Zo4_jZ0dc<LPV)Ww|*53vofDz2>ySi?3t8<gn^@D)Mq1lf@&bdF?4
zEDV_=JC4K)@UpAyiqNt%tOow1i|^7Py}7eOpkrG_0cNK5)Fs@9`3LL9fY^=;8_Z2G
z!L5rt0Y1h2UijMrQF&s<-8EC-#OgSCX+N+6ED9An;I;^uI-Sn1eM0I2Q?@r`!u1aK
zjtMN?0^eNnf5c90(}+7h7g<3jMBd+L7mxr>nd^)W71y|z?%3BA`F3$l@_?l4k`T*6
zyv7xFuegRZ-m$Yr)<|cKr1ADEwHmwd;4_0|;SE*dRv{;o4$>seKpIkpQxkbx&KL60
zNVM0(dnKMqr?`TV;>TDaRY;}5MDw|91hR~j&KGzj8Y$!p874Gon5TOgk9cVH*6Ql5
z2c4m*V$qCAiXurqu1Q8D7TXgw)O1KoYq}mv`(=HdeWLdCn7pqipd^%=iR7p?vPVn#
zjA%3%>EEsU(po<o5$;ykjt_(*{sBqh9<Pu4yaBE%Jla2yxWW_a@ZP>ec;KjiAY+e>
zCS+aH<xsLd;PY!*T;0w6UO-PMsV3AU4l62bD+iBlpI#D2z{pJ$@>v^sz?oCYVXlNj
zVB8T7Dam12g(F!zpPO(`D+ed`>6$F-dL$U^PYmuJjKwF1hBVCx3@3G6QFg_`vDm)M
z<m0E@^E~)%aL`ayu4;y+$=;r$y29hT#$&-?UvD6Q6RQ4Ti1Wb7$YI+F8qe_;TYt?E
zO}R89jb3$W531xnmzF3+cU;;_8XIwGnF8!tmsTKuP5iN5AF}WyW|wBpBi^Mw*!L}0
zF3}nK(51Z;!b{q<k;!B^msTKe&<V7M1zJI?Xrh5M&{9mi2NgO1Y&$I@N28!m!>)nW
zW8$rCIt{3S1~ZF6Ct3?Di_LnYZSJoeFl}o*H)@`4HRjFfX1mg;&cfuOZL8LrZ&#L=
z+AXxOzxA*4)%x;m8I7#ubg#C97ZG692}^V_6F-FcP{&=3O*tB)Bbb}Vpb|DLwHE7D
z)6Q7tq`4gc7&|w1WK0DA2+{s$Z@pMuTxz!FP0Je3Se9izg3ry@6dh&|_xn!}?~Hh%
jCFWrgU!HH4#x2Xm<Bqv_xy75z1b6d^dmjnBv#<RHRbMC#

diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg
deleted file mode 100644
index dace3c481c..0000000000
--- a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2015-9-25: Created with FontForge (http://fontforge.org)
--->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
-<metadata>
-Created by FontForge 20150401 at Fri Sep 25 14:52:01 2015
- By John Mitchell
-Copyright (c) 2015, John Mitchell
-</metadata>
-<defs>
-<font id="fontcustom" horiz-adv-x="512" >
-  <font-face 
-    font-family="fontcustom"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="512"
-    panose-1="2 0 5 3 0 0 0 0 0 0"
-    ascent="448"
-    descent="-64"
-    bbox="0 -64 512 448"
-    underline-thickness="25.6"
-    underline-position="-51.2"
-    unicode-range="U+0020-F101"
-  />
-    <missing-glyph />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
- />
-    <glyph glyph-name="uniF101" unicode="&#xf101;" 
-d="M512 192c0 -141.312 -114.688 -256 -256 -256s-256 114.688 -256 256s114.688 256 256 256s256 -114.688 256 -256zM356.608 170.496c-12.5439 16.3838 -36.0967 32.7676 -70.1445 49.1523c-25.8555 12.2871 -42.2402 20.9912 -49.1523 25.5996
-c-6.91113 4.86426 -12.0312 9.72754 -15.1035 14.8477s-4.86426 11.0078 -4.86426 17.9199c0 11.0088 3.83984 19.9688 11.7764 26.624c7.93555 6.91211 19.2002 10.2402 33.792 10.2402c12.2881 0 24.832 -1.53613 37.6318 -4.86426
-c12.7998 -3.07129 28.9277 -8.7041 48.3838 -16.6396l25.0879 60.1602c-18.9434 8.19141 -36.8633 14.5918 -54.0156 18.9443c-17.1523 4.35156 -35.3281 6.65527 -54.2725 6.65527c-38.6553 0 -68.8633 -9.21582 -90.8799 -27.6475
-c-22.0156 -18.4326 -32.7676 -44.0322 -32.7676 -76.2881c0 -17.1523 3.32812 -32.2559 9.98438 -45.0566c6.65527 -12.7998 15.6152 -24.0635 26.624 -33.792c11.2637 -9.72754 27.9033 -19.7119 50.1758 -30.208c23.8076 -11.2637 39.6797 -19.7119 47.3594 -24.832
-c7.68066 -5.11914 13.5684 -10.4951 17.6641 -16.1279c4.09668 -5.63184 5.88867 -12.0312 5.88867 -19.1992c0 -12.8008 -4.6084 -22.5283 -13.5684 -28.9287c-8.95996 -6.39941 -22.0156 -9.72754 -39.168 -9.72754c-14.0801 0 -29.6963 2.30371 -46.8477 6.65625
-c-17.1523 4.60742 -37.8887 12.2881 -62.7207 23.2959v-71.6807c29.9521 -14.5918 64.5127 -22.0156 103.425 -22.0156c42.2393 0 75.2637 9.47168 99.0713 28.416c23.8086 18.9443 35.584 45.0557 35.584 78.0801c0 23.8076 -6.39941 43.7764 -18.9434 60.416z" />
-    <glyph glyph-name="uniF100" unicode="&#xf100;" 
-d="M512 192c0 -141.312 -114.688 -256 -256 -256s-256 114.688 -256 256s114.688 256 256 256s256 -114.688 256 -256zM104.96 269.568c20.7363 41.2158 57.8564 73.7275 100.864 88.832c38.6562 13.3115 81.9199 13.0557 120.319 -1.02441
-c21.5049 -7.93555 40.96 -20.2236 57.6006 -35.584c-5.63184 -6.14355 -11.7764 -11.7764 -17.4082 -17.6641c-10.752 -11.0078 -21.7598 -21.7598 -32.7676 -32.7676c-10.752 10.2393 -24.0645 18.1758 -38.4004 22.5273
-c-16.8955 5.12012 -35.0723 5.88867 -52.4795 2.04785c-19.9688 -4.35156 -38.6562 -14.8477 -53.248 -29.6953c-11.5205 -11.7764 -20.4805 -26.3682 -25.8564 -41.9844c-19.4561 15.1045 -38.9121 30.208 -58.624 45.3125zM105.216 109.568
-c19.4561 15.1035 38.9121 30.208 58.3682 45.3115c-7.67969 22.2725 -7.67969 47.1045 0 69.6318c-19.7119 15.1045 -39.168 30.208 -58.624 45.3125c-7.16797 -14.3359 -12.2881 -29.4404 -15.6162 -45.0566c-7.67969 -38.6553 -2.04785 -80.1279 15.8721 -115.199z
-M264.448 153.344c0.255859 23.2959 0.255859 46.3359 0.255859 69.8887h167.936c5.37598 -31.4883 4.35254 -64.2568 -4.60742 -94.9766c-8.19238 -28.1602 -23.8086 -54.2715 -45.3125 -74.2402c-18.9434 14.5928 -37.8877 29.4404 -56.832 44.0322
-c18.9443 12.7998 32 33.0244 35.8398 55.2959h-97.2793zM153.344 49.9199c19.2002 -15.3604 41.2158 -26.624 64.7686 -32.7676c29.6953 -7.93652 61.4395 -7.68066 91.3916 -1.02441c27.1357 6.14453 52.7363 19.2002 73.2158 38.1445
-c-18.9434 14.5918 -37.8877 29.4395 -56.832 44.0312c-11.7754 -7.93555 -25.3438 -13.0557 -39.4238 -15.6152c-14.0801 -2.30469 -28.6719 -2.81641 -42.4961 0c-14.0801 2.81543 -27.9033 8.70312 -39.6797 17.1514c-18.9443 13.3125 -33.2803 32.7686 -40.96 54.7842
-c-19.4561 -15.1045 -38.9121 -30.208 -58.3682 -45.3125c11.7764 -23.0391 28.416 -43.5195 48.3838 -59.3916z" />
-  </font>
-</defs></svg>
diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf
deleted file mode 100644
index edfa1ff528fe004829b6c952cb6fe7f5a2604048..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2008
zcmds2UuauZ82?Ug?mag*w{33ow^^FrHe0fFZI<3N$yT#jUCqi^SvTDj5j14^2W=AC
zL{|_I5%fjaQ=K3v3`A6f79W%f_DOsYw6e#&h;KqcALi3s{GIf6Ehy--=Wy=#|2x0$
zyXT%ujEMT^b&_bYP<UpcbNihF5&s(6$mOR`S(pEK;VUBc9ORcu%f;5u_x)YSKVn@h
zz1%j*U~@!L1a@b&xZ3J=k%{;hkk#taT4ny54;`?lh#Y#YT)ZK7c1B>khn1~CA^pa_
zMJ^xYqqXJsP3I&TkiUc+SZbDv?0ErDGV$nNF5Ya>0=)tIX~<@yxLp2d;fFYpoJam#
ztGU`f=Xk%4{oAmgBN2-A{npx_FAn7IlN(SlemXgS<$!j#9mKXFtF&kC#jx$}HYN8I
zc#2GihuqUBbcN)eS~#+vZkCcgjg#GGw}h2lVijmE*z`UP(VIX^GWui>=Go^!7b{QQ
z!22+NXL}fcZ5Hao2uw&@qE8r~V0|a@JsKjfSP?sB4w8tDkduysDxeGj*a2^gK&jj9
z{xTr6_F&4vhD@YBl)mQz&ja}TQU5#IJKHpF&(B0x&<WA^_t-TwfKzgV(W(3<chau4
zp~(00o00=8ZAd~b3-u;f*n|8g+PG__jkJ+S8!_YUS1J{D?ct{eOCuXjiG2z=nRJq7
zXc1bUG8UiCT5>j*4F-b!4&E>Ecp}af%s4;Ca`9X|0U?;pqyx|;r9?Kz1HnKpn@cib
zNx(hP&v?K=>vz}J?>_8~&gJuFSW*;8a&b*E0^#sT&`=XTEurbUFX5K;E%ve6*Jtv9
zK93SrcA~L~)cA-NcNxK;H!wJ?yAs+U8yD%;H)lisfIB29+~IU_m(#;lg$D;i(OW#K
zjvXC{`a@^kp`<lA5tVgKmwmBn$mQ0wh&s&OPK-WZOpU5B6e~{HqaHkVP`xBdz|2hN
zvS|x_K+W;k7+3s02=?^*l-L-&{DHKU%}m?X%HHW?x+crI9`JexqeH_(;mFMBsHPd7
zv6!wa%8{@?96pwud3@fk=i#qILx!qyRWmeAcJ`gs6&^V<74~`u`aK?0sJgvA&OH|b
zr>!1n>Zi{ieKn&rXY-6Sde!C~I3@4eyhL%@wRtCLY~1E$@~~%ZUV;8K@x?k_=)#j&
zdpsi_RczjYec!Tqi7wFxHt!@KZqhw}nM{_kc?J3!ou?+XXpL5=PF1Q=8)xk}mFNVh
zMJbx13{8N)2)`ONz%9VD4UZa?X$h0gH(P5f^=hqc9xt6Rt<+Rz!o1k5HOz&2yHqPL
z!KH%eMlY&EtDsF<hO*gcmpZHMCitsJR;3Qo6#<2=maCnmBA9|5DCi12$~{;~05kDH
znE#k~&td`iB%Q(9FM|r$u+UtomQ5>}GH1*K01&Lq<e5nU{y(6-4jd~eq~1ek0*z>t
zKqaP0biKT?T5mSYRB9@jN~NIr*ADF8ruf4Q;r;%7h<ird&=PYniFX?H!c;0{)2W`j
UxVgoh%!IV_#DhD69{#WW1;vvR2><{9

diff --git a/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff b/awx/ui/client/assets/fontcustom/fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff
deleted file mode 100644
index dc683eb4fa48eef833380156a25a1c5248ba546e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1436
zcmZuxX;4#F6uvKkBuW60fFUFrC?JFi(O4G6h!rA%Mu<WIOW}nq#FntgmTFpvKvXc`
z0!)g*6_r|CpkoDbDiMv0hzJbY0ulrl97Rx+Dn(y!)Suov-#zo4^PTg~n>**`Me=w6
z0dQIBfwkEZ|2ChWTRdL00O|^0j0Qo^(P?>+8-14nfaoFTL!gn<3C&`KC<6c-q#zu|
z!tcL!z{I)POz8Ut`Yb-c4hcySWkH>#5^|Cm7zXeusXxh}4uyG*(2~P0AI8b0A_?Sd
zsPTdDv&`vUB!^DugE~NmaKld`M!6yz)<VW0cQnId39w5|7egH`3UV7WkWC0sh?MZV
zhzjyW5KJHd+tWk}DQt}b{Q*$#e?rjZk&&L24f`|q>;=K);`E!9{bE#tqF{v6;*A-n
z22|2vSu#*Z^e<GCW-!EqV8jRe5b<#|uo5>HcKt~oG>L)2h4y$7;PVL4t#d(CCGO&<
z7%C=7P$@t>m@*02704b_TL3Zx-2RX&(i;NQ>Poe`d&g3(T5Vv2=S%lU<RTPJMy0X>
zgoh9;NMTt5ksOVB)84Ke#t_0PBc5!-{3<M*LZu>ZFRV7e=0OXvGaGOUq8<L>2lBB$
z6qOaAP6QrdUIy}#YEU^6teKsJS|=wRmBL;29<zPmt&+UKFiiZ5W8GFJDiIfCQGYG4
zu*b8|qPV4c1Y9d5J%$D0ox+p#Y1bnJbA7>{HD$eQie@}uI*Wc%d*CXcqd1|^h0rvB
zf8cNr;uv;L!ilApwK~MzI@L1>cEz+vIkCaj?u&y*2z7;pEVaovG1cpvZyO)xQk3?>
z!IczszHRJ@%+_xvW`g>z;UD{sgzmCex@n~?85??*+2!0<*C=eBnSC-tOJe-R8q_T>
zx!qP%JXyonAGt2qa;db&(1z3>`*RibqiRb$E;Jr+Vp_ci9ljS<d!)r`{pww%1M0Gz
zySWa}lfpTPHf*_-V&cNUe{F5E<1$Xf9C1+qb7#-ytu*gM%~8q*&GCqb{<Fo~hRB+O
zUCX9db@(2vIaG2*m`NY&j$Uz`dVh+W){?(Jq+dY7cjUG<{5(t^5$?MeY+O*TiLXew
z$d6gw++Ii7r+It*YG$!+(yQsuz(n2D?#DdGcx-(5;p%N0W-C3v?Kq?O;Sb_y!UHQ*
zD6bZWx^yg%v3dme&Qz`Yj`n3&?cwNfhQ+beAjZl4uT?%pFBddd?5?R5Rv(OcdUv9n
zyW`Mk!w9`8>g%Y1mI|`R;;vpM)kbBaZt*7}vw1V23hq1NNUku`d}rG7RqNY==M|eC
z+3v*&AAq&??w$>PRS9nHYrI^0YDqbgz{Cin^V^d<i{ybgcmHA8pgJYR&U(J`e06%t
z(9Ixx(-k7+mdW}#!~4~XXHCUcmjctoJ0q_%UiF<G^*PgbY;@t2Z}h2K?n!xq*v`3l
zI{iY^zkQj`w#vLgL$EbH&xMsSC>}!Rlzy?keJ@k9W{!d6V%*JLE+esB&i=+}4|8Tk
zu*j~pL2><~UXjTgZ+Oy6&!!kc?%a_y@^9P@@p32TrU+t-w|9^1;vc9K#Z**XdU#HE
zjk0Z%!LQ`^?8vxg<BCVoA=)M7MhmMU6XB3IR~xzX@w@ld^-USlset*W-o`zP@Txb4
zZ0_k!tZlrEyQOL$&r_e2K3N^Nvd!m4=~da$*Ef4Nb(lDp!Jt*b5%WAJgF=i*b#pq0
z_`z|8Ln@ObOJu&C9od}a?1CN*DCr`s{WyCFeD84P92Av+?WJY;j)i09cZ5v?>z-Pg
G0QesiWf&^}

diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot
new file mode 100644
index 0000000000000000000000000000000000000000..bbac28619de4353c5c270afb1c6ab37c0105a93a
GIT binary patch
literal 2946
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
XCZ41!MbsZC9Dnl6m+uPtWF7Y}!nm3R

literal 0
HcmV?d00001

diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg
new file mode 100644
index 0000000000..6a8eea52fa
--- /dev/null
+++ b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2015-11-4: Created with FontForge (http://fontforge.org)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata>
+Created by FontForge 20150401 at Wed Nov  4 19:00:26 2015
+ By John Mitchell
+Copyright (c) 2015, John Mitchell
+</metadata>
+<defs>
+<font id="fontcustom" horiz-adv-x="512" >
+  <font-face 
+    font-family="fontcustom"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="512"
+    panose-1="2 0 5 3 0 0 0 0 0 0"
+    ascent="448"
+    descent="-64"
+    bbox="-125.44 -194.56 512 448"
+    underline-thickness="25.6"
+    underline-position="-51.2"
+    unicode-range="U+0020-F104"
+  />
+    <missing-glyph />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
+ />
+    <glyph glyph-name="uniF103" unicode="&#xf103;" 
+d="M384 305.664v0c0 -5.12012 -2.55957 -121.6 -77.5684 -196.608l-94.9756 -94.9756c7.93555 -22.0156 22.5283 -97.0244 -82.9443 -202.752l-0.511719 -0.511719c-3.58398 -3.84082 -9.47168 -3.84082 -13.0557 -0.256836l-0.255859 0.256836
+c-2.81641 2.81543 -3.58496 7.16797 -1.79199 10.752c0.255859 0.767578 33.0234 68.3516 9.9834 104.191l-23.5518 -23.5518c-0.511719 -0.511719 -1.02441 -1.02441 -1.79199 -1.53613c-1.79199 -1.02344 -42.752 -23.5518 -97.0244 30.7197
+c-54.5273 54.5283 -31.7441 95.2324 -30.7197 97.0244c0.511719 0.511719 1.02441 1.28027 1.53613 1.79199l23.5518 23.5518c-35.8398 23.04 -103.424 -9.72754 -104.191 -9.9834c-3.58496 -1.79199 -7.93652 -1.02441 -10.7529 1.79199
+c-0.511719 0.511719 -0.767578 0.767578 -1.02344 1.2793c-2.56055 3.84082 -2.30371 8.7041 1.02344 12.0322c105.984 105.729 181.248 91.1357 203.265 83.4561l94.9756 94.9756c75.0078 75.0088 191.488 77.8242 196.353 77.8242
+c2.55957 0 4.86328 -1.02344 6.65527 -2.81543s2.81641 -4.09668 2.81641 -6.65625zM263.424 120.064v0c20.4805 20.4795 20.4805 53.7598 0 74.2393c-20.4795 20.4805 -53.7598 20.4805 -74.2402 0c-20.4795 -20.4795 -20.4795 -53.7598 0 -74.2393
+c20.4805 -20.4805 53.7607 -20.4805 74.2402 0zM263.424 120.064zM-0.511719 -124.672v0c7.67969 1.28027 15.1035 2.81543 22.5273 4.60742c8.7041 2.30469 16.8965 5.88867 25.3447 8.96094c-3.32812 -8.19238 -8.44824 -15.1045 -14.3359 -21.5049
+c-23.8086 -25.0879 -59.6484 -36.6074 -93.4404 -38.9111c-7.42383 -0.512695 -14.8477 -0.512695 -22.2725 0c-8.19141 0.511719 -15.6152 5.63184 -18.4316 13.5674c-2.04785 5.37598 -1.53613 12.5439 -1.53613 18.1758
+c0.255859 10.4961 1.02441 20.7363 3.07227 30.9766c3.32812 17.4082 9.21582 34.3037 18.1758 49.4082c9.21582 15.6152 22.5283 30.208 39.4238 37.376c-0.767578 -2.04883 -1.79199 -4.09668 -2.55957 -6.14453c-5.8877 -15.3594 -9.72852 -31.2314 -12.0322 -47.3594
+c-1.28027 -9.2168 -2.04785 -18.4326 -2.55957 -27.9043c-0.255859 -4.0957 -0.512695 -8.19238 -0.512695 -12.2881c-0.255859 -2.81641 -0.255859 -6.91211 -0.255859 -9.72852c0 -1.2793 1.79199 -3.32715 3.32812 -3.32715
+c18.6885 -0.512695 37.6318 0.767578 56.0645 4.0957zM-0.511719 -124.672z" />
+    <glyph glyph-name="uniF101" unicode="&#xf101;" 
+d="M512 192c0 -141.312 -114.688 -256 -256 -256s-256 114.688 -256 256s114.688 256 256 256s256 -114.688 256 -256zM356.608 170.496c-12.5439 16.3838 -36.0967 32.7676 -70.1445 49.1523c-25.8555 12.2871 -42.2402 20.9912 -49.1523 25.5996
+c-6.91113 4.86426 -12.0312 9.72754 -15.1035 14.8477s-4.86426 11.0078 -4.86426 17.9199c0 11.0088 3.83984 19.9688 11.7764 26.624c7.93555 6.91211 19.2002 10.2402 33.792 10.2402c12.2881 0 24.832 -1.53613 37.6318 -4.86426
+c12.7998 -3.07129 28.9277 -8.7041 48.3838 -16.6396l25.0879 60.1602c-18.9434 8.19141 -36.8633 14.5918 -54.0156 18.9443c-17.1523 4.35156 -35.3281 6.65527 -54.2725 6.65527c-38.6553 0 -68.8633 -9.21582 -90.8799 -27.6475
+c-22.0156 -18.4326 -32.7676 -44.0322 -32.7676 -76.2881c0 -17.1523 3.32812 -32.2559 9.98438 -45.0566c6.65527 -12.7998 15.6152 -24.0635 26.624 -33.792c11.2637 -9.72754 27.9033 -19.7119 50.1758 -30.208c23.8076 -11.2637 39.6797 -19.7119 47.3594 -24.832
+c7.68066 -5.11914 13.5684 -10.4951 17.6641 -16.1279c4.09668 -5.63184 5.88867 -12.0312 5.88867 -19.1992c0 -12.8008 -4.6084 -22.5283 -13.5684 -28.9287c-8.95996 -6.39941 -22.0156 -9.72754 -39.168 -9.72754c-14.0801 0 -29.6963 2.30371 -46.8477 6.65625
+c-17.1523 4.60742 -37.8887 12.2881 -62.7207 23.2959v-71.6807c29.9521 -14.5918 64.5127 -22.0156 103.425 -22.0156c42.2393 0 75.2637 9.47168 99.0713 28.416c23.8086 18.9443 35.584 45.0557 35.584 78.0801c0 23.8076 -6.39941 43.7764 -18.9434 60.416z" />
+    <glyph glyph-name="uniF100" unicode="&#xf100;" 
+d="M512 192c0 -141.312 -114.688 -256 -256 -256s-256 114.688 -256 256s114.688 256 256 256s256 -114.688 256 -256zM104.96 269.568c20.7363 41.2158 57.8564 73.7275 100.864 88.832c38.6562 13.3115 81.9199 13.0557 120.319 -1.02441
+c21.5049 -7.93555 40.96 -20.2236 57.6006 -35.584c-5.63184 -6.14355 -11.7764 -11.7764 -17.4082 -17.6641c-10.752 -11.0078 -21.7598 -21.7598 -32.7676 -32.7676c-10.752 10.2393 -24.0645 18.1758 -38.4004 22.5273
+c-16.8955 5.12012 -35.0723 5.88867 -52.4795 2.04785c-19.9688 -4.35156 -38.6562 -14.8477 -53.248 -29.6953c-11.5205 -11.7764 -20.4805 -26.3682 -25.8564 -41.9844c-19.4561 15.1045 -38.9121 30.208 -58.624 45.3125zM105.216 109.568
+c19.4561 15.1035 38.9121 30.208 58.3682 45.3115c-7.67969 22.2725 -7.67969 47.1045 0 69.6318c-19.7119 15.1045 -39.168 30.208 -58.624 45.3125c-7.16797 -14.3359 -12.2881 -29.4404 -15.6162 -45.0566c-7.67969 -38.6553 -2.04785 -80.1279 15.8721 -115.199z
+M264.448 153.344c0.255859 23.2959 0.255859 46.3359 0.255859 69.8887h167.936c5.37598 -31.4883 4.35254 -64.2568 -4.60742 -94.9766c-8.19238 -28.1602 -23.8086 -54.2715 -45.3125 -74.2402c-18.9434 14.5928 -37.8877 29.4404 -56.832 44.0322
+c18.9443 12.7998 32 33.0244 35.8398 55.2959h-97.2793zM153.344 49.9199c19.2002 -15.3604 41.2158 -26.624 64.7686 -32.7676c29.6953 -7.93652 61.4395 -7.68066 91.3916 -1.02441c27.1357 6.14453 52.7363 19.2002 73.2158 38.1445
+c-18.9434 14.5918 -37.8877 29.4395 -56.832 44.0312c-11.7754 -7.93555 -25.3438 -13.0557 -39.4238 -15.6152c-14.0801 -2.30469 -28.6719 -2.81641 -42.4961 0c-14.0801 2.81543 -27.9033 8.70312 -39.6797 17.1514c-18.9443 13.3125 -33.2803 32.7686 -40.96 54.7842
+c-19.4561 -15.1045 -38.9121 -30.208 -58.3682 -45.3125c11.7764 -23.0391 28.416 -43.5195 48.3838 -59.3916z" />
+    <glyph glyph-name="uniF104" unicode="&#xf104;" 
+d="M130.56 314.88c140.032 0 253.44 -113.408 253.44 -253.439c0 -140.032 -113.408 -253.44 -253.44 -253.44c-140.031 0 -253.439 113.408 -253.439 253.44c0 140.031 113.408 253.439 253.439 253.439zM297.728 -73.2158
+c29.6963 36.8643 47.6162 83.7119 47.6162 134.656c0 118.527 -96.2559 214.783 -214.784 214.783c-118.527 0 -214.783 -96.2559 -214.783 -214.783c0 -49.6641 16.8955 -95.2324 45.0557 -131.584c25.3438 46.8477 60.416 56.5752 60.416 56.5752h21.7598
+c23.5518 0 42.752 19.2002 42.752 42.752v14.3359c-8.44824 10.2402 -15.1035 22.0166 -19.2002 34.5605c-0.767578 2.55957 -1.2793 5.63184 -3.58398 7.16797c-9.47168 7.67969 -12.0312 22.0156 -6.14355 32.5117c1.02441 2.04785 3.07227 3.83984 2.81641 6.40039
+c0 12.7998 -0.256836 25.5996 0 38.3994c0.511719 12.0322 3.32715 24.0645 10.2393 34.0488c7.68066 11.5195 19.9688 19.1992 33.2803 22.5273c15.1045 3.83984 31.2324 3.83984 46.5918 1.02441c12.0322 -2.30371 23.8086 -7.93652 32.5127 -16.8965
+c10.752 -11.2637 15.1035 -27.1357 15.3594 -42.2393v-37.6328c0 -1.79199 1.53613 -3.07129 2.30371 -4.60742c6.14453 -9.98438 4.6084 -23.8086 -3.58398 -32c-1.53516 -1.53613 -3.83984 -2.81641 -4.35156 -5.12012
+c-4.0957 -14.0801 -11.0078 -27.3916 -20.4805 -38.6562v-13.8242c0 -23.5518 19.2002 -42.752 42.7529 -42.752h21.5039s36.6074 -10.2393 61.9512 -59.6475z" />
+    <glyph glyph-name="uniF102" unicode="&#xf102;" 
+d="M348.416 2.55957h31.2324c-26.624 -113.151 -128 -197.119 -249.089 -197.119c-119.04 0 -218.88 81.1514 -247.552 190.976h84.9922c7.42383 0 13.8242 4.0957 15.6162 9.72754l23.8076 71.168l33.792 -155.903c1.53613 -6.91211 8.95996 -11.5205 17.1523 -11.0078
+c8.19141 0.767578 14.8477 6.65527 14.8477 13.3115v72.7041h45.3125c8.19141 0 14.8477 4.86426 16.1279 11.5195l25.3438 144.385l55.04 -251.393c1.28027 -6.39941 8.19238 -11.0078 15.6162 -11.0078h0.255859c7.67969 0 14.3359 4.6084 15.6162 10.752l24.832 104.704
+h12.2881l18.6875 -25.8564c3.07227 -4.0957 8.19238 -6.65527 13.5684 -6.65527s10.752 2.30371 13.8232 6.14355zM-44.2881 23.04h-78.3359c-1.79199 12.5439 -2.81641 25.3438 -2.81641 38.4004c0 141.312 114.433 256.256 255.744 256.256
+c141.312 0 256 -114.688 256 -256c0 -11.0078 -0.767578 -21.7607 -2.04785 -32.2559h-44.7998c-5.37598 0 -10.4961 -2.56055 -13.5684 -6.14453l-8.95996 -11.7764l-10.2393 14.0801c-2.81641 3.84082 -8.19238 6.40039 -13.8242 6.40039h-34.8164
+c-7.93555 0 -14.5918 -4.6084 -15.8721 -10.752l-10.752 -45.8242l-57.0879 261.888c-1.28027 6.40039 -8.44824 11.5205 -16.1279 11.0088c-7.93555 -0.255859 -14.5918 -4.86426 -15.6162 -11.5205l-37.6318 -213.76h-48.1279c-1.53613 0 -3.32812 0 -4.86426 -0.511719
+l-25.3438 116.991c-1.53613 6.14453 -7.93555 10.4961 -15.3604 11.0088c-8.19141 0.767578 -14.0801 -3.83984 -16.1279 -9.98438z" />
+  </font>
+</defs></svg>
diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ee6d0e05a70e1d2b2c8df36abf22766740649607
GIT binary patch
literal 2760
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
MS3ei@>3iJ206r6humAu6

literal 0
HcmV?d00001

diff --git a/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff b/awx/ui/client/assets/fontcustom/fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff
new file mode 100644
index 0000000000000000000000000000000000000000..566b28175a3e0f0a4e5606787919d7633e47bb2e
GIT binary patch
literal 2016
zcmZuyc~Dc=8@(^V5O$D|ChW2(VpuH5Ru(~siiAawz4$^BWEB($s4NLPB8VU=(Aw&t
zq9~S9K|vu1l{K<hT4XUuRAdQ4aREj1yZH0Z-Z$sIIp;ffzB}*Dd?(3+N(BgjOL7v(
zt-qza*7yHfRH_dR`Z{1u6+)ejDI4+dHu)X^<X6aDAyCf~!HbL-dK>^4{Qot?_4$g5
zn88lahMEu5B)&okaXv(khd#;skgt33VlluTiar(webE451<*Q@=Zl>VXVICkhbi=|
z!(s#dDJ2|=P(vZtgwVqtMI6Ip5|W`d54jqII<`)%8Xe1kK8!!)gmqw1iIEt3GVF_R
zAlHJ>2A-heFg=C^0L~5SR?u%*>(Z_n7aN}d@0SHVmJq=?Bz5EDQ3lFHQ7~2Z<eGcY
zbmM9dkKX|>=QpN=wY?V8#J9>xBn5C!T^5Z1ZVZ|JZ+_cFL51V#{O9S)Sgdk!FGt!R
zVX0yp0Qgp)WOgx87C<&@hcQ9EwdrfF1dx9O=DybHw(VA2ZW)(5n7h4@%WczeO=lG|
z!|5m*in78u2o=Fe;P=GS=;5g6O4q~WNil-6dxVwU?HE~n*1*&h1Ds@J<-hhC;cIsR
zObus60^Z}oaw{1>2JF*tJzx8vXcz}2<ES{rIOJbaTM7{;r_IMzk;xZG1pD9D#0oFA
zr7%~-Vlg9)Sbba@WimMNq;iggGS(2y^56aw0=h==v+zs7e+zfRZ_iBxheTs=nCRqD
zS}84d+?mulUGCR<;z3k@i(Z{2`=8nhzC~S<sCXiJo07hZ`c5ZDX(#?IBNa*GJeiY<
zD*I=y=Y}b5)B^e5M_&$^@DRe0DP`>=&Q6#ZQsWt(F27f}WVW3C#X<L!ZPq|zTo!&~
zc!K=v_w!DkZ+E9Xei~aZlQB&Axzwg_b}@T$v40*joBUiQ#5Xzr!`pgEg~{;MOv&t?
zM~Y3y^Of%VkUxcEMVFHf{55^V#yH;Bmlf2YK~dKkqNoJl@#(wdT4U~Az_#96b+T}e
zudh=B>wvFrwSXCU;uWWuWMuqZLGR1qk6)tyexvkQYB1Z;_UW8Uj7M*Zt{J7b-!1Gj
zUJ%tV@m=l2<R-DTTTW1;j_&XScC&tE)VYgf+T8=!f`Z3I5<~Nf#-_vB?rKiL%M<fi
z{VvsiT8^8(o-hB|tHoNjoaNu=p~+5oV(NQm2Yvs$k+jR%ftNdU)>>8F#NHl5emX<l
zcMS`IhaDr_OZ^vleg$*H72Evb+MUE>*5rdVtXoUG?@9HPr;$6_7Xlj_o0?k=lR|Xe
zDFw@AAp>)A)aImxALjzTJQE$S*lgZzCQB9B6%-7Yi9%{#+7#yOuP!$_nD^+?c=y~s
zVU5Y{_mfh6UZ><0RSEKXM=DfSH9U>`=n5eob1l`mk;Ml3tlGnrl96o61lUpRQ*EDL
z8hD+f@Tsj{p{VuTZi|S{4yDnq%@fi;Sj>#juFgfT&TFKw@9`>CpU7R^B5xt!6=7$H
zZ9j$voxLya?tDYe6$Aj)=0kSkF>|fN4O$=hodSxcrR`yxado7TxAx8(%kz;nH1b}-
zgx&ZUdpY&3qMZ{yCHJmkMyP?8`2p7Em4?jSK7*FVjoUUbh#o_cMP=LL17DP!7n;9n
zxfvN<qdIJLT~y=8db#ZP)^HiqT3lx1p7g0r3Y#j##kK7@$mZZ3@^nszVg~XRtgt<}
z+|mIXDK<68e#=?}A;x)d;a`(py%N<qv)%*)T%U-lmPti8H*f8H{Q1_Pdt9iCu$`-T
zN~=SINAfl~c^2`%az6DTXSpq>XlCy~QX=Y*-EN?ov+&Do3g4W8vq-FXe<OH1Cu2UK
z)?MlvFH+pv)Kuf_b|&DHpl6r*{Z~Xn&JB6#A#1N^(=RpuBAx!#uyIR-m!Vb2CAH`~
z!?)Gqlva*PZ%W%gE@)kyI$v)VK5lR4FhQXGv)RX@*`m|m^QtSR$$I|dIhm1!tw~K6
ztKQqV#V!c6(%(9zHm#+6e7`g^vlP_KhSSWhKQTx>d7scokYwx471dV#F=MdfqVOFj
z7yntt_xA5DaE26~wsUXashBNzrEmu0^#bft);Fm8+jpo+ugk@`f^eyb(izpAtUI<<
zXH#I&&ThH8<fO@`0nV8c4fmHteU;^hfZqz|;p)A%2aIg{iyDn_T+7ZF*`=AgnJrC;
z<A2^co-oe%lI=Qt?}ey#=0*UW^FT=a&|-5~h`cHKfmF>E8awkfK3uT$e>lZamaf`^
zdODgqWo>5wIjwlNu5GijM~5nUPD*Ez$OkE+=RQ^W*O`Pu{edqjI@_X-23$M9oH|uv
z*SvgnF0W*8Dt~XK-(cNM%CUC3Q~{a&M+WUD^?Hp>35AK2>O8d|%|a>STAEr)ZJ+6t
zW4}y)h}C}aaDcd%!o9}Y<bX>qr=_L`R*G}Sj8X}dD}|m`t<NTR)Uk77g3n&(yF>||
z1ojHdTEReWaN&9egn~@5BuS6_8{!Tl01oyrW+*d^NoTT{3=@8Df|<D~XDG*W6z{6G
qD?%A$vSndB!mxswiCI67qD+ucP?S#0e7#S~z8*CPv@x6zfd2v7ollJb

literal 0
HcmV?d00001

diff --git a/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json b/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json
index 3f5b945913..cbff15adcb 100644
--- a/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json
+++ b/awx/ui/client/assets/fontcustom/new_icons/.fontcustom-manifest.json
@@ -1,27 +1,39 @@
 {
   "checksum": {
-    "previous": "037607f2fd8b86abb9de4b13a05fde6090c547d09c5428dac65a185505077e6a",
-    "current": "037607f2fd8b86abb9de4b13a05fde6090c547d09c5428dac65a185505077e6a"
+    "previous": "fbf6cfce71d2c35351b84596defbfd01ac87f29865d8f21d344cf5021e1345b0",
+    "current": "fbf6cfce71d2c35351b84596defbfd01ac87f29865d8f21d344cf5021e1345b0"
   },
   "fonts": [
-    "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.ttf",
-    "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.svg",
-    "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.woff",
-    "..//fontcustom_037607f2fd8b86abb9de4b13a05fde60.eot"
+    "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.ttf",
+    "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.svg",
+    "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.woff",
+    "..//fontcustom_fbf6cfce71d2c35351b84596defbfd01.eot"
   ],
   "glyphs": {
+    "activity-stream": {
+      "codepoint": 61698,
+      "source": "./activity-stream.svg"
+    },
     "google": {
       "codepoint": 61696,
       "source": "./google.svg"
     },
+    "launch": {
+      "codepoint": 61699,
+      "source": "./launch.svg"
+    },
     "saml-02": {
       "codepoint": 61697,
       "source": "./saml-02.svg"
+    },
+    "user": {
+      "codepoint": 61700,
+      "source": "./user.svg"
     }
   },
   "options": {
     "autowidth": false,
-    "config": "fontcustom.yml",
+    "config": false,
     "css_selector": ".icon-{{glyph}}",
     "debug": false,
     "font_ascent": 448,
@@ -29,7 +41,7 @@
     "font_design_size": 16,
     "font_em": 512,
     "font_name": "fontcustom",
-    "force": false,
+    "force": true,
     "input": {
       "templates": ".",
       "vectors": "."
diff --git a/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg b/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg
new file mode 100644
index 0000000000..a085ffefb6
--- /dev/null
+++ b/awx/ui/client/assets/fontcustom/new_icons/activity-stream.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-49 51 200 200" style="enable-background:new -49 51 200 200;" xml:space="preserve">
+<g>
+	<path d="M136.1,174l-7.3,9.2c-1.2,1.5-3.3,2.4-5.4,2.4c-2.1,0-4.1-1-5.3-2.6l-7.3-10.1h-4.8l-9.7,40.9c-0.5,2.4-3.1,4.2-6.1,4.2
+		h-0.1c-2.9,0-5.6-1.8-6.1-4.3l-21.5-98.2l-9.9,56.4c-0.5,2.6-3.1,4.5-6.3,4.5H28.6v28.4c0,2.6-2.6,4.9-5.8,5.2
+		c-3.2,0.2-6.1-1.6-6.7-4.3L2.9,144.8l-9.3,27.8c-0.7,2.2-3.2,3.8-6.1,3.8h-33.2C-34.5,219.3,4.5,251,51,251
+		c47.3,0,86.9-32.8,97.3-77H136.1z"/>
+	<path d="M-17.3,166l15.4-45.9c0.8-2.4,3.1-4.2,6.3-3.9c2.9,0.2,5.4,1.9,6,4.3l9.9,45.7c0.6-0.2,1.3-0.2,1.9-0.2H41l14.7-83.5
+		c0.4-2.6,3-4.4,6.1-4.5c3-0.2,5.8,1.8,6.3,4.3l22.3,102.3l4.2-17.9c0.5-2.4,3.1-4.2,6.2-4.2h13.6c2.2,0,4.3,1,5.4,2.5l4,5.5
+		l3.5-4.6c1.2-1.4,3.2-2.4,5.3-2.4h17.5c0.5-4.1,0.8-8.3,0.8-12.6c0-55.2-44.8-100-100-100S-49,95.8-49,151c0,5.1,0.4,10.1,1.1,15
+		H-17.3z"/>
+</g>
+</svg>
diff --git a/awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml b/awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml
deleted file mode 100644
index 69a38ba71b..0000000000
--- a/awx/ui/client/assets/fontcustom/new_icons/fontcustom.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-# =============================================================================
-# Font Custom Configuration
-#   This file should live in the directory where you run `fontcustom compile`.
-#   For more info, visit <https://github.com/FontCustom/fontcustom>.
-# =============================================================================
-
-
-# -----------------------------------------------------------------------------
-# Project Info
-# -----------------------------------------------------------------------------
-
-# The font's name. Also determines the file names of generated templates.
-#font_name: icons
-
-# Format of CSS selectors. {{glyph}} is substituted for the glyph name.
-#css_selector: .i-{{glyph}}
-
-# Generate fonts without asset-busting hashes.
-#no_hash: true
-
-# Encode WOFF fonts into the generated CSS.
-#base64: true
-
-# Forces compilation, even if inputs have not changed
-#force: true
-
-# Display (possibly useful) debugging messages.
-#debug: true
-
-# Hide status messages.
-#quiet: true
-
-
-# -----------------------------------------------------------------------------
-# Input / Output Locations
-#   You can save generated fonts, CSS, and other files to different locations
-#   here. Font Custom can also read input vectors and templates from different
-#   places.
-#
-#   NOTE:
-#   - Be sure to preserve the whitespace in these YAML hashes.
-#   - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is
-#     optional.
-#   - Specify output locations for custom templates by including their file
-#     names as the key.
-# -----------------------------------------------------------------------------
-
-#input:
-#  vectors: my/vectors
-#  templates: my/templates
-
-#output:
-#  fonts: app/assets/fonts
-#  css: app/assets/stylesheets
-#  preview: app/views/styleguide
-#  my-custom-template.yml: path/to/template/output
-
-
-# -----------------------------------------------------------------------------
-# Templates
-#   A YAML array of templates and files to generate alongside fonts. Custom
-#   templates should be saved in the INPUT[:templates] directory and referenced
-#   by their base file name.
-#
-#   For Rails and Compass templates, set `preprocessor_path` as the relative
-#   path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same
-#   directory.
-#
-#   Included in Font Custom: preview, css, scss, scss-rails
-#   Default: css, preview
-# -----------------------------------------------------------------------------
-
-#templates:
-#- scss-rails
-#- preview
-#- my-custom-template.yml
-
-#preprocessor_path: ../fonts/
-
-
-# -----------------------------------------------------------------------------
-# Font Settings (defaults shown)
-# -----------------------------------------------------------------------------
-
-# Size (in pica points) for which your font is designed.
-#font_design_size: 16
-
-# The em size. Setting this will scale the entire font to the given size.
-#font_em: 512
-
-# The font's ascent and descent. Used to calculate the baseline.
-#font_ascent: 448
-#font_descent: 64
-
-# Horizontally fit glyphs to their individual vector widths.
-#autowidth: false
diff --git a/awx/ui/client/assets/fontcustom/new_icons/launch.svg b/awx/ui/client/assets/fontcustom/new_icons/launch.svg
new file mode 100644
index 0000000000..396289cde6
--- /dev/null
+++ b/awx/ui/client/assets/fontcustom/new_icons/launch.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-49 51 200 200" style="enable-background:new -49 51 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{clip-path:url(#SVGID_2_);}
+</style>
+<g>
+	<g>
+		<defs>
+			<rect id="SVGID_1_" x="-48" y="52" width="198" height="198"/>
+		</defs>
+		<clipPath id="SVGID_2_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<path class="st0" d="M150,55.6c0-1-0.4-1.9-1.1-2.6c-0.7-0.7-1.6-1.1-2.6-1.1c-1.9,0-47.4,1.1-76.7,30.4l-37.1,37.1
+			c-8.6-3-38-8.7-79.4,32.6c-1.3,1.3-1.4,3.2-0.4,4.7c0.1,0.2,0.2,0.3,0.4,0.5c1.1,1.1,2.8,1.4,4.2,0.7c0.3-0.1,26.7-12.9,40.7-3.9
+			l-9.2,9.2c-0.2,0.2-0.4,0.5-0.6,0.7c-0.4,0.7-9.3,16.6,12,37.9c21.2,21.2,37.2,12.4,37.9,12c0.3-0.2,0.5-0.4,0.7-0.6L48,204
+			c9,14-3.8,40.4-3.9,40.7c-0.7,1.4-0.4,3.1,0.7,4.2c0,0,0,0,0.1,0.1c1.4,1.4,3.7,1.4,5.1-0.1c0.1-0.1,0.1-0.1,0.2-0.2
+			c41.2-41.3,35.5-70.6,32.4-79.2l37.1-37.1C149,103.1,150,57.6,150,55.6L150,55.6z M102.9,128.1c-8,8-21,8-29,0c-8-8-8-21,0-29
+			c8-8,21-8,29,0C110.9,107.1,110.9,120.1,102.9,128.1L102.9,128.1z M102.9,128.1"/>
+	</g>
+	<path d="M-0.2,223.7c-7.2,1.3-14.6,1.8-21.9,1.6c-0.6,0-1.3-0.8-1.3-1.3c0-1.1,0-2.7,0.1-3.8c0-1.6,0.1-3.2,0.2-4.8
+		c0.2-3.7,0.5-7.3,1-10.9c0.9-6.3,2.4-12.5,4.7-18.5c0.3-0.8,0.7-1.6,1-2.4c-6.6,2.8-11.8,8.5-15.4,14.6c-3.5,5.9-5.8,12.5-7.1,19.3
+		c-0.8,4-1.1,8-1.2,12.1c0,2.2-0.2,5,0.6,7.1c1.1,3.1,4,5.1,7.2,5.3c2.9,0.2,5.8,0.2,8.7,0c13.2-0.9,27.2-5.4,36.5-15.2
+		c2.3-2.5,4.3-5.2,5.6-8.4c-3.3,1.2-6.5,2.6-9.9,3.5C5.7,222.6,2.8,223.2-0.2,223.7L-0.2,223.7z M-0.2,223.7"/>
+</g>
+</svg>
diff --git a/awx/ui/client/assets/fontcustom/new_icons/user.svg b/awx/ui/client/assets/fontcustom/new_icons/user.svg
new file mode 100644
index 0000000000..5637e50c0e
--- /dev/null
+++ b/awx/ui/client/assets/fontcustom/new_icons/user.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-49 51 200 200" style="enable-background:new -49 51 200 200;" xml:space="preserve">
+<path d="M51,52c-54.7,0-99,44.3-99,99s44.3,99,99,99s99-44.3,99-99S105.7,52,51,52z M116.3,203.6c-9.9-19.3-24.2-23.3-24.2-23.3
+	h-8.4c-9.2,0-16.7-7.5-16.7-16.7v-5.4c3.7-4.4,6.4-9.6,8-15.1c0.2-0.9,1.1-1.4,1.7-2c3.2-3.2,3.8-8.6,1.4-12.5
+	c-0.3-0.6-0.9-1.1-0.9-1.8c0-4.9,0-9.8,0-14.7c-0.1-5.9-1.8-12.1-6-16.5c-3.4-3.5-8-5.7-12.7-6.6c-6-1.1-12.3-1.1-18.2,0.4
+	c-5.2,1.3-10,4.3-13,8.8c-2.7,3.9-3.8,8.6-4,13.3c-0.1,5,0,10,0,15c0.1,1-0.7,1.7-1.1,2.5c-2.3,4.1-1.3,9.7,2.4,12.7
+	c0.9,0.6,1.1,1.8,1.4,2.8c1.6,4.9,4.2,9.5,7.5,13.5v5.6c0,9.2-7.5,16.7-16.7,16.7H8.3c0,0-13.7,3.8-23.6,22.1
+	c-11-14.2-17.6-32-17.6-51.4c0-46.3,37.6-83.9,83.9-83.9s83.9,37.6,83.9,83.9C134.9,170.9,127.9,189.2,116.3,203.6z"/>
+</svg>

From cb9495c2e3d97be84ea45cffe09d82a1378fa372 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 5 Nov 2015 19:24:18 -0500
Subject: [PATCH 2/6] hacky tooltip style fixing for new nav

---
 awx/ui/client/legacy-styles/ansible-ui.less | 17 +++++++++++++++++
 awx/ui/client/src/shared/directives.js      |  9 ++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 3f08896422..c6ab84874b 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -2013,3 +2013,20 @@ button.dropdown-toggle,
 #login-modal-body {
     padding-bottom: 5px;
 }
+
+.tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #848992;
+}
+
+.tooltip.Tooltip.fade.bottom.in {
+    opacity: 1;
+    padding-top: 4px;
+}
+
+.tooltip-inner {
+    background-color: #848992;
+}
+
+.tooltip-inner--logOut {
+    margin-left: -15px !important;
+}
diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index 2b005b06d0..f71bcc496c 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -494,6 +494,13 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'JobsHelper'])
                     placement = (attrs.placement !== undefined && attrs.placement !== null) ? attrs.placement : 'left';
                 }
 
+                var template;
+                if (attrs.tooltipInnerClass) {
+                    template = '<div class="tooltip Tooltip" role="tooltip"><div class="tooltip-arrow Tooltip-arrow"></div><div class="tooltip-inner Tooltip-inner ' + attrs.tooltipInnerClass + '"></div></div>';
+                } else {
+                    template = '<div class="tooltip Tooltip" role="tooltip"><div class="tooltip-arrow Tooltip-arrow"></div><div class="tooltip-inner Tooltip-inner"></div></div>';
+                }
+
                 $(element).on('hidden.bs.tooltip', function( ) {
                     // TB3RC1 is leaving behind tooltip <div> elements. This will remove them
                     // after a tooltip fades away. If not, they lay overtop of other elements and
@@ -510,7 +517,7 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'JobsHelper'])
                     title: attrs.awToolTip,
                     container: 'body',
                     trigger: 'hover focus',
-                    template: '<div class="tooltip Tooltip" role="tooltip"><div class="tooltip-arrow Tooltip-arrow"></div><div class="tooltip-inner Tooltip-inner"></div></div>'
+                    template: template
                 });
 
                 if (attrs.tipWatch) {

From 2db805f0519b0f222b28776832d40ff23d46e433 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 5 Nov 2015 19:30:07 -0500
Subject: [PATCH 3/6] Rehaul of main-menu

Updated assets, main-menu module code, main layout styling, and the index.html template.
---
 awx/ui/client/legacy-styles/main-layout.less  |   2 +-
 .../src/main-menu/default-menu.directive.js   |  18 -
 .../client/src/main-menu/main-menu.block.less | 313 +++++++++++++++---
 .../src/main-menu/main-menu.directive.js      | 116 ++++---
 .../src/main-menu/main-menu.partial.html      | 195 ++++++++++-
 awx/ui/client/src/main-menu/main.js           |  16 +-
 .../src/main-menu/menu-default.partial.html   |  39 ---
 .../client/src/main-menu/menu-item.block.less | 142 --------
 .../src/main-menu/menu-item.directive.js      |  39 ---
 .../src/main-menu/menu-portal.partial.html    |  24 --
 .../src/main-menu/menu-toggle.block.less      |  40 ---
 .../src/main-menu/menu-toggle.directive.js    |  30 --
 .../src/main-menu/menu-toggle.partial.html    |   9 -
 .../src/main-menu/portal-menu.directive.js    |  18 -
 .../main-menu/web-socket-status.directive.js  |  22 --
 .../main-menu/web-socket-status.partial.html  |  10 -
 awx/ui/templates/ui/index.html                |   5 +-
 17 files changed, 526 insertions(+), 512 deletions(-)
 delete mode 100644 awx/ui/client/src/main-menu/default-menu.directive.js
 delete mode 100644 awx/ui/client/src/main-menu/menu-default.partial.html
 delete mode 100644 awx/ui/client/src/main-menu/menu-item.block.less
 delete mode 100644 awx/ui/client/src/main-menu/menu-item.directive.js
 delete mode 100644 awx/ui/client/src/main-menu/menu-portal.partial.html
 delete mode 100644 awx/ui/client/src/main-menu/menu-toggle.block.less
 delete mode 100644 awx/ui/client/src/main-menu/menu-toggle.directive.js
 delete mode 100644 awx/ui/client/src/main-menu/menu-toggle.partial.html
 delete mode 100644 awx/ui/client/src/main-menu/portal-menu.directive.js
 delete mode 100644 awx/ui/client/src/main-menu/web-socket-status.directive.js
 delete mode 100644 awx/ui/client/src/main-menu/web-socket-status.partial.html

diff --git a/awx/ui/client/legacy-styles/main-layout.less b/awx/ui/client/legacy-styles/main-layout.less
index 20a8b2639b..770bdf7218 100644
--- a/awx/ui/client/legacy-styles/main-layout.less
+++ b/awx/ui/client/legacy-styles/main-layout.less
@@ -13,7 +13,7 @@ body {
     font-family: 'Open Sans', sans-serif;
     font-weight: 400;
     color: @black;
-    padding-top: 58px;
+    padding-top: 50px;
 }
 
 #main-menu-container {
diff --git a/awx/ui/client/src/main-menu/default-menu.directive.js b/awx/ui/client/src/main-menu/default-menu.directive.js
deleted file mode 100644
index 59e7039be5..0000000000
--- a/awx/ui/client/src/main-menu/default-menu.directive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default
-    [   'templateUrl',
-        function(templateUrl) {
-            return {
-                restrict: 'E',
-                templateUrl: templateUrl('main-menu/menu-default'),
-                link: function(scope, element) {
-                    var contents = element.contents();
-                    contents.unwrap();
-
-                    scope.$on('$destroy', function() {
-                        contents.remove();
-                        $(".MenuItem--socketStatus").remove();
-                    });
-                }
-            };
-        }
-    ];
diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less
index 932f3a1438..e255ff818f 100644
--- a/awx/ui/client/src/main-menu/main-menu.block.less
+++ b/awx/ui/client/src/main-menu/main-menu.block.less
@@ -1,57 +1,268 @@
 /** @define MainMenu */
 
 .MainMenu {
-  @menu-breakpoint: 871px;
-
-  display: flex;
-
-  background-color: white;
-  margin: 0;
-
-  @media screen and (max-width: @menu-breakpoint) {
-    position: relative;
-    transition: height 0.5s ease-out;
-    justify-content: flex-start;
-    flex-direction: column;
-    height: 58px;
-    overflow: hidden;
-
-    &.Menu--open {
-        height: 523px !important;
-        // border-bottom: solid thin black;
-    }
-
-    &--portal.Menu--open {
-        height: 290px !important;
-    }
-
-  }
-
-  @media screen and (min-width: (@menu-breakpoint + 1px)) {
-      padding: 0 20px;
-      padding-right: 23px;
-  }
-
-  &-menuContainer {
-      display: flex;
-  }
-
-  &-toggle {
+    padding: 0;
     display: flex;
-    @media screen and (min-width: (@menu-breakpoint + 1px)) {
-      display: none;
-    }
-    margin-left: auto;
-  }
-
-  &--fixedTop {
-      width: 100%;
-      z-index: 1040;
-      position: fixed;
-      right: 0;
-      left: 0;
-      top: 0;
-  }
-
+    background-color: #167ec4;
+    width: 100%;
+    z-index: 1040;
+    position: fixed;
+    right: 0;
+    left: 0;
+    top: 0;
 }
 
+.MainMenu-logo,
+.MainMenu-item {
+    color: #fff;
+    background-color: #167ec4;
+}
+
+.MainMenu-logoImage {
+    max-width: 147px;
+    max-height: 50px;
+}
+
+.MainMenu-item {
+    padding: 0 20px;
+}
+
+.MainMenu-itemText,
+.MainMenu-itemImage {
+    flex: initial;
+}
+
+.MainMenu-socket {
+    transition: background-color 0.2s, color 0.2s, border-bottom 0.1s, padding-top 0.1s;
+    color: #fff;
+    background: url(assets/socket_background.png) #167ec4;
+    background-size: 55px 52px;
+    background-repeat: no-repeat;
+    order: 0;
+    flex: initial;
+    padding-top: 0px;
+    padding-left: 20px;
+    padding-right: 20px;
+    display: flex;
+    align-items: center;
+    border: 0;
+    border-left: 1px solid #509ad3;
+    cursor: default;
+}
+
+.MainMenu-socketImage {
+    font-size: 18px;
+    text-shadow:
+    -1px -1px 0 #fff,
+    1px -1px 0 #fff,
+    -1px 1px 0 #fff,
+    1px 1px 0 #fff;
+    z-index: 1042;
+}
+
+@menu-breakpoint: 886px;
+
+@media screen and (min-width: (@menu-breakpoint + 1px)) {
+    .MainMenu-mobileItems,
+    .MainMenu-toggle {
+        display: none;
+    }
+
+    .MainMenu {
+        height: 50px;
+        align-items: stretch;
+    }
+
+    .MainMenu-logo {
+        flex: initial;
+        padding: 0;
+        display: flex;
+        align-items: center;
+        border: 0;
+        border-bottom: 0px solid #fff;
+        border-right: 1px solid #509ad3;
+    }
+
+    .MainMenu-item {
+        transition: background-color 0.2s, color 0.2s, border-bottom 0.1s, padding-top 0.1s;
+        flex: initial;
+        padding-top: 0px;
+        border: 0;
+        border-bottom: 0px solid #fff;
+        display: flex;
+        align-items: center;
+    }
+
+    // Set up elements based on if their layout in the menu bar
+    .MainMenu-item--left {
+        border-right: 1px solid #509ad3;
+    }
+
+    .MainMenu-item--left:hover,
+    .MainMenu-item--left.is-currentRoute {
+        margin-left: -1px;
+        padding-left: 21px;
+        padding-right: 21px;
+        border-right: 0px;
+    }
+
+    .MainMenu-item--lastLeft {
+        margin-right: auto;
+    }
+
+    .MainMenu-item--right {
+        border-left: 1px solid #509ad3;
+        order: 1;
+    }
+
+    .MainMenu-item--right:hover,
+    .MainMenu-item--right.is-currentRoute {
+        border-left: 0px;
+        padding-left: 21px;
+        padding-right: 21px;
+        margin-right: -1px;
+    }
+
+    // the user item is a little different based on the icon being
+    // strangely positioned
+    .MainMenu-item--user {
+        margin-top: -3px;
+        padding-left: 25px;
+    }
+
+    .MainMenu-item--user:hover,
+    .MainMenu-item--user.is-currentRoute {
+        padding-left: 26px;
+    }
+
+    .MainMenu-item:hover,
+    .MainMenu-item.is-currentRoute {
+        padding-top: 5px;
+        border-bottom: 5px solid #fff;
+    }
+
+    .MainMenu-itemText--username {
+        padding-left: 13px;
+    }
+
+    .MainMenu-itemImage {
+        font-size: 20px;
+    }
+
+    .MainMenu-itemImage--user {
+        font-size: 21px;
+        margin-top: -9px;
+        margin-right: -9px;
+    }
+
+    .MainMenu-itemImage--docs {
+        font-size: 21px;
+        margin-top: -2px;
+    }
+}
+
+@media screen and (max-width: @menu-breakpoint) {
+    .MainMenu-item--notMobile {
+        display: none;
+    }
+
+    .MainMenu {
+        flex-direction: row;
+        flex-wrap: wrap;
+    }
+
+    .MainMenu-logo {
+        flex: 1;
+        border-bottom: 1px solid #509ad3;
+        order: 0;
+    }
+
+    .MainMenu-mobileItems {
+        display: flex;
+        order: 2;
+        flex-direction: row;
+        flex-wrap: wrap;
+        font-size: 15px;
+        width: 100%;
+        visibility: visible;
+        opacity: 1;
+        height: 416px;
+        transition: 0s visibility, 0.1s height, 0.3s opacity;
+    }
+
+    .MainMenu-mobileItems.is-hiddenOnMobile,
+    .MainMenu-mobileItems.is-loggedOut {
+        visibility: hidden;
+        opacity: 0;
+        height: 0;
+    }
+
+    .MainMenu-item {
+        flex: 0 0 100%;
+        padding-top: 15px;
+        padding-bottom: 15px;
+        order: 1;
+        border-bottom: 1px solid #509ad3;
+    }
+
+    .MainMenu-toggle {
+        transition: background-color 0.2s;
+        color: #fff;
+        background-color: #167ec4;
+        order: 0;
+        flex: initial;
+        padding-top: 3px;
+        padding-left: 15px;
+        padding-right: 15px;
+        font-size: 34px;
+        display: flex;
+        align-items: center;
+        border: 0;
+        border-left: 1px solid #509ad3;
+        border-bottom: 1px solid #509ad3;
+    }
+
+    .MainMenu-socket {
+        border-bottom: 1px solid #509ad3;
+    }
+
+    .MainMenu-toggleImage {
+        width: 36px;
+    }
+}
+
+.MainMenu-toggle:focus,
+.MainMenu-item:focus,
+.MainMenu-logo:focus,
+.MainMenu-toggle:hover,
+.MainMenu-item:hover,
+.MainMenu-logo:hover,
+.MainMenu-item.is-currentRoute {
+    color: #fff;
+}
+
+.MainMenu-toggle:hover,
+.MainMenu-item:hover,
+.MainMenu-logo:hover {
+    background-color: #5bbdbf;
+}
+
+.MainMenu-item.is-currentRoute {
+    background-color: #509ad3;
+}
+
+// item on
+.MainMenu-logo,
+.MainMenu-item,
+.MainMenu-socket,
+.MainMenu-toggle {
+    opacity: 1;
+    transition: opacity .5s, background-color .2s, border-bottom .1s, padding-top .1s;
+}
+
+.MainMenu-logo.is-loggedOut,
+.MainMenu-item.is-loggedOut,
+.MainMenu-socket.is-loggedOut,
+.MainMenu-toggle.is-loggedOut {
+    opacity: 0;
+}
diff --git a/awx/ui/client/src/main-menu/main-menu.directive.js b/awx/ui/client/src/main-menu/main-menu.directive.js
index ad139cd24e..ec00f31729 100644
--- a/awx/ui/client/src/main-menu/main-menu.directive.js
+++ b/awx/ui/client/src/main-menu/main-menu.directive.js
@@ -1,48 +1,76 @@
 /* jshint unused: vars */
 
 export default
-    [   'templateUrl',
-        function(templateUrl) {
-            return {
-                restrict: 'E',
-                controllerAs: 'mainMenu',
-                templateUrl: templateUrl('main-menu/main-menu'),
-                controller: ['$scope', function($scope) {
-                    this.open = function() {
-                        $scope.isOpen = true;
-                    };
-
-                    this.close = function() {
-                        $scope.isOpen = false;
-                    };
-
-                    this.toggle = function() {
-                        $scope.isOpen = !$scope.isOpen;
-                    };
-
-                    $scope.isOpen = false;
-                }],
-                scope: {
-                    menuStyle: '&menuStyle',
-                    currentUser: '='
-                },
-                link: function(scope, element, attrs) {
-                    scope.menuStyleClassName = 'blah';
-                    scope.$watch(function() {
-                        return scope.$eval(scope.menuStyle);
-                    }, function(newValue) {
-                        scope.menuStyleClassName = 'MainMenu--' + newValue;
-                    });
-                    scope.$watch('isOpen', function(isOpen) {
-                        if (isOpen) {
-                            element.find('.MainMenu').addClass("Menu--open");
-                            element.find('menu-toggle-button').addClass("MenuToggle--open");
-                        } else {
-                            element.find('.MainMenu').removeClass("Menu--open");
-                            element.find('menu-toggle-button').removeClass("MenuToggle--open");
-                        }
-                    });
+    [   '$location', 'templateUrl', '$rootScope', function($location, templateUrl, $rootScope) {
+        return {
+            restrict: 'E',
+            templateUrl: templateUrl('main-menu/main-menu'),
+            link: function(scope, element, attrs) {
+                // check to see if this is the current route
+                scope.isCurrentRoute = function(route) {
+                    if ($location.url().split('/')[1] === route) {
+                        return true;
+                    } else {
+                        return false;
+                    }
                 }
-            };
-        }
-    ];
+
+                // check to see if the current route is the currently
+                // logged in user
+                scope.isCurrentRouteUser = function() {
+                    if ($rootScope && $rootScope.current_user) {
+                        if ($location.url().split('/')[1] === 'users') {
+                            if ($location.url().split('/')[2] ===                                 ($rootScope.current_user.id + "")) {
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                        } else {
+                            return false;
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+
+                // set up the user tooltip
+                $rootScope.$on('current_user', function(user) {
+                    scope.currentUserTip = "Logged in as " + user.un;
+                });
+
+                // set up things for the socket notification
+                scope.socketHelp = $rootScope.socketHelp;
+                scope.socketTip = $rootScope.socketTip;
+                $rootScope.$watch('socketStatus', function(newStatus) {
+                    scope.socketStatus = newStatus;
+                    scope.socketIconClass = "icon-socket-" + scope.socketStatus;
+                });
+                $rootScope.$watch('socketTip', function(newTip) {
+                    scope.socketTip = newTip;
+                });
+
+                // default the mobile menu as hidden
+                scope.isHiddenOnMobile = true;
+                // set up the click function to toggle mobile menu
+                scope.toggleMenu = function() {
+                    if (scope.isHiddenOnMobile) {
+                        scope.isHiddenOnMobile = false;
+                    } else {
+                        scope.isHiddenOnMobile = true;
+                    }
+                }
+                // if the user clicks outside of the mobile menu,
+                // close it if it's open
+                $("body").on('click', function(e) {
+                    e.stopPropagation();
+                    if ($(e.target).parents(".MainMenu").length === 0) {
+                        scope.isHiddenOnMobile = true;
+                    }
+                });
+                // close the menu when the user clicks a link to a different route
+                scope.$on('$locationChangeStart', function(event) {
+                    scope.isHiddenOnMobile = true;
+                });
+            }
+        };
+    }];
diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index 3a423318e2..c3e636a059 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -1,8 +1,191 @@
-<nav class="MainMenu MainMenu--fixedTop" ng-class="menuStyleClassName" ng-switch="$eval(menuStyle)">
-    <a link-to="dashboard" menu-item class="MenuItem MenuItem--logo">
-        <img id="ansible-brand-logo" alt="Ansible Tower" class="MenuItem-logo" src="/static/assets/TowerLogo.svg">
-        <menu-toggle-button width="15" height="15" bar-height="2" class="MainMenu-toggle"></menu-toggle-button>
+<nav class="MainMenu">
+    <!-- Menu logo item -->
+    <a id="MainMenuLogo"
+        href="/#/"
+        class="MainMenu-logo"
+        ng-class="{'is-loggedOut' : !$root.current_user.username}">
+        <img class="MainMenu-logoImage"
+            ng-src="/static/assets/main_menu_logo.png">
     </a>
-    <default-menu ng-switch-when="default" class="MainMenu-menuContainer"></default-menu>
-    <portal-menu ng-switch-when="portal" class="MainMenu-menuContainer"></portal-menu>
+
+    <!-- Mobile menu items -->
+    <span class="MainMenu-mobileItems" ng-class="{'is-hiddenOnMobile': isHiddenOnMobile, 'is-loggedOut' : !$root.current_user.username}">
+        <a class="MainMenu-item"
+            id="menu_projects_mobile_link"
+            href="/#/projects"
+            ng-class="{'is-currentRoute' : isCurrentRoute('projects')}">
+            <span class="MainMenu-itemText">
+                PROJECTS
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_inventories_mobile_link"
+            href="/#/inventories"
+            ng-class="{'is-currentRoute' : isCurrentRoute('inventories')}">
+            <span class="MainMenu-itemText">
+                INVENTORIES
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_job_templates_mobile_link"
+            href="/#/job_templates"
+            ng-class="{'is-currentRoute' : isCurrentRoute('job_templates')}">
+            <span class="MainMenu-itemText">
+                JOB TEMPLATES
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_jobs_mobile_link"
+            href="/#/jobs"
+            ng-class="{'is-currentRoute' : isCurrentRoute('jobs')}">
+            <span class="MainMenu-itemText">
+                JOBS
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_current_user_mobile_link"
+            ng-href="/#/users/{{ $root.current_user.id }}"
+            ng-class="{'is-currentRoute' : isCurrentRouteUser()}">
+            <span class="MainMenu-itemText">
+                VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_setup_mobile_link"
+            ng-href="/#/setup"
+            ng-class="{'is-currentRoute' : isCurrentRoute('setup')}">
+            <span class="MainMenu-itemText">
+                SETTINGS
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_docs_mobile_link"
+            ng-href="http://docs.ansible.com/ansible-tower/"
+            target="_blank">
+            <span class="MainMenu-itemText">
+                VIEW DOCUMENTATION
+            </span>
+        </a>
+        <a class="MainMenu-item"
+            id="menu_logout_mobile_link"
+            ng-href="/#/logout"
+            ng-class="{'is-currentRoute' : isCurrentRoute('logout')}">
+            <span class="MainMenu-itemText">
+                LOG OUT
+            </span>
+        </a>
+    </span>
+
+    <!-- Non-mobile menu items -->
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
+        id="menu_projects_link"
+        href="/#/projects"
+        ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}">
+        <span class="MainMenu-itemText">
+            PROJECTS
+        </span>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
+        id="menu_inventories_link"
+        href="/#/inventories"
+        ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}">
+        <span class="MainMenu-itemText">
+            INVENTORIES
+        </span>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
+        id="menu_job_templates_link"
+        href="/#/job_templates"
+        ng-class="{'is-currentRoute' : isCurrentRoute('job_templates'), 'is-loggedOut' : !$root.current_user.username}">
+        <span class="MainMenu-itemText">
+            JOB TEMPLATES
+        </span>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left MainMenu-item--lastLeft"
+        id="menu_jobs_link"
+        href="/#/jobs"
+        ng-class="{'is-currentRoute' : isCurrentRoute('jobs'), 'is-loggedOut' : !$root.current_user.username}">
+        <span class="MainMenu-itemText">
+            JOBS
+        </span>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--user MainMenu-item--right"
+        id="menu_current_user_link"
+        ng-href="/#/users/{{ $root.current_user.id }}"
+        ng-class="{'is-currentRoute' : isCurrentRouteUser(), 'is-loggedOut' : !$root.current_user.username}"
+        aw-tool-tip="{{currentUserTip}}"
+        aw-tip-watch="currentUserTip"
+        data-placement="bottom"
+        data-trigger="hover"
+        data-container="body">
+        <i class="MainMenu-itemImage MainMenu-itemImage--user icon-user"
+            alt="Logged in as {{::$root.current_user.username}}">
+        </i>
+        <span class="MainMenu-itemText MainMenu-itemText--username">
+            {{::$root.current_user.username}}
+        </span>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
+        id="menu_setup_link"
+        ng-href="/#/setup"
+        ng-class="{'is-currentRoute' : isCurrentRoute('setup'), 'is-loggedOut' : !$root.current_user.username}"
+        aw-tool-tip="Settings"
+        data-placement="bottom"
+        data-trigger="hover"
+        data-container="body">
+        <i class="MainMenu-itemImage fa fa-cog"
+            alt="Settings">
+        </i>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
+        id="menu_docs_link"
+        ng-href="http://docs.ansible.com/ansible-tower/"
+        ng-class="{'is-loggedOut' : !$root.current_user.username}"
+        aw-tool-tip="View Documentation"
+        data-placement="bottom"
+        data-trigger="hover"
+        data-container="body"
+        target="_blank">
+        <i class="MainMenu-itemImage MainMenu-itemImage--docs fa fa-question-circle"
+            alt="View Documentation">
+        </i>
+    </a>
+    <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
+        id="menu_logout_link"
+        ng-href="/#/logout"
+        ng-class="{'is-currentRoute' : isCurrentRoute('logout'), 'is-loggedOut' : !$root.current_user.username}"
+        aw-tool-tip="Log Out"
+        data-placement="bottom"
+        data-trigger="hover"
+        data-container="body"
+        data-tooltip_inner_class="tooltip-inner--logOut">
+        <i class="MainMenu-itemImage fa fa-power-off"
+            alt="Log Out">
+        </i>
+    </a>
+
+    <!-- Socket-status item -->
+    <button
+        id="socket_status_notification"
+        class="MainMenu-socket"
+        aw-tool-tip="{{socketTip}}"
+        tip-watch="socketTip"
+        data-placement="bottom"
+        data-trigger="hover"
+        data-container="body"
+        ng-class="{'is-loggedOut' : !$root.current_user.username}"
+        ng-if="socketStatus && socketStatus !== 'ok'">
+        <i class="fa MainMenu-socketImage"
+            ng-class="socketIconClass">
+        </i>
+    </button>
+
+    <!-- Mobile menu toggle item -->
+    <button
+        id="mobile_toggle_button"
+        class="MainMenu-toggle"
+        ng-class="{'is-active': !isHiddenOnMobile, 'is-loggedOut' : !$root.current_user.username}"
+        ng-click="toggleMenu()">
+        <i class="fa fa-bars MainMenu-toggleImage"></i>
+    </button>
 </nav>
diff --git a/awx/ui/client/src/main-menu/main.js b/awx/ui/client/src/main-menu/main.js
index ce4bbea920..dad4f0bd14 100644
--- a/awx/ui/client/src/main-menu/main.js
+++ b/awx/ui/client/src/main-menu/main.js
@@ -1,19 +1,5 @@
 import mainMenu from './main-menu.directive';
-import menuItem from './menu-item.directive';
-import menuToggle from './menu-toggle.directive';
-import webSocketStatus from './web-socket-status.directive';
-import defaultMenu from './default-menu.directive';
-import portalMenu from './portal-menu.directive';
-
-import shared from '../shared/main';
 
 export default
-    angular.module('mainMenu',
-                   [    shared.name
-                   ])
-        .directive('menuItem', menuItem)
-        .directive('defaultMenu', defaultMenu)
-        .directive('portalMenu', portalMenu)
-        .directive('menuToggleButton', menuToggle)
-        .directive('webSocketStatus', webSocketStatus)
+    angular.module('mainMenu', [])
         .directive('mainMenu', mainMenu);
diff --git a/awx/ui/client/src/main-menu/menu-default.partial.html b/awx/ui/client/src/main-menu/menu-default.partial.html
deleted file mode 100644
index 902f665eaf..0000000000
--- a/awx/ui/client/src/main-menu/menu-default.partial.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<a menu-item link-to="projects" title="Projects" class="MenuItem MenuItem--projects">
-    Projects
-</a>
-<a menu-item link-to="inventories" title="Inventories" class="MenuItem">
-    Inventories
-</a>
-<a menu-item link-to="jobTemplates" title="Job Templates" class="MenuItem">
-    Job Templates
-</a>
-<a menu-item link-to="jobs" title="Jobs" class="MenuItem">
-    Jobs
-</a>
-<web-socket-status class="MenuItem MenuItem--socketStatus MenuItem--right MenuItem--fixed"></web-socket-status>
-<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem--username">
-  <i class="MenuItem-icon MenuItem-icon--labelled">
-    <aw-icon name="User"></aw-icon>
-  </i>
-  <span class="u-truncatedText">
-    {{currentUser.username}}
-  </span>
-</a>
-<a link-to="setup" class="MenuItem MenuItem--fixed">
-  <i class="MenuItem-icon" title="Setup" data-placement="bottom">
-    <aw-icon name="Setup"></aw-icon>
-  </i>
-  <span class="MenuItem-helpTitle">Setup</span>
-</a>
-<a link-to="portal" menu-item class="MenuItem MenuItem--fixed">
-  <i class="MenuItem-icon" title="Portal Mode" data-placement="bottom">
-    <aw-icon name="PortalMode"></aw-icon>
-  </i>
-    <span class="MenuItem-helpTitle">Portal Mode</span>
-</a>
-<a link-to="signOut" class="MenuItem MenuItem--fixed">
-  <i class="MenuItem-icon" title="Sign Out" data-placement="bottom">
-    <aw-icon name="Signout"></aw-icon>
-  </i>
-  <span class="MenuItem-helpTitle" data-placement="bottom">Sign Out</span>
-</a>
diff --git a/awx/ui/client/src/main-menu/menu-item.block.less b/awx/ui/client/src/main-menu/menu-item.block.less
deleted file mode 100644
index e9c258c558..0000000000
--- a/awx/ui/client/src/main-menu/menu-item.block.less
+++ /dev/null
@@ -1,142 +0,0 @@
-/** @define MenuItem */
-
-@import (reference) "../shared/utilities/icons.less";
-@import "../shared/branding/colors.less";
-
-.MenuItem {
-  @menu-breakpoint: 870px;
-
-  display: flex;
-  flex: none;
-
-  transition: color 60ms;
-
-  padding: 0 1rem;
-  min-height: 5.8rem;
-  min-width: 9.2rem;
-  margin-right: 2rem;
-  align-items: center;
-
-  &, &:active, &:focus {
-      color: black;
-  }
-
-  &:hover {
-      color: @blue;
-  }
-
-  &:last-child {
-    margin-right: 0;
-  }
-
-  @media screen and (max-width: @menu-breakpoint) {
-    flex: 1 1 0;
-    padding: 0 1rem;
-    margin-right: 0;
-    border-bottom: solid thin rgb(202, 202, 202);
-
-    .tooltip, &+.tooltip {
-        display: none !important;
-    }
-
-    &--logo {
-        border: none;
-        display: flex;
-        align-items: stretch;
-    }
-  }
-
-  &--fixed {
-      flex: none;
-      min-width: 0;
-      margin-right: 0;
-      @media screen and (min-width: (@menu-breakpoint + 1px)) {
-          padding: 0 0.75rem;
-      }
-  }
-
-  &-helpTitle {
-    @media screen and (min-width: (@menu-breakpoint + 1px)) {
-      display: none;
-    }
-  }
-
-  &-hoverIcon {
-    width: 28px;
-  }
-
-  &--active {
-      font-weight: bold;
-  }
-
-  &--right {
-    // Push this and all following elements to the right
-    margin-left: auto;
-    @media screen and (max-width: @menu-breakpoint) {
-      margin-left: 0;
-    }
-  }
-
-  &--setup {
-    &:before {
-      .icon(@fa-var-cogs);
-      padding-right: 0.25rem;
-    }
-  }
-
-  &--popup {
-    // Make pseudo button
-    background: transparent;
-    border: 0;
-    padding: 8px 0;
-
-    outline: none;
-
-    &:after {
-        .icon(@fa-var-angle-down);
-    }
-  }
-
-  &-logo {
-    height: 34px;
-    width: 165px; // IE11 needs hard-coded with to calculate correct dimensions for image in flexbox
-    align-self: center;
-  }
-
-  &-icon {
-      height: 17px;
-      width: auto;
-      max-width: 18px;
-      flex: none;
-      box-sizing: initial;
-      &--labelled {
-          margin-right: 0.25rem;
-      }
-      @media screen and (max-width: @menu-breakpoint) {
-          display: none;
-        margin-right: 1.4rem;
-      }
-  }
-
-  &--socketStatus {
-      @media screen and (max-width: @menu-breakpoint) {
-          display: none;
-      }
-  }
-
-  &--username {
-      padding-right: 0.25rem;
-      @media screen and (max-width: @menu-breakpoint) {
-          order: 1; // moves this to the bottom
-      }
-      @media screen and (min-width: (@menu-breakpoint + 1px)) {
-          max-width: 110px;
-          margin-left: -3px;
-      }
-  }
-
-  &--projects {
-      margin-right: 0;
-  }
-
-}
diff --git a/awx/ui/client/src/main-menu/menu-item.directive.js b/awx/ui/client/src/main-menu/menu-item.directive.js
deleted file mode 100644
index d2a47f3412..0000000000
--- a/awx/ui/client/src/main-menu/menu-item.directive.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* jshint unused: vars */
-
-export default ['$route', '$rootScope', function($route, $rootScope) {
-    return {
-        require: '?^^mainMenu',
-        link: function(scope, element, attrs, mainMenuController) {
-            var routeName = attrs.linkTo;
-
-            scope.$on('$routeChangeStart', function() {
-                // any time we start a route change,
-                // assume it was from the menu, and
-                // close it in case it's open
-                mainMenuController.close();
-            });
-
-            scope.$on('$routeChangeSuccess', function(e, nextRoute) {
-                if (nextRoute.$$route && nextRoute.$$route.name === routeName) {
-                    element.addClass('MenuItem--active');
-                } else {
-                    element.removeClass('MenuItem--active');
-                }
-                if (nextRoute.$$route) {
-                    return nextRoute.$$route.name;
-                } else {
-                    return undefined;
-                }
-            });
-
-            scope.$on('$destroy', function() {
-                element.off('click.menu-item');
-            });
-
-            element.on('click', function(e) {
-                mainMenuController.close();
-            }, true);
-
-        }
-    };
-}];
diff --git a/awx/ui/client/src/main-menu/menu-portal.partial.html b/awx/ui/client/src/main-menu/menu-portal.partial.html
deleted file mode 100644
index 172f8cc6fe..0000000000
--- a/awx/ui/client/src/main-menu/menu-portal.partial.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<a href="#portal" title="Portal" class="MenuItem MenuItem--hoverable">
-    Portal
-</a>
-<web-socket-status class="MenuItem MenuItem--socketStatus MenuItem--right MenuItem--fixed"></web-socket-status>
-<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--fixed MenuItem-username">
-  <i class="MenuItem-icon MenuItem-icon--labelled">
-    <aw-icon name="User"></aw-icon>
-  </i>
-  <span class="u-truncatedText">
-    {{currentUser.username}}
-  </span>
-</a>
-<a link-to="dashboard" class="MenuItem MenuItem--fixed" title="Portal Mode">
-  <i class="MenuItem-icon" title="Exit Portal Mode" data-placement="bottom">
-    <aw-icon name="PortalMode--exit"></aw-icon>
-  </i>
-  <span class="MenuItem-helpTitle">Exit Portal Mode</span>
-</a>
-<a link-to="signOut" class="MenuItem MenuItem--fixed">
-  <i class="MenuItem-icon" title="Sign Out" data-placement="bottom">
-    <aw-icon name="Signout"></aw-icon>
-  </i>
-  <span class="MenuItem-helpTitle" data-placement="bottom">Sign Out</span>
-</a>
diff --git a/awx/ui/client/src/main-menu/menu-toggle.block.less b/awx/ui/client/src/main-menu/menu-toggle.block.less
deleted file mode 100644
index 2484752f0c..0000000000
--- a/awx/ui/client/src/main-menu/menu-toggle.block.less
+++ /dev/null
@@ -1,40 +0,0 @@
-/** @define MenuToggle */
-
-.MenuToggle {
-
-    align-self: center;
-
-    // Width & height hardcoded for IE
-    width: 12px;
-    height: 10px;
-
-
-    &-icon {
-        // Override settings (on svg tag) from nv.d3.css that really
-        // shouldn't be there, but are, so meh.
-        display: inherit;
-        width: inherit;
-        height: inherit;
-        // border: solid thin white;
-    }
-
-    &-bar {
-        fill: #000;
-        transition: transform 0.25s cubic-bezier(.96,-0.6,.27,1.68), opacity 0.25s;
-        transform: rotate(0deg);
-        transform-origin: center center;
-    }
-
-
-    &--open {
-        .MenuToggle-crossBar1 {
-            transform: rotate(45deg);
-        }
-        .MenuToggle-topBar, .MenuToggle-bottomBar {
-            opacity: 0;
-        }
-        .MenuToggle-crossBar2 {
-            transform: rotate(-45deg);
-        }
-    }
-}
diff --git a/awx/ui/client/src/main-menu/menu-toggle.directive.js b/awx/ui/client/src/main-menu/menu-toggle.directive.js
deleted file mode 100644
index 6459f3e09b..0000000000
--- a/awx/ui/client/src/main-menu/menu-toggle.directive.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* jshint unused: vars */
-
-export default
-    [   'templateUrl',
-        function(templateUrl) {
-            return {
-                templateUrl: templateUrl('main-menu/menu-toggle'),
-                restrict: 'E',
-                require: '^^mainMenu',
-                scope: {
-                    width: '@',
-                    height: '@',
-                    barHeight: '@'
-                },
-                link: function(scope, element, attrs, mainMenuController) {
-                    scope.$on('$destroy', function() {
-                        element.off('click');
-                    });
-
-                    element.on("click", function(e) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        scope.$apply(function() {
-                            mainMenuController.toggle();
-                        });
-                    });
-                }
-            };
-        }
-    ];
diff --git a/awx/ui/client/src/main-menu/menu-toggle.partial.html b/awx/ui/client/src/main-menu/menu-toggle.partial.html
deleted file mode 100644
index 962cc4c7c9..0000000000
--- a/awx/ui/client/src/main-menu/menu-toggle.partial.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<button menu-toggle class="MenuToggle Button--pseudo">
-    <svg class="MenuToggle-icon" width="12" height="10">
-        <rect class="MenuToggle-bar MenuToggle-topBar" x="0" y="0" width="100%" height="2" />
-        <rect class="MenuToggle-bar MenuToggle-crossBar1" x="0" y="4" width="100%" height="2" />
-        <rect class="MenuToggle-bar MenuToggle-crossBar2" x="0" y="4" width="100%" height="2" />
-        <rect class="MenuToggle-bar MenuToggle-bottomBar" x="0" y="8" width="100%" height="2" />
-    </svg>
-</button>
-
diff --git a/awx/ui/client/src/main-menu/portal-menu.directive.js b/awx/ui/client/src/main-menu/portal-menu.directive.js
deleted file mode 100644
index cd4c7b588d..0000000000
--- a/awx/ui/client/src/main-menu/portal-menu.directive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default
-    [   'templateUrl',
-        function(templateUrl) {
-            return {
-                restrict: 'E',
-                templateUrl: templateUrl('main-menu/menu-portal'),
-                link: function(scope, element) {
-                    var contents = element.contents();
-                    contents.unwrap();
-
-                    scope.$on('$destroy', function() {
-                        contents.remove();
-                        $(".MenuItem--socketStatus").remove();
-                    });
-                }
-            };
-        }
-    ];
diff --git a/awx/ui/client/src/main-menu/web-socket-status.directive.js b/awx/ui/client/src/main-menu/web-socket-status.directive.js
deleted file mode 100644
index e7cdb5a0df..0000000000
--- a/awx/ui/client/src/main-menu/web-socket-status.directive.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* jshint unused: vars */
-
-export default
-    [   '$rootScope',
-        'templateUrl',
-        function($rootScope, templateUrl) {
-            return {
-                restrict: 'E',
-                templateUrl: templateUrl('main-menu/web-socket-status'),
-                link: function(scope, element, attrs) {
-                    scope.socketHelp = $rootScope.socketHelp;
-                    scope.socketTip = $rootScope.socketTip;
-                    $rootScope.$watch('socketStatus', function(newStatus) {
-                        scope.socketStatus = newStatus;
-                    });
-                    $rootScope.$watch('socketTip', function(newTip) {
-                        scope.socketTip = newTip;
-                    });
-                }
-            };
-        }
-    ];
diff --git a/awx/ui/client/src/main-menu/web-socket-status.partial.html b/awx/ui/client/src/main-menu/web-socket-status.partial.html
deleted file mode 100644
index 7f9ba2543e..0000000000
--- a/awx/ui/client/src/main-menu/web-socket-status.partial.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<button
-    aw-tool-tip="{{socketTip}}"
-    tip-watch="socketTip"
-    data-placement="bottom"
-    data-trigger="hover"
-    data-container="body"
-    class="Button--pseudo"
-    ng-if="socketStatus !== 'ok'">
-    <i class="fa icon-socket-{{socketStatus}}"></i>
-</button>
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 8154266d46..8f3901f42b 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -40,10 +40,7 @@
 
     <include-svg href="{{ STATIC_URL }}assets/icons.svg"></include-svg>
 
-  <main-menu
-          menu-style="portalMode ? 'portal' : 'default'"
-          current-user="current_user">
-  </main-menu>
+  <main-menu></main-menu>
 
   <div class="container-fluid">
     <div class="container-fluid" id="#content-container">

From 7d208b7d6f0c7c859273488fc24088d0b524c15e Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 6 Nov 2015 10:53:20 -0500
Subject: [PATCH 4/6] updates based on jtabor's review

---
 awx/ui/client/src/main-menu/main-menu.directive.js | 8 ++++----
 awx/ui/client/src/main-menu/main-menu.partial.html | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/awx/ui/client/src/main-menu/main-menu.directive.js b/awx/ui/client/src/main-menu/main-menu.directive.js
index ec00f31729..5f45fc7a18 100644
--- a/awx/ui/client/src/main-menu/main-menu.directive.js
+++ b/awx/ui/client/src/main-menu/main-menu.directive.js
@@ -13,14 +13,14 @@ export default
                     } else {
                         return false;
                     }
-                }
+                };
 
                 // check to see if the current route is the currently
                 // logged in user
                 scope.isCurrentRouteUser = function() {
                     if ($rootScope && $rootScope.current_user) {
                         if ($location.url().split('/')[1] === 'users') {
-                            if ($location.url().split('/')[2] ===                                 ($rootScope.current_user.id + "")) {
+                            if ($location.url().split('/')[2] === ($rootScope.current_user.id + "")) {
                                     return true;
                                 } else {
                                     return false;
@@ -31,7 +31,7 @@ export default
                     } else {
                         return false;
                     }
-                }
+                };
 
                 // set up the user tooltip
                 $rootScope.$on('current_user', function(user) {
@@ -58,7 +58,7 @@ export default
                     } else {
                         scope.isHiddenOnMobile = true;
                     }
-                }
+                };
                 // if the user clicks outside of the mobile menu,
                 // close it if it's open
                 $("body").on('click', function(e) {
diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index c3e636a059..f085378fb7 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -119,10 +119,10 @@
         data-trigger="hover"
         data-container="body">
         <i class="MainMenu-itemImage MainMenu-itemImage--user icon-user"
-            alt="Logged in as {{::$root.current_user.username}}">
+            alt="Logged in as {{ $root.current_user.username}}">
         </i>
         <span class="MainMenu-itemText MainMenu-itemText--username">
-            {{::$root.current_user.username}}
+            {{ $root.current_user.username}}
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"

From 5863d259682285a17d82278b443bc7634763b71b Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 6 Nov 2015 13:25:23 -0500
Subject: [PATCH 5/6] move hover style under selected so it is not overridden

---
 awx/ui/client/src/main-menu/main-menu.block.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less
index e255ff818f..e7363659f8 100644
--- a/awx/ui/client/src/main-menu/main-menu.block.less
+++ b/awx/ui/client/src/main-menu/main-menu.block.less
@@ -241,16 +241,16 @@
     color: #fff;
 }
 
+.MainMenu-item.is-currentRoute {
+    background-color: #509ad3;
+}
+
 .MainMenu-toggle:hover,
 .MainMenu-item:hover,
 .MainMenu-logo:hover {
     background-color: #5bbdbf;
 }
 
-.MainMenu-item.is-currentRoute {
-    background-color: #509ad3;
-}
-
 // item on
 .MainMenu-logo,
 .MainMenu-item,

From 1662b8bff76738c3bbfe2ce2a9116df1d136716f Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 6 Nov 2015 13:26:03 -0500
Subject: [PATCH 6/6] update ids based on conversation with jlaska

---
 .../src/main-menu/main-menu.partial.html      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index f085378fb7..6969e8951d 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -1,6 +1,6 @@
-<nav class="MainMenu">
+<nav id="main_menu" class="MainMenu">
     <!-- Menu logo item -->
-    <a id="MainMenuLogo"
+    <a id="main_menu_logo"
         href="/#/"
         class="MainMenu-logo"
         ng-class="{'is-loggedOut' : !$root.current_user.username}">
@@ -9,9 +9,9 @@
     </a>
 
     <!-- Mobile menu items -->
-    <span class="MainMenu-mobileItems" ng-class="{'is-hiddenOnMobile': isHiddenOnMobile, 'is-loggedOut' : !$root.current_user.username}">
+    <span id="main_menu_mobile_items" class="MainMenu-mobileItems" ng-class="{'is-hiddenOnMobile': isHiddenOnMobile, 'is-loggedOut' : !$root.current_user.username}">
         <a class="MainMenu-item"
-            id="menu_projects_mobile_link"
+            id="main_menu_projects_mobile_link"
             href="/#/projects"
             ng-class="{'is-currentRoute' : isCurrentRoute('projects')}">
             <span class="MainMenu-itemText">
@@ -19,7 +19,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_inventories_mobile_link"
+            id="main_menu_inventories_mobile_link"
             href="/#/inventories"
             ng-class="{'is-currentRoute' : isCurrentRoute('inventories')}">
             <span class="MainMenu-itemText">
@@ -27,7 +27,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_job_templates_mobile_link"
+            id="main_menu_job_templates_mobile_link"
             href="/#/job_templates"
             ng-class="{'is-currentRoute' : isCurrentRoute('job_templates')}">
             <span class="MainMenu-itemText">
@@ -35,7 +35,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_jobs_mobile_link"
+            id="main_menu_jobs_mobile_link"
             href="/#/jobs"
             ng-class="{'is-currentRoute' : isCurrentRoute('jobs')}">
             <span class="MainMenu-itemText">
@@ -43,7 +43,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_current_user_mobile_link"
+            id="main_menu_current_user_mobile_link"
             ng-href="/#/users/{{ $root.current_user.id }}"
             ng-class="{'is-currentRoute' : isCurrentRouteUser()}">
             <span class="MainMenu-itemText">
@@ -51,7 +51,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_setup_mobile_link"
+            id="main_menu_setup_mobile_link"
             ng-href="/#/setup"
             ng-class="{'is-currentRoute' : isCurrentRoute('setup')}">
             <span class="MainMenu-itemText">
@@ -59,7 +59,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_docs_mobile_link"
+            id="main_menu_docs_mobile_link"
             ng-href="http://docs.ansible.com/ansible-tower/"
             target="_blank">
             <span class="MainMenu-itemText">
@@ -67,7 +67,7 @@
             </span>
         </a>
         <a class="MainMenu-item"
-            id="menu_logout_mobile_link"
+            id="main_menu_logout_mobile_link"
             ng-href="/#/logout"
             ng-class="{'is-currentRoute' : isCurrentRoute('logout')}">
             <span class="MainMenu-itemText">
@@ -78,7 +78,7 @@
 
     <!-- Non-mobile menu items -->
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
-        id="menu_projects_link"
+        id="main_menu_projects_link"
         href="/#/projects"
         ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
@@ -86,7 +86,7 @@
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
-        id="menu_inventories_link"
+        id="main_menu_inventories_link"
         href="/#/inventories"
         ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
@@ -94,7 +94,7 @@
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
-        id="menu_job_templates_link"
+        id="main_menu_job_templates_link"
         href="/#/job_templates"
         ng-class="{'is-currentRoute' : isCurrentRoute('job_templates'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
@@ -102,7 +102,7 @@
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left MainMenu-item--lastLeft"
-        id="menu_jobs_link"
+        id="main_menu_jobs_link"
         href="/#/jobs"
         ng-class="{'is-currentRoute' : isCurrentRoute('jobs'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
@@ -110,7 +110,7 @@
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--user MainMenu-item--right"
-        id="menu_current_user_link"
+        id="main_menu_current_user_link"
         ng-href="/#/users/{{ $root.current_user.id }}"
         ng-class="{'is-currentRoute' : isCurrentRouteUser(), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="{{currentUserTip}}"
@@ -126,7 +126,7 @@
         </span>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
-        id="menu_setup_link"
+        id="main_menu_setup_link"
         ng-href="/#/setup"
         ng-class="{'is-currentRoute' : isCurrentRoute('setup'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="Settings"
@@ -138,7 +138,7 @@
         </i>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
-        id="menu_docs_link"
+        id="main_menu_docs_link"
         ng-href="http://docs.ansible.com/ansible-tower/"
         ng-class="{'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="View Documentation"
@@ -151,7 +151,7 @@
         </i>
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--right"
-        id="menu_logout_link"
+        id="main_menu_logout_link"
         ng-href="/#/logout"
         ng-class="{'is-currentRoute' : isCurrentRoute('logout'), 'is-loggedOut' : !$root.current_user.username}"
         aw-tool-tip="Log Out"
@@ -166,7 +166,7 @@
 
     <!-- Socket-status item -->
     <button
-        id="socket_status_notification"
+        id="main_menu_socket_status_notification"
         class="MainMenu-socket"
         aw-tool-tip="{{socketTip}}"
         tip-watch="socketTip"
@@ -182,7 +182,7 @@
 
     <!-- Mobile menu toggle item -->
     <button
-        id="mobile_toggle_button"
+        id="main_menu_mobile_toggle_button"
         class="MainMenu-toggle"
         ng-class="{'is-active': !isHiddenOnMobile, 'is-loggedOut' : !$root.current_user.username}"
         ng-click="toggleMenu()">