From 821eec5463313ce355398b9dc49ebdbb4ad5887c Mon Sep 17 00:00:00 2001
From: azammitdcarf <azammitdcarf>
Date: Fri, 28 Jan 2011 01:12:55 +0000
Subject: [PATCH] Replaced display:inline with display:"" to avoid changing
 location of box Added statusbox class Removed headerexpander script from
 index unless selected in config file Can specify whether to escape ampersands
 when using get_respondentselection_url function

---
 css/status.css                   | 10 ++++++++++
 functions/functions.operator.php |  8 ++++++--
 index.php                        |  2 --
 js/headerexpand.js               |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/css/status.css b/css/status.css
index e5532599..32ea24a0 100644
--- a/css/status.css
+++ b/css/status.css
@@ -1,3 +1,13 @@
+.statusbox {
+ padding: 1px 1px;
+ margin: 1px;
+ border: 1px solid #778;
+ text-decoration: none;
+ color: black;
+ float: left;
+ text-align: center;
+ clear: both;
+}
 .statusbutton {
  padding: 1px 1px;
  margin: 1px;
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index b82d0a4b..1d52a0f0 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -952,10 +952,11 @@ function get_call($operator_id,$respondent_id = "",$contact_phone_id = "",$creat
  * If no case available, return an error screen
  *
  * @param int $operator_id The operator id
+ * @param bool $escape Whether to escape the ampersands default true
  * @return string The URL of the LimeSurvey questionnaire, or the URL of an error screen if none available
  *
  */
-function get_respondentselection_url($operator_id)
+function get_respondentselection_url($operator_id,$escape = true)
 {
 	global $db;
 
@@ -965,11 +966,14 @@ function get_respondentselection_url($operator_id)
 
 	$call_id = get_call($operator_id);
 
+	$amp = "&amp;";
+	if (!$escape) $amp = "&";
+
 	if ($call_id)
 	{
 		$sid = get_limesurvey_id($operator_id,true); //true for RS
 		if ($sid != false && !empty($sid) && $sid != 'NULL')
-			$url = LIME_URL . "index.php?loadall=reload&amp;sid=$sid&amp;token=$call_id&amp;lang=" . DEFAULT_LOCALE;
+			$url = LIME_URL . "index.php?loadall=reload" . $amp . "sid=$sid" . $amp . "token=$call_id" . $amp . "lang=" . DEFAULT_LOCALE;
 		else
 			$url = 'rs_intro.php';
 	}
diff --git a/index.php b/index.php
index 74df7793..8a60d890 100644
--- a/index.php
+++ b/index.php
@@ -247,8 +247,6 @@ xhtml_object($data,"main-content");
 
 </div>
 
-<script type='text/javascript' src='js/headerexpand.js'/>
-
 <?
 
 xhtml_foot();
diff --git a/js/headerexpand.js b/js/headerexpand.js
index d3a8fa3f..556730ab 100644
--- a/js/headerexpand.js
+++ b/js/headerexpand.js
@@ -6,7 +6,7 @@ $(document).ready(function(){
 				$(".header").css("height","30%");
 				$(".content").css("height","70%");
 				$(".content").css("top","30%");
-				$(".box:not(.important)").css("display","inline");
+				$(".box:not(.important)").css("display","");
 			},
 
 			//function on mouse out