From a6473a0d046221ab2a134e56ca1930efe26fee75 Mon Sep 17 00:00:00 2001
From: Castro0o <andre@andrecastro.info>
Date: Mon, 24 Nov 2014 15:08:38 +0100
Subject: [PATCH] * selet#formatselect onchange: submits form; * download file
 renamed: hype_conversion.ext; * styled dropzone and tried to use employ
 messages;

---
 cgi-bin/pandoc.cgi       |  8 ++++----
 hybrid.css               | 13 +++++++++++++
 hybrid.html              |  4 ++--
 hybrid.js                |  6 ++++--
 lib/dropzone/dropzone.js | 10 +++++-----
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/cgi-bin/pandoc.cgi b/cgi-bin/pandoc.cgi
index 12ac3ea..f3e93f1 100755
--- a/cgi-bin/pandoc.cgi
+++ b/cgi-bin/pandoc.cgi
@@ -42,7 +42,7 @@ if method == "POST":
     download = submit == "download"
     download_filename = None
     if download:
-        download_filename = "pandoc" + to_type['ext']
+        download_filename = "hype_conversion." + to_type['ext']
 
 
     try:
@@ -72,7 +72,7 @@ if method == "POST":
 
             print "Content-type: {0}".format(to_type['mime'])
             if download:
-                print "Content-Disposition: attachment;filename=\"pandoc.{0}\"".format(to_type['ext'])
+                print "Content-Disposition: attachment;filename=\"hype_conversion.{0}\"".format(to_type['ext'])
             print
             # p = subprocess.check_output('pandoc --from {0} --to {1} "{2}"'.format(ffrom, to, tmp.name), shell=True, stderr=subprocess.STDOUT)
             # print p
@@ -97,7 +97,7 @@ if method == "POST":
             try:
                 print "Content-type: {0}".format(to_type['mime'])
                 if download:
-                    print "Content-Disposition: attachment;filename=\"pandoc.{0}\"".format(to_type['ext'])
+                    print "Content-Disposition: attachment;filename=\"hype_conversion.{0}\"".format(to_type['ext'])
                 print
                 # p = subprocess.check_output('pandoc --from {0} --to {1} "{2}"'.format(ffrom, to, tmp.name), shell=True, stderr=subprocess.STDOUT)
                 # print p
@@ -135,4 +135,4 @@ to: <select name="to">
 <p><input type="submit" value="OK"></p>
 </form>
 </body></html>
