From 21bd70b98385585432afa6658fb4ce1cfed2b850 Mon Sep 17 00:00:00 2001
From: skhanker <skhanker@gmail.com>
Date: Tue, 5 Aug 2014 16:36:02 -0700
Subject: [PATCH 1/3] re-implement iFrame that was previously in, but taken
 out, as the theme no longer has iFrame. add basic style to iFrame to not have
 to do it with JS later

---
 WebContent/WEB-INF/view/auth.jsp      | 12 ++++++++++--
 WebContent/WEB-INF/view/index.jsp     | 12 ++++++++++--
 WebContent/ubclibrary-static/get.jsp  | 13 +++++++++----
 WebContent/ubclibrary-static/view.jsp | 13 +++++++++----
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/WebContent/WEB-INF/view/auth.jsp b/WebContent/WEB-INF/view/auth.jsp
index e6e28f9..5b7e5ea 100644
--- a/WebContent/WEB-INF/view/auth.jsp
+++ b/WebContent/WEB-INF/view/auth.jsp
@@ -4,9 +4,17 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<div id="frameContent">
 <h3>Error</h3>
 <br><br>
 You are not authorized to view this page.
-
+</div>
+<script>
+    var contentFrame = document.getElementById("contentFrame");
+    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
+    var fc = document.getElementById("frameContent");
+    frameContent.body.appendChild(fc);
+    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
+</script>
 </bbNG:genericPage>
diff --git a/WebContent/WEB-INF/view/index.jsp b/WebContent/WEB-INF/view/index.jsp
index 0236241..2ba1355 100644
--- a/WebContent/WEB-INF/view/index.jsp
+++ b/WebContent/WEB-INF/view/index.jsp
@@ -4,8 +4,8 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-
-<form action="<% out.print(request.getContextPath()); %>/setting" method="GET">
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<form action="<% out.print(request.getContextPath()); %>/setting" method="GET" id="frameContent">
 		URL: <input type="text" value="<% out.print(request.getAttribute("url").toString()); %>" size="50" name="url">
 		<br> 
 		<br> 
@@ -14,4 +14,12 @@
 		<br> 
 		<input TYPE="SUBMIT" VALUE="Submit">
 </form>
+<script>
+    var contentFrame = document.getElementById("contentFrame");
+    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
+    var fc = document.getElementById("frameContent");
+    frameContent.body.appendChild(fc);
+    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
+    frameContent.getElementById("frameContent").submit();
+</script>
 </bbNG:genericPage>
diff --git a/WebContent/ubclibrary-static/get.jsp b/WebContent/ubclibrary-static/get.jsp
index e1ff59d..b8277e6 100755
--- a/WebContent/ubclibrary-static/get.jsp
+++ b/WebContent/ubclibrary-static/get.jsp
@@ -17,8 +17,9 @@
   String nonce = String.valueOf(Math.random() * 100000000);
   String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
-%>    
-<form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="theform">
+%>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
   <input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
   <input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
   <input type="hidden" value="<%= timestamp %>" name="oauth_timestamp" id="oauth_timestamp">
@@ -30,7 +31,11 @@
 </form>
 
 <script>
-  var theform = document.getElementById("theform");
-  theform.submit();
+    var contentFrame = document.getElementById("contentFrame");
+    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
+    var fc = document.getElementById("frameContent");
+    frameContent.body.appendChild(fc);
+    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
+    frameContent.getElementById("frameContent").submit();
 </script>
 </bbNG:genericPage>
diff --git a/WebContent/ubclibrary-static/view.jsp b/WebContent/ubclibrary-static/view.jsp
index 0c741fb..fdf04fc 100644
--- a/WebContent/ubclibrary-static/view.jsp
+++ b/WebContent/ubclibrary-static/view.jsp
@@ -17,8 +17,9 @@
 	String nonce = String.valueOf(Math.random() * 100000000);
 	String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
-%>		
-<form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="theform">
+%>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
 	<input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
 	<input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
 	<input type="hidden" value="<%= timestamp %>" name="oauth_timestamp" id="oauth_timestamp">
@@ -29,7 +30,11 @@
 </form>
 
 <script>
-	var theform = document.getElementById("theform");
-	theform.submit();
+    var contentFrame = document.getElementById("contentFrame");
+    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
+    var fc = document.getElementById("frameContent");
+    frameContent.body.appendChild(fc);
+    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
+    frameContent.getElementById("frameContent").submit();
 </script>
 </bbNG:genericPage>

From 048e0ea2dfba9b2101055fb348d2e9891114ddc8 Mon Sep 17 00:00:00 2001
From: Stefan Khan-Kernahan <skhanker@gmail.com>
Date: Tue, 5 Aug 2014 22:02:07 -0700
Subject: [PATCH 2/3] Removed iFrames: - Removed iFrame from get.jsp and
 view.jsp (understanding now is that they will handoff to auth.jsp or
 index.jsp, which retain iFrame) - Removed associated javascript for iFrames
 that were removed

