Facilitate branding og workspace

thexerteproject · Oct 24, 2018 · 680735d · 680735d
1 parent aed0f1d
commit 680735d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/index.php b/index.php
@@ -100,13 +100,6 @@
         <link href='branding/branding.css' rel='stylesheet' type='text/css'>
         <?php
     }
-    else {
-        ?>
-        <?php
-    }
-    ?>
-
-    <?PHP
     if (isset($_SESSION['toolkits_language']))
     {
         $languagecodevar = "var language_code = \"" . $_SESSION['toolkits_language'] . "\"";
@@ -399,7 +392,7 @@
             <!--<img src="website_code/images/lt_logo.gif" /><br/>-->
             <?PHP
             echo $xerte_toolkits_site->copyright;
-            ?> <i class="fa fa-info-circle" aria-hidden="true" style="color:#f86718; cursor: help;" title="<?PHP echo $version;?>"></i></p><div class="footerlogos"><a href="http://opensource.org/" target="_blank" title="Open Source Initiative: http://opensource.org/"><img src="website_code/images/osiFooterLogo.png" border="0"></a> <a href="https://www.apereo.org" target="_blank" title="Apereo: https://www.apereo.org"><img src="website_code/images/apereoFooterLogo.png" border="0"></a> <a href="http://xerte.org.uk" target="_blank" title="Xerte: http://xerte.org.uk"><img src="website_code/images/xerteFooterLogo.png" border="0"></a></div>
+            ?> <i class="fa fa-info-circle xerte_info_button" aria-hidden="true" style=" cursor: help;" title="<?PHP echo $version;?>"></i></p><div class="footerlogos"><a href="http://opensource.org/" target="_blank" title="Open Source Initiative: http://opensource.org/"><img src="website_code/images/osiFooterLogo.png" border="0"></a> <a href="https://www.apereo.org" target="_blank" title="Apereo: https://www.apereo.org"><img src="website_code/images/apereoFooterLogo.png" border="0"></a> <a href="http://xerte.org.uk" target="_blank" title="Xerte: http://xerte.org.uk"><img src="website_code/images/xerteFooterLogo.png" border="0"></a></div>
 
         <div style="clear:both;"></div>
     </div>

diff --git a/website_code/php/login_library.php b/website_code/php/login_library.php
@@ -31,7 +31,7 @@
 function html_headers() {
   global $xerte_toolkits_site;
 
-  print <<<END
+?>
 <!DOCTYPE html>
 <html><head>
 
@@ -48,7 +48,14 @@ function html_headers() {
 
         <link href="../website_code/styles/frontpage.css" media="screen" type="text/css" rel="stylesheet" />
         <link href="../website_code/styles/folder_popup.css" media="screen" type="text/css" rel="stylesheet" />
-END;
+    <?php
+    if (file_exists($xerte_toolkits_site->root_file_path . "branding/branding.css"))
+    {
+        ?>
+        <link href='branding/branding.css' rel='stylesheet' type='text/css'>
+        <?php
+    }
+    ?>
   _include_javascript_file("../website_code/scripts/file_system.js");
   _include_javascript_file("../website_code/scripts/screen_display.js");
   _include_javascript_file("../website_code/scripts/ajax_management.js");
@@ -199,7 +206,14 @@ function login_form($messages, $xerte_toolkits_site)
     <link href="website_code/styles/xerte_buttons.css" media="screen" type="text/css" rel="stylesheet" />
     <link href="website_code/styles/frontpage.css" media="screen" type="text/css" rel="stylesheet" />
     <link rel="stylesheet" type="text/css" href="modules/xerte/parent_templates/Nottingham/common_html5/font-awesome-4.3.0/css/font-awesome.min.css">
-
+    <?php
+    if (file_exists($xerte_toolkits_site->root_file_path . "branding/branding.css"))
+    {
+    ?>
+        <link href='branding/branding.css' rel='stylesheet' type='text/css'>
+    <?php
+    }
+    ?>
     <!--
 
     HTML to use to set up the login page

diff --git a/website_code/styles/frontpage.css b/website_code/styles/frontpage.css
@@ -815,4 +815,8 @@ div.ui-layout-center {
 	border-radius : 4px;
 	background:#fff;
 
+}
+
+.xerte_info_button {
+	color:#f86718;
 }