2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

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
This commit is contained in:
azammitdcarf
2011-01-28 01:12:55 +00:00
parent 29e10d7cb9
commit 821eec5463
4 changed files with 17 additions and 5 deletions

View File

@@ -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;

View File

@@ -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 = "&";
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&sid=$sid&token=$call_id&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';
}

View File

@@ -247,8 +247,6 @@ xhtml_object($data,"main-content");
</div>
<script type='text/javascript' src='js/headerexpand.js'/>
<?
xhtml_foot();

View File

@@ -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