From dd0bc0ec171a16830e8b3e6b808a4977c06b3109 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 21 Sep 2015 17:34:19 -0400
Subject: [PATCH 1/2] rebranding and notice in ui login support

---
 awx/ui/client/legacy-styles/ansible-ui.less    |  4 ++++
 awx/ui/client/src/config.js                    |  3 ++-
 .../src/login/authentication.controller.js     |  5 +++++
 .../client/src/login/loginModal.partial.html   |  3 ++-
 .../src/login/loginMotalNotice.block.less      | 18 ++++++++++++++++++
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 awx/ui/client/src/login/loginMotalNotice.block.less

diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 2dfc7682e6..72cf89fe70 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -2031,3 +2031,7 @@ button.dropdown-toggle,
 .input-group-btn {
     z-index: 1;
 }
+
+#login-modal-body {
+    padding-bottom: 5px;
+}
diff --git a/awx/ui/client/src/config.js b/awx/ui/client/src/config.js
index e8e036cee2..c1a6c4008a 100644
--- a/awx/ui/client/src/config.js
+++ b/awx/ui/client/src/config.js
@@ -27,7 +27,8 @@
     $.fn.systemTrackingDP = datepicker;
 
     return {
-
+        // custom_logo: "example.png", // utilize a custom logo, see documentation for how to get the server to serve your logo to the browser
+        // custom_login_info: "example notice" // have a notice displayed in the login modal for users.  note that, as a security measure, custom html is not supported and will be escaped.
         tooltip_delay: {show: 500, hide: 100},   // Default number of milliseconds to delay displaying/hiding tooltips
 
         debug_mode: false,                       // Enable console logging messages
diff --git a/awx/ui/client/src/login/authentication.controller.js b/awx/ui/client/src/login/authentication.controller.js
index 1bd4d91175..f8b3c27c46 100644
--- a/awx/ui/client/src/login/authentication.controller.js
+++ b/awx/ui/client/src/login/authentication.controller.js
@@ -111,6 +111,11 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
         setLoginFocus();
     });
 
+    scope.customLogo = $AnsibleConfig.custom_logo || "tower_console_logo.png";
+
+    scope.customLoginInfo = $AnsibleConfig.custom_login_info;
+    scope.customLoginInfoPresent = (scope.custom_login_info) ? true : false;
+
     // Reset the login form
     //scope.loginForm.login_username.$setPristine();
     //scope.loginForm.login_password.$setPristine();
diff --git a/awx/ui/client/src/login/loginModal.partial.html b/awx/ui/client/src/login/loginModal.partial.html
index e6bd3215c1..75474eb7dc 100644
--- a/awx/ui/client/src/login/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal.partial.html
@@ -4,7 +4,7 @@
       <div class="modal-content" id="login-modal-content">
 
           <div class="modal-header login-header">
-              <img src="" + $basePath + "assets/tower_console_logo.png" >
+              <img ng-src="/static/assets/{{ customLogo }}" >
           </div>
           <div class="modal-body" id="login-modal-body">
               <div class="login-alert" ng-show="!sessionExpired">Welcome to Ansible Tower! &nbsp;Please sign in.</div>
@@ -29,6 +29,7 @@
                       </div>
                   </div>
               </form>
+              <div class="LoginModalNotice" ng-if="customLoginInfoPresent"><div class="LoginModalNotice-title">Notice</div>{{ customLoginInfo | sanitize }}</div>
           </div>
           <div class="modal-footer">
               <button ng-click="systemLogin(login_username, login_password)" id="login-button" class="btn btn-primary"><i class="fa fa-sign-in"></i> Sign in</button>
diff --git a/awx/ui/client/src/login/loginMotalNotice.block.less b/awx/ui/client/src/login/loginMotalNotice.block.less
new file mode 100644
index 0000000000..efcd8a5cf5
--- /dev/null
+++ b/awx/ui/client/src/login/loginMotalNotice.block.less
@@ -0,0 +1,18 @@
+/** @define LoginModalNotice */
+.LoginModalNotice {
+    font-size: 12px;
+    width: 100%;
+    height: 129px;
+    padding: 5px 10px;
+    border-radius: 4px;
+    border: 0px;
+    background-color: #efefef;
+    overflow: scroll;
+}
+
+.LoginModalNotice-title {
+    color: #808080;
+    font-weight: bold;
+    padding-bottom: 4px;
+    font-size: 14px;
+}

From 353a7ec9b471d8591516dd5f6c9ea60c650cefaf Mon Sep 17 00:00:00 2001
From: jlmitch5 <jlmitch5@ncsu.edu>
Date: Tue, 22 Sep 2015 15:59:54 -0400
Subject: [PATCH 2/2] fixed type in auth controller causing notice to not show
 up

---
 awx/ui/client/src/login/authentication.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/authentication.controller.js b/awx/ui/client/src/login/authentication.controller.js
index f8b3c27c46..6954778c06 100644
--- a/awx/ui/client/src/login/authentication.controller.js
+++ b/awx/ui/client/src/login/authentication.controller.js
@@ -114,7 +114,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
     scope.customLogo = $AnsibleConfig.custom_logo || "tower_console_logo.png";
 
     scope.customLoginInfo = $AnsibleConfig.custom_login_info;
-    scope.customLoginInfoPresent = (scope.custom_login_info) ? true : false;
+    scope.customLoginInfoPresent = (scope.customLoginInfo) ? true : false;
 
     // Reset the login form
     //scope.loginForm.login_username.$setPristine();