Added Style Change:
- Targetied the parent div of the resultant iFrame that gets injected and removed margin, since we can re-add within the iFrame as needed to retain the L&F of LOCR.
---
 WebContent/WEB-INF/view/auth.jsp      | 5 ++++-
 WebContent/WEB-INF/view/index.jsp     | 5 ++++-
 WebContent/ubclibrary-static/get.jsp  | 7 +------
 WebContent/ubclibrary-static/view.jsp | 7 +------
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/WebContent/WEB-INF/view/auth.jsp b/WebContent/WEB-INF/view/auth.jsp
index 5b7e5ea..0513779 100644
--- a/WebContent/WEB-INF/view/auth.jsp
+++ b/WebContent/WEB-INF/view/auth.jsp
@@ -4,7 +4,7 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%;" frameborder="0" name="content" title="Content"></iframe>
 <div id="frameContent">
 <h3>Error</h3>
 <br><br>
@@ -14,6 +14,9 @@ You are not authorized to view this page.
     var contentFrame = document.getElementById("contentFrame");
     var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
     var fc = document.getElementById("frameContent");
+    var pane = document.getElementById("globalNavPageContentArea").getElementsByClassName("contentPaneWide clearfix tabbedPane portal")[0];
+    pane.style.marginLeft = '0px';
+    pane.style.marginRight = '0px';
     frameContent.body.appendChild(fc);
     document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
 </script>
diff --git a/WebContent/WEB-INF/view/index.jsp b/WebContent/WEB-INF/view/index.jsp
index 2ba1355..96ac1fb 100644
--- a/WebContent/WEB-INF/view/index.jsp
+++ b/WebContent/WEB-INF/view/index.jsp
@@ -4,7 +4,7 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%;" frameborder="0" name="content" title="Content"></iframe>
 <form action="<% out.print(request.getContextPath()); %>/setting" method="GET" id="frameContent">
 		URL: <input type="text" value="<% out.print(request.getAttribute("url").toString()); %>" size="50" name="url">
 		<br> 
@@ -18,6 +18,9 @@
     var contentFrame = document.getElementById("contentFrame");
     var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
     var fc = document.getElementById("frameContent");
+    var pane = document.getElementById("globalNavPageContentArea").getElementsByClassName("contentPaneWide clearfix tabbedPane portal")[0];
+    pane.style.marginLeft = '0px';
+    pane.style.marginRight = '0px';
     frameContent.body.appendChild(fc);
     document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
     frameContent.getElementById("frameContent").submit();
diff --git a/WebContent/ubclibrary-static/get.jsp b/WebContent/ubclibrary-static/get.jsp
index b8277e6..2074cf0 100755
--- a/WebContent/ubclibrary-static/get.jsp
+++ b/WebContent/ubclibrary-static/get.jsp
@@ -18,7 +18,6 @@
   String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
 %>
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
 <form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
   <input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
   <input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
@@ -31,11 +30,7 @@
 </form>
 
 <script>
-    var contentFrame = document.getElementById("contentFrame");
-    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
     var fc = document.getElementById("frameContent");
-    frameContent.body.appendChild(fc);
-    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
-    frameContent.getElementById("frameContent").submit();
+    fc.submit();
 </script>
 </bbNG:genericPage>
diff --git a/WebContent/ubclibrary-static/view.jsp b/WebContent/ubclibrary-static/view.jsp
index fdf04fc..291401f 100644
--- a/WebContent/ubclibrary-static/view.jsp
+++ b/WebContent/ubclibrary-static/view.jsp
@@ -18,7 +18,6 @@
 	String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
 %>
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0" frameborder="0" name="content" title="Content"></iframe>
 <form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
 	<input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
 	<input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
@@ -30,11 +29,7 @@
 </form>
 
 <script>
-    var contentFrame = document.getElementById("contentFrame");
-    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
     var fc = document.getElementById("frameContent");
-    frameContent.body.appendChild(fc);
-    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
-    frameContent.getElementById("frameContent").submit();
+    fc.submit();
 </script>
 </bbNG:genericPage>

From 6fe2a5f64e5b51e8909d0e4ca822ede74c30be01 Mon Sep 17 00:00:00 2001
From: skhanker <skhanker@gmail.com>
Date: Fri, 8 Aug 2014 12:38:35 -0700
Subject: [PATCH 3/3] re-implement iFrame that was previously in, but taken
 out, as the theme no longer has iFrame. add basic style to iFrame to not have
 to do it with JS later

---
 WebContent/WEB-INF/view/auth.jsp      | 13 -------------
 WebContent/WEB-INF/view/index.jsp     | 14 +-------------
 WebContent/ubclibrary-static/get.jsp  | 13 ++++++++++---
 WebContent/ubclibrary-static/view.jsp | 11 +++++++++--
 4 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/WebContent/WEB-INF/view/auth.jsp b/WebContent/WEB-INF/view/auth.jsp
index 0513779..a81e606 100644
--- a/WebContent/WEB-INF/view/auth.jsp
+++ b/WebContent/WEB-INF/view/auth.jsp
@@ -4,20 +4,7 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%;" frameborder="0" name="content" title="Content"></iframe>
-<div id="frameContent">
 <h3>Error</h3>
 <br><br>
 You are not authorized to view this page.
