Skip to content
This repository was archived by the owner on Jan 28, 2025. It is now read-only.

revised library tab #5

Open
skhanker wants to merge 3 commits into
base: master
Choose a base branch
from
Open

revised library tab #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21bd70b
re-implement iFrame that was previously in, but taken out, as the the…
skhanker Aug 5, 2014
048e0ea
Removed iFrames:
skhanker Aug 6, 2014
6fe2a5f
re-implement iFrame that was previously in, but taken out, as the the…
skhanker Aug 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions WebContent/WEB-INF/view/auth.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<%@ taglib prefix="bbNG" uri="/bbNG"%>

<bbNG:genericPage ctxId="ctx" >

<h3>Error</h3>
<br><br>
You are not authorized to view this page.

</bbNG:genericPage>
5 changes: 2 additions & 3 deletions WebContent/WEB-INF/view/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<%@ taglib prefix="bbNG" uri="/bbNG"%>

<bbNG:genericPage ctxId="ctx" >

<form action="<% out.print(request.getContextPath()); %>/setting" method="GET">
<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>
Expand All @@ -14,4 +13,4 @@
<br>
<input TYPE="SUBMIT" VALUE="Submit">
</form>
</bbNG:genericPage>
</bbNG:genericPage>
17 changes: 12 additions & 5 deletions WebContent/ubclibrary-static/get.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; 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">
<input type="hidden" value="<%= timestamp %>" name="oauth_timestamp" id="oauth_timestamp">
Expand All @@ -30,7 +31,13 @@
</form>

<script>
var theform = document.getElementById("theform");
theform.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>
15 changes: 11 additions & 4 deletions WebContent/ubclibrary-static/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; 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">
<input type="hidden" value="<%= timestamp %>" name="oauth_timestamp" id="oauth_timestamp">
Expand All @@ -29,7 +30,13 @@
</form>

<script>
var theform = document.getElementById("theform");
theform.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>