Merge branch 'master' into del

This commit is contained in:
Beatrice Olivera
2018-08-31 15:09:04 +01:00
committed by GitHub
10 changed files with 73 additions and 19 deletions

View File

@@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<%= favicon_link_tag 'favicon.ico' %> <!-- Need a favicon to change picture in title bar -->
<title>Polyglot</title>
<%= csrf_meta_tags %>
<%= action_cable_meta_tag %>
@@ -15,5 +16,6 @@
<%= yield %>
<%= javascript_include_tag 'application' %>
<%= javascript_pack_tag 'application' %>
</body>
</html>

View File

@@ -65,4 +65,3 @@ end
</div>
<%= javascript_pack_tag 'modal' %>

View File

@@ -8,7 +8,6 @@
<i class="fas fa-plus-square"></i>
<% end %>
</div>
<% current_user.contacts.each do |contact| %>
<%= render "pages/contact", contact: contact %>
<% end %>

View File

@@ -0,0 +1,10 @@
<%= simple_form_for(@page) do |p| %>
<%= p.input :first_name, as: :text, input_html: { autocomplete: "off" } %>
<%= p.input :last_name, as: :text, input_html: { autocomplete: "off" } %>
<%= p.input :email, as: :text, input_html: { autocomplete: "off" } %>
<%= p.input :photo %>
<%= p.input :photo_cache, as: :hidden %>
<%= p.button :submit, class: "btn btn-primary" %>
<% end %>