-"""
\ No newline at end of file
+"""
diff --git a/hybrid.css b/hybrid.css
index f87096a..e7e1ba3 100644
--- a/hybrid.css
+++ b/hybrid.css
@@ -230,4 +230,17 @@ img.logo{
 input, select, button{
     background: #FFF;
     border: 2px solid #0F0;
+}
+
+div.dz-error-message span{
+    border-bottom: 2px dotted #0F0!important; 
+}
+
+div.dz-details{
+    font-size: 0.8em;
+    margin-top: 20px;
+}
+
+div.ace_print-margin{
+    visibility:hidden!important;
 }
\ No newline at end of file
diff --git a/hybrid.html b/hybrid.html
index 44e6c4b..107e8e4 100644
--- a/hybrid.html
+++ b/hybrid.html
@@ -40,7 +40,7 @@
           <form id="previewform" method="post" action="/cgi-bin/pandoc.cgi" target="previewiframe">
             <input type="hidden" name="text" id="previewformtext" />
             <input type="hidden" name="from" value="markdown" />
-            <select id="formatselect" name="to">
+            <select id="formatselect" name="to" onchange="this.form.submit()">
               <option value="html">HTML</option>
               <option value="plain">Plain text</option>
               <option value="icml">ICML (InDesign)</option>
@@ -55,7 +55,7 @@
     </div>
   </div>
 
-  <div id="footer"><a href="https://github.com/DigitalPublishingToolkit">Hybrid Publishing Editor</a> is <a href="http://www.gnu.org/copyleft/gpl.html">free software</a> based on <a href="http://daringfireball.net/projects/markdown/">markdown</a>, <a href="http://johnmacfarlane.net/pandoc/">pandoc</a> &amp; <a href="http://ace.c9.io/">ace</a>.
+  <div id="footer"><a href="https://github.com/DigitalPublishingToolkit/hybrideditor">Hybrid Publishing Editor</a> is <a href="http://www.gnu.org/copyleft/gpl.html">free software</a> based on <a href="http://daringfireball.net/projects/markdown/">markdown</a>, <a href="http://johnmacfarlane.net/pandoc/">pandoc</a> &amp; <a href="http://ace.c9.io/">ace</a>.
     <a href="http://networkcultures.org/digitalpublishing/"><img src="imgs/logo_horiz.jpg" class="logo" alt="" ></a>
 
   </div>
diff --git a/hybrid.js b/hybrid.js
index d16352b..06aed1e 100644
--- a/hybrid.js
+++ b/hybrid.js
@@ -14,7 +14,7 @@ function get_editor_text () {
 }
 
 $("#previewform").on("submit", function () {
-  // console.log("preview form submit")
+  //console.log("preview form submit")
   $("#previewformtext").val(get_editor_text());
   return true;
 })
@@ -32,11 +32,13 @@ Dropzone.options.dropzone = {
     // console.log("success")
     $("#openmenu").hide();
     file.previewElement.classList.add("dz-success");
+      //    file.previewElement.classList.remove("dz-error-mark");
+
     set_editor(resp);
     var pf = $("#previewform");
     // console.log("about to submit", pf.get(0));
     pf.submit();
-  }
+  }   
 };
 
 $("#openbutton").click(function () {
diff --git a/lib/dropzone/dropzone.js b/lib/dropzone/dropzone.js
index 499f4e0..2baf0e0 100644
--- a/lib/dropzone/dropzone.js
+++ b/lib/dropzone/dropzone.js
@@ -303,23 +303,23 @@ require.register("dropzone/lib/dropzone.js", function (exports, module) {
       params: {},
       clickable: true,
       ignoreHiddenFiles: true,
-      acceptedFiles: null,
+      acceptedFiles: ".docx",
       acceptedMimeTypes: null,
       autoProcessQueue: true,
       autoQueue: true,
       addRemoveLinks: false,
       previewsContainer: null,
-      dictDefaultMessage: "Drop files here to upload",
+      dictDefaultMessage: "Drop or <u>browse</u> .docx file",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
       dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
       dictFileTooBig: "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",
-      dictInvalidFileType: "You can't upload files of this type.",
+      dictInvalidFileType: "File type not allowed",
       dictResponseError: "Server responded with {{statusCode}} code.",
       dictCancelUpload: "Cancel upload",
       dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
       dictRemoveFile: "Remove file",
       dictRemoveFileConfirmation: null,
-      dictMaxFilesExceeded: "You can not upload any more files.",
+      dictMaxFilesExceeded: "No more files can be uploaded.",
       accept: function(file, done) {
         return done();
       },
@@ -548,7 +548,7 @@ require.register("dropzone/lib/dropzone.js", function (exports, module) {
       completemultiple: noop,
       maxfilesexceeded: noop,
       maxfilesreached: noop,
-      previewTemplate: "<div class=\"dz-preview dz-file-preview\">\n  <div class=\"dz-details\">\n    <div class=\"dz-filename\"><span data-dz-name></span></div>\n    <div class=\"dz-size\" data-dz-size></div>\n    <img data-dz-thumbnail />\n  </div>\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress></span></div>\n  <div class=\"dz-success-mark\"><span>✔</span></div>\n  <div class=\"dz-error-mark\"><span>✘</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>"
+      previewTemplate: "<div class=\"dz-preview dz-file-preview\">\n  <div class=\"dz-details\">\n    <div class=\"dz-filename\"><span data-dz-name></span></div>\n    <div class=\"dz-size\" data-dz-size></div>\n    <img data-dz-thumbnail />\n  </div>\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress></span></div>\n  <div class=\"dz-success-mark\"><span></span></div>\n  <!--div class=\"dz-error-mark\"><span>✘</span></div-->\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>"
     };
 
     extend = function() {