Merge pull request #128 from freshprogrammer/layout

Visual Layout Update

Author: freshprogrammer

index.php

@@ -39,7 +39,7 @@
 	//$errorMessage[] = "initialized";
 	//$debugMessage[] = "initialized";
 
-	global $siteName;
+	global $appName;
 	global $pageTitle;
 	global $versionNote;
 
@@ -107,7 +107,7 @@
 				<a href="./"><img src="images/logo.png" border="0"></a>
 			</td>
 			<td valign="middle">
-				<div id="appname"><h1><?php echo $siteName;?></h1><?php echo $versionNote;?></div>
+				<div id="appname"><h1><?php echo $appName;?></h1><?php echo $versionNote;?></div>
 			</td>
 			<?php
 	if(!UserHasReadPermission())
@@ -176,93 +176,19 @@
 	//search
 	if(UserHasReadPermission())
 	{
-		$placeholder = "";
-		//random placeholders
-		if(true)
-		{
-			$linesOfCode = CountLinesInDir();
-			$dbRecs = CountDBRecords();
-			$rand = rand(0,90);
-			$searchPlaceHolders = array();
-			//ROUGH LIMIT           "------------------------"
-			$searchPlaceHolders[] = "Search";
-			$searchPlaceHolders[] = "Search from here";
-			$searchPlaceHolders[] = "Everyone loves to search";
-			$searchPlaceHolders[] = "Your companion";
-			$searchPlaceHolders[] = "Like a pet but useful";
-			$searchPlaceHolders[] = "Type here";
-			$searchPlaceHolders[] = "Waiting...";
-			$searchPlaceHolders[] = "Got your back";
-			$searchPlaceHolders[] = "It's cool, I got this";
-			$searchPlaceHolders[] = "You know what to do";
-			$searchPlaceHolders[] = "Self explanatory";
-			$searchPlaceHolders[] = "This is where your search";
-			$searchPlaceHolders[] = "See KB for details";
-			$searchPlaceHolders[] = "Search is your friend";
-			$searchPlaceHolders[] = "Search could save your life some day";
-			$searchPlaceHolders[] = "Indexes to the rescue";
-			$searchPlaceHolders[] = "Pioneering Omni-Search";
-			$searchPlaceHolders[] = "Into the depths";
-			$searchPlaceHolders[] = "Almost lunch time";
-			$searchPlaceHolders[] = "Who's behind you";
-			$searchPlaceHolders[] = "Not on break";
-			$searchPlaceHolders[] = "Almost never on break";
-			$searchPlaceHolders[] = "Like an unpaid intern";
-			$searchPlaceHolders[] = "I am so smart... SMRT";
-			$searchPlaceHolders[] = "Your coffee is ready";
-			$searchPlaceHolders[] = "Search never sleeps";
-			$searchPlaceHolders[] = "Wont save you on car inssurance";
-			$searchPlaceHolders[] = "Smoke free for $rand days";
-			$searchPlaceHolders[] = "NSA free for 0 days";
-			$searchPlaceHolders[] = "Not a calculator";
-			$searchPlaceHolders[] = "Still not a calculator";
-			$searchPlaceHolders[] = "Sponsored by your tax dollars";
-			$searchPlaceHolders[] = "You are here *";
-			$searchPlaceHolders[] = "I search to serve";
-			$searchPlaceHolders[] = "Give a man a match...";
-			$searchPlaceHolders[] = "Not from The Simpsons&reg;";
-			$searchPlaceHolders[] = "One man's dream of data";
-			$searchPlaceHolders[] = "Please like and subscribe";
-			$searchPlaceHolders[] = "Doesn't search Facebook";
-			$searchPlaceHolders[] = "No Facebook login";
-			$searchPlaceHolders[] = "No like buttons here";
-			
-			$searchPlaceHolders[] = "$linesOfCode+ lines of code";
-			$searchPlaceHolders[] = "$linesOfCode+ free range lines";
-			$searchPlaceHolders[] = "$linesOfCode lines, but cutting back";
-			$searchPlaceHolders[] = "10K+ line club";
-			$searchPlaceHolders[] = "$dbRecs+ DB Records";
-			$searchPlaceHolders[] = "$dbRecs Records and counting";
-			
-			$searchPlaceHolders[] = "Google's nemesis";
-			$searchPlaceHolders[] = "Googol * Googol";
-			$searchPlaceHolders[] = "Who cares about Bing";
-			$searchPlaceHolders[] = "Remember Yahoo!?";
-			$searchPlaceHolders[] = "DuckDuckGo";
-			$searchPlaceHolders[] = "One DogPile for all";
-			$searchPlaceHolders[] = "Making search Cuil again";
-			$searchPlaceHolders[] = "Not AltaVista";
-			$searchPlaceHolders[] = "Fetch Jeeves";
-			$searchPlaceHolders[] = "Fresh Search";
-			
-			$searchPlaceHolders[] = "e.g. H######";
-			$searchPlaceHolders[] = "e.g. C######";
-			$searchPlaceHolders[] = "e.g. Company name";
-			$searchPlaceHolders[] = "e.g. Company note";
-			$searchPlaceHolders[] = "e.g. Device Name";
-			$searchPlaceHolders[] = "e.g. Badge Holder";
-			$searchPlaceHolders[] = "e.g. Location Name";
-			$placeholder = $searchPlaceHolders[array_rand($searchPlaceHolders)];
-		}
-
+		$placeholder = "Search";
+		
+		if(true)//custom search placeholder(s)
+			$placeholder = CustomFunctions::GetSearchPlaceholder();
+		
 		$menuItems .= "<td class='dr-toolbar-int rich-toolbar-item'  align='right''>\n";
 		$menuItems .= "	<form name='MainSearch' action='./' method=get>\n";
 		$menuItems .= "		Search: <input type='text' name='search' placeholder=\"$placeholder\">\n";
 		$menuItems .= "	<input type='hidden' name='searchbtn' value='T'>\n";
 		$menuItems .= "	</form>\n";
 		$menuItems .= "</td>\n";
 	}
