Fixed issue #08496: Undefined attributes in Central Participant Database

Dev Minor layout and style changes
LimeSurvey · Jan 19, 2014 · 79b4b64 · 79b4b64
1 parent 9278836
commit 79b4b64
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 10 deletions.
diff --git a/application/views/admin/participants/attributeMapToken_view.php b/application/views/admin/participants/attributeMapToken_view.php
@@ -51,9 +51,14 @@
 
             <?php if (!empty($attribute)) { ?>
             <div class='explanation'>
-                <label for='overwriteman'><?php $clang->eT("Overwrite existing attribute values if a participant already exists?") ?></label><br /><input type='checkbox' id='overwriteman' name='overwriteman' />
-                <br />
-                <label for='createautomap'><?php $clang->eT("Make these mappings automatic in future") ?></label><br /><input type='checkbox' id='createautomap' name='createautomap' />
+                <div class="explanation-row">
+                    <input type='checkbox' id='overwriteman' name='overwriteman' />
+                    <label for='overwriteman'><?php $clang->eT("Overwrite existing attribute values if a participant already exists?") ?></label>
+                </div>
+                <div class="explanation-row">
+                    <input type='checkbox' id='createautomap' name='createautomap' />
+                    <label for='createautomap'><?php $clang->eT("Make these mappings automatic in future") ?></label>
+                </div>
             </div>
             <?php } else { ?>
 
@@ -70,7 +75,10 @@
                 ?>
                 </div>
                 <div class='explanation'>
-                    <label for='overwrite'><?php $clang->eT("Overwrite existing attribute values if a participant already exists?") ?></label><input type='checkbox' id='overwrite' name='overwrite' /> 
+                    <div class="explanation-row">
+                        <input type='checkbox' id='overwrite' name='overwrite' />
+                        <label for='overwrite'><?php $clang->eT("Overwrite existing attribute values if a participant already exists?") ?></label>
+                    </div>
                 </div>
                 <?php
             }

diff --git a/styles/blobblueish/attributeMapToken.css b/styles/blobblueish/attributeMapToken.css
@@ -109,8 +109,29 @@ div.mappable-attribute-wrapper div.attribute-item {
 	color: white;
 }
 
-#centralattribute .explanation input {
-	margin: 2px 0 10px 0;
+#centralattribute .explanation {
+	width:90%;
+	margin: 0 auto;
+	text-align: left;
+}
+
+#centralattribute .explanation-row {
+	display: table-row;
+}
+
+#centralattribute .explanation input,
+#centralattribute .explanation label {
+	display: table-cell;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+
+#centralattribute .explanation label {
+	padding-left: 8px;
+}
+
+.attribute-item.draggable {
+	cursor: move;
 }
 
 .droppable.target-hover {

diff --git a/styles/darkblue/attributeMapToken.css b/styles/darkblue/attributeMapToken.css
@@ -109,8 +109,29 @@ div.mappable-attribute-wrapper div.attribute-item {
 	color: white;
 }
 
-#centralattribute .explanation input {
-	margin: 2px 0 10px 0;
+#centralattribute .explanation {
+	width:90%;
+	margin: 0 auto;
+	text-align: left;
+}
+
+#centralattribute .explanation-row {
+	display: table-row;
+}
+
+#centralattribute .explanation input,
+#centralattribute .explanation label {
+	display: table-cell;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+
+#centralattribute .explanation label {
+	padding-left: 8px;
+}
+
+.attribute-item.draggable {
+	cursor: move;
 }
 
 .droppable.target-hover {

diff --git a/styles/gringegreen/attributeMapToken.css b/styles/gringegreen/attributeMapToken.css
@@ -109,8 +109,29 @@ div.mappable-attribute-wrapper div.attribute-item {
 	color: white;
 }
 
-#centralattribute .explanation input {
-	margin: 2px 0 10px 0;
+#centralattribute .explanation {
+	width:90%;
+	margin: 0 auto;
+	text-align: left;
+}
+
+#centralattribute .explanation-row {
+	display: table-row;
+}
+
+#centralattribute .explanation input,
+#centralattribute .explanation label {
+	display: table-cell;
+	padding-top: 4px;
+	padding-bottom: 4px;
+}
+
+#centralattribute .explanation label {
+	padding-left: 8px;
+}
+
+.attribute-item.draggable {
+	cursor: move;
 }
 
 .droppable.target-hover {