-</div>
-<script>
-    var contentFrame = document.getElementById("contentFrame");
-    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
-    var fc = document.getElementById("frameContent");
-    var pane = document.getElementById("globalNavPageContentArea").getElementsByClassName("contentPaneWide clearfix tabbedPane portal")[0];
-    pane.style.marginLeft = '0px';
-    pane.style.marginRight = '0px';
-    frameContent.body.appendChild(fc);
-    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
-</script>
 </bbNG:genericPage>
diff --git a/WebContent/WEB-INF/view/index.jsp b/WebContent/WEB-INF/view/index.jsp
index 96ac1fb..8cac52d 100644
--- a/WebContent/WEB-INF/view/index.jsp
+++ b/WebContent/WEB-INF/view/index.jsp
@@ -4,7 +4,6 @@
 <%@ taglib prefix="bbNG" uri="/bbNG"%>
 
 <bbNG:genericPage ctxId="ctx" >
-<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%;" frameborder="0" name="content" title="Content"></iframe>
 <form action="<% out.print(request.getContextPath()); %>/setting" method="GET" id="frameContent">
 		URL: <input type="text" value="<% out.print(request.getAttribute("url").toString()); %>" size="50" name="url">
 		<br> 
@@ -14,15 +13,4 @@
 		<br> 
 		<input TYPE="SUBMIT" VALUE="Submit">
 </form>
-<script>
-    var contentFrame = document.getElementById("contentFrame");
-    var frameContent = (contentFrame.contentDocument) ? contentFrame.contentDocument: contentFrame.contentWindow.document;
-    var fc = document.getElementById("frameContent");
-    var pane = document.getElementById("globalNavPageContentArea").getElementsByClassName("contentPaneWide clearfix tabbedPane portal")[0];
-    pane.style.marginLeft = '0px';
-    pane.style.marginRight = '0px';
-    frameContent.body.appendChild(fc);
-    document.getElementById("contentFrame").style.height = document.getElementById("content").offsetHeight + 'px';
-    frameContent.getElementById("frameContent").submit();
-</script>
-</bbNG:genericPage>
+</bbNG:genericPage>
\ No newline at end of file
diff --git a/WebContent/ubclibrary-static/get.jsp b/WebContent/ubclibrary-static/get.jsp
index 2074cf0..14f8bca 100755
--- a/WebContent/ubclibrary-static/get.jsp
+++ b/WebContent/ubclibrary-static/get.jsp
@@ -18,6 +18,7 @@
   String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
 %>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%" frameborder="0" name="content" title="Content"></iframe>
 <form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
   <input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
   <input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
@@ -30,7 +31,13 @@
 </form>
 
 <script>
-    var fc = document.getElementById("frameContent");
-    fc.submit();
+    var globalContentArea = document.getElementById("globalNavPageContentArea");
+    var script = document.createElement("script");
+    var locrjsUrl = "<%= new UBCLibraryServlet().getParam("url") %>";
+    locrjsUrl = locrjsUrl.replace("tab.php", "locrjs.js");
+    script.type = 'text/javascript';
+    script.setAttribute('defer', 'defer');
+    script.setAttribute('src', locrjsUrl);
+    globalContentArea.appendChild(script);
 </script>
-</bbNG:genericPage>
+</bbNG:genericPage>
\ No newline at end of file
diff --git a/WebContent/ubclibrary-static/view.jsp b/WebContent/ubclibrary-static/view.jsp
index 291401f..94c6925 100644
--- a/WebContent/ubclibrary-static/view.jsp
+++ b/WebContent/ubclibrary-static/view.jsp
@@ -18,6 +18,7 @@
 	String user_id = ctx.getUser().getBatchUid();
   String signature = sigService.generateSig(consumerKey, signatureMethod, version, user_id, timestamp, nonce);
 %>
+<iframe id="contentFrame" style="height: 750px; border:none; margin: 0; padding: 0; width: 100%" frameborder="0" name="content" title="Content"></iframe>
 <form method="POST" action="<%= new UBCLibraryServlet().getParam("url") %>" id="frameContent">
 	<input type="hidden" value="<%= consumerKey %>" name="oauth_consumer_key" id="oauth_consumer_key">
 	<input type="hidden" value="<%= signatureMethod %>" name="oauth_signature_method" id="oauth_signature_method">
@@ -29,7 +30,13 @@
 </form>
 
 <script>
-    var fc = document.getElementById("frameContent");
-    fc.submit();
+    var globalContentArea = document.getElementById("globalNavPageContentArea");
+    var script = document.createElement("script");
+    var locrjsUrl = "<%= new UBCLibraryServlet().getParam("url") %>";
+    locrjsUrl = locrjsUrl.replace("tab.php", "locrjs.js");
+    script.type = 'text/javascript';
+    script.setAttribute('defer', 'defer');
+    script.setAttribute('src', locrjsUrl);
+    globalContentArea.appendChild(script);
 </script>
 </bbNG:genericPage>