Fixes lp:1480880 - disable create new questionnaire if no active Limesurvey available

Also some other comment / localisation fixes
2024-04-02 12:12:16 +00:00 · 2015-08-05 10:49:42 +10:00
parent f18f8852a0 9af54ab70e
commit fdc317c79a
8 changed files with 153 additions and 137 deletions
--- a/admin/availability.php
+++ b/admin/availability.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");

 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
 			);
--- a/admin/callrestrict.php
+++ b/admin/callrestrict.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");

 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 //"../include/font-awesome/css/font-awesome.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
--- a/admin/new.php
+++ b/admin/new.php
@@ -144,8 +144,16 @@ $_POST['import_file'] = false;


 <a href="questionnairelist.php" class="btn btn-default pull-left" ><i class="fa fa-list text-primary"></i>&emsp;<?php echo T_("Go to");?>&ensp;<?php echo T_("Questionnaire management");?> </a>
-
 	
+<?php	
+$sql = "SELECT s.sid as sid, CONCAT(s.sid,' -> ',sl.surveyls_title) AS title
+	FROM " . LIME_PREFIX . "surveys AS s
+	LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( s.sid = sl.surveyls_survey_id)
+	WHERE s.active = 'Y'
+	GROUP BY s.sid";
+$surveys = $db->GetAll($sql);
+
+if (!empty($surveys)){?>

 <form enctype="multipart/form-data" action="" method="post" class="form-horizontal col-lg-12" >

@@ -157,25 +165,14 @@ $_POST['import_file'] = false;
 		</div>
 	</div>
 	
-<?php	
-$sql = "SELECT s.sid as sid, sl.surveyls_title AS title
-	FROM " . LIME_PREFIX . "surveys AS s
-	LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( s.sid = sl.surveyls_survey_id)
-	WHERE s.active = 'Y'
-	GROUP BY s.sid";
-$surveys = $db->GetAll($sql);
-?>
 	<div class="form-group row">
 		<label class="col-sm-4 control-label" ><?php  echo T_("Select limesurvey instrument:");?> </label>
 		<div class='col-sm-4'>
-		<?php if (!empty($surveys)){?>
 			<select name="select" class="form-control">
 			<?php foreach($surveys as $s){?>  
-				<option value="<?php echo $s['sid'];?>"><?php echo T_("Existing instrument:"), "&ensp;", $s['title'] ;?></option><?php } ?>
+				<option value="<?php echo $s['sid'];?>"><?php echo T_("Survey"), ":&ensp;", $s['title'] ;?></option><?php } ?>
 			</select>
-		<?php } else { ?>
-			<a class="btn btn-lime" href="<?php echo LIME_URL ;?>admin/admin.php?action=newsurvey"><i class="fa fa-lemon-o text-danger"></i>&emsp;<?php echo T_("Create an instrument in Limesurvey") ;?></a> <?php } ?>
-		</div>		
+		</div>
 		<div class='col-sm-4'>
 			<strong><?php echo T_("or") ;?>&emsp;</strong>
 			<a class="btn btn-lime" href="<?php echo LIME_URL ;?>admin/admin.php?action=newsurvey"><i class="fa fa-lemon-o text-danger"></i>&emsp;<?php echo T_("Create an instrument in Limesurvey") ;?></a>
@@ -189,15 +186,9 @@ $surveys = $db->GetAll($sql);
 				<option value="none"><?php  echo T_("No respondent selection (go straight to questionnaire)"); ?></option>
 				<option value="old" ><?php echo T_("Use basic respondent selection text (below)"); ?></option>
 			<?php 
-			$sql = "SELECT s.sid as sid, sl.surveyls_title AS title
-					FROM " . LIME_PREFIX . "surveys AS s
-					LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( s.sid = sl.surveyls_survey_id)
-					WHERE s.active = 'Y'";
-			$surveys = $db->GetAll($sql);
-				
-			if (!empty($surveys)){ foreach($surveys as $s){ ?> 
-				<option value="<?php echo $s['sid'];?>"><?php echo T_("Existing instrument:") ,"&ensp;", $s['title'] ;?></option>
-			<?php } } ?>
+			foreach($surveys as $s){ ?> 
+				<option value="<?php echo $s['sid'];?>"><?php echo T_("Survey") ,":&ensp;", $s['title'] ;?></option>
+			<?php }?>
 			</select>
 		</div>
 	</div>
