Merge branch 'master' into setup/pagination

app/views/forms/_form_example.html.erb

@@ -6,6 +6,16 @@
       <%= text_field_tag header %>
     </p>
   <% end %>
+  <% if form.spreadsheet_headers.blank? %>
+    <p>
+      <label for="Name">Name</label>
+      <input type="text" name="Name" required>
+    </p>
+    <p>
+      <label for="Email">Email</label>
+      <input type="email" name="Email" required>
+    </p>
+  <% end %>
   ...
   <input type="submit" value="Submit">
 </form>

app/views/forms/_form_example_js.html.erb

@@ -7,5 +7,4 @@
     </p>
   <% end %>
     ...
-  <input type="submit" value="Submit">
 </form>

app/views/forms/setup.html.erb

@@ -42,7 +42,7 @@
       <p>
         Please set your form action as in the example below. Make sure to use proper <code>name</code> attributes.
       <p>
-      <pre><code class="html">
+      <pre><code class="language-html">
 <%= html_escape_once render('form_example', form: @form) %>
       </code></pre>
 
@@ -50,12 +50,9 @@
       <p>
         Learn more about our <a href="https://www.notion.so/JavaScript-Library-442071548edd4cd1af9c7d8edb3d42cb">JavaScript library</a> and our <a href="https://www.notion.so/Tinyforms-API-7862355e22ce4bbead5de3b635cda55e">API</a> in your help section.
       </p>
-      <pre><code class="html">
+      <pre><code class="language-html">
 <%= html_escape_once render('form_example_js', form: @form) %>
       </code></pre>
-
-      <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/styles/railscasts.min.css">
-      <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/highlight.min.js"></script>
     </div>
   </div>
 

app/views/forms/show.html.erb

@@ -24,22 +24,23 @@
     <div class="columns is-centered">
       <div class="column is-two-thirds">
 
-        <h3 class="title">Setup your online form:</h3>
+        <h3 class="title">One more step:</h3>
         <p>
-          Your form submission URL: <code><%= submission_url(@form) %></code>
-        </p>
-        <p>
-          Set the <code>action</code> of your online form to this URL and make sure your fields have proper <code>name</code> attributes.
+          Set the <code>action</code> of your online form to <code><%= submission_url(@form) %></code> and make sure your fields have proper <code>name</code> attributes.
         </p>
         <h4 class="subtitle" style="margin-top:1em">Example:</h4>
-        <pre><code class="html">
+        <pre><code class="language-html">
 <%= html_escape_once render('form_example', form: @form) %>
         </code></pre>
-        <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/styles/default.min.css">
-        <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.0.0/build/highlight.min.js"></script>
 
         <p>
-          Let us know if you need <%= link_to 'help', help_url %> - we also build the form for you!
+          If you prefer to submit the form using JavaScript/AJAX have a look at our <a href="https://www.notion.so/JavaScript-Library-442071548edd4cd1af9c7d8edb3d42cb">JavaScript library</a> and our <a href="https://www.notion.so/Tinyforms-API-7862355e22ce4bbead5de3b635cda55e">API</a>.
+        </p>
+        <p>
+          If you need help, <%= link_to "we're here!", help_url %>
+        </p>
+        <p style="margin-top:15px">
+          And if you do not want to deal with your form at all, have a look at our <%= link_to 'form building service', form_building_service_url %>.
         </p>
 
       </div>

app/views/sessions/new.html.erb

@@ -14,7 +14,7 @@
         <% end %>
         <hr>
         <p>
-          Simply login with your existing Google account.
+          Login with your existing Google account, no new credentials needed.
           <br>
           Do you need help? <%= link_to 'let us know', help_url %>.
         </p>