fixes for erb templates

app.rb

@@ -573,7 +573,7 @@ post '/contact' do
   end
 
   if !@errors.empty?
-    slim :'contact'
+    erb :'contact'
   else
     EmailWorker.perform_async({
       from: 'web@neocities.org',

views/contact.erb

@@ -4,7 +4,11 @@
   };
 </script>
 
-<% if !@errors.nil? && !@errors.empty? %>
+<main class="content-Base">
+  <div class="row content">
+    <div class="col col-80">
+      
+      <% if !@errors.nil? && !@errors.empty? %>
         <div class="row">
           <div class="col col-100">
             <div class="alert alert-block alert-error">
@@ -14,13 +18,9 @@
             </div>
           </div>
         </div>
-<% end %>
+      <% end %>
       
     
-
-<div class="row content">
-  <div class="col col-80">
-    
       <h2>Contact Us</h2>
       <h6>Please Note Before Contacting:</h6>
 
@@ -54,5 +54,5 @@
         </fieldset>
       </form>
     </div>
-</div>
+  </div>
-
+</main>

views/contact.slim

@@ -1,39 +0,0 @@
-javascript:
-  var RecaptchaOptions = {
-    theme : 'clean'
-  };
-
-- if !@errors.nil? && !@errors.empty?
-  .row
-    .span8.offset2
-      .alert.alert-block.alert-error
-        - @errors.each do |error|
-          p = error
-
-.row
-  .span8.offset2
-    h2 style="margin-bottom: 20px" Contact Us
-
-    div
-      h5 Please Note Before Contacting:
-      ul
-        li For security reasons, we cannot reset your password if you did not enter an e-mail for your site. You will have to make a new site (don't worry, it's free!). If you didn't get an e-mail from the password reset form, you didn't enter an e-mail (or it's in your spam folder). Again you will have to make a new site, we cannot help you for security reasons.
-        li We do not support FTP or GIT uploading, and have no plans to. SFTP possibly, if we can find the time.
-
-    form action="/contact" method="POST"
-      input name="csrf_token" type="hidden" value="#{csrf_token}"
-    
-      label Email address
-      input type="email" name="email" placeholder="Your Email" style="width: 300px" value="#{params[:email]}"
-      
-      label Subject
-      input type="text" name="subject" placeholder="Subject" style="width: 400px" value="#{params[:subject]}"
-      
-      label Comments
-      textarea name="body" style="width: 600px" rows="10" #{params[:body]}
-      
-      label Fill out captcha so we know you're not a robot
-      == recaptcha_tag :challenge, ssl: true
-      
-      div style="margin-top: 30px; margin-bottom: 50px"
-        input.btn.btn-large.btn-success type="submit" value="Send"

views/privacy.erb

@@ -1,4 +1,5 @@
-<div class="row content">
+<main class="content-Base">
+  <div class="row content">
     <h2 class="col">Privacy</h2>
     <div class="col col-100">
       <p>Our Privacy Policy was last updated and posted on June 3, 2013. It governs the privacy terms of our Website, located at http://neocities.org. Any capitalized terms not defined in our Privacy Policy, have the meaning as specified in our Terms of Service.</p>
@@ -43,4 +44,5 @@
 
       <p><strong>Questions About Our Privacy Practices or This Privacy Policy</strong><br />If you have any questions about our Privacy Practices or this Policy, please contact us.</p>
     </div>
-</div>
+  </div>
+</main>

views/terms.erb

@@ -1,4 +1,5 @@
-<div class="row content">
+<main class="content-Base">
+  <div class="row content">
     <h2 class="col">Terms of Service</h2>
     <div class="col col-100">
       <p>This web page represents a legal document that serves as our Terms of Service and it governs the legal terms of our website, http://neocities.org, sub-domains, and any associated web-based and mobile applications (collectively, "Website"), as owned and operated by Neocities.</p>
@@ -21,4 +22,5 @@
 
       <p><strong>General Terms</strong><br />Our Legal Terms shall be treated as though it were executed and performed in Oregon, United States, and shall be governed by and construed in accordance with the laws of Oregon, United States, without regard to conflict of law principles. In addition, you agree to submit to the personal jurisdiction and venue of such courts. Any cause of action by you with respect to our Website, must be instituted within one (1) year after the cause of action arose or be forever waived and barred. Should any part of our Legal Terms be held invalid or unenforceable, that portion shall be construed consistent with applicable law and the remaining portions shall remain in full force and effect. To the extent that any Content in our Website conflicts or is inconsistent with our Legal Terms, our Legal Terms shall take precedence. Our failure to enforce any provision of our Legal Terms shall not be deemed a waiver of such provision nor of the right to enforce such provision. The rights of Neocities under our Legal Terms shall survive the termination of our Legal Terms.</p>
     </div>
-</div>
+  </div>
+</main>