diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/_head_panel.html.erb | 6 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/layouts/_head_panel.html.erb b/app/views/layouts/_head_panel.html.erb index e6f36e3fd06..590e16a2f13 100644 --- a/app/views/layouts/_head_panel.html.erb +++ b/app/views/layouts/_head_panel.html.erb @@ -10,7 +10,10 @@ <%= current_user.name %> <% end %> <%= link_to 'Logout', destroy_user_session_path, :class => "logout", :method => :delete %> - </div> + </div> + <div class="search"> + <%= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" %> + </div> <!-- .login-top --> <nav> <%= link_to root_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %> @@ -31,7 +34,6 @@ <div class="span-24"> <div class="span-10"> <span class="search-holder"> - <%= text_field_tag "search", nil, :placeholder => "Search" %> </span> </div> <div class="right"> diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index d814a05807f..968fe58d39c 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -11,6 +11,5 @@ REQ_URI = "#{request.env["REQUEST_URI"]}"; REQ_REFFER = "#{request.env["HTTP_REFERER"]}"; %body.login-page - #container - = render :partial => "layouts/flash" + = render :partial => "layouts/flash" = yield |