Commit f95e2fa2 by chenith Committed by Harsh Shah

Extention names updated for website.

parent 99e994dc
...@@ -8,10 +8,10 @@ import oneit.objstore.ObjectTransaction; ...@@ -8,10 +8,10 @@ import oneit.objstore.ObjectTransaction;
public class PerformaArticleUtil public class PerformaArticleUtil
{ {
public static final String CLIENT_PORTAL = "ClientPortal"; public static final String APPLICANT_PORTAL = "ApplicantPortal";
public static final String JOB_PORTAL = "JobApplicationEngine"; public static final String ADMIN_PORTAL = "AdminPortal";
public static final String CLIENT_HOME = "ClientHome"; public static final String APPLICANT_HOME = "ApplicantHome";
public static final String JOB_HOME = "JobHome"; public static final String ADMIN_HOME = "AdminHome";
public static boolean descendsFrom (Article article, String parentArticleIdFilter) public static boolean descendsFrom (Article article, String parentArticleIdFilter)
{ {
...@@ -29,21 +29,21 @@ public class PerformaArticleUtil ...@@ -29,21 +29,21 @@ public class PerformaArticleUtil
} }
} }
public static String getPortalName(ObjectTransaction objTran, Article article, Article clientArticle, Article jobArticle) public static String getPortalName(ObjectTransaction objTran, Article article, Article applicantArticle, Article adminArticle)
{ {
if(clientArticle != null) if(applicantArticle != null)
{ {
if(descendsFrom(article, clientArticle.getIdentifier())) if(descendsFrom(article, applicantArticle.getIdentifier()))
{ {
return CLIENT_PORTAL; return APPLICANT_PORTAL;
} }
} }
if(jobArticle != null) if(adminArticle != null)
{ {
if(descendsFrom(article, jobArticle.getIdentifier())) if(descendsFrom(article, adminArticle.getIdentifier()))
{ {
return JOB_PORTAL; return ADMIN_PORTAL;
} }
} }
......
...@@ -2,26 +2,26 @@ ...@@ -2,26 +2,26 @@
<%@ page extends="oneit.servlets.jsp.FormJSP" %> <%@ page extends="oneit.servlets.jsp.FormJSP" %>
<%@ include file="/inc/stdimports50.jsp" %> <%@ include file="/inc/stdimports50.jsp" %>
<%@ include file="/extensions/jobportal/inc/stdimports.jsp" %> <%@ include file="/extensions/adminportal/inc/stdimports.jsp" %>
<% <%
ORMProcessState process = (ORMProcessState)(ProcessDecorator.getDefaultProcess(request)); ORMProcessState process = (ORMProcessState)(ProcessDecorator.getDefaultProcess(request));
ObjectTransaction objTran = (process == null ? ObjectTransaction.getTransaction () : process.getTransaction ()); ObjectTransaction objTran = (process == null ? ObjectTransaction.getTransaction () : process.getTransaction ());
Article clientArticle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.CLIENT_PORTAL); Article applicantArticle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.APPLICANT_PORTAL);
Article jobArticle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.JOB_PORTAL); Article adminArticle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.ADMIN_PORTAL);
SecUser loggedInUser = SecUser.getTXUser(objTran); SecUser loggedInUser = SecUser.getTXUser(objTran);
OAuthUserExtension userEx = (loggedInUser != null ? loggedInUser.getExtension(OAuthUserExtension.REFERENCE_OAuthUserExtension) : null); OAuthUserExtension userEx = (loggedInUser != null ? loggedInUser.getExtension(OAuthUserExtension.REFERENCE_OAuthUserExtension) : null);
String portalName = PerformaArticleUtil.getPortalName(objTran, article, clientArticle, jobArticle); String portalName = PerformaArticleUtil.getPortalName(objTran, article, applicantArticle, adminArticle);
%> %>
<%@ include file="setuprequest.jsp" %> <%@ include file="setuprequest.jsp" %>
<% <%
if(CollectionUtils.equals(portalName, PerformaArticleUtil.JOB_PORTAL)) if(CollectionUtils.equals(portalName, PerformaArticleUtil.ADMIN_PORTAL))
{ {
%> %>
<%@ include file="extensions/jobportal/inc/htmlheader.jsp" %> <%@ include file="extensions/adminportal/inc/htmlheader.jsp" %>
<%@ include file="extensions/jobportal/inc/menuinclude.jsp" %> <%@ include file="extensions/adminportal/inc/menuinclude.jsp" %>
<% <%
} }
else else
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
%> %>
<oneit:dynInclude page="descendPageContent.jsp" data="<%= m %>"/> <oneit:dynInclude page="descendPageContent.jsp" data="<%= m %>"/>
<% <%
if(CollectionUtils.equals(portalName, PerformaArticleUtil.CLIENT_PORTAL)) if(CollectionUtils.equals(portalName, PerformaArticleUtil.APPLICANT_PORTAL))
{ {
} }
else if(CollectionUtils.equals(portalName, PerformaArticleUtil.JOB_PORTAL)) else if(CollectionUtils.equals(portalName, PerformaArticleUtil.ADMIN_PORTAL))
{ {
%><%@ include file="extensions/jobportal/inc/htmlfooter.jsp" %><% %><%@ include file="extensions/adminportal/inc/htmlfooter.jsp" %><%
} }
else else
{ {
......
<?xml version="1.0"?> <?xml version="1.0"?>
<OBJECTS name="FOO"> <OBJECTS name="AdminPortal">
<NODE name="dynamic_content_form::JOB_PORTAL" factory="Participant"> <NODE name="dynamic_content_form::ADMIN_PORTAL" factory="Participant">
</NODE> </NODE>
......
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<OBJECTS name=""> <OBJECTS name="">
<NODE name="StandardCMSTemplates::PERFORMA_JOB_PORTAL"> <NODE name="StandardCMSTemplates::PERFORMA_ADMIN_PORTAL">
<MAP value="JOB_PORTAL_HOME" description="Job Portal Home" TemplatePage="dynamic_content_form.jsp"> <MAP value="ADMIN_PORTAL_HOME" description="Admin Portal Home" TemplatePage="dynamic_content_form.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration"> <NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/> <INHERITS nodename="StandardJSP"/>
<RenderMode name="Page" preIncludeJSP="extensions/jobportal/page_job_home.jsp"/> <RenderMode name="Page" preIncludeJSP="extensions/adminportal/page_admin_home.jsp"/>
</NODE> </NODE>
......
...@@ -4,20 +4,9 @@ ...@@ -4,20 +4,9 @@
<meta charset="utf-8"></meta> <meta charset="utf-8"></meta>
<meta http-equiv="X-UA-Compatible" content="IE=edge"></meta> <meta http-equiv="X-UA-Compatible" content="IE=edge"></meta>
<meta name="viewport" content="width=device-width, initial-scale=1"></meta> <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
<title>Job Portal</title> <title>Admin Portal</title>
<%@include file="/inc/std_imports.jsp" %> <%@include file="/inc/std_imports.jsp" %>
</head> </head>
<body> <body>
<!-- Google Tag Manager -->
<noscript>
<iframe src="//www.googletagmanager.com/ns.html?id=GTM-NJCBZX"
height="0" width="0" style="display:none;visibility:hidden">
</iframe>
</noscript>
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-NJCBZX');</script>
<!-- End Google Tag Manager -->
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
<% <%
NavigationBar subSiteNavbar = navbar.getChildNavBarFor(article.getCategory()); NavigationBar subSiteNavbar = navbar.getChildNavBarFor(article.getCategory());
Article jpAricle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.JOB_PORTAL); Article jpAricle = PerformaArticleUtil.getArticleByShortCut(objTran, PerformaArticleUtil.ADMIN_PORTAL);
NavigationBar npAricle = navbar.getChildNavBarFor(jpAricle); NavigationBar npAricle = navbar.getChildNavBarFor(jpAricle);
// String homeUrl = (clientHome != null ? clientHome.getLink(request) : clientArticle.getLink(request));
// String logoutUrl = "logout.jsp?nextURL=" + homeUrl;
%> %>
<nav class="navbar navbar-default navbar-static-top"> <nav class="navbar navbar-default navbar-static-top">
<div class="container-fluid"> <div class="container-fluid">
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
<%@ include file="inc/stdimports.jsp" %> <%@ include file="inc/stdimports.jsp" %>
<oneit:dynIncluded> <oneit:dynIncluded>
JOB-HOME ADMIN-HOME
</oneit:dynIncluded> </oneit:dynIncluded>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<OBJECTS xmlns:oneit="http://www.1iT.com.au" name=""> <OBJECTS xmlns:oneit="http://www.1iT.com.au" name="">
<NODE factory="Vector" name="Script"><NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="Home"> <NODE factory="Vector" name="Script"><NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="AdminPortal">
<createSpecificIdentifier factory='String' value='HKHZ9TY3JWKK1XYU14JNPVDBUX175V'/> <createSpecificIdentifier factory='String' value='5L47UE8LMI51VOIOS8YTLLVQAT5NTW'/>
<articleIdentifiers factory="Array" class="java.lang.String"> <articleIdentifiers factory="Array" class="java.lang.String">
<NODE factory="String" value="HKHZ9TY3JWKK1XYU14JNPVDBUX175V"/> <NODE factory="String" value="5L47UE8LMI51VOIOS8YTLLVQAT5NTW"/>
</articleIdentifiers> </articleIdentifiers>
<createdLabel factory="String" value="HKHZ9TY3JWKK1XYU14JNPVDBUX175V"/> <createdLabel factory="String" value="5L47UE8LMI51VOIOS8YTLLVQAT5NTW"/>
<newParentCategory factory="String" value="{INSERTION_ROOT}"/> <newParentCategory factory="String" value="{INSERTION_ROOT}"/>
<articleAttributeChanges factory="Map"> <articleAttributeChanges factory="Map">
</articleAttributeChanges>
<ormAttributeChanges factory="Map">
<NODE name="PublishDate" factory="Date" value="2017-06-18 00:00:00"/>
<NODE name="WithdrawDate" factory="Date" value="2067-06-18 22:10:00"/>
<NODE name="Title" factory="String" value="AdminPortal"/>
<NODE name="ShortTitle" factory="String" value="AdminPortal"/>
<NODE name="SortOrder" factory="Integer" value="-36830681"/>
<NODE name="Type" factory="Enumerated" class="oneit.business.content.ArticleType" value="ARTICLE"/>
<NODE name="Template" factory="Enumerated" class="oneit.business.content.ArticleTemplate" value="SITE"/>
</ormAttributeChanges>
<content factory="Map"> <NODE name="Body" factory="Map">
<NODE name="Content" factory="String"><![CDATA[
<p></p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
<NODE name="Synopsis" factory="Map">
<NODE name="Content" factory="String"><![CDATA[
<p></p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE>
</content>
</NODE>
<NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="AdminHome">
<createSpecificIdentifier factory='String' value='YRZCOYGLDTAG02BK7VK4TXHJIZF3ZS'/>
<articleIdentifiers factory="Array" class="java.lang.String">
<NODE factory="String" value="YRZCOYGLDTAG02BK7VK4TXHJIZF3ZS"/>
</articleIdentifiers>
<createdLabel factory="String" value="YRZCOYGLDTAG02BK7VK4TXHJIZF3ZS"/>
<newParentCategory factory="String" value="created:5L47UE8LMI51VOIOS8YTLLVQAT5NTW"/>
<articleAttributeChanges factory="Map">
<NODE name="Exclude From Search" factory="Boolean" value="false"/> <NODE name="Exclude From Search" factory="Boolean" value="false"/>
<NODE name="Exclude From Sitemap" factory="Boolean" value="false"/> <NODE name="Exclude From Sitemap" factory="Boolean" value="false"/>
<NODE name="Exclude from SEO Indexing" factory="Boolean" value="false"/> <NODE name="Exclude from SEO Indexing" factory="Boolean" value="false"/>
<NODE name="On Left Menu" factory="Boolean" value="false"/> <NODE name="On Left Menu" factory="Boolean" value="false"/>
<NODE name="On Top Menu" factory="Boolean" value="false"/> <NODE name="On Top Menu" factory="Boolean" value="false"/>
<NODE name="On Footer Left" factory="Boolean" value="false"/> <NODE name="On Footer Left" factory="Boolean" value="false"/>
<NODE name="Shortcuts" factory="String" value="JobHome"/> <NODE name="Shortcuts" factory="String" value="AdminHome"/>
<NODE name="Menu Title" factory="Null"/> <NODE name="Menu Title" factory="Null"/>
<NODE name="On Footer Menu" factory="Boolean" value="false"/> <NODE name="On Footer Menu" factory="Boolean" value="false"/>
<NODE name="Exclude From Navigation" factory="Boolean" value="false"/> <NODE name="Exclude From Navigation" factory="Boolean" value="false"/>
<NODE name="On Footer Right" factory="Boolean" value="false"/> <NODE name="On Footer Right" factory="Boolean" value="false"/>
</articleAttributeChanges> </articleAttributeChanges>
<ormAttributeChanges factory="Map"> <ormAttributeChanges factory="Map">
<NODE name="PublishDate" factory="Date" value="2017-06-16 00:00:00"/> <NODE name="PublishDate" factory="Date" value="2017-06-18 00:00:00"/>
<NODE name="WithdrawDate" factory="Date" value="2067-06-16 13:00:00"/> <NODE name="WithdrawDate" factory="Date" value="2067-06-18 22:00:00"/>
<NODE name="Title" factory="String" value="Home"/> <NODE name="Title" factory="String" value="AdminHome"/>
<NODE name="ShortTitle" factory="String" value="Home"/> <NODE name="ShortTitle" factory="String" value="AdminHome"/>
<NODE name="SortOrder" factory="Integer" value="-36830077"/> <NODE name="SortOrder" factory="Integer" value="-36830629"/>
<NODE name="Type" factory="Enumerated" class="oneit.business.content.ArticleType" value="ARTICLE"/> <NODE name="Type" factory="Enumerated" class="oneit.business.content.ArticleType" value="ARTICLE"/>
<NODE name="Template" factory="Enumerated" class="oneit.business.content.ArticleTemplate" value="JOB_PORTAL_HOME"/> <NODE name="Template" factory="Enumerated" class="oneit.business.content.ArticleTemplate" value="ADMIN_PORTAL_HOME"/>
</ormAttributeChanges> </ormAttributeChanges>
<content factory="Map"> <NODE name="Body" factory="Map"> <content factory="Map"> <NODE name="Body" factory="Map">
<NODE name="Content" factory="String"><![CDATA[<html> <NODE name="Content" factory="String"><![CDATA[
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <p></p>
<meta content="HTML Tidy, see www.w3.org" name="generator">
<title></title> ]]></NODE>
</head>
<body>
<p>&nbsp;</p>
</body>
</html>
]]></NODE>
<NODE name="TransformedContent" factory="String"><![CDATA[<p>&nbsp;</p>
]]></NODE>
<NODE name="IncludeContent" factory="Boolean" value="true"/> <NODE name="IncludeContent" factory="Boolean" value="true"/>
</NODE> </NODE>
<NODE name="Synopsis" factory="Map"> <NODE name="Synopsis" factory="Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment