Merge pull request #53 from hakasapl/main

Removing UMA branding from site by default

Author: hakasapl

config/branding/config.ini

@@ -1,8 +1,8 @@
 [site]
 name = "Unity Cluster"  ; Name of the website
-url = "https://unity.rc.umass.edu/"  ; URL of the website
-description = "The Unity Cluster is a shared High-Performance-Computing cluster maintained by UMass Amherst, University of Rhode Island, and UMass Dartmouth"  ; Description of the website
-logo = "logo.png"
+url = "https://127.0.0.1:8000/"  ; URL of the website
+description = "The Unity Web Portal is a lightweight HPC cluster front-end"  ; Description of the website
+logo = "logo.png"  ; path to logo file, in the webroot/res/branding folder
 
 [colors]
 light_background = "#ffffff"  ; Background color when in light mode
@@ -20,37 +20,40 @@ accent_disabled = "#e48181"  ; Disabled element color for element using accent c
 accent_foreground = "#ffffff"  ; Text color when accent color is background
 
 [footer]
-logos[] = "umass.png"  ; Footer logos (add new lines for each)
-links[] = "https://www.umass.edu/"
-title[] = "University of Massachusetts Amherst"
-logos[] = "uri.png"
-links[] = "https://www.uri.edu/"
-title[] = "University of Rhode Island"
-logos[] = "mghpcc.png"
-links[] = "https://www.mghpcc.org/"
-title[] = "Massachusetts Green High Performance Computing Center"
+logos[] = "testLongFooter.png"  ; Footer logos (add new lines for each)
+links[] = "https://github.com/"
+title[] = "Test Long Footer"
+logos[] = "testMedFooter.png"
+links[] = "https://github.com/"
+title[] = "Test Medium Footer"
+logos[] = "testSquareFooter.png"
+links[] = "https://github.com/"
+title[] = "Test Square Footer"
+logos[] = "testMedFooter.png"
+links[] = "https://github.com/"
+title[] = "Test Medium Footer"
 
 [loginshell] ; menu items, Login Shells
 shell[] = "/bin/bash"
 shell[] = "/bin/zsh"
 
 [menuitems]  ; menu items, add a label and link for each
-labels[] = "Documentation"
-links[] = "https://docs.unity.rc.umass.edu/"
+labels[] = "Global Menuitem 1"
+links[] = "https://github.com/"
 
 [menuitems_secure]  ; menu items which only show up for users who have an account
-labels[] = "JupyterLab"
-links[] = "https://unity.rc.umass.edu/panel/jhub"
+labels[] = "Secure Menuitem 1"
+links[] = "https://github.com/"
 
 [mail]  ; mail addresses
-support = "[email protected]"
-support_name = "Unity Cluster Support"
-admin = "[email protected]"
-admin_name = "Unity Cluster Admins"
-sender = "[email protected]"
-sender_name = "Unity Cluster Updates"
-pi_approve = "piapproval@umass.edu"
-pi_approve_name = "PI Approval"
+support = "[email protected]"
+support_name = "Unity Support"
+admin = "[email protected]"
+admin_name = "Unity Admins"
+sender = "[email protected]"
+sender_name = "Unity Sender"
+pi_approve = "piapproval@unitywebportal.test"
+pi_approve_name = "Unity PI Approval"
 
 [page]  ; which sql objects to use for the content on these pages
 home = "home"

resources/mail/footer.php

@@ -1,6 +1,6 @@
 <footer style="text-align: center; font-size: 8pt; color: #aaaaaa; border-top: 1px solid #dddddd; padding-top: 10px;">
     <span>You are receiving this email because you have an account 
-        on the <a target='_blank' href='<?php echo $this->MSG_LINKREF; ?>'>Unity Cluster</a> 
-        at UMass Amherst. If you would like to stop receiving these emails, 
+        on the <a target='_blank' href='<?php echo $this->MSG_LINKREF; ?>'>Unity Cluster</a>. 
+        If you would like to stop receiving these emails, 
         you may request to close your account by replying to this email.</span>
 </footer>

resources/templates/header.php

@@ -43,7 +43,7 @@
 
   <header>
     <img id="imgLogo" draggable=false 
-    src="<?php echo $CONFIG["site"]["prefix"]; ?>/res/<?php echo $BRANDING["site"]["logo"]; ?>">
+    src="<?php echo $CONFIG["site"]["prefix"]; ?>/res/branding/<?php echo $BRANDING["site"]["logo"]; ?>">
     <button class="hamburger vertical-align">
       <img draggable="false" src="<?php echo $CONFIG["site"]["prefix"]; ?>/res/menu.png" alt="Menu Button">
     </button>

tests/user.md

@@ -241,7 +241,8 @@ footer>* {
 
 footer #footerLogos img {
     padding: 0 10px 0 10px;
-    width: 120px;
+    max-width: 120px;
+    max-height: 90px;
     margin-bottom: 10px;
     vertical-align: middle;
 }