application.html.erb in iqvoc-3.5.7

- old
+ new

@@ -1,9 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= I18n.locale %>">
   <head>
-    <meta name="i18n-locale" content="<%= I18n.locale %>">
     <meta charset="utf-8">
     <%= csrf_meta_tag %>
 
     <title><%= Iqvoc.title || t("txt.common.iqvoc_title") %></title>
     <%= stylesheet_link_tag "blueprint/screen", :media => "screen, projection" %>
@@ -47,10 +46,10 @@
       <div id="footer" class="span-24 last">
         <div id="footer_box">
           <% if current_user %>
             <%= t('txt.common.welcome', :user_name => current_user.name) %> (<%= current_user.role.humanize %>) | <%= link_to t("txt.views.layouts.application.logout"), user_session_path, :method => :delete %>
           <% else %>
-            <%= link_to t("txt.views.layouts.application.login"), new_user_session_path() %>
+            <%= link_to t("txt.views.layouts.application.login"), new_user_session_path(:back_to => @return_url) %>
           <% end %>
           <a href="http://www.w3.org/2001/sw/" id="w3c_link"></a>
         </div>
       </div>
     </div>