Merge pull request #5 from wet-boew/4-added-an-optional-parameter-hideplaceholdermenu-to-the-gcintranet-theme

Adding hidePlaceholderMenu parameter

Author: plup2

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/Constants.java

@@ -15,7 +15,7 @@ public abstract class Constants {
 
     public static final String WEB_TEMPLATE_DISTRIBUTION_VERSION = "2.4.0";
 
-    public static final String CDTS_DEFAULT_VERSION = "v4_0_45";
+    public static final String CDTS_DEFAULT_VERSION = "v4_0_46";
 
     public static final String STATIC_FALLBACK_FILES_INTERNAL_PATH = "/goc/webtemplate/StaticFallbackFiles";
 

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/AbstractCoreBean.java

@@ -150,6 +150,7 @@ private enum Themes { GCWEB, GCINTRANET }
     private WebAnalyticsInfo webAnalytics = new WebAnalyticsInfo(Boolean.parseBoolean(this.getResourceBundleString("cdn", "goc.webtemplate.usewebanalytics"))); //will be false if not specified in config
     private boolean gcToolsModal = false;
     private String footerPath = null;
+    private boolean hidePlaceholderMenu = false;
     //-------------------------------------------------------
 
     //-------------------------------------------------------
@@ -457,7 +458,7 @@ public void setUseHttps(boolean value) {
     }
 
     /**
-     * Returns the version of the CDN files to use to build the page. (e.g v4_0_45)
+     * Returns the version of the CDN files to use to build the page. (e.g v4_0_46)
      * 
      * Set at application level via "wettemplate_version" property in cdn.properties, 
      * can be overriden programatically.  
@@ -478,7 +479,7 @@ public String getTemplateVersion() {
     }
 
     /**
-     * Sets the version of the CDN files to use to build the page. (e.g v4_0_45)
+     * Sets the version of the CDN files to use to build the page. (e.g v4_0_46)
      * 
      * Set at application level via "wettemplate_version" property in cdn.properties, 
      * can be overriden programatically.  
@@ -1452,6 +1453,25 @@ public void setCustomFooterSections(ArrayList<FooterSection> value) {
         this.customFooterSections = value;
     }
 
+    /**
+     * Returns whether the placeholder menu should be hidden while a custom menu is being loaded
+     *
+     * can be overriden programatically.
+     */
+    public boolean getHidePlaceholderMenu() {
+        this.initializeOnce();
+        return this.hidePlaceholderMenu;
+    }
+
+    /**
+     * Sets whether the placeholder menu should be hidden while a custom menu is being loaded
+     *
+     * can be overriden programatically.
+     */
+    public void setHidePlaceholderMenu(boolean value) {
+        this.hidePlaceholderMenu = value;
+    }
+
     /**
      * Returns a copy of the breadcrumb list, ready for JSON serialization 
      */
@@ -1797,7 +1817,8 @@ public String getRenderTop() {
                     true, //siteMenu
                     this.getHasLeftMenuSections(), //topSecMenu, true if there is at least one left menu section defined
                     this.customSearch != null? Arrays.asList(this.customSearch): null,      
-                    this.gcToolsModal
+                    this.gcToolsModal,
+                    this.hidePlaceholderMenu
                 ));        
     }
 
@@ -1822,7 +1843,8 @@ public String getRenderTransactionalTop() {
                     false, //siteMenu
                     this.getHasLeftMenuSections(), //topSecMenu, true if there is at least one left menu section defined
                     this.customSearch != null? Arrays.asList(this.customSearch): null,
-                    this.gcToolsModal        
+                    this.gcToolsModal,
+                    this.hidePlaceholderMenu
                 ));        
     }
 

gocwebtemplate-core/gocwebtemplate-core-base/src/main/java/goc/webtemplate/component/jsonentities/Top.java

