From 6214007fde4b90f0ecdddfd24daf8e9858a74af5 Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Mon, 5 May 2014 11:52:01 +0200
Subject: [PATCH 01/10] Login: Render auth providers as round buttons (still
 ugly)

---
 app/assets/images/auth_provider-developer.png | Bin 0 -> 7468 bytes
 .../stylesheets/content/_buttons.css.sass     |  22 +++++++++++++++++-
 app/views/account/_auth_providers.html.erb    |   3 +++
 app/views/account/_login.html.erb             |   2 +-
 app/views/account/login.html.erb              |   2 +-
 app/views/hooks/login/_auth_provider.html.erb |   4 +++-
 6 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/images/auth_provider-developer.png
 create mode 100644 app/views/account/_auth_providers.html.erb

diff --git a/app/assets/images/auth_provider-developer.png b/app/assets/images/auth_provider-developer.png
new file mode 100644
index 0000000000000000000000000000000000000000..39b569b63b47dbbbfa7ab1b95ea697593072fa07
GIT binary patch
literal 7468
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
Q{RJg2ts+$|VG{iR0P86MUjP6A

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/content/_buttons.css.sass b/app/assets/stylesheets/content/_buttons.css.sass
index 294151621f..30ca420622 100644
--- a/app/assets/stylesheets/content/_buttons.css.sass
+++ b/app/assets/stylesheets/content/_buttons.css.sass
@@ -1,6 +1,6 @@
 /*-- copyright
  * OpenProject is a project management system.
- * Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
+ * Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -37,3 +37,23 @@ a.button, .button
 input.button, input.button_highlight
   margin-top: 0
   padding: 2px 10px
+
+a.auth-provider
+  float: left
+  width: 120px
+  height: 60px
+  padding-left: 65px
+  margin-left: 10px
+  background-image: url(image-path('auth_provider-developer.png'))
+  background-size: 60px 60px
+  background-repeat: no-repeat
+  font-weight: normal
+  color: $global_font_color
+
+a.auth-provider:hover
+  text-decoration: none
+
+a.auth-provider .auth-provider-name
+  vertical-align: middle
+  height: 60px
+  display: table-cell
diff --git a/app/views/account/_auth_providers.html.erb b/app/views/account/_auth_providers.html.erb
new file mode 100644
index 0000000000..932bf45eec
--- /dev/null
+++ b/app/views/account/_auth_providers.html.erb
@@ -0,0 +1,3 @@
+<div class="login-auth-providers">
+  <%= call_hook :view_account_login_auth_provider %>
+</div>
diff --git a/app/views/account/_login.html.erb b/app/views/account/_login.html.erb
index 13cf2ba243..726b055cad 100644
--- a/app/views/account/_login.html.erb
+++ b/app/views/account/_login.html.erb
@@ -59,7 +59,7 @@ See doc/COPYRIGHT.rdoc for more details.
           <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
         <% end %>
         <br>
-        <%= call_hook :view_account_login_auth_provider %>
+        <%= render :partial => 'account/auth_providers' %>
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 4f3be81cb5..549579e1a2 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -68,5 +68,5 @@ See doc/COPYRIGHT.rdoc for more details.
     </div>
   <% end %>
 </div>
-<%= call_hook :view_account_login_auth_provider %>
+<%= render :partial => 'auth_providers' %>
 <%= call_hook :view_account_login_bottom %>
diff --git a/app/views/hooks/login/_auth_provider.html.erb b/app/views/hooks/login/_auth_provider.html.erb
index 19e13eed78..66fc50f1d5 100644
--- a/app/views/hooks/login/_auth_provider.html.erb
+++ b/app/views/hooks/login/_auth_provider.html.erb
@@ -1,3 +1,5 @@
 <% unless Rails.env.production? %>
-  <%= link_to "Omniauth Developer", :controller => '/auth', :action => 'developer' %>
+  <a href="<%= url_for controller: '/auth', action: 'developer' %>" class="auth-provider auth-provider-developer">
+    <span class="auth-provider-name">Omniauth Developer</span>
+  </a>
 <% end %>

From 2274de6c21912d06a997c9b50803e43aaba21a67 Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Mon, 5 May 2014 14:27:56 +0200
Subject: [PATCH 02/10] CSS: Refactor work package and account stuff into own
 files

---
 ...age_report.css.sass => _accounts.css.sass} |  39 +++++--
 .../stylesheets/content/_buttons.css.sass     |  20 ----
 .../stylesheets/content/_forms.css.sass       |  76 +------------
 .../content/_work_packages.css.sass           | 102 ++++++++++++++++++
 app/assets/stylesheets/default.css.sass       |   3 +-
 5 files changed, 138 insertions(+), 102 deletions(-)
 rename app/assets/stylesheets/content/{_work_package_report.css.sass => _accounts.css.sass} (65%)
 create mode 100644 app/assets/stylesheets/content/_work_packages.css.sass

diff --git a/app/assets/stylesheets/content/_work_package_report.css.sass b/app/assets/stylesheets/content/_accounts.css.sass
similarity index 65%
rename from app/assets/stylesheets/content/_work_package_report.css.sass
rename to app/assets/stylesheets/content/_accounts.css.sass
index f2604fffdd..697e542d2b 100644
--- a/app/assets/stylesheets/content/_work_package_report.css.sass
+++ b/app/assets/stylesheets/content/_accounts.css.sass
@@ -1,6 +1,6 @@
 /*-- copyright
  * OpenProject is a project management system.
- * Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
+ * Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -26,9 +26,34 @@
  * See doc/COPYRIGHT.rdoc for more details.  ++
  */
 
-div
-  .report-category-actions
-    margin-top: -28px
-    font-size: 17px // like h3
-    width: 100%
-    text-align: right
+@import content/forms
+
+a.auth-provider
+  float: left
+  width: 120px
+  height: 60px
+  padding-left: 65px
+  margin-left: 10px
+  background-image: url(image-path('auth_provider-developer.png'))
+  background-size: 60px 60px
+  background-repeat: no-repeat
+  font-weight: normal
+  color: $global_font_color
+
+a.auth-provider:hover
+  text-decoration: none
+
+a.auth-provider .auth-provider-name
+  vertical-align: middle
+  height: 60px
+  display: table-cell
+
+
+#login-form form
+  @extend %form-style
+  .button_highlight
+    margin-right: 0
+
+#lost_password
+  margin-top: 20px
+
diff --git a/app/assets/stylesheets/content/_buttons.css.sass b/app/assets/stylesheets/content/_buttons.css.sass
index 30ca420622..8fed2b2ddf 100644
--- a/app/assets/stylesheets/content/_buttons.css.sass
+++ b/app/assets/stylesheets/content/_buttons.css.sass
@@ -37,23 +37,3 @@ a.button, .button
 input.button, input.button_highlight
   margin-top: 0
   padding: 2px 10px
-
-a.auth-provider
-  float: left
-  width: 120px
-  height: 60px
-  padding-left: 65px
-  margin-left: 10px
-  background-image: url(image-path('auth_provider-developer.png'))
-  background-size: 60px 60px
-  background-repeat: no-repeat
-  font-weight: normal
-  color: $global_font_color
-
-a.auth-provider:hover
-  text-decoration: none
-
-a.auth-provider .auth-provider-name
-  vertical-align: middle
-  height: 60px
-  display: table-cell
diff --git a/app/assets/stylesheets/content/_forms.css.sass b/app/assets/stylesheets/content/_forms.css.sass
index b2c5ad3e38..78d50e5061 100644
--- a/app/assets/stylesheets/content/_forms.css.sass
+++ b/app/assets/stylesheets/content/_forms.css.sass
@@ -1,6 +1,6 @@
 /*-- copyright
  * OpenProject is a project management system.
- * Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
+ * Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -66,7 +66,7 @@
   padding-right: 5px
   vertical-align: middle
 
-#login-form form, #work_package-form, #update #work_package-form
+%form-style
   padding: 30px 20px
   background-color: $content_form_bg_color
   display: block
@@ -114,84 +114,12 @@
         vertical-align: middle
         width: 160px
 
-#login-form form
-  .button_highlight
-    margin-right: 0
-
-#work_package-form
-  .attributes
-    margin-bottom: 30px
-    overflow: auto
-
-  #watchers_form
-    position: relative
-    padding-left: 160px
-    margin-bottom: 30px
-    font-size: 14px
-    line-height: 30px
-
-    .watcher_label
-      @include label-style
-      width: 152px
-      margin-left: -160px
-
-    .floating
-      float: none
-      display: inline-block
-
-  #attachments
-    padding-left: 0
-    padding-right: 0
-
-  .handle_attachments, #attachments
-    > label
-      @include label-style
-      height: 30px
-      display: block
-    margin-bottom: 30px
-
-    #attachments_fields
-      display: inline-block
-
-    .attachment_field
-      display: block
-      margin-bottom: 10px
-      height: 32px
-      > input
-        @include input-style
-        border: none
-        &:hover, &:focus
-          border: none
-      label
-        @include label-style
-        width: auto
-        height: 32px
-        input
-          margin-left: 50px
-    .add_another_file
-      padding-left: 10px
-
-  fieldset
-    margin-bottom: 20px
-    padding: 30px 20px
-
-  legend.change_properties
-    padding-right: 20px
-  #show_more_wp_properties
-    float: left
-    margin-left: 115px
-    margin-top: -48px
-    background-color: $content_form_bg_color
-
 hr.form_separator
   border: 0
   border-bottom: 1px solid $content_form_separator_color
   margin: 0 0 30px
   background: none
 
-#lost_password
-  margin-top: 20px
-
 .form-space
   padding-top: 10px
 
diff --git a/app/assets/stylesheets/content/_work_packages.css.sass b/app/assets/stylesheets/content/_work_packages.css.sass
new file mode 100644
index 0000000000..d343b9e418
--- /dev/null
+++ b/app/assets/stylesheets/content/_work_packages.css.sass
@@ -0,0 +1,102 @@
+/*-- copyright
+ * OpenProject is a project management system.
+ * Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See doc/COPYRIGHT.rdoc for more details.  ++
+ */
+
+@import content/forms
+
+div
+  .report-category-actions
+    margin-top: -28px
+    font-size: 17px // like h3
+    width: 100%
+    text-align: right
+
+#work_package-form
+  @extend %form-style
+  .attributes
+    margin-bottom: 30px
+    overflow: auto
+
+  #watchers_form
+    position: relative
+    padding-left: 160px
+    margin-bottom: 30px
+    font-size: 14px
+    line-height: 30px
+
+    .watcher_label
+      @include label-style
+      width: 152px
+      margin-left: -160px
+
+    .floating
+      float: none
+      display: inline-block
+
+  #attachments
+    padding-left: 0
+    padding-right: 0
+
+  .handle_attachments, #attachments
+    > label
+      @include label-style
+      height: 30px
+      display: block
+    margin-bottom: 30px
+
+    #attachments_fields
+      display: inline-block
+
+    .attachment_field
+      display: block
+      margin-bottom: 10px
+      height: 32px
+      > input
+        @include input-style
+        border: none
+        &:hover, &:focus
+          border: none
+      label
+        @include label-style
+        width: auto
+        height: 32px
+        input
+          margin-left: 50px
+    .add_another_file
+      padding-left: 10px
+
+  fieldset
+    margin-bottom: 20px
+    padding: 30px 20px
+
+  legend.change_properties
+    padding-right: 20px
+  #show_more_wp_properties
+    float: left
+    margin-left: 115px
+    margin-top: -48px
+    background-color: $content_form_bg_color
diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass
index 8f93af0b5b..07fdbd1424 100644
--- a/app/assets/stylesheets/default.css.sass
+++ b/app/assets/stylesheets/default.css.sass
@@ -39,6 +39,7 @@
 @import work_packages
 @import openproject_plugins
 @import layout/all
+@import content/accounts
 @import content/forms
 @import content/flash_messages
 @import content/calendar
@@ -49,7 +50,7 @@
 @import content/buttons
 @import content/boxes
 @import content/tabular
-@import content/work_package_report
+@import content/work_packages
 @import content/expandable_group_content
 @import content/control_colors
 @import content/tabular

From 1ef894672ae7c24449dfec3b700262559e33e6df Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Mon, 5 May 2014 17:08:40 +0200
Subject: [PATCH 03/10] Center main login form and use generic form formatting

No more table!
---
 .../stylesheets/content/_accounts.css.sass    | 42 +++++++++---
 .../stylesheets/content/_forms.css.sass       |  8 +++
 app/views/account/login.html.erb              | 65 +++++++++----------
 3 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/app/assets/stylesheets/content/_accounts.css.sass b/app/assets/stylesheets/content/_accounts.css.sass
index 697e542d2b..8a69b81e49 100644
--- a/app/assets/stylesheets/content/_accounts.css.sass
+++ b/app/assets/stylesheets/content/_accounts.css.sass
@@ -28,6 +28,38 @@
 
 @import content/forms
 
+#login-form
+  margin-left: auto
+  margin-right: auto
+  // label width + label padding-right + input width + input padding-left + input border
+  width: 155px + 5px + $content_from_input_width + 10px + 2px
+
+  .button_highlight
+    // align with input fields
+    // label width + label padding-right
+    margin-left: 155px + 5px
+
+    height: 32px
+
+  label
+    // inline-block can't guarantee a specific width (possibly due to whitespace)
+    display: block
+    float: left
+
+  input
+    &[type=password], &[type=text]
+      // inline-block can't guarantee a specific width
+      display: block
+
+  .login-button-links-container
+    margin-bottom: 10px
+    input
+      display: block
+    div
+      float: right
+      text-align: right
+      font-size: 12px
+
 a.auth-provider
   float: left
   width: 120px
@@ -47,13 +79,3 @@ a.auth-provider .auth-provider-name
   vertical-align: middle
   height: 60px
   display: table-cell
-
-
-#login-form form
-  @extend %form-style
-  .button_highlight
-    margin-right: 0
-
-#lost_password
-  margin-top: 20px
-
diff --git a/app/assets/stylesheets/content/_forms.css.sass b/app/assets/stylesheets/content/_forms.css.sass
index 78d50e5061..d7c091768e 100644
--- a/app/assets/stylesheets/content/_forms.css.sass
+++ b/app/assets/stylesheets/content/_forms.css.sass
@@ -114,6 +114,14 @@
         vertical-align: middle
         width: 160px
 
+// A general CSS class to be applied to forms using the above defined form style.
+// We can't define this on form itself as this would break a lot of existing forms.
+//
+// Using this form class allows to easily override defaults defined here with a more
+// specific definition.
+.form
+  @extend %form-style
+
 hr.form_separator
   border: 0
   border-bottom: 1px solid $content_form_separator_color
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 549579e1a2..3fc2400fe0 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -31,42 +31,35 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <% breadcrumb_paths(l(:label_login)) %>
 <%= call_hook :view_account_login_top %>
-<div id="login-form">
-  <%= form_tag({:action=> "login"}, :autocomplete => 'off') do %>
-    <%= back_url_hidden_field_tag %>
-    <table>
-      <tr>
-        <td class="label"><label for="username"><%= User.human_attribute_name :login %>:</label></td>
-        <td><%= text_field_tag 'username', nil %></td>
-      </tr>
-      <tr>
-        <td class="label"><label for="password"><%= User.human_attribute_name :password %>:</label></td>
-        <td><%= password_field_tag 'password', nil %></td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <% if Setting.autologin? %>
-            <label for="autologin"><%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %></label>
-          <% end %>
-        </td>
-      </tr>
-      <tr>
-        <td>
-        </td>
-        <td align="right">
-          <input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" />
-        </td>
-      </tr>
-    </table>
-    <%= javascript_tag "Form.Element.focus('username');" %>
-  <% end %>
+<%= form_tag({:action=> "login"}, autocomplete: 'off', id: 'login-form', class: 'form') do %>
+  <%= back_url_hidden_field_tag %>
+  <h1><%= I18n.t(:label_login) %></h1>
 
-  <% if Setting.lost_password? %>
-    <div id="lost_password">
-      <%= link_to l(:label_password_lost), :controller => '/account', :action => 'lost_password' %>
+  <hr class="form_separator">
+
+  <div class="attribute_wrapper">
+    <label for="username"><%= User.human_attribute_name :login %></label>
+    <%= text_field_tag 'username', nil %>
+  </div>
+
+  <div class="attribute_wrapper">
+    <label for="password"><%= User.human_attribute_name :password %></label>
+    <%= password_field_tag 'password', nil %>
+  </div>
+
+  <div class="login-button-links-container">
+    <div>
+    <% if Setting.lost_password? %>
+        <%= link_to l(:label_password_lost), :controller => '/account', :action => 'lost_password' %>
+        <br>
+    <% end %>
+    <% if Setting.self_registration? %>
+      <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
+    <% end %>
     </div>
-  <% end %>
-</div>
-<%= render :partial => 'auth_providers' %>
+    <input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" />
+  </div>
+  <%= render :partial => 'auth_providers' %>
+  <%= javascript_tag "Form.Element.focus('username');" %>
+<% end %>
 <%= call_hook :view_account_login_bottom %>

From f343d5d723690e5c504584f814e267c69c7d5df0 Mon Sep 17 00:00:00 2001
From: Michael Frister <m.frister@finn.de>
Date: Tue, 6 May 2014 18:08:47 +0200
Subject: [PATCH 04/10] Login forms: Improve looks

---
 app/assets/images/auth_provider-developer.png | Bin 7468 -> 4242 bytes
 .../stylesheets/content/_accounts.css.sass    |  96 ++++++++++++++----
 app/views/account/_auth_providers.html.erb    |  24 ++++-
 config/locales/de.yml                         |   5 +-
 config/locales/en.yml                         |   7 +-
 5 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/app/assets/images/auth_provider-developer.png b/app/assets/images/auth_provider-developer.png
index 39b569b63b47dbbbfa7ab1b95ea697593072fa07..c564a87663cc67958e8e58f35878a2e40df8d7f3 100644
GIT binary patch
literal 4242
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

literal 7468
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
Q{RJg2ts+$|VG{iR0P86MUjP6A

diff --git a/app/assets/stylesheets/content/_accounts.css.sass b/app/assets/stylesheets/content/_accounts.css.sass
index 8a69b81e49..f2b007489c 100644
--- a/app/assets/stylesheets/content/_accounts.css.sass
+++ b/app/assets/stylesheets/content/_accounts.css.sass
@@ -60,22 +60,80 @@
       text-align: right
       font-size: 12px
 
-a.auth-provider
-  float: left
-  width: 120px
-  height: 60px
-  padding-left: 65px
-  margin-left: 10px
-  background-image: url(image-path('auth_provider-developer.png'))
-  background-size: 60px 60px
-  background-repeat: no-repeat
-  font-weight: normal
-  color: $global_font_color
-
-a.auth-provider:hover
-  text-decoration: none
-
-a.auth-provider .auth-provider-name
-  vertical-align: middle
-  height: 60px
-  display: table-cell
+// use id selectors to be specific enough to override general content and top-menu definitions
+#content .login-auth-providers, #top-menu #nav-login-content .login-auth-providers
+  width: 471px
+  margin-top: 10px
+
+  h3
+    border: none
+    margin-top: 20px
+    font-weight: normal
+    font-size: $global_font_size
+    text-decoration: none
+    text-align: center
+
+    position: relative
+    z-index: 1
+
+    // line behind title
+    // from http://codepen.io/ericrasch/pen/Irlpm
+    &:before
+      border-top: 2px solid $content_form_separator_color
+      content: ""
+      // this centers the line to the full width specified
+      margin: 0 auto
+      // positioning must be absolute here, and relative positioning
+      //  must be applied to the parent
+      position: absolute
+      top: 50%
+      left: 0
+      right: 0
+      bottom: 0
+      width: 95%
+      z-index: -1
+
+    // also line behind title
+    span
+      // to hide the lines from behind the text, you have to set the
+      // background color the same as the container
+      background: $content_form_bg_color
+      padding: 0 15px
+
+  .login-auth-provider-list
+    // Make sure this element doesn't collapse due to floated elements inside
+    &:after
+      content: " "
+      display: block
+      height: 0
+      clear: both
+
+  a.auth-provider
+    float: left
+    width: 97px
+    height: 40px
+    padding-left: 50px
+    margin-left: 10px
+    margin-top: 20px
+    background-image: url(image-path('auth_provider-developer.png'))
+    background-size: 40px 40px
+    background-repeat: no-repeat
+    font-weight: normal
+    color: $global_font_color
+
+    &:hover
+      text-decoration: none
+
+    .auth-provider-name
+      vertical-align: middle
+      height: 40px
+      display: table-cell
+      white-space: normal
+
+#top-menu #nav-login-content .login-auth-providers
+  h3
+    span
+      background: $header_drop_down_bg_color
+  .login-auth-provider-list
+    margin-top: -25px
+    margin-bottom: 8px
diff --git a/app/views/account/_auth_providers.html.erb b/app/views/account/_auth_providers.html.erb
index 932bf45eec..809589ee21 100644
--- a/app/views/account/_auth_providers.html.erb
+++ b/app/views/account/_auth_providers.html.erb
@@ -1,3 +1,21 @@
-<div class="login-auth-providers">
-  <%= call_hook :view_account_login_auth_provider %>
-</div>
+<%
+# Remove this ugly hack when creating an authentication plugin.
+#
+# This hack is required as we don't have a way to list all active
+# Omniauth Providers without a patch.
+#
+# See
+# * https://www.openproject.org/work_packages/7192
+# * http://stackoverflow.com/questions/13112430/find-loaded-providers-for-omniauth
+auth_provider_html = call_hook :view_account_login_auth_provider
+%>
+<% if auth_provider_html.strip != '' %>
+  <div class="login-auth-providers">
+    <h3 class="login-auth-providers-title"><span>
+      <%= I18n.t('account.login_with_auth_provider')%>
+    </span></h3>
+    <div class="login-auth-provider-list">
+      <%= auth_provider_html %>
+    </div>
+  </div>
+<% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0f0b013a3e..32f9925524 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -51,6 +51,7 @@ de:
     error_self_registration_disabled: >
       Auf diesem System ist die Nutzerregistierung deaktiviert. Bitte fragen Sie einen
       Administrator nach einem Nutzerkonto.
+    login_with_auth_provider: "oder melden Sie sich mit einem bestehenden Konto an"
 
   actionview_instancetag_blank_option: "Bitte auswählen"
 
@@ -806,7 +807,7 @@ de:
   label_overall_activity: "Aktivität aller Projekte anzeigen"
   label_overall_spent_time: "Aufgewendete Zeit aller Projekte anzeigen"
   label_overview: "Übersicht"
-  label_password_lost: "Kennwort vergessen"
+  label_password_lost: "Kennwort vergessen?"
   label_password_rule_lowercase: "Kleinbuchstaben"
   label_password_rule_numeric: "Ziffern"
   label_password_rule_special: "Sonderzeichen"
@@ -840,7 +841,7 @@ de:
   label_query_plural: "Benutzerdefinierte Berichte"
   label_query_menu_item: "Filter-Menüpunkt"
   label_read: "Lesen ..."
-  label_register: "Registrieren"
+  label_register: "Neues Konto erstellen"
   label_register_with_developer: "Als Entwickler anmelden"
   label_registered_on: "Angemeldet am"
   label_registration_activation_by_email: "Kontoaktivierung durch E-Mail"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e85883936b..ed6cb4f42e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -51,6 +51,7 @@ en:
     error_self_registration_disabled: >
       User registration is disabled on this system. Please ask an administrator to create an
       account for you.
+    login_with_auth_provider: "or sign in with your existing account"
 
   actionview_instancetag_blank_option: "Please select"
 
@@ -358,7 +359,7 @@ en:
   button_list: "List"
   button_lock: "Lock"
   button_log_time: "Log time"
-  button_login: "Login"
+  button_login: "Sign in"
   button_move: "Move"
   button_move_and_follow: "Move and follow"
   button_quote: "Quote"
@@ -803,7 +804,7 @@ en:
   label_overall_activity: "Overall activity"
   label_overall_spent_time: "Overall spent time"
   label_overview: "Overview"
-  label_password_lost: "Lost password"
+  label_password_lost: "Forgot your password?"
   label_password_rule_lowercase: "Lowercase"
   label_password_rule_numeric: "Numeric Characters"
   label_password_rule_special: "Special Characters"
@@ -837,7 +838,7 @@ en:
   label_query_plural: "Custom queries"
   label_query_menu_item: "Query menu item"
   label_read: "Read..."
-  label_register: "Register"
+  label_register: "Create a new account"
   label_register_with_developer: "Register as developer"
   label_registered_on: "Registered on"
   label_registration_activation_by_email: "account activation by email"

From 584c5013f74d8fa6a0dc572bfdd75d86abbf339f Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Wed, 7 May 2014 17:56:10 +0200
Subject: [PATCH 05/10] Main login form: Add accidentally removed "stay logged
 in" option

---
 .../stylesheets/content/_accounts.css.sass    | 17 +++++-------
 .../stylesheets/content/_forms.css.sass       |  3 +++
 app/assets/stylesheets/global/_mixins.sass    |  8 ++++++
 app/views/account/login.html.erb              | 27 ++++++++++++-------
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/content/_accounts.css.sass b/app/assets/stylesheets/content/_accounts.css.sass
index f2b007489c..96ab7bf0cd 100644
--- a/app/assets/stylesheets/content/_accounts.css.sass
+++ b/app/assets/stylesheets/content/_accounts.css.sass
@@ -26,6 +26,7 @@
  * See doc/COPYRIGHT.rdoc for more details.  ++
  */
 
+@import global/mixins
 @import content/forms
 
 #login-form
@@ -41,6 +42,9 @@
 
     height: 32px
 
+  .attribute_wrapper
+    @include prevent-float-collapse
+
   label
     // inline-block can't guarantee a specific width (possibly due to whitespace)
     display: block
@@ -51,11 +55,9 @@
       // inline-block can't guarantee a specific width
       display: block
 
-  .login-button-links-container
+  .login-options-container
     margin-bottom: 10px
-    input
-      display: block
-    div
+    .login-links
       float: right
       text-align: right
       font-size: 12px
@@ -101,12 +103,7 @@
       padding: 0 15px
 
   .login-auth-provider-list
-    // Make sure this element doesn't collapse due to floated elements inside
-    &:after
-      content: " "
-      display: block
-      height: 0
-      clear: both
+    @include prevent-float-collapse
 
   a.auth-provider
     float: left
diff --git a/app/assets/stylesheets/content/_forms.css.sass b/app/assets/stylesheets/content/_forms.css.sass
index d7c091768e..8c4188ebde 100644
--- a/app/assets/stylesheets/content/_forms.css.sass
+++ b/app/assets/stylesheets/content/_forms.css.sass
@@ -85,6 +85,9 @@
       width: 100px
       margin-right: 200px
 
+    &.indented
+      margin-left: 160px
+
   select
     @include select-style
 
diff --git a/app/assets/stylesheets/global/_mixins.sass b/app/assets/stylesheets/global/_mixins.sass
index 155e250890..e06aba06f8 100644
--- a/app/assets/stylesheets/global/_mixins.sass
+++ b/app/assets/stylesheets/global/_mixins.sass
@@ -172,6 +172,14 @@ $button_gray_font_color: #222222
   ul
     margin-bottom: 20px
 
+// Make sure an element doesn't collapse due to floated elements inside
+@mixin prevent-float-collapse
+  &:after
+    content: " "
+    display: block
+    height: 0
+    clear: both
+
 @mixin text-shortener
   white-space: nowrap
   overflow: hidden
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 3fc2400fe0..b8df5412af 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -47,18 +47,25 @@ See doc/COPYRIGHT.rdoc for more details.
     <%= password_field_tag 'password', nil %>
   </div>
 
-  <div class="login-button-links-container">
-    <div>
-    <% if Setting.lost_password? %>
-        <%= link_to l(:label_password_lost), :controller => '/account', :action => 'lost_password' %>
-        <br>
-    <% end %>
-    <% if Setting.self_registration? %>
-      <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
-    <% end %>
+  <div class="login-options-container">
+    <div class="login-links">
+      <% if Setting.lost_password? %>
+          <%= link_to l(:label_password_lost), :controller => '/account', :action => 'lost_password' %>
+          <br>
+      <% end %>
+      <% if Setting.self_registration? %>
+        <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
+      <% end %>
     </div>
-    <input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" />
+    <% if Setting.autologin? %>
+      <div class="attribute_wrapper indented">
+        <label for="autologin">
+          <%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %>
+        </label>
+      </div>
+    <% end %>
   </div>
+  <input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" />
   <%= render :partial => 'auth_providers' %>
   <%= javascript_tag "Form.Element.focus('username');" %>
 <% end %>

From 978879c43228de929413d301c9df6bc098fc879f Mon Sep 17 00:00:00 2001
From: Michael Frister <michael+git@frister.net>
Date: Wed, 7 May 2014 18:49:58 +0200
Subject: [PATCH 06/10] Pulldown login form: Improve looks

Also contains some small improvements for main login form.
---
 .../stylesheets/content/_accounts.css.sass    |  9 +++--
 .../stylesheets/layout/_top_menu.css.sass     | 13 +++----
 app/views/account/_login.html.erb             | 39 ++++++++++---------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/content/_accounts.css.sass b/app/assets/stylesheets/content/_accounts.css.sass
index 96ab7bf0cd..19b50b51ef 100644
--- a/app/assets/stylesheets/content/_accounts.css.sass
+++ b/app/assets/stylesheets/content/_accounts.css.sass
@@ -32,6 +32,7 @@
 #login-form
   margin-left: auto
   margin-right: auto
+  padding-top: 20px
   // label width + label padding-right + input width + input padding-left + input border
   width: 155px + 5px + $content_from_input_width + 10px + 2px
 
@@ -65,7 +66,7 @@
 // use id selectors to be specific enough to override general content and top-menu definitions
 #content .login-auth-providers, #top-menu #nav-login-content .login-auth-providers
   width: 471px
-  margin-top: 10px
+  margin-top: 25px
 
   h3
     border: none
@@ -129,8 +130,10 @@
 
 #top-menu #nav-login-content .login-auth-providers
   h3
+    &:before
+      width: 100%
     span
       background: $header_drop_down_bg_color
   .login-auth-provider-list
-    margin-top: -25px
-    margin-bottom: 8px
+    margin-top: -15px
+    margin-bottom: 10px
diff --git a/app/assets/stylesheets/layout/_top_menu.css.sass b/app/assets/stylesheets/layout/_top_menu.css.sass
index 653bae0390..9ff8883ffb 100644
--- a/app/assets/stylesheets/layout/_top_menu.css.sass
+++ b/app/assets/stylesheets/layout/_top_menu.css.sass
@@ -156,12 +156,12 @@
     border: 0px solid #194E60
     border-top: 0
     line-height: 19px
-    padding: 10px
+    padding: 15px 10px 15px 15px
     @include header-fonts(#555555, 13px)
 
     input[type=text]
       height: 16px
-      width: 150px
+      width: 175px
       border: 1px solid #CCCCCC
       padding: 5px
       @include default-transition
@@ -169,22 +169,21 @@
         border: 1px solid #888888
     input[type=password]
       height: 16px
-      width: 150px
+      width: 175px
       border: 1px solid #CCCCCC
       padding: 5px
       @include default-transition
       &:hover
         border: 1px solid #888888
-    div a
+    input[type=submit]
+      height: 28px
+    a
       display: inline
       padding: 0
       font-family: $font_family_normal
       font-weight: normal
     table td
       padding: 3px
-  #optional_login_fields
-    white-space: nowrap
-    margin: 5px 0 0 3px
 
 #quick-search
   float: right
diff --git a/app/views/account/_login.html.erb b/app/views/account/_login.html.erb
index 726b055cad..f976b973ea 100644
--- a/app/views/account/_login.html.erb
+++ b/app/views/account/_login.html.erb
@@ -43,24 +43,27 @@ See doc/COPYRIGHT.rdoc for more details.
                                    :id => 'password-pulldown' %></td>
         <td><input type="submit" name="login" value="<%=l(:button_login)%>" class="button_highlight" /></td>
       </tr>
+      <tr>
+        <td>
+          <% if Setting.autologin? %>
+            <label for="autologin"><%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %></label>
+          <% elsif Setting.self_registration? %>
+            <%# show here if autologin is disabled, otherwise below lost_password link %>
+            <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
+          <% end %>
+        </td>
+        <td>
+          <% if Setting.lost_password? %>
+            <%= link_to l(:label_password_lost), {:controller => '/account', :action => 'lost_password'} %>
+          <% end %>
+          <% if Setting.autologin? && Setting.self_registration? %>
+            <%# show here if autologin is enabled, otherwise below login field %>
+            <%= '<br>'.html_safe if Setting.lost_password? %>
+            <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
+          <% end %>
+        </td>
+      </tr>
     </table>
-    <div id = "optional_login_fields" style = "top = 10px; white-space:nowrap">
-      <% if Setting.autologin? %>
-        <label for="autologin"><%= check_box_tag 'autologin', 1, false %> <%= l(:label_stay_logged_in) %></label>
-      <% end %>
-
-      <% if Setting.lost_password? %>
-        <%= link_to l(:label_password_lost), {:controller => '/account', :action => 'lost_password'} %>
-      <% end %>
-
-      <% if !User.current.logged? %>
-        <% if Setting.self_registration? %>
-          <%= "|" if Setting.lost_password? %>
-          <%= link_to l(:label_register), { :controller => '/account', :action => 'register' } %>
-        <% end %>
-        <br>
-        <%= render :partial => 'account/auth_providers' %>
-      <% end %>
-    </div>
+    <%= render :partial => 'account/auth_providers' %>
   <% end %>
 </div>

From 2e402dbf84e40ca1600c3fada003ced94b7e34f2 Mon Sep 17 00:00:00 2001
From: kgalli <mail@kgalli.de>
Date: Wed, 7 May 2014 22:31:26 +0200
Subject: [PATCH 07/10] rename of labels to get tests running again

---
 config/locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ed6cb4f42e..29c06b82e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -359,7 +359,7 @@ en:
   button_list: "List"
   button_lock: "Lock"
   button_log_time: "Log time"
-  button_login: "Sign in"
+  button_login: "Login"
   button_move: "Move"
   button_move_and_follow: "Move and follow"
   button_quote: "Quote"
@@ -804,7 +804,7 @@ en:
   label_overall_activity: "Overall activity"
   label_overall_spent_time: "Overall spent time"
   label_overview: "Overview"
-  label_password_lost: "Forgot your password?"
+  label_password_lost: "Lost password"
   label_password_rule_lowercase: "Lowercase"
   label_password_rule_numeric: "Numeric Characters"
   label_password_rule_special: "Special Characters"

From 1688a50cebef0e53097200b7912ce5355594c9c7 Mon Sep 17 00:00:00 2001
From: kgalli <mail@kgalli.de>
Date: Wed, 7 May 2014 22:32:21 +0200
Subject: [PATCH 08/10] removal of colon to ensure capybara is able to find
 input

---
 features/support/login_steps.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/login_steps.rb b/features/support/login_steps.rb
index 48a7391e18..ea943c1010 100644
--- a/features/support/login_steps.rb
+++ b/features/support/login_steps.rb
@@ -32,7 +32,7 @@ module LoginSteps
     # visit '/logout' # uncomment me if needed
     visit '/login'
     within('#login-form') do
-      fill_in User.human_attribute_name(:login)+":", :with => login
+      fill_in User.human_attribute_name(:login), :with => login
       fill_in 'Password:', :with => password
       click_button 'Login'
     end

From 90efec66bd3b35891fb16cc426acf59ec609872c Mon Sep 17 00:00:00 2001
From: kgalli <mail@kgalli.de>
Date: Wed, 7 May 2014 22:52:12 +0200
Subject: [PATCH 09/10] removal of second colon to get tests running again

---
 features/support/login_steps.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/support/login_steps.rb b/features/support/login_steps.rb
index ea943c1010..91c05f6315 100644
--- a/features/support/login_steps.rb
+++ b/features/support/login_steps.rb
@@ -33,7 +33,7 @@ module LoginSteps
     visit '/login'
     within('#login-form') do
       fill_in User.human_attribute_name(:login), :with => login
-      fill_in 'Password:', :with => password
+      fill_in 'Password', :with => password
       click_button 'Login'
     end
   end

From 08bbb6a86ec5a5184f0292eab7bb2fc78dc422c6 Mon Sep 17 00:00:00 2001
From: kgalli <mail@kgalli.de>
Date: Wed, 7 May 2014 23:39:15 +0200
Subject: [PATCH 10/10] rename of label label_register to get tests runnning
 again

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 29c06b82e8..88a4a83631 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -838,7 +838,7 @@ en:
   label_query_plural: "Custom queries"
   label_query_menu_item: "Query menu item"
   label_read: "Read..."
-  label_register: "Create a new account"
+  label_register: "Register"
   label_register_with_developer: "Register as developer"
   label_registered_on: "Registered on"
   label_registration_activation_by_email: "account activation by email"