Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

LimeSurvey · May 18, 2013 · a386e52 · a386e52
2 parents 8d25100 + 5f5f30f
commit a386e52
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 136 deletions.
diff --git a/installer/sql/create-pgsql.sql b/installer/sql/create-pgsql.sql
@@ -215,8 +215,8 @@ CREATE TABLE prefix_participants (
 --
 CREATE TABLE prefix_permissions (
     id serial NOT NULL,
-	entity varying(50) NOT NULL,
-	entity_id varying(100) NOT NULL,
+	entity character varying(50) NOT NULL,
+	entity_id character varying(100) NOT NULL,
 	uid integer NOT NULL,
 	permission character varying(100) NOT NULL,
 	create_p integer DEFAULT 0 NOT NULL,

diff --git a/scripts/admin/attributeControl.js b/scripts/admin/attributeControl.js
@@ -7,6 +7,9 @@ $(document).ready(function() {
     ];
 
     $("#flashinfo").css("opacity", 0); //Make sure the flash message doesn't display in IE
+
+    // Set some custom messages
+    $.jgrid.edit.msg.required = sRequired;
 
     jQuery("#attributeControl").jqGrid({
         loadtext : sLoadText,
@@ -65,11 +68,9 @@ $(document).ready(function() {
             deltitle: deleteCaption,
             edittitle: sEditAttributeMsg,
             searchtitle: searchMsg,
-            msg: {required: sRequired},
             refreshtitle: refreshMsg},
         {
             edittitle: sEditAttributeMsg,
-            msg: {required: sRequired}
         }, //Default settings for edit
         { addCaption: addCaption,
             bCancel: sCancel,

diff --git a/scripts/ranking.js b/scripts/ranking.js
@@ -100,6 +100,9 @@ function doDragDropRank(qID, showpopups, samechoiceheight, samelistheight) {
       $('#sortable-rank-'+qID+'').sortable('refresh');
       updateDragDropRank(qID);
     });
+  $(function() { // Update height for IE7, maybe for other function too
+    fixChoiceListHeight(qID,samechoiceheight,samelistheight);
+  }); 
   }
 
 function updateDragDropRank(qID){

diff --git a/styles-public/ranking.css b/styles-public/ranking.css
@@ -22,6 +22,7 @@
     padding: 3px 0;
     padding-bottom:2em;
     list-style-type: none;
+    list-style-position:outside;
 	display: block; /* Force the li to full width */
 }
 
@@ -31,6 +32,7 @@
     margin-top:0;
     padding: 3px;
 	min-height: 1.3em;
+	*height: 1.3em;
 	font-weight: normal;
 	cursor: move;
 	clear:both;

diff --git a/templates/basic/ie_fix_7.css b/templates/basic/ie_fix_7.css
@@ -7,25 +7,6 @@ input.ui-button {
 	padding: 0.2em 0 0.1em 0;
 }
 
-.ui-button-icon-only .ui-icon,
-.ui-button-text-icon-primary .ui-icon,
-.ui-button-text-icon-secondary .ui-icon,
-.ui-button-text-icons .ui-icon,
-.ui-button-icons-only .ui-icon {
-}
-
-.ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0 0 1.0em; 
-}
-
-.ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.2em 0 0; 
-}
-
-.ui-button-text-icons .ui-button-text {
-	padding: 0 1.0em; 
-}
-
 /*** End jQuery UI Theme Styles ***/
 
 #moveprevbtn {

diff --git a/templates/basic/template.css b/templates/basic/template.css
@@ -60,11 +60,13 @@ button.ui-button-icons-only {
 }
 
 .ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0.7em 0 1.7em; 
+	padding: 0 0.7em 0 1.7em;
+	*padding: 0 20px;
 }
 
 .ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.7em 0 0.7em; 
+	padding: 0 1.7em 0 0.7em;
+	*padding: 0 20px;
 }
 
 .ui-button-text-icons .ui-button-text {
@@ -94,18 +96,21 @@ input.ui-button {
 .ui-button-text-icon-primary .ui-button-icon-primary, 
 .ui-button-text-icons .ui-button-icon-primary, 
 .ui-button-icons-only .ui-button-icon-primary {
-	left: .4em; 
+	left: .4em;
+	*left: 2px;
 }
 
 .ui-button-text-icon-secondary .ui-button-icon-secondary, 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
-	right: .4em; 
+	right: .4em;
+	*right: 2px;
 }
 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
-	right: .4em; 
+	right: .4em;
+	*right: 2px;
 }
 
 /* Button sets*/
@@ -612,6 +617,7 @@ table.question tr.array1:hover,table.question tr.array2:hover {
 .list-radio .answer li label,
 .list-with-comment .answer li label {
   display: inline-block;
+  *display:inline;
   width: 85%;
 }
 .list-radio .answer li.other-item label,
@@ -723,6 +729,7 @@ ul.cols-8 li,ul.cols-8-ul,table.cols-8 td {
 
 .multiple-opt .answer li label, .multiple-opt-comments .answer li .option label {
   display: inline-block;
+  *display:inline;
   width: 85%;
 }
 .multiple-opt .answer li.other-item label, .multiple-opt-comments .answer li.other-item .option label {
@@ -1120,6 +1127,7 @@ div.questionTitle {
   width: 3em;
   text-align: right;
   display: inline-block;
+  *display:inline;
   padding: 0 0.5em 0 0;
 }
 

diff --git a/templates/bluengrey/ie_fix_7.css b/templates/bluengrey/ie_fix_7.css
@@ -15,18 +15,6 @@ input.ui-button {
 	margin-top: -9px;
 }
 
-.ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0 0 1.0em; 
-}
-
-.ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.2em 0 0; 
-}
-
-.ui-button-text-icons .ui-button-text {
-	padding: 0 1.0em; 
-}
-
 /*** End jQuery UI Theme Styles ***/
 
 .submit-buttons button {
@@ -149,4 +137,4 @@ input.submit {
 
 .slider_righttext {
   float: left;
-}
+}
diff --git a/templates/bluengrey/template.css b/templates/bluengrey/template.css
@@ -107,11 +107,13 @@ button.ui-button-icons-only {
 }
 
 .ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0.7em 0 1.7em; 
+	padding: 0 0.7em 0 1.7em;
+	*padding: 0 20px;
 }
 
 .ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.7em 0 0.7em; 
+	padding: 0 1.7em 0 0.7em;
+	*padding: 0 20px;
 }
 
 .ui-button-text-icons .ui-button-text {
@@ -142,17 +144,20 @@ input.ui-button {
 .ui-button-text-icons .ui-button-icon-primary, 
 .ui-button-icons-only .ui-button-icon-primary {
 	left: .4em; 
+	*left: 2px;
 }
 
 .ui-button-text-icon-secondary .ui-button-icon-secondary, 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em; 
+	*right: 2px;
 }
 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em; 
+	*right: 2px;
 }
 
 /* Button sets*/

diff --git a/templates/clear_logo/ie_fix_7.css b/templates/clear_logo/ie_fix_7.css
@@ -15,18 +15,6 @@ input.ui-button {
 	margin-top: -9px;
 }
 
-.ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0 0 1.0em; 
-}
-
-.ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.2em 0 0; 
-}
-
-.ui-button-text-icons .ui-button-text {
-	padding: 0 1.0em; 
-}
-
 /*** End jQuery UI Theme Styles ***/
 
 .choice-5-pt-radio ul {
@@ -148,4 +136,4 @@ input.submit {
 .slider_righttext {
   float: left;
   padding-top: 1.4em;
-}
+}
diff --git a/templates/clear_logo/template.css b/templates/clear_logo/template.css
@@ -69,10 +69,12 @@ button.ui-button-icons-only {
 
 .ui-button-text-icon-primary .ui-button-text {
 	padding: 0 0.7em 0 1.7em; 
+	*padding: 0 20px; 
 }
 
 .ui-button-text-icon-secondary .ui-button-text {
 	padding: 0 1.7em 0 0.7em; 
+	*padding: 0 20px; 
 }
 
 .ui-button-text-icons .ui-button-text {
@@ -103,17 +105,20 @@ input.ui-button {
 .ui-button-text-icons .ui-button-icon-primary, 
 .ui-button-icons-only .ui-button-icon-primary {
 	left: .4em; 
+	*left: 2px;
 }
 
 .ui-button-text-icon-secondary .ui-button-icon-secondary, 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em; 
+	*right: 2px;
 }
 
 .ui-button-text-icons .ui-button-icon-secondary, 
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em; 
+	*right: 2px;
 }
 
 /* Button sets*/
@@ -649,6 +654,7 @@ p.question {
 .list-radio .answer li label,
 .list-with-comment .answer li label {
   display: inline-block;
+  *display:inline;
   width: 85%;
 }
 .list-radio .answer li.other-item label,
@@ -757,6 +763,7 @@ ul.cols-8 li,ul.cols-8-ul,table.cols-8 td {
 
 .multiple-opt .answer li label, .multiple-opt-comments .answer li .option label {
   display: inline-block;
+  *display:inline;
   width: 90%;
 }
 .multiple-opt .answer li.other-item label {
@@ -1183,6 +1190,7 @@ span.qnumcode {
   width: 3em;
   text-align: right;
   display: inline-block;
+  *display:inline;
   padding: 0 0.5em 0 0;
 }
 

diff --git a/templates/default/ie_fix_7.css b/templates/default/ie_fix_7.css
@@ -4,7 +4,7 @@
 
 .ui-button,
 input.ui-button { 
-	padding: 0.1em 0 0.1em 0; 
+	padding: 0.1em 0; 
 }
 
 .ui-button-icon-only .ui-icon,
@@ -14,21 +14,7 @@ input.ui-button {
 .ui-button-icons-only .ui-icon {
 	margin-top: -9px;
 }
-
-.ui-button-text-icon-primary .ui-button-text {
-	padding: 0 0 0 1.0em; 
-}
-
-.ui-button-text-icon-secondary .ui-button-text {
-	padding: 0 1.2em 0 0; 
-}
-
-.ui-button-text-icons .ui-button-text {
-	padding: 0 1.0em; 
-}
-
 /*** End jQuery UI Theme Styles ***/
-
 .save-all {
   padding-left: 5px;
 }
@@ -150,4 +136,4 @@ input.submit {
 .slider_righttext {
   float: left;
   padding-top: 1.4em;
-}
+}
diff --git a/templates/default/template.css b/templates/default/template.css
@@ -106,10 +106,12 @@ button.ui-button-icons-only {
 
 .ui-button-text-icon-primary .ui-button-text {
 	padding: 0 0.7em 0 1.7em;
+	*padding: 0 20px; 
 }
 
 .ui-button-text-icon-secondary .ui-button-text {
 	padding: 0 1.7em 0 0.7em;
+	*padding: 0 20px; 
 }
 
 .ui-button-text-icons .ui-button-text {
@@ -140,17 +142,20 @@ input.ui-button {
 .ui-button-text-icons .ui-button-icon-primary,
 .ui-button-icons-only .ui-button-icon-primary {
 	left: .4em;
+	*left: 2px;
 }
 
 .ui-button-text-icon-secondary .ui-button-icon-secondary,
 .ui-button-text-icons .ui-button-icon-secondary,
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em;
+	*right: 2px;
 }
 
 .ui-button-text-icons .ui-button-icon-secondary,
 .ui-button-icons-only .ui-button-icon-secondary {
 	right: .4em;
+	*right: 2px;
 }
 
 /* Button sets*/
@@ -878,6 +883,7 @@ table.clearall-result td {
 .list-radio .answer li label,
 .list-with-comment .answer li label {
   display: inline-block;
+  *display: inline;
   width: 85%;
 }
 
@@ -994,6 +1000,7 @@ ul.cols-8 li,ul.cols-8-ul,table.cols-8 td {
 }
 .multiple-opt .answer li label, .multiple-opt-comments .answer li .option label {
   display: inline-block;
+  *display: inline;
   width: 90%;
 }
 .multiple-opt .answer li.other-item label {