Index: l10n_client.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_client/Attic/l10n_client.css,v
retrieving revision 1.6.4.1
diff -u -p -r1.6.4.1 l10n_client.css
--- l10n_client.css	4 Aug 2010 11:08:15 -0000	1.6.4.1
+++ l10n_client.css	4 Aug 2010 11:35:01 -0000
@@ -55,13 +55,13 @@ how it wants to round. */
 
   /* 25 + 37 + 37 = 99 */
   #l10n-client .strings {
-    width:25%; float:left;} 
+    width:25%; float:left;}
 
   #l10n-client .source {
-    width:37%; float:left;} 
+    width:37%; float:left;}
 
   #l10n-client .translation {
-    width:37%; float:left;} 
+    width:37%; float:left;}
 
 /* Translatable string list */
 #l10n-client-string-select {
@@ -74,7 +74,7 @@ how it wants to round. */
     overflow:auto;
     list-style:none; list-style-image:none;
     margin:0em; padding:0em;}
-  
+
   #l10n-client .string-list li {
     font-size:.9em;
     line-height:1.5em;
@@ -92,7 +92,7 @@ how it wants to round. */
 
     #l10n-client .string-list li.translated:hover {
       background: #df8;}
-  
+
     #l10n-client .string-list li.translated:active {
       background: #9c3;}
 
@@ -101,10 +101,10 @@ how it wants to round. */
 
   /* Gray + Blue hover for untranslated */
   #l10n-client .string-list li.untranslated {}
-  
+
     #l10n-client .string-list li.untranslated:hover {
       background: #ace;}
-  
+
     #l10n-client .string-list li.untranslated:active {
       background: #8ac;}
 
@@ -122,21 +122,21 @@ how it wants to round. */
   #l10n-client #l10n-client-search-form .form-item,
   #l10n-client #l10n-client-search-form input.form-text,
   #l10n-client #l10n-client-search-form #search-filter-go,
-  #l10n-client #l10n-client-search-form #search-filter-clear {
+  #l10n-client #l10n-client-search-form #l10n-client-search-filter-clear {
     display:inline;
     vertical-align:middle;
   }
-  
+
     #l10n-client #l10n-client-search-form .form-item {
       margin:0em;
       padding:0em;
     }
-  
+
     #l10n-client #l10n-client-search-form input.form-text {
       width:80%;
     }
-  
-    #l10n-client #l10n-client-search-form #search-filter-clear {
+
+    #l10n-client #l10n-client-search-form #l10n-client-search-filter-clear {
       width:10%;
       margin:0em;
     }
@@ -150,13 +150,13 @@ how it wants to round. */
   #l10n-client-string-editor .source {
     overflow:hidden;
     width:50%; float:left;}
-  
+
     #l10n-client-string-editor .source .source-text {
       line-height:1.5em;
       background:#eee;
       height:16em; margin:1em; padding:1em;
       overflow:auto;}
-  
+
   #l10n-client-string-editor .translation {
     overflow:hidden;
     width:49%; float:right;}
@@ -168,7 +168,7 @@ how it wants to round. */
     height:13em;
     font-size:1em; line-height:1.25em;
     width:95%;}
-  
+
   #l10n-client-form .form-submit {
     margin-top: 0em;}
 
