From: Seth Woodworth <seth@sethish.com>
Date: Tue, 4 Jun 2013 03:00:03 +0000 (-0400)
Subject: rework note html for pdfview/
X-Git-Tag: release-20150131~423
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1f75ec4c32a6c280203bf98f0b81aab88b727b61;p=oweals%2Fkarmaworld.git

rework note html for pdfview/
---

diff --git a/karmaworld/templates/notes/note_detail.html b/karmaworld/templates/notes/note_detail.html
index 7e2c519..352122b 100644
--- a/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@ -41,9 +41,10 @@
           <div class="twelve columns">
             <iframe
                 style="border:none; width:100%; min-height: 700px; margins:auto" 
-                id="noteframe" 
-                src="/pdfview?file='http://{{ hostname|urlencode }}{{ note.note_file.url|urlencode }}'" 
+                id="noteframe"
+                src="/pdfview/{{ note.id }}"
                 onload="autoResize('noteframe')"> </iframe>
+                <!--src="/pdfview?file={{ "http://"|urlencode }}{{ hostname|urlencode }}{{ note.note_file.url|urlencode }}"  -->
           </div>
         </div> <!-- .row -->
         {% comment %}
diff --git a/karmaworld/templates/partial/pdfembed.html b/karmaworld/templates/partial/pdfembed.html
index 441a539..2f5d65e 100644
--- a/karmaworld/templates/partial/pdfembed.html
+++ b/karmaworld/templates/partial/pdfembed.html
@@ -11,7 +11,7 @@
 
 <script>
   //var DEFAULT_URL = '{{ note.note_file.url }}';
-  //var DEFAULT_URL = '{{ STATIC_URL }}Letter_to_Ishman_Click_5-14.pdf';
+  var DEFAULT_URL = '{{ object.note_file.url }}';
 </script>
 <script type="text/javascript" src="{{ STATIC_URL }}vendor/js/pdf.js"></script>
 <script src="{{ STATIC_URL }}vendor/js/viewer.js"></script>