-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Login Modal redesign * some more changes * making changes * making changes to title * using partials
- Loading branch information
1 parent
d97fa08
commit fed9f00
Showing
2 changed files
with
24 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,26 @@ | ||
| <p><i> | ||
| Use your <a href="http://publiclab.org" target="_blank">PublicLab.org</a> username to log in. | ||
| <br /> | ||
| If you do not yet have one, <a href="http://publiclab.org/signup">sign up there</a> first! | ||
| </i></p> | ||
| <div> | ||
| <p style="text-align: center;font-family:'Junction Light','lucida grande','lucida sans console',sans-serif;font-size: 20px; margin-top: 10px;"> | ||
| Log In via Public Lab | ||
| </p> | ||
| <div style="display: flex;justify-content: center;align-items: center;"> | ||
| <form id="open_id_form" method="GET" action="/session/new"> | ||
|
|
||
| <form id="open_id_form" method="GET" action="/session/new"> | ||
| <%= hidden_field_tag :authenticity_token, form_authenticity_token -%> | ||
| <%= hidden_field_tag :back_to, (params[:back_to] || request.env['PATH_INFO']) -%> | ||
| <input type="hidden" name="return_to" value="<%= params[:back_to] || request.env['PATH_INFO'] %>" /> | ||
|
|
||
| <%= hidden_field_tag :authenticity_token, form_authenticity_token -%> | ||
| <%= hidden_field_tag :back_to, (params[:back_to] || request.env['PATH_INFO']) -%> | ||
| <div style="display: flex;flex-direction: row;justify-content: space-around;width: 400px;margin-top: 30px;"> | ||
| <button tabindex="2" type="submit" style="background-color: #EDEDEE"> <img src="https://i.publiclab.org/system/images/photos/000/000/354/medium/Boots-ground-02.png" style="width: 50px; height: 50px;"></button> | ||
| <button tabindex="2" class="btn btn-large btn-danger" type="submit" name="subaction", value="google_oauth2"><i class="fa fa-google fa-fw" style="font-size:20px;color:white;"></i></button> | ||
| <button tabindex="2" class="btn btn-large btn-info" type="submit" name="subaction", value="twitter"><i class="fa fa-twitter fa-fw" style="font-size:20px;color:white;margin-left:2px;"></i></button> | ||
| <button tabindex="2" class="btn btn-large btn-primary" type="submit" name="subaction", value="facebook"><i class="fa fa-facebook fa-fw" style="font-size:20px;color:white;"></i></button> | ||
| <button tabindex="2" class="btn btn-large btn-dark" type="submit" name="subaction", value="github"><i class="fa fa-github fa-fw" style="font-size:20px;color:black;"></i></button> | ||
| </div> | ||
| | ||
| <label class="checkbox inline" for="remember_me"> | ||
| <input tabIndex="3" class="hidden" id="remember_me" name="remember_me" type="checkbox" value="1" checked /> | ||
| </label> | ||
| </form> | ||
| </div> | ||
| </div> | ||
|
|
||
| <input tabindex="1" placeholder="username" id="username" name="open_id" type="text" /></p> | ||
| <input type="hidden" name="return_to" value="<%= params[:back_to] || request.env['PATH_INFO'] %>" /> | ||
|
|
||
| <button tabindex="2" class="btn btn-large btn-primary" type="submit">Log in</button> | ||
| | ||
| <label class="checkbox inline" for="remember_me"> | ||
| <input tabIndex="3" id="remember_me" name="remember_me" type="checkbox" value="1" /> | ||
| Remember me | ||
| </label> | ||
|
|
||
| </form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,5 @@ | ||
| <div class="container"> | ||
|
|
||
| <h1>Log In</h1> | ||
|
|
||
| <p><i>Use your <a href="http://publiclab.org" target="_blank">PublicLab.org</a> username to log in. If you do not yet have one, <a href="http://publiclab.org/signup">sign up there</a> first!</i></p> | ||
|
|
||
| <form id="open_id_form" method="GET" action="/session/new"> | ||
|
|
||
| <%= hidden_field_tag :authenticity_token, form_authenticity_token -%> | ||
| <%= hidden_field_tag :back_to,@referer -%> | ||
|
|
||
| <input tabindex="1" placeholder="username" id="username" name="open_id" type="text" /></p> | ||
| <input type="hidden" name="return_to" value="<%= params[:return_to] %>" /> | ||
|
|
||
| <label class="checkbox inline" for="remember_me">Remember</label> | ||
| <input id="remember_me" name="remember_me" type="checkbox" value="1" /> | ||
| <br> | ||
| <button tabindex="2" class="btn btn-large btn-primary" type="submit">Log in</button> | ||
|
|
||
| </form> | ||
| <%= render partial: 'login' %> | ||
|
|
||
| </div> |