Roll back some unwanted changes from commit e7cd3adc2775b1450251f89d70680b3be8f291a3

(These would have broken WTDK theme)

2 files changed, 20 insertions, 4 deletions

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index c193d0c1b..159aa1e62 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -76,10 +76,10 @@
 =end
 %>
 <div class="entirebody">
+    <div id="banner"></div>
     <div id="header">
-  		<div class="lang"><%= render :partial => 'general/locale_switcher' %></div>
         <h1>
-            <%= link_to "&nbsp;", frontpage_url %>
+            <%= link_to site_name, frontpage_url %>
         </h1>
 
         <div id="tagline">
@@ -87,7 +87,10 @@
         </div>
 
     </div>
-
+    <div id="orglogo">
+      <%= render :partial => 'general/orglink' %>
+    </div>
+    <div class="lang"><%= render :partial => 'general/locale_switcher' %></div>
           
     <div id="navigation_search">
         <% form_tag({:controller => "general", :action => "search_redirect"}, {:id => "navigation_search_form"}) do %>
@@ -96,6 +99,7 @@
                <%= submit_tag _("Search") %>
            </p>
         <% end %>
+
     </div>
 	<div id="topnav">
 		<ul id="navigation">
@@ -122,6 +126,7 @@
 	</div>
 	
     <div id="wrapper">
+
         <div id="content">
 
             <% if flash[:notice] %>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index c17d95bc0..78a6088f3 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -119,7 +119,7 @@ body
 		position: absolute;
 		width: 100%;
 		left: 0px;
-		top: 0px;
+		top: 0;
 		z-index: 150;
 		text-align: right;
 		font-size: 0.8em;
@@ -1239,4 +1239,15 @@ div.user_about_me
     font-style: italic;
 }
 
+div.lang {
+ position: relative;
+ clear: both;
+ text-align: right;
+ font-size: 0.8em;
+ top: 45px;
+ padding-right: 5px;
+}
 
+div#user_locale_switcher {
+ margin: 5px;
+}
\ No newline at end of file