Index: l10n_client.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_client/Attic/l10n_client.js,v
retrieving revision 1.10.4.5
diff -u -p -r1.10.4.5 l10n_client.js
--- l10n_client.js	4 Aug 2010 11:07:01 -0000	1.10.4.5
+++ l10n_client.js	4 Aug 2010 11:35:01 -0000
@@ -19,12 +19,12 @@ $.extend(Drupal, {
           if(userSelection.length > 0) {
             Drupal.l10nClient.filter(userSelection);
             Drupal.l10nClient.toggle(1);
-            $('#l10n-client #edit-search').focus();
+            $('#l10n-client .string-search').focus();
           } else {
             if($('#l10n-client').is('.hidden')) {
               Drupal.l10nClient.toggle(1);
               if(!$.browser.safari) {
-                $('#l10n-client #edit-search').focus();
+                $('#l10n-client .string-search').focus();
               }
             } else {
               Drupal.l10nClient.toggle(0);
@@ -70,15 +70,15 @@ $.extend(Drupal, {
     // Filter the the string list by a search string
     this.filter = function(search) {
       if(search == false || search == '') {
-        $('#l10n-client #search-filter-clear').focus();
+        $('#l10n-client #l10n-client-search-filter-clear').focus();
         $('#l10n-client-string-select li').show();
-        $('#l10n-client #edit-search').val('');
-        $('#l10n-client #edit-search').focus();
+        $('#l10n-client .string-search').val('');
+        $('#l10n-client .string-search').focus();
       } else {
         if(search.length > 0) {
           $('#l10n-client-string-select li').hide();
           $('#l10n-client-string-select li:contains('+search+')').show();
-          $('#l10n-client #edit-search').val(search);
+          $('#l10n-client .string-search').val(search);
         }
       }
     }
@@ -129,28 +129,28 @@ Drupal.behaviors.l10nClient.attach = fun
   });
 
   // Copy source text to translation field on button click.
-  $('#l10n-client-form #edit-copy').click(function() {
+  $('#l10n-client-form .edit-copy').click(function() {
     $('#l10n-client-form .translation-target').val($('#l10n-client-string-editor .source-text').text());
   });
 
   // Clear translation field on button click.
-  $('#l10n-client-form #edit-clear').click(function() {
+  $('#l10n-client-form .edit-clear').click(function() {
     $('#l10n-client-form .translation-target').val('');
   });
 
   // Register keybindings using jQuery hotkeys
   if($.hotkeys) {
     $.hotkeys.add(Drupal.l10nClient.keys['toggle'], function(){Drupal.l10nClient.key('toggle')});
-    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client #edit-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
+    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client .string-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
   }
 
   // Custom listener for l10n_client livesearch
-  $('#l10n-client #edit-search').keyup(function(key) {
-    Drupal.l10nClient.filter($('#l10n-client #edit-search').val());
+  $('#l10n-client .string-search').keyup(function(key) {
+    Drupal.l10nClient.filter($('#l10n-client .string-search').val());
   });
 
   // Clear search
-  $('#l10n-client #search-filter-clear').click(function() {
+  $('#l10n-client #l10n-client-search-filter-clear').click(function() {
     Drupal.l10nClient.filter(false);
   });
 
Index: l10n_client.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_client/Attic/l10n_client.module,v
retrieving revision 1.22.4.8
diff -u -p -r1.22.4.8 l10n_client.module
--- l10n_client.module	4 Aug 2010 11:10:34 -0000	1.22.4.8
+++ l10n_client.module	4 Aug 2010 11:35:01 -0000
@@ -383,10 +383,10 @@ function l10n_client_form($form_id, $str
     '#type' => 'submit',
   );
   $form['copy'] = array(
-    '#markup' => "<input id='edit-copy' class='form-submit' type='button' value='". t('Copy Source') ."'/>",
+    '#markup' => "<input id='l10n-client-edit-copy' class='form-submit edit-copy' type='button' value='". t('Copy Source') ."'/>",
   );
   $form['clear'] = array(
-    '#markup' => "<input id='edit-clear' class='form-submit' type='button' value='". t('Clear') ."'/>",
+    '#markup' => "<input id='l10n-client-edit-clear' class='form-submit edit-clear' type='button' value='". t('Clear') ."'/>",
   );
 
   return $form;
@@ -401,9 +401,10 @@ function l10n_client_search_form() {
   $form = array();
   $form['search'] = array(
     '#type' => 'textfield',
+    '#attributes' => array('class' => array('string-search')),
   );
   $form['clear-button'] = array(
-    '#markup' => "<input id='search-filter-clear' class='form-submit' type='button' value='". t('X') ."'/>",
+    '#markup' => "<input id='l10n-client-search-filter-clear' class='form-submit' type='button' value='". t('X') ."'/>",
   );
   return $form;
 }