-	else 
+	else
 	{
 		//keep format and left seperator
 		$menuItems .= "<td class='dr-toolbar-int rich-toolbar-item'>&nbsp;</td>\n";
@@ -273,19 +199,14 @@
 		</tbody>
 		</table>
 	</div>
-	
-	<!-- Page Body -->
 	<table id="pagecontainer" id="pagecontainer" cellpadding="0" cellspacing="0" class='center pageMinWidth'><tbody><tr><td>
-		
-	<?php
 
+	<?php
 	//BackupDatabase();
 
 	if(UserHasReadPermission())
 	{
-		//TODO this should be an actual room lookup not hardcoded roomids
-		?>
-		<!-- HEADER LINKS -->
+		?><!-- HEADER LINKS -->
 		<table width=100%><tr>
 			<td>
 				<?php echo CustomFunctions::CreateNavigationQuickLinks() ?>
@@ -294,10 +215,9 @@
 				<a href='#' class='' id='showMessagesButton' onclick='ToggleMessgeVisibility()'>Show Messages</a>&nbsp;
 			</td>
 		</tr></table>
-		<BR>
-		<?php
+		<BR><?php
 	}
-		
+	
 	//error and reporting mesages - filled in at the bottom of the page with JS
 	echo "<!-- DEBUG MESSAGE  -->\n<div id='debugMessage'  style='display:none;' class='debugMessage'></div>\n";
 	echo "<!-- ERROR MESSAGE  -->\n<div id='errorMessage'  style='display:none;' class='errorMessage'></div>\n";
@@ -309,49 +229,30 @@
 		echo "<BR>\n";
 		LoginPrompt();
 	}
-	else 
-	{
-		//officaliy logged in with min read access-------------------------------------------------------------------------------------------------
+	else
+	{//officaliy logged in with min read access-------------------------------------------------------------------------------------------------
 		echo "<!--  PAGE BODY-->\n";
 
 		if(strlen($host) > 0)
-		{
-			//build customer page
-			ShowCustomerPage($host);
-			
-		}
+			ShowCustomerPage($host);//build customer page
 		else if(strlen($roomID) > 0)
-		{
-			ListLocationCustomers($roomID);
-		}
+			ShowRoomPage($roomID);
 		else if(strlen($deviceIDInput) > 0)
-		{
 			ShowDevicePage($deviceIDInput);
-		}
 		else if(strlen($chassisnameInput) > 0)
-		{
 			ShowChassisPage($chassisnameInput);
-		}
 		else if(strlen($locationIDInput) > 0)
-		{
 			ShowLocationPage($locationIDInput);
-		}
 		else if(strlen($userIDInput) > 0)
-		{
 			ShowUsersPage($userIDInput);
-		}
 		else if(strlen($page) > 0)
 		{
 			if($page==="PowerAudit")
 			{
 				if(strlen($pa_roomID) > 0 && strlen($pa_panel) > 0)
-				{
 					PowerAuditPanel($pa_roomID,$pa_panel);
-				}
 				else
-				{
 					PowerAuditPanelList();
-				}
 			}
 			else if($page==="Audits")
 			{
@@ -368,7 +269,7 @@
 				//single customer
 				ShowCustomerPage($singleCustomerMatch);
 			}
-			else 
+			else
 			{
 				//search all	
 				$resultCount = 0;
@@ -396,48 +297,16 @@
 					echo "</div>\n";
 					echo "</div>\n";
 				}
-				else 
+				else
 				{
-					if($searchbtn==="T")
-					{
-						//mock for empty search
-						$pageSubTitle = "Blank Search";
-						echo "<div class=\"panel\">\n";
-						echo "<div class=\"panel-header\">\n";
-						echo "Search for nuthin ($search) yields a whole lot of nuthin.\n";
-						echo "</div>\n";
-						
-						echo "<div class=\"panel-body\">\n\n";
-						
-						//nothing here
-						
-						echo "</div>\n";
-						echo "</div>\n";
-					}
-					else 
-					{
-						//just logged in
-						echo "<div class=\"panel\">\n";
-						echo "<div class=\"panel-header\">\n";
-						echo "Welcome\n";
-						echo "</div>\n";
-						
-						echo "<div class=\"panel-body\">\n\n";
-						
-						echo "Welcome to $siteName.";
-						
-						if(UserHasWritePermission() && IsUserUsingDefaultPassword())
-						{
-							echo "<BR><BR>Please <a href='./?userid=$userID'>change your password</a> from the default when you get a chance.";
-						}
-						
-						echo "</div>\n";
-						echo "</div>\n";
-					}
+					if($searchbtn==="T")//mock for empty search
+						$errorMessage[] ="Search for nuthin yields a whole lot of nuthin.";
+					
+					echo CustomFunctions::CreateHomePageContent();
 				}//end search len > 0
 			}//single cust not found
 		}//not specific row/ca/cust
-		echo "<BR>";
+		echo "<!--  PAGE BODY END-->\n";
 	}//end - page body vs login - //officaliy logged in with min read access
 
 	//end of Body