@@ -343,7 +334,7 @@ $ckeditorConfig = array("toolbar" => array(array("tokens","-","Source"),
 </div>


-<div class="panel  panel-default">
+<div class="panel panel-default">
  <div class="panel-heading">
 	<i class="fa fa-fw fa-2x wminimize fa-chevron-circle-up text-primary pull-left" data-toggle="tooltip" title="<?php echo T_("Expand/Collapse");?>" style="margin-top: -5px;"></i>
    <h3 class="panel-title "><?php  echo T_("Project end text (thank you screen):");?></h3>
@@ -353,7 +344,7 @@ $ckeditorConfig = array("toolbar" => array(array("tokens","-","Source"),
  </div>
 </div>

-<div class="panel panel-default ">
+<div class="panel panel-default">
  <div class="panel-heading">
 	<i class="fa fa-fw fa-2x wminimize fa-chevron-circle-up text-primary pull-left" data-toggle="tooltip" title="<?php echo T_("Expand/Collapse");?>" style="margin-top: -5px;"></i>
    <h3 class="panel-title"><?php echo T_("Project information for interviewers/operators:");?></h3>
@@ -365,14 +356,26 @@ $ckeditorConfig = array("toolbar" => array(array("tokens","-","Source"),

 <div class="row form-group">
 	<div class="col-sm-4 ">
-		<a href="questionnairelist.php"  class="btn btn-default pull-right" ><i class="fa fa-list text-primary"></i>&emsp;<?php echo T_("Go to");?>&ensp;<?php echo T_("Questionnaire management");?></a>
+		<a href="questionnairelist.php"  class="btn btn-default pull-right" ><i class="fa fa-list text-primary"></i>&emsp;<?php echo T_("Cancel");?></a>
 	</div>
 	<div class="col-sm-4 ">
-		<button type="submit" class="btn btn-default pull-right" name="import_file" ><i class="fa fa-check-square-o fa-lg text-primary"></i>&emsp;<?php  echo T_("Create Questionnaire"); ?></button>
+		<button type="submit" class="btn btn-primary pull-right btn-lg" name="import_file" ><i class="fa fa-check-square-o fa-lg"></i>&emsp;<?php  echo T_("Create Questionnaire"); ?></button>
 	</div>
 </div>
+
 </form>

+<?php }
+else { ?>
+		<div class='col-sm-6 col-sm-offset-1'>
+		<h3 class="alert alert-warning"> <?php echo T_("NO active Lime surveys available");?> </h3>
+			<a class="btn btn-lime btn-lg btn-block" href="<?php echo LIME_URL ;?>admin/admin.php?action=newsurvey"><i class="fa fa-lemon-o text-danger"></i>&emsp;<?php echo T_("Create an instrument in Limesurvey");?>  </a>
+			<h4 class="text-center"><?php echo T_("or"); ?></h4>
+			<a class="btn btn-lime btn-lg btn-block" href="<?php echo LIME_URL ;?>admin/admin.php?action=listsurveys"><i class="fa fa-lemon-o text-danger"></i>&emsp;<?php echo T_("Administer instruments with Limesurvey");?>  </a> 
+		</div>
+<?php } ?>
+
+
 <?php 
 xhtml_foot($js_foot);//
-?>
+?>
--- a/admin/questionnairelist.php
+++ b/admin/questionnairelist.php
@@ -45,7 +45,7 @@ include("../db.inc.php");
 include("../functions/functions.xhtml.php");

 /**
- * Input functions
+ * Display functions
 */
 include("../functions/functions.display.php");

@@ -55,7 +55,7 @@ include("../functions/functions.display.php");
 include("../functions/functions.input.php");

 /**
- * CKEditor
+ * Limesurvey functions
 */
 include("../functions/functions.limesurvey.php");

@@ -321,8 +321,9 @@ if (isset($_GET['modify']))
 {
 	$questionnaire_id = intval($_GET['modify']);

-	$sql = "SELECT *
+	$sql = "SELECT `questionnaire`.*, sl.surveyls_title as title
 		FROM questionnaire
+		LEFT JOIN " . LIME_PREFIX . "surveys_languagesettings AS sl ON ( questionnaire.lime_sid = sl.surveyls_survey_id)
 		WHERE questionnaire_id = $questionnaire_id";
 	$rs = $db->GetRow($sql);

@@ -365,9 +366,13 @@ if (isset($_GET['modify']))
 	"extraPlugins" => "tokens");
 ?>
 	<div class="form-group">
-		<div class="col-sm-2"><a href='questionnairelist.php' class='btn btn-default pull-left' ><i class='fa fa-chevron-left fa-lg' style='color:blue;'></i>&emsp;<?php  echo T_("Go back"); ?></a></div>
-		<div class="col-sm-8"><?php // ?> </div>
-		<div class="col-sm-2"><?php echo "<a class='btn btn-default btn-lime pull-right' href='" . LIME_URL . "admin/admin.php?sid={$rs['lime_sid']}'><i class='fa fa-edit' style='color:blue;'></i>&emsp;" . T_("Edit instrument in Limesurvey") . "&emsp;</a>"; ?> </div>
+		<div class="col-sm-4">
+			<a href='questionnairelist.php' class='btn btn-default pull-left' ><i class='fa fa-chevron-left fa-lg' style='color:blue;'></i>&emsp;<?php  echo T_("Go back"); ?></a><h3 class="pull-right"><?php echo T_("Assigned survey"); ?>:</h3>
+		</div>
+		<div class="col-sm-8">
+			<h3 class="pull-left" ><?php echo $rs['lime_sid'],"&emsp;",$rs['title']; ?></h3>
+			<?php echo "<a class='btn btn-default btn-lime pull-right' href='" . LIME_URL . "admin/admin.php?sid={$rs['lime_sid']}'><i class='fa fa-edit' style='color:blue;'></i>&emsp;" . T_("Edit instrument in Limesurvey") . "&emsp;</a>"; ?> 
+		</div>
 	</div>

 <form action="?modify=<?php  echo $questionnaire_id; ?>" method="post" class="form-horizontal col-sm-12 form-group ">
--- a/admin/quotarow.php
+++ b/admin/quotarow.php
@@ -326,7 +326,7 @@ if ($questionnaire_id != false)
        {
          if (count($data) > 2)
          {
-            //one quota record per row
+            //one quota record per row,  placed in order of records sequence
          	$description = $db->quote($data[0]);
 			$completions = intval($data[1]);
          	$autoprioritise = 0;
@@ -431,7 +431,7 @@ if ($questionnaire_id != false)
      if (isset($_GET['sgqa']))
        $ssgqa = $db->qstr($_GET['sgqa']);

-      //select question
+      //select question + corrected question order as in questionnaire with subquestions 
  		$sql = "SELECT CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) as value, CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END, '&ensp;->&ensp;' , CASE WHEN lq.parent_qid = 0 THEN lq.question ELSE CONCAT(lq2.question, ' : ', lq.question) END) as description, CASE WHEN $ssgqa LIKE CONCAT( lq.sid, 'X', lq.gid, 'X', CASE WHEN lq.parent_qid = 0 THEN lq.qid ELSE CONCAT(lq.parent_qid, lq.title) END) THEN 'selected=\'selected\'' ELSE '' END AS selected
 	  		FROM `" . LIME_PREFIX . "questions` AS lq
  			LEFT JOIN `" . LIME_PREFIX . "questions` AS lq2 ON ( lq2.qid = lq.parent_qid )
--- a/admin/shifttemplate.php
+++ b/admin/shifttemplate.php
@@ -46,7 +46,7 @@ include ("../functions/functions.xhtml.php");

 $css = array(
 "../include/bootstrap/css/bootstrap.min.css", 
-//"../include/bootstrap-3.3.2/css/bootstrap-theme.min.css",
+//"../include/bootstrap/css/bootstrap-theme.min.css",
 "../include/clockpicker/dist/bootstrap-clockpicker.min.css",
 "../css/custom.css"
 			);
--- a/include/limesurvey/classes/adodb/lang/adodb-ru1251.inc.php
+++ b/include/limesurvey/classes/adodb/lang/adodb-ru1251.inc.php
@@ -1,35 +1,35 @@
-<?php
-
-// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'ru1251',
-DB_ERROR                    => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_ALREADY_EXISTS     => '<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_CANNOT_CREATE      => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_CANNOT_DELETE      => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_CANNOT_DROP        => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (drop)',
-DB_ERROR_CONSTRAINT         => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_DIVZERO            => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 0',
-DB_ERROR_INVALID            => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_INVALID_DATE       => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_INVALID_NUMBER     => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_MISMATCH           => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NODBSELECTED       => '<EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NOSUCHFIELD        => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>',
-DB_ERROR_NOSUCHTABLE        => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NOT_CAPABLE        => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NOT_FOUND          => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NOT_LOCKED         => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_SYNTAX             => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_UNSUPPORTED        => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_VALUE_COUNT_ON_ROW => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_INVALID_DSN        => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DSN',
-DB_ERROR_CONNECT_FAILED     => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-0                               => '<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>', // DB_OK
-DB_ERROR_NEED_MORE_DATA     => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_EXTENSION_NOT_FOUND=> '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
-DB_ERROR_NOSUCHDB           => '<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>',
-DB_ERROR_ACCESS_VIOLATION   => '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>'
-);
+<?php
+
+// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'ru1251',
+            DB_ERROR                    => 'неизвестная ошибка',
+            DB_ERROR_ALREADY_EXISTS     => 'уже существует',
+            DB_ERROR_CANNOT_CREATE      => 'невозможно создать',
+            DB_ERROR_CANNOT_DELETE      => 'невозможно удалить',
+            DB_ERROR_CANNOT_DROP        => 'невозможно удалить (drop)',
+            DB_ERROR_CONSTRAINT         => 'нарушение условий проверки',
+            DB_ERROR_DIVZERO            => 'деление на 0',
+            DB_ERROR_INVALID            => 'неправильно',
+            DB_ERROR_INVALID_DATE       => 'некорректная дата или время',
+            DB_ERROR_INVALID_NUMBER     => 'некорректное число',
+            DB_ERROR_MISMATCH           => 'ошибка',
+            DB_ERROR_NODBSELECTED       => 'БД не выбрана',
+            DB_ERROR_NOSUCHFIELD        => 'не существует поле',
+            DB_ERROR_NOSUCHTABLE        => 'не существует таблица',
+            DB_ERROR_NOT_CAPABLE        => 'СУБД не в состоянии',
+            DB_ERROR_NOT_FOUND          => 'не найдено',
+            DB_ERROR_NOT_LOCKED         => 'не заблокировано',
+            DB_ERROR_SYNTAX             => 'синтаксическая ошибка',
+            DB_ERROR_UNSUPPORTED        => 'не поддерживается',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'счетчик значений в строке',
+            DB_ERROR_INVALID_DSN        => 'неправильная DSN',
+            DB_ERROR_CONNECT_FAILED     => 'соединение неуспешно',
+            0                               => 'нет ошибки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоставлено недостаточно данных',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'расширение не найдено',
+            DB_ERROR_NOSUCHDB           => 'не существует БД',
+            DB_ERROR_ACCESS_VIOLATION   => 'недостаточно прав доступа'
+);
 ?>
--- a/locale/quexs.pot
+++ b/locale/quexs.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: queXS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-04 13:57+1000\n"
+"POT-Creation-Date: 2015-08-05 10:48+1000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Adam Zammit <adam.zammit@acspri.org.au>\n"
 "Language-Team: \n"
@@ -535,9 +535,9 @@ msgid "Add note"
 msgstr ""

 #: casenote.php:69 admin/samplelist.php:284 admin/samplelist.php:495
-#: admin/samplesearch.php:102 admin/questionnairelist.php:368
-#: admin/questionnairelist.php:503 admin/questionnairelist.php:525
-#: admin/questionnairelist.php:533 admin/callhistory.php:137
+#: admin/samplesearch.php:102 admin/questionnairelist.php:370
+#: admin/questionnairelist.php:508 admin/questionnairelist.php:530
+#: admin/questionnairelist.php:538 admin/callhistory.php:137
 #: admin/availability.php:121 admin/operatorlist.php:182 admin/import.php:43
 #: admin/import.php:81 admin/import.php:112 admin/casesbyoutcome.php:54
 #: admin/assignsample.php:150 admin/assignsample.php:203
@@ -594,15 +594,15 @@ msgstr ""
 #: waitnextcase_interface2.php:136 admin/operators.php:284
 #: admin/operators.php:296 admin/operators.php:300 admin/operators.php:304
 #: admin/operators.php:308 admin/samplesearch.php:96
-#: admin/supervisorchat.php:74 admin/questionnairelist.php:380
-#: admin/questionnairelist.php:383 admin/questionnairelist.php:387
-#: admin/questionnairelist.php:391 admin/questionnairelist.php:395
+#: admin/supervisorchat.php:74 admin/questionnairelist.php:385
+#: admin/questionnairelist.php:388 admin/questionnairelist.php:392
+#: admin/questionnairelist.php:396 admin/questionnairelist.php:400
 #: admin/operatorlist.php:239 admin/operatorlist.php:251
 #: admin/operatorlist.php:255 admin/assignsample.php:173
 #: admin/assignsample.php:176 admin/assignsample.php:264
 #: admin/assignsample.php:268 admin/supervisor.php:185 admin/quotarow.php:392
-#: admin/quotarow.php:596 admin/new.php:208 admin/new.php:215
-#: admin/new.php:222 admin/new.php:229 admin/new.php:236
+#: admin/quotarow.php:596 admin/new.php:199 admin/new.php:206
+#: admin/new.php:213 admin/new.php:220 admin/new.php:227
 msgid "Yes"
 msgstr ""

@@ -1452,7 +1452,7 @@ msgid "characters"
 msgstr ""

 #: admin/operators.php:267 admin/operators.php:276
-#: admin/questionnairelist.php:375 admin/operatorlist.php:225
+#: admin/questionnairelist.php:380 admin/operatorlist.php:225
 #: admin/operatorlist.php:233 admin/assignsample.php:228
 #: admin/quotarow.php:582 admin/shiftreport.php:104
 #: admin/displayappointments.php:258 admin/displayappointments.php:277
@@ -1474,15 +1474,15 @@ msgstr ""

 #: admin/operators.php:284 admin/operators.php:296 admin/operators.php:300
 #: admin/operators.php:304 admin/operators.php:308 admin/supervisorchat.php:74
-#: admin/questionnairelist.php:380 admin/questionnairelist.php:383
-#: admin/questionnairelist.php:387 admin/questionnairelist.php:391
-#: admin/questionnairelist.php:395 admin/operatorlist.php:239
+#: admin/questionnairelist.php:385 admin/questionnairelist.php:388
+#: admin/questionnairelist.php:392 admin/questionnairelist.php:396
+#: admin/questionnairelist.php:400 admin/operatorlist.php:239
 #: admin/operatorlist.php:251 admin/operatorlist.php:255
 #: admin/assignsample.php:173 admin/assignsample.php:174
 #: admin/assignsample.php:176 admin/assignsample.php:264
 #: admin/assignsample.php:265 admin/assignsample.php:268
-#: admin/quotarow.php:392 admin/quotarow.php:596 admin/new.php:208
-#: admin/new.php:215 admin/new.php:222 admin/new.php:229 admin/new.php:236
+#: admin/quotarow.php:392 admin/quotarow.php:596 admin/new.php:199
+#: admin/new.php:206 admin/new.php:213 admin/new.php:220 admin/new.php:227
 msgid "No"
 msgstr ""

@@ -2004,136 +2004,140 @@ msgstr ""
 msgid "Update"
 msgstr ""

-#: admin/questionnairelist.php:347
+#: admin/questionnairelist.php:348
 msgid "Modify Questionnaire "
 msgstr ""

 #: admin/questionnairelist.php:370
+msgid "Assigned survey"
+msgstr ""
+
+#: admin/questionnairelist.php:374
 msgid "Edit instrument in Limesurvey"
 msgstr ""

-#: admin/questionnairelist.php:375 admin/questionnairelist.php:376
-#: admin/new.php:154 admin/new.php:156
+#: admin/questionnairelist.php:380 admin/questionnairelist.php:381
+#: admin/new.php:162 admin/new.php:164
 msgid "Name for questionnaire:"
 msgstr ""

-#: admin/questionnairelist.php:379 admin/new.php:206
+#: admin/questionnairelist.php:384 admin/new.php:197
 msgid "Restrict appointments to shifts?"
 msgstr ""

-#: admin/questionnairelist.php:382 admin/new.php:213
+#: admin/questionnairelist.php:387 admin/new.php:204
 msgid "Restrict work to shifts?"
 msgstr ""

-#: admin/questionnairelist.php:386 admin/new.php:220
+#: admin/questionnairelist.php:391 admin/new.php:211
 msgid "Questionnaire for testing only?"
 msgstr ""

-#: admin/questionnairelist.php:390 admin/new.php:227
+#: admin/questionnairelist.php:395 admin/new.php:218
 msgid "Allow operators to generate referrals?"
 msgstr ""

-#: admin/questionnairelist.php:394 admin/new.php:234
+#: admin/questionnairelist.php:399 admin/new.php:225
 msgid "Allow for respondent self completion via email invitation?"
 msgstr ""

-#: admin/questionnairelist.php:399 admin/new.php:242
+#: admin/questionnairelist.php:404 admin/new.php:233
 msgid "Questionnaire display mode for respondent"
 msgstr ""

-#: admin/questionnairelist.php:402 admin/new.php:245
+#: admin/questionnairelist.php:407 admin/new.php:236
 msgid "All in one"
 msgstr ""

-#: admin/questionnairelist.php:403 admin/new.php:246
+#: admin/questionnairelist.php:408 admin/new.php:237
 msgid "Question by question"
 msgstr ""

-#: admin/questionnairelist.php:404 admin/new.php:247
+#: admin/questionnairelist.php:409 admin/new.php:238
 msgid "Group at a time"
 msgstr ""

-#: admin/questionnairelist.php:409 admin/new.php:252
+#: admin/questionnairelist.php:414 admin/new.php:243
 msgid "Limesurvey template for respondent"
 msgstr ""

-#: admin/questionnairelist.php:428 admin/new.php:270
+#: admin/questionnairelist.php:433 admin/new.php:261
 msgid "URL to forward respondents on self completion (required)"
 msgstr ""

-#: admin/questionnairelist.php:439 admin/questionnairelist.php:449
-#: admin/questionnairelist.php:459 admin/questionnairelist.php:469
-#: admin/questionnairelist.php:485 admin/questionnairelist.php:495
-#: admin/new.php:306 admin/new.php:316 admin/new.php:326 admin/new.php:336
-#: admin/new.php:348 admin/new.php:358
+#: admin/questionnairelist.php:444 admin/questionnairelist.php:454
+#: admin/questionnairelist.php:464 admin/questionnairelist.php:474
+#: admin/questionnairelist.php:490 admin/questionnairelist.php:500
+#: admin/new.php:297 admin/new.php:307 admin/new.php:317 admin/new.php:327
+#: admin/new.php:339 admin/new.php:349
 msgid "Expand/Collapse"
 msgstr ""

-#: admin/questionnairelist.php:440 admin/new.php:307
+#: admin/questionnairelist.php:445 admin/new.php:298
 msgid "Respondent selection introduction:"
 msgstr ""

-#: admin/questionnairelist.php:450 admin/new.php:317
+#: admin/questionnairelist.php:455 admin/new.php:308
 msgid "Respondent selection project introduction:"
 msgstr ""

-#: admin/questionnairelist.php:460 admin/new.php:327
+#: admin/questionnairelist.php:465 admin/new.php:318
 msgid "Respondent selection callback (already started questionnaire):"
 msgstr ""

-#: admin/questionnairelist.php:470 admin/new.php:337
+#: admin/questionnairelist.php:475 admin/new.php:328
 msgid "Message to leave on an answering machine:"
 msgstr ""

-#: admin/questionnairelist.php:480
+#: admin/questionnairelist.php:485
 msgid "Edit respondent selection instrument in Limesurvey"
 msgstr ""

-#: admin/questionnairelist.php:486 admin/new.php:349
+#: admin/questionnairelist.php:491 admin/new.php:340
 msgid "Project end text (thank you screen):"
 msgstr ""

-#: admin/questionnairelist.php:496 admin/new.php:359
+#: admin/questionnairelist.php:501 admin/new.php:350
 msgid "Project information for interviewers/operators:"
 msgstr ""

-#: admin/questionnairelist.php:504
+#: admin/questionnairelist.php:509
 msgid "Update Questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:518
+#: admin/questionnairelist.php:523
 msgid "Delete Questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:520
+#: admin/questionnairelist.php:525
 msgid "Any collected data and the limesurvey instrument will NOT be deleted"
 msgstr ""

-#: admin/questionnairelist.php:521
+#: admin/questionnairelist.php:526
 msgid ""
 "The questionnaire will be deleted from queXS including call history, cases, "
 "case notes, respondent details, appointments and the links between "
 "operators, clients and the questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:522
+#: admin/questionnairelist.php:527
 msgid "Please confirm you wish to delete the questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:525
+#: admin/questionnairelist.php:530
 msgid "Delete this questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:531 admin/index.php:100 admin/new.php:136
-#: admin/new.php:146 admin/new.php:368
+#: admin/questionnairelist.php:536 admin/index.php:100 admin/new.php:136
+#: admin/new.php:146
 msgid "Questionnaire management"
 msgstr ""

-#: admin/questionnairelist.php:534 admin/index.php:99 admin/new.php:42
+#: admin/questionnairelist.php:539 admin/index.php:99 admin/new.php:42
 msgid "Create a new questionnaire"
 msgstr ""

-#: admin/questionnairelist.php:552
+#: admin/questionnairelist.php:557
 msgid "Edit Lime survey"
 msgstr ""

@@ -2366,7 +2370,7 @@ msgid "Enter new sample name..."
 msgstr ""

 #: admin/index.php:50
-msgid "Administrative Tools"
+msgid "queXS Administration"
 msgstr ""

 #: admin/index.php:67
@@ -2397,11 +2401,11 @@ msgstr ""
 msgid "Questionnairies"
 msgstr ""

-#: admin/index.php:98 admin/new.php:177 admin/new.php:181
+#: admin/index.php:98 admin/new.php:178 admin/new.php:372
 msgid "Create an instrument in Limesurvey"
 msgstr ""

-#: admin/index.php:101
+#: admin/index.php:101 admin/new.php:374
 msgid "Administer instruments with Limesurvey"
 msgstr ""

@@ -2763,7 +2767,7 @@ msgstr ""
 msgid "Select case"
 msgstr ""

-#: admin/supervisor.php:142 admin/new.php:180
+#: admin/supervisor.php:142 admin/new.php:177 admin/new.php:373
 msgid "or"
 msgstr ""

@@ -2775,7 +2779,7 @@ msgstr ""
 msgid "Set an outcome for this call"
 msgstr ""

-#: admin/supervisor.php:166
+#: admin/supervisor.php:166 admin/new.php:359
 msgid "Cancel"
 msgstr ""

@@ -3337,11 +3341,11 @@ msgstr ""
 msgid "No, Thank you, go to"
 msgstr ""

-#: admin/new.php:146 admin/new.php:368
+#: admin/new.php:146
 msgid "Go to"
 msgstr ""

-#: admin/new.php:156
+#: admin/new.php:164
 msgid "Enter New questionnaire name.."
 msgstr ""

@@ -3349,26 +3353,30 @@ msgstr ""
 msgid "Select limesurvey instrument:"
 msgstr ""

-#: admin/new.php:174 admin/new.php:199
-msgid "Existing instrument:"
+#: admin/new.php:173 admin/new.php:190
+msgid "Survey"
 msgstr ""

-#: admin/new.php:186
+#: admin/new.php:183
 msgid "Respondent selection type:"
 msgstr ""

-#: admin/new.php:189
+#: admin/new.php:186
 msgid "No respondent selection (go straight to questionnaire)"
 msgstr ""

-#: admin/new.php:190
+#: admin/new.php:187
 msgid "Use basic respondent selection text (below)"
 msgstr ""

-#: admin/new.php:371
+#: admin/new.php:362
 msgid "Create Questionnaire"
 msgstr ""

+#: admin/new.php:371
+msgid "NO active Lime surveys available"
+msgstr ""
+
 #: admin/databasestrings.php:32 rs_intro_interface2.php:76
 msgid "Not attempted or worked"
 msgstr ""