@@ -27,6 +27,7 @@ public class Top implements Serializable {
     private List<Breadcrumb>    breadcrumbs;
     private String              localPath;
     private boolean             siteMenu;
+    private boolean             hidePlaceholderMenu;
 
     @SerializedName("GCToolsModal")
     private boolean             gcToolsModal;
@@ -41,7 +42,7 @@ public Top() {
 
     public Top(String cdnEnv, String subTheme, List<IntranetTitle> intranetTitle, boolean search, List<LanguageLink> lngLinks,
             boolean showPreContent, List<Breadcrumb> breadcrumbs, String localPath, boolean siteMenu,
-            boolean topSecMenu, List<CustomSearch> customSearch, boolean gcToolsModal) {
+            boolean topSecMenu, List<CustomSearch> customSearch, boolean gcToolsModal, boolean hidePlaceholderMenu) {
         this.cdnEnv = cdnEnv;
         this.subTheme = subTheme;
         this.intranetTitle = intranetTitle;
@@ -54,6 +55,7 @@ public Top(String cdnEnv, String subTheme, List<IntranetTitle> intranetTitle, bo
         this.topSecMenu = topSecMenu;
         this.customSearch = customSearch;
         this.gcToolsModal = gcToolsModal;
+        this.hidePlaceholderMenu = hidePlaceholderMenu;
     }
 
     public String getCdnEnv() {
@@ -151,4 +153,12 @@ public boolean getGcToolsModal() {
     public void setGcToolsModal(boolean value) {
         this.gcToolsModal = value;
     }
+
+    public boolean getHidePlaceholderMenu() {
+        return hidePlaceholderMenu;
+    }
+
+    public void setHidePlaceholderMenu(boolean value) {
+        this.hidePlaceholderMenu = value;
+    }
 }

gocwebtemplate-core/gocwebtemplate-core-base/src/test/java/goc/webtemplate/component/abstractcorebeantest/RenderTopTest.java

@@ -48,4 +48,13 @@ public void testGcToolsModalThrowsExceptionInGcWeb() {
             sut.getRenderTop(); 
         });
     }
+
+    @Test
+    public void testHidePlaceholderMenuTrueRenders() {
+        AbstractCoreBeanImpl sut = new AbstractCoreBeanImpl();
+
+        sut.setHidePlaceholderMenu(true);
+
+        assertTrue(sut.getRenderTop().contains("\"hidePlaceholderMenu\":true"));
+    }
 }

gocwebtemplate-core/gocwebtemplate-core-base/src/test/resources/goc/webtemplate/global/config/cdn.properties

@@ -29,7 +29,7 @@ cdn_localdev_localpath=/loadtesting/app/cls/WET/{0}/{1}/
 #(blank values for theme, subtheme and version will use defaults from internal environment configuration)
 wettemplate_theme=
 wettemplate_subtheme=
-wettemplate_version=v4_0_45
+wettemplate_version=v4_0_46
 wettemplate_loadjqueryfromgoogle=false
 webtemplate_usehttps=true
 #

gocwebtemplate-core/gocwebtemplate-core-jsp/src/test/resources/goc/webtemplate/global/config/cdn.properties

@@ -29,7 +29,7 @@ cdn_localdev_localpath=/GoCWebTemplateSampleJSP/loadtesting/app/cls/WET/{0}/{1}/
 #(blank values for theme, subtheme and version will use defaults from internal environment configuration)
 wettemplate_theme=
 wettemplate_subtheme=
-wettemplate_version=v4_0_45
+wettemplate_version=v4_0_46
 wettemplate_loadjqueryfromgoogle=false
 webtemplate_usehttps=true
 #

gocwebtemplate-sample-jsp/src/main/resources/goc/webtemplate/global/config/cdn.properties

@@ -29,7 +29,7 @@ cdn_localdev_localpath=/GoCWebTemplateSampleJSP/loadtesting/app/cls/WET/{0}/{1}/
 #(blank values for theme, subtheme and version will use defaults from internal environment configuration)
 wettemplate_theme=
 wettemplate_subtheme=
-wettemplate_version=v4_0_45
+wettemplate_version=
 wettemplate_loadjqueryfromgoogle=false
 webtemplate_usehttps=true
 #