5 files changed, 24 insertions, 12 deletions
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index d8f70bfb6..bcbfe81f2 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -188,11 +188,11 @@ FORM.properties SPAN.property {
   padding: 0 0.5em 0 0;
 }
 
-FORM.properties .focus {
+FORM .focus {
   background-color: whitesmoke;
 }
 
-FORM.properties .nofocus {
+FORM .nofocus {
   background-color: lightgrey; /* must be the same as input background-color */
 }
 
diff --git a/template/yoga/identification.tpl b/template/yoga/identification.tpl
index 8f28ac224..1fd0e7619 100644
--- a/template/yoga/identification.tpl
+++ b/template/yoga/identification.tpl
@@ -20,27 +20,27 @@
   </div>
   <!-- END errors -->
 
-<form action="{F_LOGIN_ACTION}" method="post" class="properties">
+<form action="{F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
   <fieldset>
     <legend>{lang:Connection settings}</legend>
-    
+
     <input type="hidden" name="redirect" value="{U_REDIRECT}">
-    
+
     <ul>
-      <li> 
+      <li>
         <span class="property">
           <label for="username">{L_USERNAME}</label>
         </span>
         <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
       </li>
-  
+
       <li>
         <span class="property">
           <label for="password">{L_PASSWORD}</label>
         </span>
         <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
       </li>
-  
+
       <!-- BEGIN remember_me -->
       <li>
         <span class="property">
@@ -54,7 +54,11 @@
 
   <p><input tabindex="4" type="submit" name="login" value="{L_LOGIN}"></p>
 </form>
- 
+
+<script><!--
+document.login_form.username.focus();
+//--></script>
+
   <p>
     <a href="{U_REGISTER}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {L_REGISTER}</a>
     <a href="{U_LOST_PASSWORD}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt=""> {lang:Forgot your password?}</a>
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index e56ceaa97..062a99061 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -89,12 +89,12 @@
 
         <label>
           {lang:Username}
-          <input type="text" name="username" size="15" value="">
+          <input type="text" name="username" size="15" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
         </label>
 
         <label>
           {lang:password}
-          <input type="password" name="password" size="15">
+          <input type="password" name="password" size="15" onfocus="this.className='focus';" onblur="this.className='nofocus';">
         </label>
 
         <!-- BEGIN remember_me -->
diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl
index 90115d101..b00dd9e79 100644
--- a/template/yoga/register.tpl
+++ b/template/yoga/register.tpl
@@ -19,7 +19,7 @@
   </div>
   <!-- END errors -->
 
-<form method="post" action="{F_ACTION}" class="properties">
+<form method="post" action="{F_ACTION}" class="properties" name="register_form">
   <fieldset>
     <legend>{lang:Enter your personnal informations}</legend>
 
@@ -63,5 +63,9 @@
 
 </form>
 
+<script><!--
+document.register_form.login.focus();
+//--></script>
+
 </div> <!-- content -->
 </div> <!-- registerPage -->
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index 433a2d4f0..2ac9ba0b1 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -146,4 +146,8 @@
 </table>
 </form>
 
+<script><!--
+document.post.search_allwords.focus();
+//--></script>
+
 </div> <!-- content -->