Merge pull request #759 from glogiotatidis/957995

[fix bug 957995] Don't autofocus on search box.
mozilla · Jan 21, 2014 · fc478e2 · fc478e2
2 parents 281acb4 + dca134b
commit fc478e2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/mozillians/static/mozillians/css/main.less b/mozillians/static/mozillians/css/main.less
@@ -913,12 +913,6 @@ body#home {
         }
     }
     &.loggedin {
-        nav form.navbar-search {
-            display: none;
-            @media (max-width: @breakDesktop) {
-                display: inline;
-            }
-        }
         #main {
             #profile-info {
                 .span(3);

diff --git a/mozillians/templates/base.html b/mozillians/templates/base.html
@@ -73,8 +73,8 @@
                 {% block search %}
                   <form class="navbar-search"
                       action="{{ url('phonebook:search') }}" method="GET">
-                    <input autofocus type="text" name="q" class="search-query"
-                        placeholder="{{ _('Search for people, groups and more') }}">
+                    <input type="text" name="q" class="search-query"
+                           placeholder="{{ _('Search for people, groups and more') }}">
                   </form>
                 {% endblock %}
                 {% if user.is_authenticated() %}

diff --git a/mozillians/templates/phonebook/home.html b/mozillians/templates/phonebook/home.html
@@ -10,13 +10,7 @@
 {% endblock mosaic %}
 
 {% block search %}
-  {% if user.is_authenticated() %}
-    <form class="navbar-search"
-        action="{{ url('phonebook:search') }}" method="GET">
-      <input type="text" name="q" class="search-query"
-          placeholder="{{ _('Search for people, groups and more') }}">
-    </form>
-  {% endif %}
+  {# Don't display search in navbar on home.html #}
 {% endblock %}
 
 {% block content %}
@@ -25,8 +19,8 @@
       <img id="mozillians-logo" src="{{ static('mozillians/img/mozillians-logo.png') }}" alt="Mozillians">
       <hr>
       <form id="homepage-search" action="{{ url('phonebook:search') }}" method="GET">
-          <input autofocus type="text" name="q" class="search-query"
-          placeholder="{{ _('Search for people, groups and more') }}">
+          <input type="text" name="q" class="search-query"
+                 placeholder="{{ _('Search for people, groups and more') }}">
        </form>
     </hgroup>
 
@@ -165,7 +159,7 @@ <h4>{{ _('Skills') }}</h4>
     <article id="content-info">
       <h1>{{ _('Hello!') }}</h1>
       <form id="homepage-search" action="{{ url('phonebook:search') }}" method="GET">
-        <input autofocus type="text" name="q" class="search-query"
+        <input type="text" name="q" class="search-query"
                placeholder="{{ _('Search for people, groups and more') }}">
         <small>{{ _('Examples:') }}
           {% trans search_url=url('phonebook:search') %}

diff --git a/mozillians/templates/phonebook/search.html b/mozillians/templates/phonebook/search.html
@@ -29,8 +29,7 @@
   <h1>{{ _('Search') }}</h1>
   <form method="GET" id="search-form" action="{{ url('phonebook:search') }}">
     {{ field_with_attrs(search_form.q,
-                        placeholder=_('Name, IRC Nick, Email or Location'),
-                        autofocus='autofocus') }}
+                        placeholder=_('Search for people, groups and more')) }}
 
     {{ search_form.limit }}
     <button type="submit">