From 0cfb3fe13a2a5280112bf942b4e0b12e5abee1c9 Mon Sep 17 00:00:00 2001
From: fschneider <florian.schneider@student.tugraz.at>
Date: Thu, 6 Aug 2015 14:40:23 +0200
Subject: Preparing for Bootstrap

---
 pdf-as-web/src/main/webapp/assets/js/dragNdrop.js           | 4 ++--
 pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.css  | 5 +++++
 pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.html | 1 +
 pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.js   | 3 ++-
 pdf-as-web/src/main/webapp/index.jsp                        | 8 ++++----
 5 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'pdf-as-web')

diff --git a/pdf-as-web/src/main/webapp/assets/js/dragNdrop.js b/pdf-as-web/src/main/webapp/assets/js/dragNdrop.js
index c3f340d6..4b605d76 100644
--- a/pdf-as-web/src/main/webapp/assets/js/dragNdrop.js
+++ b/pdf-as-web/src/main/webapp/assets/js/dragNdrop.js
@@ -50,11 +50,11 @@ function registerEventListeners() {
 		if(files == null || files.length === 0) {
 			return;
 		}
-		else if(files[0].name.indexOf(".pdf") < 0)
+	/*	else if(files[0].name.indexOf(".pdf") < 0)
 		{
 			window.alert("The file type must be PDF");
 			return;
-		} 
+		}  */ // the pdf viewer will handle this
 		
 		file = files[0];
 		previewFile();
diff --git a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.css b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.css
index de21f494..84e0f073 100644
--- a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.css
+++ b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.css
@@ -1067,6 +1067,11 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
   content: url(images/signature-icon.png);
 }
 
+.toolbarButton.addPage::before,
+.secondaryToolbarButton.addPage::before {
+	content: url(images/signature-icon.png);
+}
+
 .toolbarButton.delSignature::before,
 .secondaryToolbarButton.delSignature::before {
   content: url(images/document_del_signature.png);
diff --git a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.html b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.html
index c6cf575f..1f8a6a44 100644
--- a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.html
+++ b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.html
@@ -225,6 +225,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
                 </button>
 				
 				<!-- ADDED -->
+				
 				<button id="placeSignature" class="toolbarButton placeSignature hiddenLargeView" title="Place Signature on current Page" tabindex="30" data-l10n-id="place_signature">
                   <span data-l10n-id="place_signature_label">Place Signature</span>
                 </button>
diff --git a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.js b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.js
index 129823ff..6a2cc14d 100644
--- a/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.js
+++ b/pdf-as-web/src/main/webapp/assets/js/pdf.js/web/viewer.js
@@ -6680,6 +6680,7 @@ function webViewerInitialized() {
   
   var fileInput = document.createElement('input');
   fileInput.id = 'fileInput';
+  fileInput.accept = 'application/pdf'
   fileInput.className = 'fileInput';
   fileInput.setAttribute('type', 'file');
   fileInput.oncontextmenu = noContextMenuHandler;
@@ -6861,7 +6862,7 @@ function webViewerInitialized() {
 
   document.getElementById('openFile').addEventListener('click',
     SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
-
+    
   document.getElementById('print').addEventListener('click',
     SecondaryToolbar.printClick.bind(SecondaryToolbar));
 
diff --git a/pdf-as-web/src/main/webapp/index.jsp b/pdf-as-web/src/main/webapp/index.jsp
index abc2ece1..e567e217 100644
--- a/pdf-as-web/src/main/webapp/index.jsp
+++ b/pdf-as-web/src/main/webapp/index.jsp
@@ -16,17 +16,17 @@
 </header>
 
 	<div id="sidebar">
-		<div id="fileSelector" class="container">
+		<!-- <div id="fileSelector" class="container">
 			<h3 class="center">File Selector</h3>
-			<!--<div id="dropzone" class="center">
+			<div id="dropzone" class="center">
 				Drag and Drop your Document here ...
 			</div>
 			  <div id="traditionalUpload">
 				<p>... or select File here</p>
 				<input type="file" name="pdf-file" id="pdf-file" accept="application/pdf">
-			</div> --> <!-- Care: id and name must be unique! -->
+			</div>
 			
-		</div>
+		</div>  -->
 
 		<div id="signMethod" class="container">
 			<h3 class="center">Sign Method</h3>
-- 
cgit v1.2.3