Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix front ui #1011

Merged
merged 17 commits into from
Sep 11, 2019
Merged

Fix front ui #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
58bc692
h
sashadev-sky Jul 25, 2019
8dcff6a
h
sashadev-sky Jul 25, 2019
c075966
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Jul 26, 2019
986b49a
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Jul 30, 2019
34cf99d
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 6, 2019
11e11be
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 7, 2019
ba41fb4
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 11, 2019
d398f00
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 12, 2019
1828645
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 13, 2019
95759ad
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 22, 2019
8238c6f
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Aug 27, 2019
bf84e93
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 4, 2019
fc9d5ce
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 9, 2019
ae6a192
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 10, 2019
596f150
updates
sashadev-sky Sep 10, 2019
4f0a534
Merge branch 'main' of https://github.com/publiclab/mapknitter into main
sashadev-sky Sep 10, 2019
ed655e4
fix front-ui
sashadev-sky Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/assets/stylesheets/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ It was originally created by Caroline Hadilaksono: http://www.hadilaksono.com
width: 45%;
font-size: 1em;
}
.btn.btn-default {
width: auto;
}
}

.jumbotron {
Expand Down
24 changes: 2 additions & 22 deletions app/views/front_ui/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,8 @@
</div>

<div id = "anonymous-map" class="collapse text-block lead-text col-lg-4 offset-lg-4 col-md-6 offset-md-3 col-sm-8 offset-sm-2">
<p>We strongly prefer that you should Log in via
<br><br>
<form id="open_id_form" method="GET" action="/sessions/create" style="padding:10px;">
<%= hidden_field_tag :authenticity_token, form_authenticity_token -%>
<%= hidden_field_tag :back_to, params[:back_to] || request.path -%>
<%= button_tag 'Google', name: "subaction", value: "google_oauth2" do %>
<span class="btn btn-default" style="background-color: #d34836;width: 60px;">
<i class="fab fa-google fa-fw"></i>
</span>
<% end %>
<%= button_tag submit: 'Twitter', name: "subaction", value: "twitter" do %>
<span class="btn btn-default" style="background-color: #1da1f2;width: 60px;">
<i class="fab fa-twitter fa-fw"></i>
</span>
<% end %>
<%= button_tag 'Facebook', name: "subaction", value: "facebook" do%>
<span class="btn btn-default" style="background-color: #3b5998;width: 60px;">
<i class="fab fa-facebook fa-fw"></i>
</span>
<% end %>
</form>
<br><br>
<p>We strongly prefer that you should
<%= render partial: "layouts/login_form" %>
OR <a href="http://publiclab.org/signup">sign up for a Public Lab account</a>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @sashadev-sky I think this line can be removed now.

<br>
before making a map. However, if you wish to remain anonymous for privacy reasons, <a href="<%= new_map_url %>">click here</a> to create a map. Also, note that, Anonymous maps have some limitations, <a href="/anonymous">click here</a> to learn more.
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_login_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<p style="text-align: center;"><%= button_tag submit: 'Log in via PublicLab.org' do %>
<span class="btn btn-default" style="background-color: #ededee;">
<img src="https://i.publiclab.org/system/images/photos/000/000/354/medium/Boots-ground-02.png" style="width: 30px; height: 30px;">
<img src="https://i.publiclab.org/system/images/photos/000/000/354/medium/Boots-ground-02.png" style="width: 30px; height: 30px; padding-bottom: 0px">
</span>
<% end %>
</p>
Expand Down