Merge pull request #1262 from opf/feature/multi_provider_login
Multi provider login formspull/1266/head
meeee
11 years ago
commit
d19915e4b7
|
After Width: | Height: | Size: 4.1 KiB |
@ -0,0 +1,139 @@ |
||||
/*-- 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 global/mixins |
||||
@import content/forms |
||||
|
||||
#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 |
||||
|
||||
.button_highlight |
||||
// align with input fields |
||||
// label width + label padding-right |
||||
margin-left: 155px + 5px |
||||
|
||||
height: 32px |
||||
|
||||
.attribute_wrapper |
||||
@include prevent-float-collapse |
||||
|
||||
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-options-container |
||||
margin-bottom: 10px |
||||
.login-links |
||||
float: right |
||||
text-align: right |
||||
font-size: 12px |
||||
|
||||
// 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: 25px |
||||
|
||||
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 |
||||
@include prevent-float-collapse |
||||
|
||||
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 |
||||
&:before |
||||
width: 100% |
||||
span |
||||
background: $header_drop_down_bg_color |
||||
.login-auth-provider-list |
||||
margin-top: -15px |
||||
margin-bottom: 10px |
||||
@ -1,34 +0,0 @@ |
||||
/*-- copyright |
||||
* OpenProject is a project management system. |
||||
* Copyright (C) 2012-2013 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. ++ |
||||
*/ |
||||
|
||||
div |
||||
.report-category-actions |
||||
margin-top: -28px |
||||
font-size: 17px // like h3 |
||||
width: 100% |
||||
text-align: right |
||||
@ -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 |
||||
@ -0,0 +1,21 @@ |
||||
<% |
||||
# 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 %> |
||||
@ -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 %> |
||||
|
||||
Loading…
Reference in new issue