Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

LimeSurvey · Jan 4, 2016 · 76986c9 · 76986c9
2 parents a32290e + 67a4017
commit 76986c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/application/views/admin/participants/viewAttribute_view.php b/application/views/admin/participants/viewAttribute_view.php
@@ -81,16 +81,9 @@
             }
         ?>
     </table>
-    <table>
-        <tr>
-            <td></td>
-            <td class='actions'>
-                <a href='#' class='add' id='add_new_attribute'>
-                    <span data-toggle='tooltip' data-placement='bottom' class="icon-add text-success" title='<?php eT("Add value") ?>' id='addsign' name='addsign'></span>
-                </a>
-            </td>
-        </tr>
-    </table>
+    <a href='#' class='add' id='add_new_attribute'>
+        <span data-toggle='tooltip' data-placement='bottom' class="icon-add text-success" title='<?php eT("Add value") ?>' id='addsign' name='addsign'></span>
+    </a>
 </div>
 
 <div id="addlang" class='form-group'>

diff --git a/scripts/admin/viewAttribute.js b/scripts/admin/viewAttribute.js
@@ -77,7 +77,7 @@ $(document).ready(function() {
     var id = 1;
     $('#add_new_attribute').click(function(){
             html = "<tr>"+
-            "<td colspan='2'><input type='text' name='attribute_value_name_"+id+"' id='attribute_value_name_"+id+"' size='8' style='50%;'></td></tr>";
+            "<td colspan='2'><input type='text' name='attribute_value_name_"+id+"' id='attribute_value_name_"+id+"' size='30'></td></tr>";
                   $('.dd').fadeIn('slow');
         $('#ddtable tr:last').after(html);
         id++;
@@ -102,7 +102,7 @@ $(document).ready(function() {
     function editAttrValue(valueId) {
         var valueText = $.trim($("#"+valueId).text());
         var thisRow = $("#"+valueId).closest('tr');
-        $("#"+valueId).replaceWith( "<div><input type='text' size='20' name='editbox' id='editbox"+valueId+"' /><input type='hidden' id='value_id' name='value_id' value='"+valueId+"' /></div>" );
+        $("#"+valueId).replaceWith( "<div><input type='text' size='30' name='editbox' id='editbox"+valueId+"' /><input type='hidden' id='value_id' name='value_id' value='"+valueId+"' /></div>" );
         $('#editbox'+valueId).val(valueText);
         $('.actions .edit, .actions .delete', thisRow).hide();
         $('.actions .cancel', thisRow).show();