From 3d07f4f48cb4fd5a6807ae7e1cc4cfc475cd5eed Mon Sep 17 00:00:00 2001
From: felipebormann <felipe.bormann@gmail.com>
Date: Thu, 9 Feb 2017 15:48:02 -0300
Subject: [PATCH] modified form and added pdf rendering in html

---
 pdf_file/templates/pdf_file/_form.html | 46 ++++++++++++++++++++++++----------------------
 pdf_file/templates/pdf_file/view.html  | 16 +++++++++-------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pdf_file/templates/pdf_file/_form.html b/pdf_file/templates/pdf_file/_form.html
index 7c0d050..2cce843 100644
--- a/pdf_file/templates/pdf_file/_form.html
+++ b/pdf_file/templates/pdf_file/_form.html
@@ -87,28 +87,7 @@
 		{% endif %}
 	</div>
 
-	<div class="form-group{% if form.has_error %} has-error {% endif %}">
-		<div class=" checkbox">
-			<label for="{{ form.show_window.auto_id }}">
-				{% render_field form.show_window %} {{ form.show_window.label }}
-			</label>
-		</div>
-
-		<span id="helpBlock" class="help-block">{{ form.show_window.help_text }}</span>
-			
-		{% if form.show_window.errors %}
-			<div class="alert alert-danger alert-dismissible" role="alert">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">&times;</span>
-					</button>
-				<ul>
-					{% for error in form.show_window.errors %}
-						<li>{{ error }}</li>
-					{% endfor %}
-				</ul>
-			</div>
-		{% endif %}
-	</div>
+	
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
 		<label for="{{ form.tags.auto_id }}">{{ form.tags.label }}</label>
@@ -318,6 +297,29 @@
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %}">
 		<div class=" checkbox">
+			<label for="{{ form.show_window.auto_id }}">
+				{% render_field form.show_window %} {{ form.show_window.label }}
+			</label>
+		</div>
+
+		<span id="helpBlock" class="help-block">{{ form.show_window.help_text }}</span>
+			
+		{% if form.show_window.errors %}
+			<div class="alert alert-danger alert-dismissible" role="alert">
+					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				<ul>
+					{% for error in form.show_window.errors %}
+						<li>{{ error }}</li>
+					{% endfor %}
+				</ul>
+			</div>
+		{% endif %}
+	</div>
+
+	<div class="form-group{% if form.has_error %} has-error {% endif %}">
+		<div class=" checkbox">
 			<label for="{{ form.visible.auto_id }}">
 				{% render_field form.visible %} {{ form.visible.label }}
 			</label>
diff --git a/pdf_file/templates/pdf_file/view.html b/pdf_file/templates/pdf_file/view.html
index d36746b..ff42885 100644
--- a/pdf_file/templates/pdf_file/view.html
+++ b/pdf_file/templates/pdf_file/view.html
@@ -13,20 +13,22 @@
 {% endblock %}
 
 {% block breadcrumbs %}
-	{{ block.super }}
-
-	{% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
-	
+	{% clear_breadcrumbs %}
+	{% breadcrumb 'Home' 'subjects:home' %}
+	{% breadcrumb pdf_file.topic.subject.category 'subjects:cat_view'  pdf_file.topic.subject.category.slug %}
+	{% breadcrumb pdf_file.topic.subject 'subjects:view' pdf_file.topic.subject.slug %}
+	{% breadcrumb pdf_file.topic 'subjects:topic_view' pdf_file.topic.subject.slug pdf_file.topic.slug %}
+	{% breadcrumb pdf_file 'pdf_file:view' pdf_file.slug %}
 	
 {% endblock %}
 
 
 {% block content %}
 
-<object width="100%" height="100%" type="application/pdf" data="{{pdf_file.file.path}}" id="pdf_content">
-    <p>Insert your error message here, if the PDF cannot be displayed.</p>
+<object width="100%" height="800px" type="application/pdf" data="{{pdf_file.file.url}}" id="pdf_content">
+    <p>{% trans "PDF could not be displayed" %}</p>
   </object>
 
-  <embed src="{{pdf_file.file.path}}" width="100%" height="100%">
+  
  
 {% endblock content %}
\ No newline at end of file
--
libgit2 0.21.2