Merge branch 'master' of github.com:aaronpk/Quill

4 files changed, 26 insertions, 24 deletions

diff --git a/public/css/style.css b/public/css/style.css
index d806c62..f9f9ac2 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -13,7 +13,7 @@ body {
 .narrow {
   max-width: 700px;
   margin-right: auto;
-  margin-left: auto;  
+  margin-left: auto;
 }
 
 .footer {
@@ -28,7 +28,7 @@ body {
 .footer .nav {
   max-width: 700px;
   margin-right: auto;
-  margin-left: auto;  
+  margin-left: auto;
 }
 
 .footer .credits {
@@ -65,7 +65,7 @@ body {
 .bs-callout .highlight {
   background-color: #fff;
 }
- 
+
 /* Themes for different contexts */
 .bs-callout-danger {
   background-color: #fcf2f2;
@@ -132,7 +132,7 @@ body {
     float: left;
     margin-left: 10px;
   }
-  
+
   #last_response_date {
     font-size: 80%;
     font-weight: normal;
@@ -160,10 +160,6 @@ body {
   }
 
   .img-visible {
-    -webkit-border-bottom-right-radius: 0;
-    -webkit-border-bottom-left-radius: 0;
-    -moz-border-radius-bottomright: 0;
-    -moz-border-radius-bottomleft: 0;
     border-bottom-right-radius: 0;
     border-bottom-left-radius: 0;
   }
@@ -171,10 +167,6 @@ body {
   #note_location_img img {
     margin-top: -1px;
     border: 1px solid #ccc;
-    -webkit-border-bottom-right-radius: 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -moz-border-radius-bottomright: 4px;
-    -moz-border-radius-bottomleft: 4px;
     border-bottom-right-radius: 4px;
     border-bottom-left-radius: 4px;
   }
@@ -194,7 +186,7 @@ body {
       cursor: pointer;
       opacity: 0;
       filter: alpha(opacity=0);
-  }  
+  }
 
   .callout {
     border-left: 4px #5bc0de solid;
@@ -205,5 +197,3 @@ body {
   .callout table {
     margin-bottom: 0;
   }
-
-
diff --git a/public/images/quill-icon-196.png b/public/images/quill-icon-196.png
new file mode 100644
index 0000000..1d6c564
--- /dev/null
+++ b/public/images/quill-icon-196.png
diff --git a/views/layout.php b/views/layout.php
index da97687..03929b1 100644
--- a/views/layout.php
+++ b/views/layout.php
@@ -26,6 +26,11 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/images/quill-icon-144.png">
 
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
+    <link rel="icon" sizes="196x196" href="/images/quill-icon-196.png">
+
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="theme-color" content="#428bca">
 
     <script src="/js/jquery-1.7.1.min.js"></script>
     <script src="/js/script.js"></script>
diff --git a/views/new-post.php b/views/new-post.php
index a059ea0..8e9c692 100644
--- a/views/new-post.php
+++ b/views/new-post.php
@@ -26,9 +26,12 @@
 
         <div class="form-group">
           <label for="note_photo"><code>photo</code></label>
-          <input type="file" name="note_photo" id="note_photo" accept="image/*" onchange="previewPhoto(event)">
+          <input type="file" name="note_photo" id="note_photo" accept="image/*">
           <br>
-          <img src="" id="photo_preview" style="max-width: 300px; max-height: 300px;">
+          <div id="photo_preview_container">
+            <img src="" id="photo_preview" style="max-width: 300px; max-height: 300px;">
+            <button type="button" class="btn btn-danger btn-sm" id="remove_photo"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Remove image</button>
+          </div>
         </div>
 
         <div class="form-group">
@@ -132,16 +135,20 @@
 </style>
 
 <script>
-function previewPhoto(event) {
-  $("#photo_preview")
-    .show()
-    .attr("src", URL.createObjectURL(event.target.files[0]) );
-}
-
 $(function(){
 
   var userHasSetCategory = false;
-  $("#photo_preview").hide();
+
+  $("#photo_preview_container").hide();
+  $("#note_photo").on("change", function(e){
+    $("#photo_preview_container").show();
+    $("#photo_preview").attr("src", URL.createObjectURL(e.target.files[0]) );
+  });
+  $("#remove_photo").on("click", function(){
+    $("#note_photo").val("");
+    $("#photo_preview").attr("src", "" );
+    $("#photo_preview_container").hide();
+  });
 
   $("#note_content").on('change keyup', function(e){
     var text = $("#note_content").val();