Site Branding - Theme colors and logo config

api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java

@@ -48,6 +48,9 @@
 public class OperationController extends BaseEditController {
 
     private static final Log log = LogFactory.getLog(OperationController.class.getName());
+    private static final List<String> ignoreReferers = Arrays.asList("/siteStyle", "/uploadImages");
+
+
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
 
@@ -81,6 +84,10 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) {
         // if we're canceling, we don't need to do anything
         if (request.getParameter("_cancel") != null){
             String referer = epo.getReferer();
+            boolean ignoreReferer = ignoreReferers.stream().anyMatch(referer::contains);
+            if (ignoreReferer) {
+                referer = null;
+            }
             if (referer == null) {
             	try {
             		response.sendRedirect(defaultLandingPage);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java

@@ -31,6 +31,8 @@ public class ApplicationBean {
 
     // Default initializations, which may be overwritten in the AppBeanMapper
     // but are otherwise not changed there
+    private String    individualUri;
+
     private boolean   initialized             = false;
     private String    sessionIdStr            = null;
     private String    applicationName         = DEFAULT_APPLICATION_NAME;
@@ -48,6 +50,17 @@ public class ApplicationBean {
     private String    copyrightURL;
     private String    copyrightAnchor;
     private String    themeDir;
+    private String    themePrimaryColorLighter;
+    private String    themePrimaryColor;
+    private String    themePrimaryColorDarker;
+    private String    themeBannerColor;
+    private String    themeSecondaryColor;
+    private String    themeAccentColor;
+    private String    themeTextColor;
+    private String    themeLinkColor;
+
+    private String    logoUrl;
+    private String    logoSmallUrl;
 
     public String toString() {
         String output = "Application Bean Contents:\n";
@@ -64,6 +77,10 @@ public String toString() {
 
     /*************************** SET functions ****************************/
 
+    public void setIndividualUri( String string_val ) {
+        individualUri = string_val;
+    }
+
     public void setSessionIdStr( String string_val ) {
         sessionIdStr = string_val;
     }
@@ -116,8 +133,52 @@ public void setThemeDir(String string_val) {
 		themeDir = string_val;
 	}
 
+    public void setThemePrimaryColorLighter(String string_val) {
+        themePrimaryColorLighter = string_val;
+    }
+
+    public void setThemePrimaryColor(String string_val) {
+        themePrimaryColor = string_val;
+    }
+
+    public void setThemePrimaryColorDarker(String string_val) {
+        themePrimaryColorDarker = string_val;
+    }
+
+    public void setThemeBannerColor(String string_val) {
+        themeBannerColor = string_val;
+    }
+
+    public void setThemeSecondaryColor(String string_val) {
+        themeSecondaryColor = string_val;
+    }
+
+    public void setThemeAccentColor(String string_val) {
+        themeAccentColor = string_val;
+    }
+
+    public void setThemeTextColor(String string_val) {
+        themeTextColor = string_val;
+    }
+
+    public void setThemeLinkColor(String string_val) {
+        themeLinkColor = string_val;
+    }
+
+    public void setLogoUrl(String string_val) {
+        logoUrl = string_val;
+    }
+
+    public void setLogoSmallUrl(String string_val) {
+        logoSmallUrl = string_val;
+    }
+
     /*************************** GET functions ****************************/
 
+    public String getIndividualUri() {
+        return individualUri;
+    }
+
     public String getSessionIdStr() {
         return sessionIdStr;
     }
@@ -166,6 +227,46 @@ public String getCopyrightAnchor() {
         return copyrightAnchor;
     }
 
+    public String getThemePrimaryColorLighter() {
+        return themePrimaryColorLighter;
+    }
+
+    public String getThemePrimaryColor() {
+        return themePrimaryColor;
+    }
+
+    public String getThemePrimaryColorDarker() {
+        return themePrimaryColorDarker;
+    }
+
+    public String getThemeBannerColor() {
+        return themeBannerColor;
+    }
+
+    public String getThemeSecondaryColor() {
+        return themeSecondaryColor;
+    }
+
+    public String getThemeAccentColor() {
+        return themeAccentColor;
+    }
+
+    public String getThemeTextColor() {
+        return themeTextColor;
+    }
+
+    public String getThemeLinkColor() {
+        return themeLinkColor;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public String getLogoSmallUrl() {
+        return logoSmallUrl;
+    }
+
     // TODO deprecate or remove the following three legacy methods?
 
     public String getRootBreadCrumbURL() {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java

@@ -11,6 +11,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,6 +25,7 @@
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
 
 public class ApplicationBeanRetryController extends BaseEditController {
 
@@ -89,6 +91,9 @@ public void doPost (HttpServletRequest req, HttpServletResponse response) {
         request.setAttribute("title","Site Information");
         request.setAttribute("_action",action);
         request.setAttribute("unqualifiedClassName","ApplicationBean");
+
+        request.setAttribute("updateLogoUrl", UrlBuilder.getUrl("uploadImages", new ParamMap("entityUri", applicationForEditing.getIndividualUri(), "photoType", "portalLogo")));
+        request.setAttribute("updateLogoSmallUrl", UrlBuilder.getUrl("uploadImages", new ParamMap("entityUri", applicationForEditing.getIndividualUri(), "photoType", "portalLogoSmall")));
         setRequestAttributes(request,epo);
 
         try {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java

@@ -474,6 +474,18 @@ protected Map<String, Object> getPageTemplateValues(VitroRequest vreq) {
         map.put("headScripts", new Tags().wrap());
         map.put("metaTags", new Tags().wrap());
 
+        map.put("themePrimaryColorLighter", vreq.getAppBean().getThemePrimaryColorLighter());
+        map.put("themePrimaryColor", vreq.getAppBean().getThemePrimaryColor());
+        map.put("themePrimaryColorDarker", vreq.getAppBean().getThemePrimaryColorDarker());
+        map.put("themeBannerColor", vreq.getAppBean().getThemeBannerColor());
+        map.put("themeSecondaryColor", vreq.getAppBean().getThemeSecondaryColor());
+        map.put("themeAccentColor", vreq.getAppBean().getThemeAccentColor());
+        map.put("themeTextColor", vreq.getAppBean().getThemeTextColor());
+        map.put("themeLinkColor", vreq.getAppBean().getThemeLinkColor());
+
+        map.put("logoUrl", vreq.getAppBean().getLogoUrl());
+        map.put("logoSmallUrl", vreq.getAppBean().getLogoSmallUrl());
+
         return map;
     }