From 2e82439a53484b8a7d9a468dfc638476e30fc220 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 16 Feb 2012 16:22:23 -0800
Subject: [PATCH] Hide Citrix logo if no EULA is present (i.e., is OSS version)

---
 ui/css/cloudstack3.css        |   8 ++++++++
 ui/images/logo-login-oss.png  | Bin 0 -> 2534 bytes
 ui/scripts/cloudStack.js      |  26 +++++++++++++-------------
 ui/scripts/ui-custom/login.js |   2 ++
 ui/scripts/ui/core.js         |   3 +++
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 ui/images/logo-login-oss.png

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 52bb7930cad..515552e069a 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -306,6 +306,10 @@ body.login {
   background: url(../images/logo-login.png) no-repeat;
 }
 
+.login.nologo .logo {
+  background-image: url(../images/logo-login-oss.png);
+}
+
 .login form {
   display: block;
   width: 1000px;
@@ -1625,6 +1629,10 @@ div.detail-group.actions td {
   padding: 0 96px 0 0;
 }
 
+#header div.controls.nologo {
+  background-image: none;
+}
+
 .button {
   float: left;
   background: url(../images/buttons.png) no-repeat;
diff --git a/ui/images/logo-login-oss.png b/ui/images/logo-login-oss.png
new file mode 100644
index 0000000000000000000000000000000000000000..0366d3a73ec2fd331ccc669bab07287222437c33
GIT binary patch
literal 2534
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

literal 0
HcmV?d00001

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 8450e5d121d..4d1f1f97e4e 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -293,20 +293,10 @@
                   });
                 };
 
-                // EULA check
-                $.ajax({
-                  url: 'eula.html',
-                  dataType: 'html',
-                  success: function(html) {
-                    initInstallWizard(html);
-                  },
-                  error: function() {
-                    initInstallWizard(null);
-                  }
-                });
+                initInstallWizard(loginArgs.eula);
               } else {
                 // Show cloudStack main UI
-                $container.cloudStack(cloudStackArgs);
+                $container.cloudStack($.extend(cloudStackArgs, { hasLogo: loginArgs.eula }));
               }
             }
           }
@@ -321,7 +311,17 @@
       }
     };
 
-    cloudStack.uiCustom.login(loginArgs);
+    // EULA check
+    $.ajax({
+      url: 'eula.html',
+      dataType: 'html',
+      success: function(html) {
+        cloudStack.uiCustom.login($.extend(loginArgs, { eula: html, hasLogo: true }));
+      },
+      error: function() {
+        cloudStack.uiCustom.login(loginArgs);
+      }
+    });
 
     // Localization
     cloudStack.localizationFn = function(str) {
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index 8997fb62afc..e110e799c0b 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -47,6 +47,8 @@
       return true;
     });
 
+    if (!args.hasLogo) $login.addClass('nologo');
+
    // Labels cause related input to be focused
     $login.find('label').click(function() {
       var $input = $inputs.filter('[name=' + $(this).attr('for') + ']');
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
index fab46d296b8..b869f337bb1 100644
--- a/ui/scripts/ui/core.js
+++ b/ui/scripts/ui/core.js
@@ -293,6 +293,9 @@
         }
       }
     });
+
+    // Hide logo conditionally
+    if (!args.hasLogo) $('#header .controls').addClass('nologo');
     
     return this;
   };