Updating to Limesurvey 1.9.1+ revision 11132 (part one)

2024-04-02 12:12:16 +00:00 · 2011-10-10 01:24:38 +00:00
parent 1786cf689b
commit 11c5f3e1df
61 changed files with 1978 additions and 2317 deletions
--- a/include/limesurvey/admin/classes/pear/OLE/OLE.php
+++ b/include/limesurvey/admin/classes/pear/OLE/OLE.php
@@ -31,6 +31,7 @@ define('OLE_LONG_INT_SIZE',        4);
 define('OLE_PPS_SIZE',          0x80);

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once($homedir.'/classes/pear/PEAR.php');
 require_once $homedir.'/classes/pear/OLE/PPS.php';

--- a/include/limesurvey/admin/classes/pear/OLE/PPS.php
+++ b/include/limesurvey/admin/classes/pear/OLE/PPS.php
@@ -20,6 +20,7 @@
 // $Id: PPS.php,v 1.5 2003/12/14 18:12:28 xnoguer Exp $

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once($homedir.'/classes/pear/PEAR.php');
 require_once($homedir.'/classes/pear/OLE/OLE.php');

--- a/include/limesurvey/admin/classes/pear/OLE/PPS/File.php
+++ b/include/limesurvey/admin/classes/pear/OLE/PPS/File.php
@@ -20,6 +20,7 @@
 // $Id: File.php,v 1.8 2003/12/12 21:10:10 xnoguer Exp $

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once ($homedir.'/classes/pear/OLE/PPS.php');

 /**
--- a/include/limesurvey/admin/classes/pear/OLE/PPS/Root.php
+++ b/include/limesurvey/admin/classes/pear/OLE/PPS/Root.php
@@ -20,6 +20,7 @@
 // $Id: Root.php,v 1.7 2003/12/12 21:10:10 xnoguer Exp $

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once ($homedir.'/classes/pear/OLE/PPS.php');

 /**
@@ -175,7 +176,7 @@ class OLE_PPS_Root extends OLE_PPS
        $iCnt = count($raList);
        $iBdCnt = $this->_BIG_BLOCK_SIZE / OLE_PPS_SIZE;
        $iPPScnt = (floor($iCnt/$iBdCnt) + (($iCnt % $iBdCnt)? 1: 0));
-         
+
        return array($iSBDcnt, $iBBcnt, $iPPScnt);
    }

@@ -287,7 +288,7 @@ class OLE_PPS_Root extends OLE_PPS
    function _saveBigData($iStBlk, &$raList)
    {
        $FILE = $this->_FILEH_;
-         
+
        // cycle through PPS's
        for ($i = 0; $i < count($raList); $i++)
        {
@@ -346,7 +347,7 @@ class OLE_PPS_Root extends OLE_PPS
        $sRes = '';
        $FILE = $this->_FILEH_;
        $iSmBlk = 0;
-         
+
        for ($i = 0; $i < count($raList); $i++)
        {
            // Make SBD, small data string
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer.php
@@ -32,8 +32,8 @@
 */

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
-require_once $homedir.'/classes/pear/PEAR.php';
-require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/Workbook.php';
+@require_once $homedir.'/classes/pear/PEAR.php';
+@require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/Workbook.php';

 /**
 * Class for writing Excel Spreadsheets. This class should change COMPLETELY.
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/BIFFwriter.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/BIFFwriter.php
@@ -33,6 +33,7 @@
 */

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once $homedir.'/classes/pear/PEAR.php';

 /**
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Format.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Format.php
@@ -33,6 +33,8 @@
 */

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
+
 require_once $homedir.'/classes/pear/PEAR.php';

 /**
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Parser.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Parser.php
@@ -94,7 +94,8 @@ define('SPREADSHEET_EXCEL_WRITER_NE', "<>");


 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
-require_once $homedir.'/classes/pear/PEAR.php';
+if (!isset($homedir)) die();
+@require_once $homedir.'/classes/pear/PEAR.php';

 /**
 * Class for parsing Excel formulas
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Workbook.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Workbook.php
@@ -33,6 +33,7 @@
 */

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/Format.php';
 require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/BIFFwriter.php';
 require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/Worksheet.php';
--- a/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Worksheet.php
+++ b/include/limesurvey/admin/classes/pear/Spreadsheet/Excel/Writer/Worksheet.php
@@ -33,6 +33,7 @@
 */

 if (isset($_REQUEST['homedir'])) {die('You cannot start this script directly');}
+if (!isset($homedir)) die();
 require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/Parser.php';
 require_once $homedir.'/classes/pear/Spreadsheet/Excel/Writer/BIFFwriter.php';

--- a/include/limesurvey/admin/classes/phpCAS/CAS/PGTStorage/pgt-db.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/PGTStorage/pgt-db.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file CAS/PGTStorage/pgt-db.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/PGTStorage/pgt-file.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/PGTStorage/pgt-file.php
@@ -14,6 +14,7 @@
 *
 * @ingroup internalPGTStorageFile
 */
