diff --git a/admin/callhistory.php b/admin/callhistory.php
index 4da810b5..e4a7a7c9 100644
--- a/admin/callhistory.php
+++ b/admin/callhistory.php
@@ -72,7 +72,7 @@ $operator_id = get_operator_id();
Modified Call history list to have more information more suitable way with filtering, soring, paging and submenu for Cse history with asterisk records....
Need to be linked with cdr records from asterisk!! for monitoring (requires addtional field for call_attempt table to request and store asterisk UniqueID as a reference to CDR .wav file list at /var/spool/asterisk/monitor/ )
*/
-
+
if ($operator_id)
{
if (isset($_GET['questionnaire_id'])) $qid = $_GET['questionnaire_id'];
@@ -85,9 +85,9 @@ if ($operator_id)
$sql .= " as case_id, q.description as qd , contact_phone.phone as cpi, sample_import.description as spl
FROM `call` as c
- JOIN (operator as op, respondent as r) on (op.operator_id = '$operator_id' AND r.respondent_id = c.respondent_id)";
- if ($qid) $quest = "$qid AND q.questionnaire_id= $qid"; else $quest = "q.questionnaire_id";
- if ($sid) $samimpid = "$sid AND sample_import.sample_import_id=$sid"; else $samimpid = "sample_import.sample_import_id";
+ JOIN (operator as op, respondent as r) on (op.operator_id = '$operator_id' and r.respondent_id = c.respondent_id)";
+ if ($qid) $quest = "$qid and q.questionnaire_id= $qid"; else $quest = "q.questionnaire_id";
+ if ($sid) $samimpid = "$sid and sample_import.sample_import_id=$sid"; else $samimpid = "sample_import.sample_import_id";
$sql .= "
JOIN (`case` as ca, questionnaire as q) ON (ca.case_id = c.case_id AND ca.questionnaire_id = $quest)
@@ -102,7 +102,7 @@ if ($operator_id)
$sql .= " LIMIT 500";
else $sql .= " LIMIT 5000";
- $rs = $db->Execute($sql);
+ $rs = $db->Execute($sql);
if (empty($rs))
{
print "" . T_("No calls ever made") . "
" . T_("Please select a questionnaire") . ":
";
$questionnaire_id = false;
if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']);
-display_questionnaire_chooser($questionnaire_id,false,"form-inline pull-left", "form-control");
+display_questionnaire_chooser($questionnaire_id,false,"form-inline col-sm-3 pull-left", "form-control");
if ($questionnaire_id)
{
@@ -207,17 +206,16 @@ if ($questionnaire_id)
$ls = $db->GetRow($sql);
$lsid = $ls['lime_sid'];
- print " ". T_("Download data for this questionnaire via Limesurvey") . "";
+ print " ". T_("Download data for this questionnaire via Limesurvey") . "";
print "";
-
+ print " " . T_("Download data for this sample via Limesurvey") . "";
//get sample vars
$sql = "SELECT sivr.var_id as value, sivr.var as description
FROM `sample_import_var_restrict` as sivr
@@ -225,18 +223,17 @@ if ($questionnaire_id)
$rs = $db->GetAll($sql);
//download a key file linking the caseid to the sample
- print "";
}
}
diff --git a/admin/displayappointments.php b/admin/displayappointments.php
index 12f66d89..d02d11c8 100644
--- a/admin/displayappointments.php
+++ b/admin/displayappointments.php
@@ -132,8 +132,6 @@ if ( (isset($_GET['appointment_id']) && isset($_GET['case_id'])) ||(($_GET['new'
print "
diff --git a/css/custom.css b/css/custom.css
index b5b1d641..8dc3463f 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -2,7 +2,7 @@
body {
/*
font-size: 1.5em;
-line-height: 1.5em;*/
+line-height: 1.3em;*/
/* color: #515a63; or #666 */
/*padding-top: 0px;*/
background:#EEEFF2;
diff --git a/include/limesurvey/admin/styles/default/adminstyle.css b/include/limesurvey/admin/styles/default/adminstyle.css
index 99d6314b..14325ddc 100644
--- a/include/limesurvey/admin/styles/default/adminstyle.css
+++ b/include/limesurvey/admin/styles/default/adminstyle.css
@@ -1107,7 +1107,7 @@ textarea.updater-changelog {
#importquestion li label:first-child,
#bouncesettings li label:first-child,
#importquestion li label:first-child {
- width: 44%;
+ width: 50%;
text-align: right;
margin-right: 0.5em;
float: left;
@@ -1331,7 +1331,7 @@ padding:10px;
}
#statistics_general_filter {
- width:650px;
+ width:950px;
margin:0 auto;
}
@@ -1341,15 +1341,15 @@ clear:both;
#statistics_general_filter #left {
- width:270px;
- height:125px;
+ width:47%;
+ height:131px;
float:left;
clear:left;
}
#statistics_general_filter #right {
- width:330px;
- height:125px;
+ width:47%;
+ /* height:125px; */
float:right;
clear:none;
}
diff --git a/status_interface2.php b/status_interface2.php
index 2919e95b..74a9a902 100644
--- a/status_interface2.php
+++ b/status_interface2.php
@@ -67,7 +67,7 @@ if (AUTO_LOGOUT_MINUTES !== false)
$js[] = "js/childnap.js";
}
-xhtml_head(T_("Status"),true,array("css/status_interface2.css"),$js);
+xhtml_head(T_("Status"),false,array("css/status_interface2.css"),$js);
$ca = get_call_attempt($operator_id,false);
if ($ca)
@@ -76,7 +76,7 @@ if ($ca)
$case_id = get_case_id($operator_id);
$fname = get_respondent_variable("firstName",$respondent_id);
$lname = get_respondent_variable("lastName",$respondent_id);
- print "" . T_("Name") . ": $fname $lname
";
+ print "" . T_("Name") . ": $fname $lname
";
$appointment = is_on_appointment($ca);
@@ -173,7 +173,7 @@ if ($ca)
$apdate = $rs['time'];
- print "" . T_("Appointment") . ": " . $apdate . "
";
+ print "" . T_("Appointment") . ": " . $apdate . "
";
//if (missed_appointment($ca)) print "" . T_("MISSED") . "
";
}
@@ -212,13 +212,13 @@ if ($ca)
print "";
foreach($rs as $r)
{
- print "
";
}
print "