NOJIRA: Added support for loading 'Primary' UI plugin properties from 'primary.tenant...

diff --git a/cspace-ui/build.xml b/cspace-ui/build.xml
index 3ca12515745fa903cd14d0703e43fba7f567ecda..2a06fb21977d16e430df047a07315f357ac9c3da 100644 (file)
--- a/cspace-ui/build.xml
+++ b/cspace-ui/build.xml
@@ -67,6 +67,9 @@
                <property name="primary.profile.plugin.basename" value="${env.CSPACE_PRIMARY_UIPLUGIN_BASENAME}" />             
                <property name="primary.profile.plugin.tenantid" value="${env.CSPACE_PRIMARY_UIPLUGIN_TENANTID}" />
                <property name="primary.profile.plugin.message.title" value="${env.CSPACE_PRIMARY_UIPLUGIN_TITLE_MESSAGE}" />
+               <property name="primary.profile.plugin.message.about" value="${env.CSPACE_PRIMARY_UIPLUGIN_ABOUT_MESSAGE}" />
+               <property name="primary.profile.plugin.logo" value="${env.CSPACE_PRIMARY_UIPLUGIN_LOGO}" />
+
                <!-- Derived from the other props -->
                <property name="primary.profile.plugin.js" value="${primary.profile.plugin.name}@${primary.profile.plugin.version}.min.js" />
                
@@ -81,16 +84,29 @@
                        #               export CSPACE_PRIMARY_UIPLUGIN_LOGO="/images/myimage.png"
                        #
                -->
-               <condition property="primary.profile.plugin.logo" value="undefined">
-                       <matches pattern="^undefined$" string="${env.CSPACE_PRIMARY_UIPLUGIN_LOGO}"/>
+               <condition property="primary.profile.plugin.logo.final" value="undefined">
+                       <matches pattern="^undefined$" string="${primary.profile.plugin.logo}"/>
                </condition>            
-               <condition property="primary.profile.plugin.logo" value="undefined">
-                       <matches pattern="^$" string="${env.CSPACE_PRIMARY_UIPLUGIN_LOGO}"/>
+               <condition property="primary.profile.plugin.logo.final" value="undefined">
+                       <matches pattern="^$" string="${primary.profile.plugin.logo}"/>
                </condition>
-               <condition property="primary.profile.plugin.logo" value="'${env.CSPACE_PRIMARY_UIPLUGIN_LOGO}'">
-                       <matches pattern="^(?!\s*$).+" string="${env.CSPACE_PRIMARY_UIPLUGIN_LOGO}"/>
+               <condition property="primary.profile.plugin.logo.final" value="'${primary.profile.plugin.logo}'">
+                       <matches pattern="^(?!\s*$).+" string="primary.profile.plugin.logo"/>
                </condition>
                
+               <!--
+               
+               -->
+               <condition property="primary.profile.plugin.message.about.final" value="undefined">
+                       <matches pattern="^undefined$" string="${primary.profile.plugin.message.about}"/>
+               </condition>            
+               <condition property="primary.profile.plugin.message.about.final" value="undefined">
+                       <matches pattern="^$" string="${primary.profile.plugin.message.about}"/>
+               </condition>
+               <condition property="primary.profile.plugin.message.about.final" value="`${primary.profile.plugin.message.about}`">
+                       <matches pattern="^(?!\s*$).+" string="${primary.profile.plugin.message.about}"/>
+               </condition>
+                               
                <!-- Test to see if "core" tenant is being asked for, since we'll need to do something special for it. -->
                <condition property="is.primary.core" value="true">
                        <matches pattern="^cspaceUI$" string="${primary.profile.plugin.name}"/>
@@ -136,7 +152,8 @@
                <filter token="PLUGIN_BASENAME" value="${primary.profile.plugin.basename}" />
                <filter token="TENANT_ID" value="${primary.profile.plugin.tenantid}" />
                <filter token="MESSAGE_TITLE" value="${primary.profile.plugin.message.title}" />
-               <filter token="LOGO" value="${primary.profile.plugin.logo}" />
+               <filter token="LOGO" value="${primary.profile.plugin.logo.final}" />
+               <filter token="ABOUT" value="${primary.profile.plugin.message.about.final}" />
                
                <copy todir="${jee.deploy.cspace}/${primary.profile.plugin.dir}" filtering="true" overwrite="true">
                        <fileset dir="${webapp.template.dir}"/>

diff --git a/cspace-ui/cspace#core#template/index.html b/cspace-ui/cspace#core#template/index.html
index cf2ecf7139b5f6f6b706836419f1cb78fe40ecbd..1cf49f59b2178b954fe1c48f64f813004421313f 100644 (file)
--- a/cspace-ui/cspace#core#template/index.html
+++ b/cspace-ui/cspace#core#template/index.html
@@ -13,6 +13,7 @@
                                messages: {
                                // Override the login page title
                                        'about.title': '@MESSAGE_TITLE@',
+                                       'about.contentHTML': @ABOUT@,
                                },
                                basename: '@PLUGIN_BASENAME@',
                                prettyUrls: true,

diff --git a/cspace-ui/cspace#template/index.html b/cspace-ui/cspace#template/index.html
index d87b070d6f8857591cf1346dddcb6ac2437a8c04..0ed759f6a90863fece01407695ea34f40b17fbf8 100644 (file)
--- a/cspace-ui/cspace#template/index.html
+++ b/cspace-ui/cspace#template/index.html
@@ -15,6 +15,7 @@
                                messages: {
                                // Override the login page title
                                        'about.title': '@MESSAGE_TITLE@',
+                                       'about.contentHTML': @ABOUT@,
                                },
                                basename: '@PLUGIN_BASENAME@',
                                prettyUrls: true,