From f78a542017d76b06ba08bc10c0e837ee5aedcffd Mon Sep 17 00:00:00 2001
From: Aaron Parecki <aaron@parecki.com>
Date: Sun, 5 Oct 2014 22:26:35 -0700
Subject: [PATCH] tweaks to posting interface

---
 controllers/auth.php        |  2 +-
 controllers/controllers.php | 16 +++++++++-----
 public/css/style.css        |  6 ++---
 views/new-post.php          | 44 +++++++++++++++++++++++++++----------
 4 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/controllers/auth.php b/controllers/auth.php
index 6fd78e4..f405d86 100644
--- a/controllers/auth.php
+++ b/controllers/auth.php
@@ -5,7 +5,7 @@ function buildRedirectURI() {
 }
 
 function clientID() {
-  return Config::$base_url;
+  return trim(Config::$base_url, '/'); // remove trailing slash from client_id
 }
 
 function build_url($parsed_url) { 
diff --git a/controllers/controllers.php b/controllers/controllers.php
index d7014d0..96916f6 100644
--- a/controllers/controllers.php
+++ b/controllers/controllers.php
@@ -146,10 +146,13 @@ $app->post('/post', function() use($app) {
 
     if(k($params, 'drank')) {
       $entry->content = $params['drank'];
-    } elseif(k($params, 'custom_caffeine')) {
-      $entry->content = $params['custom_caffeine'];
-    } elseif(k($params, 'custom_alcohol')) {
-      $entry->content = $params['custom_alcohol'];
+      $type = 'drink';
+    } elseif(k($params, 'custom_drank')) {
+      $entry->content = $params['custom_drank'];
+      $type = 'drink';
+    } elseif(k($params, 'custom_ate')) {
+      $entry->content = $params['custom_ate'];
+      $type = 'eat';
     }
 
     $entry->save();
@@ -159,7 +162,8 @@ $app->post('/post', function() use($app) {
     if($user->micropub_endpoint) {
       $mp_request = array(
         'h' => 'entry',
-        'content' => $entry->content,
+        'p3k-food' => $entry->content,
+        'p3k-type' => $type,
         'location' => k($params, 'location')
       );
 
@@ -175,6 +179,8 @@ $app->post('/post', function() use($app) {
         $user->micropub_success = 1;
         $entry->micropub_success = 1;
         $entry->canonical_url = $url;
+      } else {
+        $entry->micropub_success = 0;
       }
 
       $entry->save();
diff --git a/public/css/style.css b/public/css/style.css
index 7dee754..1e93a30 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -190,16 +190,16 @@ body {
   }
 
 
-.caffeine, .alcohol {
+.entry-buttons {
   margin-bottom: 10px;
   list-style-type: none;
   padding-left: 0;
   max-width: 240px;
 }
-.caffeine li, .alcohol li {
+.entry-buttons li {
   margin-bottom: 6px;
 }
-.caffeine li input, .alcohol li input {
+.entry-buttons li input {
   width: 100%;
 }
 
diff --git a/views/new-post.php b/views/new-post.php
index 1484986..0c4ece0 100644
--- a/views/new-post.php
+++ b/views/new-post.php
@@ -4,33 +4,42 @@
       <form role="form" style="margin-top: 20px;" id="note_form" action="/post" method="post">
 
         <h3>Caffeine</h3>
-        <ul class="caffeine">
+        <ul class="caffeine entry-buttons">
           <?php foreach(caffeine_options() as $val): ?>
             <li><input type="submit" name="drank" class="btn btn-default" value="<?= $val ?>"></li>
           <?php endforeach; ?>
-          <li>
-            <input type="text" class="form-control" name="custom_caffeine" placeholder="Custom" style="width: 72%; float: left; margin-right: 2px;">
-            <input type="submit" class="btn btn-default" value="Post" style="width: 26%; float: right;">
-          </li>
         </ul>
         <br>
 
         <h3>Alcohol</h3>
-        <ul class="alcohol">
+        <ul class="alcohol entry-buttons">
           <?php foreach(alcohol_options() as $val): ?>
             <li><input type="submit" name="drank" class="btn btn-default" value="<?= $val ?>"></li>
           <?php endforeach; ?>
+        </ul>
+        <br>
+
+        <h3>Drank</h3>
+        <ul class="other entry-buttons">
+          <li>
+            <input type="text" class="form-control text-custom-drank" name="custom_drank" placeholder="Custom" style="width: 72%; float: left; margin-right: 2px;">
+            <input type="submit" class="btn btn-default btn-custom-drank" value="Post" style="width: 26%; float: right;">
+          </li>
+        </ul>
+        <br><br>
+
+        <h3>Ate</h3>
+        <ul class="other entry-buttons">
           <li>
-            <input type="text" class="form-control" name="custom_alcohol" placeholder="Custom" style="width: 72%; float: left; margin-right: 2px;">
-            <input type="submit" class="btn btn-default" value="Post" style="width: 26%; float: right;">
+            <input type="text" class="form-control text-custom-ate" name="custom_ate" placeholder="Custom" style="width: 72%; float: left; margin-right: 2px;">
+            <input type="submit" class="btn btn-default btn-custom-ate" value="Post" style="width: 26%; float: right;">
           </li>
         </ul>
         <br><br>
 
+
         <div class="form-group">
-          <label for="note_location">Location</label>
-          <input type="checkbox" id="note_location_chk" value="">
-          <img src="/images/spinner.gif" id="note_location_loading" style="display: none;">
+          <h3>Location <input type="checkbox" id="note_location_chk" value=""><img src="/images/spinner.gif" id="note_location_loading" style="display: none;"></h3>
 
           <input type="text" id="note_location_msg" value="" class="form-control" placeholder="" readonly="readonly">
           <input type="hidden" id="note_location" name="location">
@@ -75,6 +84,19 @@
 <script>
 $(function(){
 
+  $(".text-custom-ate").keydown(function(e){
+    if(e.keyCode == 13) {
+      $(".btn-custom-ate").click();
+      return false;
+    }
+  });
+  $(".text-custom-drank").keydown(function(e){
+    if(e.keyCode == 13) {
+      $(".btn-custom-drank").click();
+      return false;
+    }
+  });
+
   function location_error(msg) {
     $("#note_location_msg").val(msg);
     $("#note_location_chk").removeAttr("checked");