Appending company name to title and showing client name only if client support is enabled.

cmsWebApp/src/performa/orm/Job.java

@@ -418,10 +418,19 @@ public class Job extends BaseJob
     //to check company logo availability
     public Boolean isClientLogoAvailable()
     {
-        if( getClient()!=null 
-            && getClient().getClientLogo()!=null
-            && getCompanyUser()!=null 
-            && getCompanyUser().getCompany().getHasClientSupport()==Boolean.TRUE )
+        if(isClientAvailable() && getClient().getClientLogo()!=null)
+        {
+            return Boolean.TRUE;
+        }
+        
+        return Boolean.FALSE;
+    }
+    
+    
+    public Boolean isClientAvailable()
+    {
+        if( getClient() != null && getCompanyUser() != null
+            && getCompanyUser().getCompany().getHasClientSupport()== Boolean.TRUE )
         {
             return Boolean.TRUE;
         }

cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp

@@ -4,7 +4,12 @@
         <meta charset="utf-8"></meta>
         <meta http-equiv="X-UA-Compatible" content="IE=edge"></meta>
         <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
-        <title>Talentology</title>
+        <%
+            Company     company     =   clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null
+                                            ? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null;
+        %>
+        
+        <title><%= "Talentology" + (company != null ? " - " + company.getCompanyName() : "")%></title>
         <%@include file="/inc/std_imports.jsp" %>
     </head>
     <script>
@@ -50,7 +55,7 @@
                         <div class="search-bar">
                             <div class="inset-shadow"></div>
                             <img src="images/search-icon.svg"/>
-                            <input type="text" class="form-control" placeholder="Search for job, candidate or client"/>
+                            <input type="text" class="form-control" placeholder="<%= company.getHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/>
                         </div>
                         <div class="fl-right">
                             <div class="notification-bar">

cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp

@@ -56,7 +56,14 @@
                         </div>
                         <div class="job-company-name">
                             <span class="superlaw">
-                                <oneit:toString value="<%= job.getClient() %>"  mode="EscapeHTML" />
+                                <%
+                                    if(job.isClientAvailable())
+                                    {
+                                %>
+                                        <oneit:toString value="<%= job.getClient() %>"  mode="EscapeHTML" />
+                                <%
+                                    }
+                                %>
                             </span>
                             <span class="calendar">
                                 <%

cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp

@@ -35,7 +35,14 @@
             </div>
             <div class="off-name">
                 <span class="austr-post">
-                    <oneit:toString value="<%= job.getClient() %>"  mode="EscapeHTML" />
+                    <%
+                        if(job.isClientAvailable())
+                        {
+                    %>
+                            <oneit:toString value="<%= job.getClient() %>"  mode="EscapeHTML" />
+                    <%
+                        }
+                    %>
                 </span> by <oneit:toString   value="<%= job.getCompanyUser() %>"  mode="EscapeHTML"  nullValue=""/><span class="ex-management">&bull;&nbsp;
                     <oneit:toString value="<%= job.getLevel() %>"   mode="EscapeHTML" />
                 </span>