Removed feature #4539: In the label set browser the 'Match language' …

…option did not make much sense - removed for now.

Updated translation: German
Updated translation: German informal

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9077 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/html.php

@@ -1604,10 +1604,10 @@
         $vasummary .= "</div>";
     }
     // Label set browser
+//                      <br/><input type='checkbox' checked='checked' id='languagefilter' /><label for='languagefilter'>".$clang->gT('Match language')."</label>
     $vasummary .= "<div id='labelsetbrowser' style='display:none;'><div style='float:left;width:260px;'>
                       <label for='labelsets'>".$clang->gT('Available label sets:')."</label>
-                      <br /><select id='labelsets' size='10' style='width:250px;'><option>A label set</option></select>
-                      <br/><input type='checkbox' checked='checked' id='languagefilter' /><label for='languagefilter'>".$clang->gT('Match language')."</label>
+                      <br /><select id='labelsets' size='10' style='width:250px;'><option>&nbsp;</option></select>
                       <br /><button id='btnlsreplace' type='button'>".$clang->gT('Replace')."</button>
                       <button id='btnlsinsert' type='button'>".$clang->gT('Add')."</button>
                       <button id='btncancel' type='button'>".$clang->gT('Cancel')."</button></div>
@@ -1856,10 +1856,10 @@
     }
 
     // Label set browser
+//                      <br/><input type='checkbox' checked='checked' id='languagefilter' /><label for='languagefilter'>".$clang->gT('Match language')."</label>
     $vasummary .= "<div id='labelsetbrowser' style='display:none;'><div style='float:left; width:260px;'>
                       <label for='labelsets'>".$clang->gT('Available label sets:')."</label>
-                      <br /><select id='labelsets' size='10' style='width:250px;'><option>A label set</option></select>
-                      <br/><input type='checkbox' checked='checked' id='languagefilter' /><label for='languagefilter'>".$clang->gT('Match language')."</label>
+                      <br /><select id='labelsets' size='10' style='width:250px;'><option>&nbsp;</option></select>
                       <br /><button id='btnlsreplace' type='button'>".$clang->gT('Replace')."</button>
                       <button id='btnlsinsert' type='button'>".$clang->gT('Add')."</button>
                       <button id='btncancel' type='button'>".$clang->gT('Cancel')."</button></div>

admin/scripts/answers.js

@@ -289,12 +289,12 @@ function lsbrowser()
     scale_id=removechars($(this).attr('id'));
     $('#labelsetbrowser').dialog( 'open' );
     surveyid=$('input[name=sid]').val();
-    match=0;
+/*    match=0;
     if ($('#languagefilter').attr('checked')==true)
     {
         match=1;
-    }
-    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:match},function(json){
+    }*/
+    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:1},function(json){
         var x=0;    
         $("#labelsets").removeOption(/.*/); 
         for (x in json)

admin/scripts/subquestions.js

@@ -238,12 +238,13 @@ function lsbrowser()
     scale_id=removechars($(this).attr('id'));      
     $('#labelsetbrowser').dialog( 'open' );
     surveyid=$('input[name=sid]').val();
+    /* 
     match=0;
     if ($('#languagefilter').attr('checked')==true)
     {
         match=1;
-    }
-    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:match},function(json){
+    }*/
+    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:1},function(json){
         var x=0;    
         $("#labelsets").removeOption(/.*/); 
         for (x in json)
@@ -257,11 +258,17 @@ function lsbrowser()
         {
             $('#labelsets').selectOptions(remind); 
             lspreview();           
+            $('#btnlsreplace').removeClass('ui-state-disabled');
+            $('#btnlsinsert').removeClass('ui-state-disabled');
+            $('#btnlsreplace').attr('disabled','');
+            $('#btnlsinsert').attr('disabled','');
         } 
         else
         {
             $('#btnlsreplace').addClass('ui-state-disabled');
             $('#btnlsinsert').addClass('ui-state-disabled');
+            $('#btnlsreplace').attr('disabled','disabled');
+            $('#btnlsinsert').attr('disabled','disabled');
         }
     });
 

admin/styles/default/adminstyle.css

@@ -256,7 +256,6 @@ input, select, button {
 input[disabled], textarea[disabled], select[disabled], button[disabled] {
     color: #999;
     background: #EEE;
-    font: 10px verdana, arial, sans-serif;
     border:1px solid #ccc;
 }