From 1eb58bc6078129b0f4e2127ff77f8180674bd67f Mon Sep 17 00:00:00 2001
From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 18 Aug 2009 16:33:18 +0000
Subject: [PATCH] Reverting experimental stuff in r17121.

---
 app/views/layouts/site.html.erb |  7 +---
 app/views/user/login.html.erb   |  2 +-
 public/stylesheets/site-sml.css | 65 ---------------------------------
 3 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 public/stylesheets/site-sml.css
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index ed8c1456b..59b7c304b 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,14 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= t'html.dir' %>">
   <head>
-    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
     <%= javascript_include_tag 'prototype' %>
     <%= javascript_include_tag 'site' %>
     <!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
-    <!--[if IE]><%= stylesheet_link_tag 'site', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
-    <%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %> 
-    <%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %> 
-    <%= stylesheet_link_tag 'print', :media => "print" %> 
+    <%= stylesheet_link_tag 'site' %>
+    <%= stylesheet_link_tag 'print', :media => "print" %>
     <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
     <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
     <%= yield :head %>
diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 9b6d62f92..dc1001117 100644
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -5,7 +5,7 @@
 <% form_tag :action => 'login' do %>
 <%= hidden_field_tag('referer', h(params[:referer])) %>
 <table>
-  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
   <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   <tr><td></td><td align="right"><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>
diff --git a/public/stylesheets/site-sml.css b/public/stylesheets/site-sml.css
deleted file mode 100644
index e3f371594..000000000
--- a/public/stylesheets/site-sml.css
+++ /dev/null
@@ -1,65 +0,0 @@
-body {
-  font-family: Arial,sans-serif;
-  color: #000;
-  background-color: #fff;
-  font-size: 12px;
-}
-
-#left {
-  display: none;
-}
-
-#greeting {
-  position: absolute;
-  top: 0px;
-  right: 0px;
-  height: 16px;
-  margin: 0px;
-  padding-right: 10px;
-  font-size: 13px;
-  line-height: 14px;
-}
-
-#content {
-  padding-top: 16px;
-  height: 640px;
-}
-
-#tabnav {
-/*  display: none;*/
-}
-
-#sidebar {
-  display: none;
-}
-
-#permalink {
-  display: none;
-}
-
-input[type="text"], input[type="password"], textarea {
-  border: 1px solid black;
-  font-size: 12px;
-}
-
-.olControlPanZoomBar {
-  display: none;
-}
-
-.olControlLayerSwitcher {
-  display: none;
-}
-
-.olControlAttribution {
-  display: none !important;
-}
-
-#attribution {
-  font-size: 10px;
-  text-align: center;
-}
-
-#map {
-  border: 1px solid black;
-  height: 480px;
-}
-- 
2.43.2


<%= t 'user.login.email or username' %>	<%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.email or username' %>	<%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %>	<%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)

	<%= submit_tag t('user.login.login_button'), :tabindex => 3 %>