update footer, move terms and privacy to faq, fix recaptcha

bguzryanto · Feb 13, 2016 · 6ff91a1 · 6ff91a1
1 parent bce2ccd
commit 6ff91a1
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 54 deletions.
diff --git a/_posts/_faq_what-are-terms.md b/_posts/_faq_what-are-terms.md
@@ -0,0 +1,10 @@
+{{{
+  "title": "What are your terms and conditions?",
+  "tags": ["faq"],
+  "date": "2-2-2015 12:10 AM",
+  "author": "Admin"
+}}}
+
+
+* We make no guarantees of avilabiliy for YASP, including for Cheese purchasers or subscribers.
+* All sales are final and no refunds will be provided.
diff --git a/_posts/_faq_what-is-privacy-policy.md b/_posts/_faq_what-is-privacy-policy.md
@@ -0,0 +1,9 @@
+{{{
+  "title": "What is your privacy policy?",
+  "tags": ["faq"],
+  "date": "2-2-2015 12:10 AM",
+  "author": "Admin"
+}}}
+
+
+* We use Google Analytics on YASP just to monitor how well the site is doing. We don't share this information publicly or with third parties.
diff --git a/public/css/yasp.css b/public/css/yasp.css
@@ -447,4 +447,12 @@ ul.small.text-left {
 
 .label {
     margin: 1px;
+}
+
+table img.img-sm {
+    margin: 0 5px;
+}
+
+.center {
+    margin: 0 auto;
 }
diff --git a/views/footer.jade b/views/footer.jade
@@ -23,15 +23,17 @@ footer.footer
         span.flaticon-1.medium-cheese(style="padding: 5px 11px;")
         a(href="/carry", target="_blank")
           button.btn.btn-warning(style="margin-bottom:2em; margin-left: 2em;") Help Us Out
-    .row()
-      .col-md-12
-        span.label.label-primary An <a href='https://github.com/yasp-dota/yasp'>open source</a> volunteer project
-        span.label.label-info Follow on <a href='https://twitter.com/yasp_dota'>Twitter</a>
-        span.label.label-danger Join us on <a href='https://discord.gg/0o5SQGbXuWALMIGQ' target="_blank">Discord</a>
-        span.label.label-default Dota 2 API <a href='http://store.steampowered.com/'> powered by Steam</a>
-        span.label.label-primary Match parsing powered by <a href='https://github.com/skadistats/clarity'>clarity</a>
-        span.label.label-info Wallpaper by <a href="http://css101.deviantart.com/">css101</a>
-        span.label.label-danger Cheese icon made by <a href="http://www.belcu.com">Belc</a> from <a href="http://www.flaticon.com">www.flaticon.com</a>
+    .row
+      .col-md-12.text-center
+        small.
+          An <a href='https://github.com/yasp-dota/yasp'>open source</a> volunteer project
+          &bull; <a href='/privacyterms'>Privacy & Terms</a>
+          &bull; Follow on <a href='https://twitter.com/yasp_dota'><i class="fa fa-twitter"></i></a>
+          &bull; Join us on <a href='https://discord.gg/0o5SQGbXuWALMIGQ' target="_blank">Discord</a>
+          &bull; Dota 2 API powered by <a href='http://store.steampowered.com/'><i class="fa fa-steam-square"></i></a>
+          &bull; Parsing by <a href='https://github.com/skadistats/clarity'>clarity</a>
+          &bull; Wallpaper by <a href="http://css101.deviantart.com/">css101</a>
+          &bull; Cheese icon by <a href="http://www.belcu.com">Belc</a> on <a href="http://www.flaticon.com">flaticon</a>
 
     //- light theme selector
       .row.text-center

diff --git a/views/privacyterms.jade b/views/privacyterms.jade
diff --git a/views/request.jade b/views/request.jade
@@ -23,11 +23,11 @@ block content
               ul.small.text-left
                 li Uploads have incomplete data and eventually expire
                 li Uploads do not count toward player statistics
-        .form-group
-          if config.ENABLE_RECAPTCHA
-            .g-recaptcha#recaptcha(data-sitekey=rc_public, data-theme="dark", data-callback="requestSubmit")
-          else
-            button.btn.btn-default#submit(onclick="requestSubmit()") Request Parse
+          .row
+            if config.ENABLE_RECAPTCHA
+              g-recaptcha#recaptcha(style="display:inline-block;", data-sitekey=rc_public, data-theme="dark", data-callback="requestSubmit")
+            else
+              button.btn.btn-default#submit(onclick="requestSubmit()") Request Parse
       #progContainer(style="display:none")
         img(src="/public/images/loading.gif", style="display:none")#loading
         .progress
@@ -48,6 +48,6 @@ append footer_assets
         {
             sitekey: $('#recaptcha').attr('data-sitekey'),
             theme: "dark",
-            callback: submit
+            callback: requestSubmit
         });
-    };
+    };
diff --git a/web.js b/web.js
@@ -270,7 +270,7 @@ app.route('/logout').get(function(req, res)
     res.redirect('/');
 });
 app.route('/privacyterms').get(function(req, res) {
-    res.render("privacyterms");
+    res.redirect("/faq");
 })
 app.use('/matches', matches(db, redis));
 app.use('/players', players(db, redis));