+if (!defined('PHPCAS_VERSION')) die();

 class PGTStorageFile extends PGTStorage
 {
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/catalan.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/catalan.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/spanish.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/english.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/english.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/english.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/french.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/french.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/english.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/german.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/german.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/german.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/greek.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/greek.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/greek.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/japanese.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/japanese.php
@@ -1,4 +1,5 @@
 <?php
+if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/japanese.php
--- a/include/limesurvey/admin/classes/phpCAS/CAS/languages/spanish.php
+++ b/include/limesurvey/admin/classes/phpCAS/CAS/languages/spanish.php
@@ -1,4 +1,5 @@
 <?php
+  if (!defined('PHPCAS_VERSION')) die();

 /**
 * @file languages/spanish.php
--- a/include/limesurvey/classes/adodb/contrib/toxmlrpc.inc.php
+++ b/include/limesurvey/classes/adodb/contrib/toxmlrpc.inc.php
@@ -17,7 +17,7 @@
 /**
 * Include the main libraries
 */
-require_once('xmlrpc.inc');
+@require_once('xmlrpc.inc') OR die();
 if (!defined('ADODB_DIR')) require_once('adodb.inc.php');

 /**
--- a/include/limesurvey/classes/adodb/datadict/datadict-firebird.inc.php
+++ b/include/limesurvey/classes/adodb/datadict/datadict-firebird.inc.php
@@ -10,6 +10,9 @@

 */

+ // security - hide paths
+if (!defined('ADODB_DIR')) die();
+
 class ADODB2_firebird extends ADODB_DataDict {

    var $databaseType = 'firebird';
--- a/include/limesurvey/classes/adodb/drivers/adodb-pdo_mssql.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-pdo_mssql.inc.php
@@ -1,6 +1,6 @@
 <?php

-
+if (!defined('ADODB_DIR')) die();    
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
 Released under both BSD license and Lesser GPL library license.
--- a/include/limesurvey/classes/adodb/drivers/adodb-pdo_mysql.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-pdo_mysql.inc.php
@@ -1,6 +1,6 @@
 <?php

-
+if (!defined('ADODB_DIR')) die();    
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
 Released under both BSD license and Lesser GPL library license.
@@ -110,7 +110,7 @@ class ADODB_pdo_mysql extends ADODB_pdo {
            $false = false;
            return $false;
        }
-         
+
        $retarr = array();
        while (!$rs->EOF){
            $fld = new ADOFieldObject();
--- a/include/limesurvey/classes/adodb/drivers/adodb-pdo_oci.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-pdo_oci.inc.php
@@ -1,6 +1,6 @@
 <?php

-
+if (!defined('ADODB_DIR')) die();    
 /*
 V5.10 10 Nov 2009   (c) 2000-2009 John Lim (jlim#natsoft.com). All rights reserved.
 Released under both BSD license and Lesser GPL library license.
--- a/include/limesurvey/classes/adodb/drivers/adodb-pdo_pgsql.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-pdo_pgsql.inc.php
@@ -8,13 +8,13 @@
 Set tabs to 8.

 */
-
+if (!defined('ADODB_DIR')) die();    
 class ADODB_pdo_pgsql extends ADODB_pdo {
    var $metaDatabasesSQL = "select datname from pg_database where datname not in ('template0','template1') order by 1";
    var $metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 	and tablename not in ('sql_features', 'sql_implementation_info', 'sql_languages',
-	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles') 
-	union 
+	 'sql_packages', 'sql_sizing', 'sql_sizing_profiles')
+	union
        select viewname,'V' from pg_views where viewname not like 'pg\_%'";
    //"select tablename from pg_tables where tablename not like 'pg_%' order by 1";
    var $isoDates = true; // accepts dates in ISO format
@@ -22,16 +22,16 @@ class ADODB_pdo_pgsql extends ADODB_pdo {
    var $sysTimeStamp = "CURRENT_TIMESTAMP";
    var $blobEncodeType = 'C';
    var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum
-		FROM pg_class c, pg_attribute a,pg_type t 
+		FROM pg_class c, pg_attribute a,pg_type t
 		WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
 AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";

    // used when schema defined
    var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum
-FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
+FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n
 WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
- and c.relnamespace=n.oid and n.nspname='%s' 
-	and a.attname not like '....%%' AND a.attnum > 0 
+ and c.relnamespace=n.oid and n.nspname='%s'
+	and a.attname not like '....%%' AND a.attnum > 0
 	AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";

    // get primary key etc -- from Freek Dijkstra
@@ -87,7 +87,7 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
        if ($info['version'] >= 7.3) {
            $this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
 			  and schemaname  not in ( 'pg_catalog','information_schema')
-	union 
+	union
        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
        }
        if ($mask) {
@@ -95,13 +95,13 @@ WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
            $mask = $this->qstr(strtolower($mask));
            if ($info['version']>=7.3)
            $this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
- union 
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')
+ union
 select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
            else
            $this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask 
- union 
+select tablename,'T' from pg_tables where tablename like $mask
+ union
 select viewname,'V' from pg_views where viewname like $mask";
        }
        $ret = ADOConnection::MetaTables($ttype,$showSchema);
--- a/include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlite.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlite.inc.php
@@ -13,6 +13,7 @@
 And also Sid Dunayer [sdunayer#interserv.com] for extensive fixes.
 */

+if (!defined('ADODB_DIR')) die();    
 class ADODB_pdo_sqlite extends ADODB_pdo {
    var $metaTablesSQL   = "SELECT name FROM sqlite_master WHERE type='table'";
    var $sysDate         = 'current_date';
--- a/include/limesurvey/classes/adodb/drivers/adodb-sybase_ase.inc.php
+++ b/include/limesurvey/classes/adodb/drivers/adodb-sybase_ase.inc.php
@@ -10,6 +10,7 @@
 Contributed by Interakt Online. Thx Cristian MARIN cristic#interaktonline.com
 */

+if (!defined('ADODB_DIR')) die();

 require_once ADODB_DIR."/drivers/adodb-sybase.inc.php";

@@ -116,4 +117,4 @@ class adorecordset_sybase_ase extends ADORecordset_sybase {
    }

 }
-?>
+?>
--- a/include/limesurvey/classes/adodb/session/adodb-encrypt-secret.php
+++ b/include/limesurvey/classes/adodb/session/adodb-encrypt-secret.php
@@ -13,7 +13,7 @@
@define('HORDE_BASE', dirname(dirname(dirname(__FILE__))) . '/horde');

 if (!is_dir(HORDE_BASE)) {
-    trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), E_USER_ERROR);
+//    trigger_error(sprintf('Directory not found: \'%s\'', HORDE_BASE), E_USER_ERROR);
    return 0;
 }

--- a/include/limesurvey/locale/it/LC_MESSAGES/it.po
+++ b/include/limesurvey/locale/it/LC_MESSAGES/it.po
--- a/include/limesurvey/locale/pl/LC_MESSAGES/pl.po
+++ b/include/limesurvey/locale/pl/LC_MESSAGES/pl.po
--- a/include/limesurvey/templates/basic/template-rtl.css
+++ b/include/limesurvey/templates/basic/template-rtl.css
@@ -3,6 +3,10 @@
  text-align: right;
 }

+.asterisk {
+  padding-right:0;padding-right:1em;
+}
+
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +43,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/basic/template.css
+++ b/include/limesurvey/templates/basic/template.css
@@ -43,16 +43,21 @@ td.tenpoint {
 .bd {
  background-color: #ddd;
 }
-
+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: verdana;
+  padding-right:1em;
 }

 span.qnumcode {
 	font-style:italic;
 }	
+.showqnumcode-X .qnumcode {
+	display:none;
+}

 .questionhelp {
  font-size: 10px;
@@ -941,11 +946,11 @@ div.questionTitle {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
-
+.allinone .withindex{margin:0}
 #index {
  position: absolute;
  right: 0;
@@ -993,4 +998,4 @@ div.questionTitle {
 #index .container .row.odd { background: #CCC; }
 #index .container .row.current { background: #000; color: #fff; }
 #index .container .row.missing { background: #CC0000; color: #fff; }
-#index .container input { margin: 1em; }
+#index .container input { margin: 1em; }
--- a/include/limesurvey/templates/basic/template.js
+++ b/include/limesurvey/templates/basic/template.js
@@ -40,10 +40,7 @@ $(document).ready(function(){
 */

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
+
 });


--- a/include/limesurvey/templates/bluengrey/template-rtl.css
+++ b/include/limesurvey/templates/bluengrey/template-rtl.css
@@ -2,6 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
+.asterisk {
+  padding-right:0;padding-right:1em;
+}

 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
@@ -54,4 +57,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/bluengrey/template.css
+++ b/include/limesurvey/templates/bluengrey/template.css
@@ -251,12 +251,17 @@ input.saveall,input.clearall {
  font-style: italic;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: verdana;
+  padding-right:1em;
+}
+.showqnumcode-X .qnumcode {
+	display:none;
 }
-
 .innergraph img {
  height: 12px;
  vertical-align: top;
@@ -1263,10 +1268,11 @@ table.assessments th{
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/bluengrey/template.js
+++ b/include/limesurvey/templates/bluengrey/template.js
@@ -40,10 +40,7 @@ $(document).ready(function(){
 */

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
+
 });


--- a/include/limesurvey/templates/citronade/startpage.pstpl
+++ b/include/limesurvey/templates/citronade/startpage.pstpl
@@ -25,4 +25,4 @@
 		</div>
 	</div>
 <div id="title"><h2 id="surveytitle" class="wrapper">{SURVEYNAME}</h2></div>
-	<div id="content">
+	<div id="content" class="outerframe">
--- a/include/limesurvey/templates/citronade/template-rtl.css
+++ b/include/limesurvey/templates/citronade/template-rtl.css
@@ -32,6 +32,9 @@ ul#surveylist li{

 .wrapper,#content{text-align:right;}

+.asterisk {padding-right:0;padding-left:1em;}
+.qnumcode{padding-right:0;padding-left:1em;}
+
 table.question tbody th.answertext,table.question tbody th.arraycaptionright{text-align:left;}
 table.question tbody th.answertextleft{text-align:right;}

--- a/include/limesurvey/templates/citronade/template.css
+++ b/include/limesurvey/templates/citronade/template.css
@@ -14,7 +14,57 @@
 */
 /* This part don't have to be modified */
 /* Base style only */
-html{font-size:100%}body{font-family:Arial, Helvetica, FreeSans, sans-serif;font-size:.85em;line-height:1.4;color:#000;background:#FFF;margin:0;padding:0}html,body{height:100%}h1,h2,h3,h4,h5,h6{line-height:1.2;font-weight:700;font-style:normal;margin:1em 0 .5em}h1{font-size:1.5em}h2{font-size:1.3em}h3{font-size:1.2em}h4{font-size:1.1em}ul,ol{margin:.75em 0 .75em 32px;padding:0}address{font-style:italic;margin:.75em 0}a{text-decoration:underline}a:link{color:#11C}a:visited{color:#339}a:hover,a:focus,a:active{color:#00F}a:active{outline:none}a img{border:none}strong{font-weight:700}form,fieldset{border:none;margin:0;padding:0}input,button,select{vertical-align:middle}abbr[title]{border-bottom:1px dotted;cursor:help}blockquote{border-left:solid 2px #ddd;margin:.75em 0 .75em 20px;padding:0 0 0 10px}q cite,q q{font-style:normal}blockquote p,li p{margin:.5em 0}dt{font-weight:700;margin:.75em 0 0}dd{margin:.25em 0 .25em 32px}table{border-collapse:separate;border-spacing:0;border:1px solid gray;margin:0}table td,table th{border:1px solid #ccc;vertical-align:top;padding:4px}article,aside,dialog,figure,footer,header,hgroup,menu,nav,section{display:block}ul#surveylist{list-style:none}.hide{position:absolute;top:-9999px;left:-9999px}.good{color:#090}#progress-wrapper{width:252px;font-size:12px;height:20px;margin:0 auto}#progress-wrapper #progress-pre{float:left;width:45px;text-align:right;margin:0 5px 0 0}#progress-wrapper .ui-widget-content{float:left;width:150px;height:1em;text-align:left;border-color:#666;border-style:solid;border-width:1px}#progress-wrapper .ui-widget-header{background-color:#AAA;background-image:none;border:1px solid #666}#progress-wrapper #progress-post{float:left;width:45px;text-align:left;margin:0 0 0 5px}.ui-slider{width:15em;display:inline-block;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;margin:.4em 0 .2em}.slider_showmin{float:left;width:3em;font-size:.7em;font-weight:400;text-align:left;color:#666;margin:1.4em 0 0}.slider_showmax{float:right;width:3em;font-size:.7em;font-weight:400;text-align:right;color:#666;margin:1.4em 0 0}.slider_lefttext{display:inline-block;position:relative;top:-.5em;padding-right:1em;text-align:right;font-size:.9em;color:#666}.slider_righttext{display:inline-block;position:relative;top:-.5em;padding-left:1em;font-size:.9em;color:#666}.slider_callout{overflow:hidden;position:absolute;top:-1.3em;margin-left:.8em;text-align:right;color:#333;font-size:.9em}#percentcomplete{height:20px;display:block;margin:5px 0}h5,h6{font-size:1em}p,dl{margin:.75em 0}em,q,cite{font-style:italic}.error,.problem{color:#f70}
+html{font-size:100%}
+body{font-family:Arial, Helvetica, FreeSans, sans-serif;font-size:.85em;line-height:1.4;color:#000;background:#FFF;margin:0;padding:0}
+html,body{height:100%}
+h1,h2,h3,h4,h5,h6{line-height:1.2;font-weight:700;font-style:normal;margin:1em 0 .5em}
+h1{font-size:1.5em}
+h2{font-size:1.3em}
+h3{font-size:1.2em}
+h4{font-size:1.1em}
+ul,ol{margin:.75em 0 .75em 32px;padding:0}
+address{font-style:italic;margin:.75em 0}
+a{text-decoration:underline}
+a:link,a:visited{color:#11C}
+a:visited{color:#339}
+a:hover,a:focus,a:active{color:#00F}
+a:active{outline:none}
+a img{border:none}
+strong{font-weight:700}
+form,fieldset{border:none;margin:0;padding:0}
+input,button,select{vertical-align:middle}
+abbr[title]{border-bottom:1px dotted;cursor:help}
+blockquote{border-left:solid 2px #ddd;margin:.75em 0 .75em 20px;padding:0 0 0 10px}
+q cite,q q{font-style:normal}
+blockquote p,li p{margin:.5em 0}
+dt{font-weight:700;margin:.75em 0 0}
+dd{margin:.25em 0 .25em 32px}
+table{border-collapse:separate;border-spacing:0;border:1px solid gray;margin:0}
+table td,table th{border:1px solid #ccc;vertical-align:top;padding:4px}
+article,aside,dialog,figure,footer,header,hgroup,menu,nav,section{display:block}
+ul#surveylist{list-style:none}
+.hide{position:absolute;top:-9999px;left:-9999px}
+.good{color:#090}
+#progress-wrapper{width:252px;font-size:12px;height:20px;margin:0 auto}
+#progress-wrapper #progress-pre{float:left;width:45px;text-align:right;margin:0 5px 0 0}
+#progress-wrapper .ui-widget-content{float:left;width:150px;height:1em;text-align:left;border-color:#666;border-style:solid;border-width:1px}
+#progress-wrapper .ui-widget-header{background-color:#AAA;background-image:none;border:1px solid #666}
+#progress-wrapper #progress-post{float:left;width:45px;text-align:left;margin:0 0 0 5px}
+.ui-slider{width:15em;display:inline-block;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;margin:.4em 0 .2em}
+.slider_showmin{float:left;width:3em;font-size:.7em;font-weight:400;text-align:left;color:#666;margin:1.4em 0 0}
+.slider_showmax{float:right;width:3em;font-size:.7em;font-weight:400;text-align:right;color:#666;margin:1.4em 0 0}
+.slider_lefttext{display:inline-block;position:relative;top:-.5em;padding-right:1em;text-align:right;font-size:.9em;color:#666}
+.slider_righttext{display:inline-block;position:relative;top:-.5em;padding-left:1em;font-size:.9em;color:#666}
+.slider_callout{overflow:hidden;position:absolute;top:-1.3em;margin-left:.8em;text-align:right;color:#333;font-size:.9em}
+.ie6 .ui-slider,.ie7 .ui-slider{display:block;float:left;}
+.ie6 .slider_lefttext ,.ie7 .slider_lefttext {float: left;margin-top:1em;}
+.ie6 .slider_righttext ,.ie7 .slider_righttext {float: left;margin-top:1em;}
+
+#percentcomplete{height:20px;display:block;margin:5px 0}
+h5,h6{font-size:1em}
+p,dl{margin:.75em 0}
+em,q,cite{font-style:italic}
+.error,.problem{color:#f70}
 .ie .ui-slider{display:inline;}
 /* --------------------------------------------- */
 /* Basic adaptation of the template :            */
@@ -24,7 +74,7 @@ html{font-size:100%}body{font-family:Arial, Helvetica, FreeSans, sans-serif;font
 body {background:#FEFEFE;color:#444;}
 a:link {color: #5670A1;} 
 a:visited {color: #5670A1;} 
-a:hover, a:focus, a:active {background-color: #E5F8A8;color: #5670A1;} 
+a:hover, a:focus, a:active {background-color: #E5F8A8;color: #5670A1;text-decoration:none;} 
 /* Global margin and with*/
 /* width of limesurvey contents parts */
 .wrapper,#content{padding:0;margin:0 auto;max-width:1024px;width:auto !important; width:1024px}
@@ -63,7 +113,12 @@ ul#surveylist li a.surveytitle{color:#5670A1;}
 	input#loadbutton,
 	input#registercontinue,
 	.navigator input
-		{border:1px solid #ABB8D1;background:#FEFEFE;color:#415479;}
+		{border:1px solid #ABB8D1;background:#FEFEFE;color:#415479;
+  -moz-box-shadow: 2px 2px 5px #ccc;
+  -webkit-box-shadow: 2px 2px 5px #ccc;
+  box-shadow: 2px 2px 5px #ccc;
+
+}
 #languagechanger select:hover,
 	.tools input:hover,
 	.tools a:hover,
@@ -80,7 +135,11 @@ ul#surveylist li a.surveytitle{color:#5670A1;}
 	input#savebutton:focus,
 	input#loadbutton:focus,
 	input#registercontinue:focus
-		{color:#415479;background:#dcdfe6;border-color:#ABB8D1;}
+		{color:#415479;background:#dcdfe6;border-color:#ABB8D1;
+  -moz-box-shadow: 2px 2px 5px #415479;
+  -webkit-box-shadow: 2px 2px 5px #415479;
+  box-shadow: 2px 2px 5px #415479;
+		}
 #languagechanger select:hover option{background:#FEFEFE;}

 /* for disabled tools */
@@ -106,8 +165,7 @@ ul#surveylist li a.surveytitle{color:#5670A1;}
 /* Group decoration */
 .groupdescription{border: 1px solid #5670A1;border-top:0px none #5670A1;background:#EEF6FF;}
 .grouptitle{border: 1px solid #5670A1;border-bottom:0px none #5670A1;background:#5670A1;color:#FEFEFE}
-.groupdescription{border: 1px solid #5670A1;border-top:0px none #5670A1;background:#EEF6FF;}
-.grouptitle{border: 1px solid #5670A1;border-bottom:0px none #5670A1;background:#5670A1;color:#FEFEFE}
+

 /* Question bloc decoration */
 .question-wrapper{background-color:#FEFEFE;border:1px solid #5670A1;}
@@ -116,8 +174,11 @@ ul#surveylist li a.surveytitle{color:#5670A1;}
 .question-wrapper .question-text a:hover{color:#5670A1}
 .question-wrapper .question-text{font-weight:bold;}
 .question-wrapper .question-text strong,.question-wrapper .question-text b{font-weight:bolder;}/* see for strong and b to add some color */
-.asterisk {color:#FF8900;}
-span.qnumcode {font-style:italic;}
+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
+.asterisk {color:#FF8900;padding-right:1em;}
+.showqnumcode-X .qnumcode {display:none;}
+.qnumcode {font-style:italic;padding-right:1em;}

 /* input decoration */
 #tokenform input[type=text],.form input[type=text],.answers input[type=text],.answers textarea
@@ -143,6 +204,16 @@ span.qnumcode {font-style:italic;}
 .slider_righttext {color:#5670A1;}
 .slider_callout {color: #161c28;}

+/* index */
+#index .container{margin-top: 2em;border: 1px solid #5670A1;background:#EEF6FF;}
+#index .container h2{padding:0.2em 1em 0.5em;margin:0 0 0em;font-size:1.1em;}
+#index .container h2{background:#5670A1;color:#FEFEFE;font-size:1.2em}
+#index .hdr{color:#5670A1;padding:0 0.5em;}
+#index .row{padding:0.1em 1em;cursor: pointer;color:#5670A1;text-decoration: underline;}
+#index .current{padding:0.1em 1em;cursor: pointer;color:#5670A1;text-decoration: none;font-weight:bold;}
+#index .missing{/*background: url()*/}
+#index .row:hover, #index .row:focus, #index .row:active {background-color: #E5F8A8;color: #5670A1;text-decoration:none;}
+#index .container .submit{margin:0 auto 0.5em;display:block}
 /* --------------------------------------------- */
 /* More tempate adaptation                       */
 /* --------------------------------------------- */
@@ -159,7 +230,7 @@ span.qnumcode {font-style:italic;}
 #content{padding-bottom:4.8em;}
 #footer {text-align:center;padding:0.8em 0 0.4em;margin:0;font-size:0.8em;font-weight:normal;}
 #footer{border-width:1px 0;}
-#footer{width:100%;position:absolute;bottom:0;}
+#footer{width:100%;position:absolute;bottom:0;left:0;}
 #footer ul#credits{list-style: none outside;margin-top:0;margin-bottom:0;padding:0;text-align:center;overflow:auto;}
 #footer ul#credit a {display: block;}
 #footer ul#credit li a.ui-state-hover {font-weight:normal;}/* to be corrected */
@@ -209,10 +280,10 @@ ul.info a {}
 #progress-wrapper {height: 2em;}

 /*surveylist (home page) */
-ul#surveylist{margin: 0.5em auto;padding: 0;text-align: left;overflow:auto;display:inline-block;}
-ul#surveylist li{display:inline;float:left;clear:left;padding:0.5em 10px;}
-ul#surveylist li a.surveytitle{font-weight:bold;font-size:1.2em;padding:3px 10px;text-decoration: none;margin-bottom: 8px;}
-
+#surveylist{margin: 0.5em auto;padding: 0;text-align: left;overflow:auto;display:inline-block;}
+#surveylist li{padding:0.5em 10px;}
+#surveylist li a.surveytitle{display:block;font-weight:bold;font-size:1.2em;padding:3px 10px;margin-bottom: 4px;border-bottom:1px dotted;text-decoration:none;}
+#surveylist li a.surveytitle:hover,#surveylist li a.surveytitle:focus{border-bottom:1px dotted #FFF;}
 /* specific box */
 .note,#tokenmessage{width:80%;margin:0.5em auto;padding:1em;}
 #tokenform ul{list-style: none ;margin: 0.5em auto;padding: 0;text-align: center;}
@@ -230,9 +301,7 @@ div.form table table td{padding:0;}
 .group{margin-bottom: 2em}
 .groupdescription{padding:1em 1.5em 0.5em;margin:0 0 0.5em;}
 .grouptitle{padding:0.2em 1em 0.5em;margin:0 0 0em;font-size:1.1em;}
-.group{margin-bottom: 2em}
-.groupdescription{padding:1em 1.5em 0.5em;margin:0 0 0.5em;}
-.grouptitle{padding:0.2em 1em 0.5em;margin:0 0 0em;font-size:1.1em;}
+

 /* Question decoration */
 .question-wrapper{margin:1em 0;}
@@ -248,7 +317,7 @@ div.form table table td{padding:0;}
 /* error bloc */
 .error-wrapper {display:none;}/* don't diplay error-wrapper if all is OK */
 .input-error .error-wrapper {display:block;padding:0 1em;}/*diplay error-wrapper only if there are error */
-.error-wrapper br:first-child{display:inline;}/* don't put linefeed at start of an error box */
+.error-wrapper br:first-child{display:none;}/* don't put linefeed at start of an error box */
 .error-wrapper {margin:0.5em auto;width:96%;}
 .error-wrapper .error,.error-wrapper .errormandatory {padding:0.3em 1em;}
 .error-wrapper {background:transparent url(./exclamation.png) no-repeat center left;padding:4px;padding-left:20px;}
@@ -443,7 +512,7 @@ table.question tbody td.ddarrayseparator{border-top-width: 0px;}
 	font-style: italic;
 }

-
+table.rank{width:98%;table-layout:fixed;}
 table.rank, table.rank table{border:0px none #FFF;border-collapse:collapse}
 table.rank td{border-width:1px;}
 table.rank table td{border-width:0px;}
@@ -594,7 +663,7 @@ ul.cols-7 li , ul.cols-7-ul , table.cols-7 td { width: 13%; }
 ul.cols-8 li , ul.cols-8-ul , table.cols-8 td { width: 11.5%; }


-.list-dropdown-flexible p.question, .list-dropdown p.question
+.list-dropdown-flexible .question, .list-dropdown .question, .language .question
 {
 text-align:center;
 }
@@ -674,6 +743,7 @@ text-align:center;
 ,.multiple-opt-comments ul li span.option
 ,.multiple-short-txt ul li label
 {
+	clear:left;
 	float:left; 
 	width:45%;
 	padding: 0.3em 1em 0% 0%;
@@ -704,7 +774,7 @@ text-align:center;
 , .list-with-comment .answers ul li input.radio 
 , .list-radio-flexible .answers ul li input.radio 
 {
-	margin-left:45%;
+	margin-left:40%;
 }
 .ie .multiple-opt .answers ul li input.checkbox,
 	.ie .list-radio .answers ul li input.radio,
--- a/include/limesurvey/templates/citronade/template.js
+++ b/include/limesurvey/templates/citronade/template.js
@@ -53,10 +53,7 @@ function focusFirst(Event)
 $(document).ready(function(){
  // focusFirst(); /** Uncomment if you want to use the focusFirst function **/
  
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
+
 })


--- a/include/limesurvey/templates/clear_logo/template-rtl.css
+++ b/include/limesurvey/templates/clear_logo/template-rtl.css
@@ -2,7 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {
+  padding-right:0;padding-left:1em;
+}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +41,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/clear_logo/template.css
+++ b/include/limesurvey/templates/clear_logo/template.css
@@ -975,21 +975,28 @@ td.statsImageholder {
  background-color: #EFE5CA;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: arial, verdana, sans-serif;
+  padding-right:1em;
 }

+.showqnumcode-X .qnumcode {
+	display:none;
+}
 span.qnumcode {
 	font-style:italic;
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/clear_logo/template.js
+++ b/include/limesurvey/templates/clear_logo/template.js
@@ -72,8 +72,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});
--- a/include/limesurvey/templates/default/template-rtl.css
+++ b/include/limesurvey/templates/default/template-rtl.css
@@ -2,6 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
+.asterisk {
+  padding-left:1em;padding-right:0;
+}

 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
@@ -39,4 +42,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/default/template.css
+++ b/include/limesurvey/templates/default/template.css
@@ -126,10 +126,13 @@ a:link,a:visited {
  margin: 5px;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9px;
  font-family: verdana;
+  padding-right:1em;
 }

 .hide {
@@ -202,6 +205,9 @@ a:link,a:visited {
 span.questionhelp {
 }

+.showqnumcode-X .qnumcode {
+	display:none;
+}
 span.qnumcode {
 	font-style:italic;
 }
@@ -1280,10 +1286,11 @@ div.questionTitle {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/default/template.js
+++ b/include/limesurvey/templates/default/template.js
@@ -74,8 +74,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});
--- a/include/limesurvey/templates/eirenicon/template-rtl.css
+++ b/include/limesurvey/templates/eirenicon/template-rtl.css
@@ -2,7 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {
+  padding-right:0;padding-left:1em;
+}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +41,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/eirenicon/template.css
+++ b/include/limesurvey/templates/eirenicon/template.css
@@ -35,15 +35,21 @@ td.survey-question-help {
  font-weight: 700;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: verdana;
+  padding-right:1em;
 }

 span.qnumcode {
 	font-style:italic;
 }
+.showqnumcode-X .qnumcode {
+	display:none;
+}

 #progress-graph {
  line-height: 1.5em;
@@ -1137,10 +1143,11 @@ td.statsImageholder {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/eirenicon/template.js
+++ b/include/limesurvey/templates/eirenicon/template.js
@@ -72,8 +72,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});
--- a/include/limesurvey/templates/limespired/template-rtl.css
+++ b/include/limesurvey/templates/limespired/template-rtl.css
@@ -2,7 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {
+  padding: 0 10px 0 5px;
+}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +41,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/limespired/template.css
+++ b/include/limesurvey/templates/limespired/template.css
@@ -386,6 +386,8 @@ input.submit:hover {
  font-size: 0.9em
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: #FF0000;
  padding: 0 5px 0 10px;
@@ -394,6 +396,9 @@ input.submit:hover {
 span.qnumcode {
 	font-style:italic;
 }
+.showqnumcode-X .qnumcode {
+	display:none;
+}

 .questionhelp {
  visibility: visible;
@@ -1167,10 +1172,11 @@ td.statsImageholder {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/limespired/template.js
+++ b/include/limesurvey/templates/limespired/template.js
@@ -40,10 +40,7 @@ $(document).ready(function(){
 */

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
+
 });


--- a/include/limesurvey/templates/mint_idea/template-rtl.css
+++ b/include/limesurvey/templates/mint_idea/template-rtl.css
@@ -2,7 +2,7 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {padding-right:0;padding-left:1em;}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +39,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/mint_idea/template.css
+++ b/include/limesurvey/templates/mint_idea/template.css
@@ -619,6 +619,12 @@ select {
 	font-weight: bold;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
+.asterisk {padding-right:1em;}
+.showqnumcode-X .qnumcode {
+	display:none;
+}
 /* -------------------------------------------------
   START: Question styles  ------------------------- */
  /* =====================================
@@ -1246,10 +1252,11 @@ td.statsImageholder {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/mint_idea/template.js
+++ b/include/limesurvey/templates/mint_idea/template.js
@@ -75,8 +75,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});
--- a/include/limesurvey/templates/sherpa/template-rtl.css
+++ b/include/limesurvey/templates/sherpa/template-rtl.css
@@ -2,7 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {
+  padding-right:0;padding-left:1em;
+}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +41,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/sherpa/template.css
+++ b/include/limesurvey/templates/sherpa/template.css
@@ -1,4 +1,4 @@
-.answertextright {
+.outerframe.answertextright {
  text-align: left;
 }

@@ -12,10 +12,16 @@
  text-align: center;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: verdana;
+  padding-right:1em;
+}
+.showqnumcode-X .qnumcode {
+	display:none;
 }

 .graph {
@@ -1059,10 +1065,11 @@ td.statsImageholder {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex,.withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .withindex{margin:0}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/sherpa/template.js
+++ b/include/limesurvey/templates/sherpa/template.js
@@ -72,8 +72,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});
--- a/include/limesurvey/templates/vallendar/template-rtl.css
+++ b/include/limesurvey/templates/vallendar/template-rtl.css
@@ -2,7 +2,9 @@
 .answertext,.answer {
  text-align: right;
 }
-
+.asterisk {
+  padding-right:0;padding-left:1em;
+}
 .boilerplate td td,.numeric td td,.choice-5-pt-radio td td,.yes-no td td,.gender td td,.date td td,.numeric-multi td td,.numeric td td,.list-with-comment td td,.list-dropdown-flexible td td,.ranking td td,.numeric-multi td td,.language td td,.multiple-opt-comments td td,.multiple-short-txt td td,.text-short td td,.text-long td td,.text-huge td td,.numeric-multi td td,.array-5-pt td,.array-10-pt td,.array-yes-uncertain-no td,.array-increase-same-decrease td,.array-flexible-row td,.array-flexible-column td,.array-multi-flexi td,.array-multi-flexi-text td,.array-flexible-duel-scale td
  {
  text-align: right !important;
@@ -39,4 +41,4 @@ td.questiontext {
 .list-with-comment p.comment {
  text-align: right;
  float: left;
-}
+}
--- a/include/limesurvey/templates/vallendar/template.css
+++ b/include/limesurvey/templates/vallendar/template.css
@@ -361,10 +361,16 @@ table.clearall-result td {
  color: red;
 }

+.asterisk {display:none}
+.mandatory .asterisk {display:inline;}
 .asterisk {
  color: red;
  font-size: 9pt;
  font-family: verdana;
+  padding-right:1em;
+}
+.showqnumcode-X .qnumcode {
+	display:none;
 }

 td.graph {
@@ -1059,10 +1065,13 @@ table.statisticstable strong {
 }

 /* Question Index */
-.outerframe.withindex {
+.outerframe.withindex, .withindex .outerframe{
  margin-left: 1em;
  margin-right: 26em;
 }
+.allinone .outerframe{
+  margin:0;
+}

 #index {
  position: absolute;
--- a/include/limesurvey/templates/vallendar/template.js
+++ b/include/limesurvey/templates/vallendar/template.js
@@ -72,8 +72,5 @@ function correctPNG() // correctly handle PNG transparency in Win IE 5.5 & 6.
 }

 $(document).ready(function(){
-   // If the question code and number are hidden, hide any white space in the span(for dumb browsers)
-   if($('.qnumcode').text().replace(/\s/g, '').length == 0) {
-	   $('.qnumcode').hide();
-   }
-});
+
+});