4 files changed, 16 insertions, 12 deletions
diff --git a/app/views/admin_general/debug.rhtml b/app/views/admin_general/debug.rhtml
index 40fe33616..d7bf1c6da 100644
--- a/app/views/admin_general/debug.rhtml
+++ b/app/views/admin_general/debug.rhtml
@@ -7,6 +7,8 @@
 <h2>Version numbers</h2>
 
 <p>
+Alaveteli version: <%= link_to @current_version, @github_origin + @current_version %>
+<br>
 Alaveteli branch: <%= link_to @current_branch, @github_origin + @current_branch %>
 <br>
 Alaveteli commit: <%= link_to @current_commit, @github_origin + @current_commit %>
diff --git a/app/views/general/_locale_switcher.rhtml b/app/views/general/_locale_switcher.rhtml
index 27e492e84..2521b5eb5 100644
--- a/app/views/general/_locale_switcher.rhtml
+++ b/app/views/general/_locale_switcher.rhtml
@@ -1,11 +1,13 @@
-     <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
-     <div id="user_locale_switcher">
-       <% for possible_locale in FastGettext.default_available_locales %>
-        <% if possible_locale == I18n.locale.to_s %>
-	          <span class="active"><%= locale_name(possible_locale) %></span>
-        <% else %>
-          <a href="<%= locale_switcher(possible_locale, params) %>"><%= locale_name(possible_locale) %></a>
-        <% end %>
-         <% end %>
+ <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
+   <div id="user_locale_switcher">
+     <div class="btn-group">
+     <% for possible_locale in FastGettext.default_available_locales %>
+      <% if possible_locale == I18n.locale.to_s %>
+        <a href="#" class="btn disabled"><%= locale_name(possible_locale) %></a>
+      <% else %>
+        <a href="<%= locale_switcher(possible_locale, params) %>" class="btn"><%= locale_name(possible_locale) %></a>
+      <% end %>
+       <% end %>
      </div>
-     <% end %>
+   </div>
+ <% end %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index 42ca5dbbb..65670538d 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -9,7 +9,7 @@
       <%= stylesheet_link_tag 'admin-theme/jquery-ui-1.8.15.custom.css', :rel => 'stylesheet'%>
       <%= stylesheet_link_tag 'admin', :title => "Main", :rel => "stylesheet"  %>
     </head>
-    <body>
+    <body class="admin">
 
     <p>
     <strong><%= link_to 'Alaveteli', main_url('/') %> admin:</strong> 
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 5f6d5c721..e60e7bef2 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -58,7 +58,7 @@
 
         <%= render :partial => 'general/before_head_end' %>
     </head>
-    <body <%= "class='front'" if params[:action] == 'frontpage' %>>
+    <body class="<%= 'admin' if !session[:using_admin].nil?%> <%= 'front' if params[:action] == 'frontpage' %>">
 
     <!-- XXX: move to a separate file -->
     <% if force_registration_on_new_request && !@user %>