Mercurial > hg > digilib-old

changeset 317:610c7ee770cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big autumn cleaning :-) - finally digilib.jsp uses the new javascript code - dito digicat.jsp - all files corresponding to the old frontend moved into /oldskin - all icons moved into /img
author robcast
date Thu, 28 Oct 2004 22:25:59 +0200
parents bf34a4d8f6b4
children 4ab3accf3f7f
files client/digitallibrary/digilib.jsp client/digitallibrary/digimage.jsp client/digitallibrary/digimage_tbl_inc.jsp client/digitallibrary/dllib.js
diffstat 4 files changed, 39 insertions(+), 236 deletions(-) [+]
line wrap: on
line diff
--- a/client/digitallibrary/digilib.jsp	Thu Oct 28 22:25:59 2004 +0200
+++ b/client/digitallibrary/digilib.jsp	Thu Oct 28 22:25:59 2004 +0200
@@ -16,10 +16,6 @@
     }
 }
 %>
-
-
-
-
 <%
 
 // parsing the query
@@ -28,230 +24,20 @@
 digilib.servlet.DigilibRequest dlRequest = new digilib.servlet.DigilibRequest(request);
 // check if authentication is needed and redirect if necessary
 docBean.doAuthentication(dlRequest, response);
-
-%>
-
-<%
-
-// the different levels of presentation
-// ------------------------------------
-
-
-// level 3 representation hack - lugi
-      // it would be much more interesting to check
-      // if the sidebar is actually installed and in
-      // the case it isn't - automatically do it.
-      // however this requires client-side tests and
-      // so slows down everything.
-      // we might want to talk about it for a future
-      // release
-
-if (dlRequest.getAsInt("lv") == 3) {
-  String userAgent = request.getHeader("User-Agent").toLowerCase();
-  
-  if (userAgent.indexOf("mozilla/5.0") == 0) {
-
-    // mozilla 5 that does not support xul-sidebars
-    if (userAgent.indexOf("opera")     > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("chimera")   > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("camino")    > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("konqueror") > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("safari")    > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("galeon")    > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("skipstone") > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("k-meleon")  > -1) dlRequest.setValue("lv", 2);
-    if (userAgent.indexOf("firebird")  > -1) dlRequest.setValue("lv", 2);
-
-    // the chance is quite big, that the browser supports xul-sidebars
-    dlRequest.setValue("lv", 1);
-  
-  } else {
-
-    // redirect to level 2 because of definitive lack of sidebar support
-    dlRequest.setValue("lv", 2);
-  }
-}
-
-
-
-switch (dlRequest.getAsInt("lv")) {
-
-  // LEVEL 0 --------------------------------------------------------------
-
-  case 0:
-%>
-
-<%
-    break; // level 0
-
-
-
-
-  // LEVEL 1 --------------------------------------------------------------
-
-  case 1:
-%>
-
-<%
-    // checking if the height and width of this client is already known
-    if ((dlRequest.getAsInt("dw") == 0) || (dlRequest.getAsInt("dh") == 0)) {
-%>
-
-<html>
-<head>
-<script language="Javascript">
-
-function redirect() {
-
-  var wwidth, wheight;
-  if (self.innerHeight) // all except Explorer
-  {
-      wwidth = self.innerWidth;
-      wheight = self.innerHeight;
-  }
-  else if (document.documentElement && document.documentElement.clientHeight)
-  // Explorer 6 Strict Mode
-  {
-      wwidth = document.documentElement.clientWidth;
-      wheight = document.documentElement.clientHeight;
-  }
-  else if (document.body) // other Explorers
-  {
-      wwidth = document.body.clientWidth;
-      wheight = document.body.clientHeight;
-  }
-
-  client = "&dw=" + (wwidth-30) + "&dh=" + (wheight-30);
-  //alert("CLIENT: "+client);
+    
+String digiURL = "digimage.jsp?" + dlRequest.getAsString();
 
-<%
-  if (dlRequest.isRDF()){
-    String strAllParams=dlRequest.getAsString();
-%>
-    location.replace(document.URL+"?"+"<%=strAllParams%>" + client);
-<%
-  }else{
-%>
-    location.replace(document.URL + client);
-<%
-  }
-%>
-}
-
-</script>
-</head>
-<body bgcolor="#666666" onload="redirect()">
-</body>
-</html>
-
-<%
-    } else {
-
-      // add number of pages
-      dlRequest.setValue("pt", docBean.getNumPages(dlRequest));
-
-      String imageLocation = dlRequest.getAsString("base.url") + "/servlet/Scaler/?" + dlRequest.getAsString();
-%>
-
-<html>
-<head>
-<title>Digital Document Library (L1)</title>
-
-<script src="navigation.js" type="text/javascript"> </script>
-
-<!-- modules -->
-<script src="modules/pagesTotal.js" type="text/javascript"> </script>
-<script src="modules/newReferences.js" type="text/javascript"> </script>
-<script src="modules/imago.js" type="text/javascript"> </script>
-
-<script type="text/javascript">
-
-var baseUrl = "<%= dlRequest.getAsString("base.url") %>";
-
-newParameter('fn', '<%= dlRequest.getFilePath() %>', '', 1);  
-newParameter('pn', '<%= dlRequest.getAsString("pn") %>', '1', 1);
-newParameter('ws', '<%= dlRequest.getAsString("ws") %>', '1.0', 1);
-newParameter('mo', '<%= dlRequest.getAsString("mo") %>', '', 1);
-newParameter('mk', '<%= dlRequest.getAsString("mk") %>', '', 3);
-newParameter('wx', '<%= dlRequest.getAsString("wx") %>', '0.0', 2);
-newParameter('wy', '<%= dlRequest.getAsString("wy") %>', '0.0', 2);
-newParameter('ww', '<%= dlRequest.getAsString("ww") %>', '1.0', 2);
-newParameter('wh', '<%= dlRequest.getAsString("wh") %>', '1.0', 2);
-
-newParameter('pt', '<%= dlRequest.getAsString("pt") %>', '<%= dlRequest.getAsString("pt") %>', 9);
-
-newParameter('brgt', '<%= dlRequest.getAsString("brgt") %>', '0.0', 1);
-newParameter('cont', '<%= dlRequest.getAsString("cont") %>', '0.0', 1);
-newParameter('rot', '<%= dlRequest.getAsString("rot") %>', '0.0', 1);
-newParameter('rgba', '<%= dlRequest.getAsString("rgba") %>', '', 1);
-newParameter('rgbm', '<%= dlRequest.getAsString("rgbm") %>', '', 1);
-
-newParameter('ddpix', '<%= dlRequest.getAsString("ddpix") %>', '', 1);
-newParameter('ddpiy', '<%= dlRequest.getAsString("ddpiy") %>', '', 1);
-
-</script>
-
-</head>
-
-<body bgcolor="#666666" onload="init_pagesTotal();">
-
- <div id="lay1" style="position: absolute; left: 10px; top: 10px; visibility: visible"><img name="pic" src="<%= imageLocation %>" border="0"></div>
-
- <div id="dot0" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark1.gif" border="0"></div>
- <div id="dot1" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark2.gif" border="0"></div>
- <div id="dot2" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark3.gif" border="0"></div>
- <div id="dot3" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark4.gif" border="0"></div>
- <div id="dot4" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark5.gif" border="0"></div>
- <div id="dot5" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark6.gif" border="0"></div>
- <div id="dot6" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark7.gif" border="0"></div>
- <div id="dot7" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="mark8.gif" border="0"></div>
- <div id="eck1" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="olinks.gif" border="0"></div>
- <div id="eck2" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="orechts.gif" border="0"></div>
- <div id="eck3" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="ulinks.gif" border="0"></div>
- <div id="eck4" style="position: absolute; left: -20; top: 100; visibility: hidden"><img src="urechts.gif" border="0"></div>
-
-</body>
-
-</html>
-<%
-    }
-%>
-
-<%
-    break; // level 1
-
-
-
-
-  // LEVEL 2 --------------------------------------------------------------
-
-  case 2:
-%>
-
-<%
-    // retrieve request in new paramter format and redirect to level 1
-    dlRequest.setValue("lv", 1);
-    String query = "digilib.jsp?" + dlRequest.getAsString();
-%>
-
-<html>
+%><html>
 <head>
 <title>Digital Document Library (L2)</title>
 </head>
 
-<frameset cols="*,90" border="0">
-  <frame name="mainFrame" src="<%= query %>" scrolling="auto">
+<frameset cols="*,90" border="0" onload="pageFrame.show()">
+  <frame name="mainFrame" src="<%= digiURL %>" scrolling="auto">
   <frameset rows="20,*" border="0">
-    <frame name="pageFrame" src="empty.html" scrolling="no" noresize>
-    <frame name="rightFrame" src="dlMenu.html" scrolling="no" noresize>
+    <frame name="pageFrame" src="oldskin/pageWin.html" scrolling="no" noresize>
+    <frame name="rightFrame" src="oldskin/dlMenu.html" scrolling="no" noresize>
   </frameset>
 </frameset>
 
 </html>
-
-<%
-    break; // level 2
-
-} // end switch
-
-%>
--- a/client/digitallibrary/digimage.jsp	Thu Oct 28 22:25:59 2004 +0200
+++ b/client/digitallibrary/digimage.jsp	Thu Oct 28 22:25:59 2004 +0200
@@ -65,18 +65,18 @@
 }
 %>
 
- <div id="dot0" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark1.gif" border="0"></div>
- <div id="dot1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark2.gif" border="0"></div>
- <div id="dot2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark3.gif" border="0"></div>
- <div id="dot3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark4.gif" border="0"></div>
- <div id="dot4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark5.gif" border="0"></div>
- <div id="dot5" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark6.gif" border="0"></div>
- <div id="dot6" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark7.gif" border="0"></div>
- <div id="dot7" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="mark8.gif" border="0"></div>
- <div id="eck1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="olinks.gif" border="0"></div>
- <div id="eck2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="orechts.gif" border="0"></div>
- <div id="eck3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="ulinks.gif" border="0"></div>
- <div id="eck4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="urechts.gif" border="0"></div>
+ <div id="dot0" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark1.gif" border="0"></div>
+ <div id="dot1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark2.gif" border="0"></div>
+ <div id="dot2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark3.gif" border="0"></div>
+ <div id="dot3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark4.gif" border="0"></div>
+ <div id="dot4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark5.gif" border="0"></div>
+ <div id="dot5" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark6.gif" border="0"></div>
+ <div id="dot6" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark7.gif" border="0"></div>
+ <div id="dot7" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/mark8.gif" border="0"></div>
+ <div id="eck1" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/olinks.gif" border="0"></div>
+ <div id="eck2" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/orechts.gif" border="0"></div>
+ <div id="eck3" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/ulinks.gif" border="0"></div>
+ <div id="eck4" style="position:absolute; left:-20; top:100; visibility:hidden"><img src="img/urechts.gif" border="0"></div>
 
 </body>
 
--- a/client/digitallibrary/digimage_tbl_inc.jsp	Thu Oct 28 22:25:59 2004 +0200
+++ b/client/digitallibrary/digimage_tbl_inc.jsp	Thu Oct 28 22:25:59 2004 +0200
@@ -24,7 +24,7 @@
 <script type="text/javascript">
 var ps = bestPicSize(getElement('scaler'), 10);
 document.write('<img id="pic" src="<%=
-  dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString()
+  dlRequest.getAsString("base.url") + "/servlet/Scaler?" + dlRequest.getAsString('s')
 %>&dw='+ps.width+'&dh='+ps.height+'" />');
 </script>
 </div>
--- a/client/digitallibrary/dllib.js	Thu Oct 28 22:25:59 2004 +0200
+++ b/client/digitallibrary/dllib.js	Thu Oct 28 22:25:59 2004 +0200
@@ -17,13 +17,21 @@
 Authors:
   Christian Luginbuehl, 01.05.2003 (first version)
   DW 24.03.2004 (Changed for digiLib in Zope)
-  Robert Casties, 04.08.2004
+  Robert Casties, 27.10.2004
 
   ! Requires baselib.js !
 
 */
 
-var dlScriptVersion = "1.0b2";
+var dlScriptVersion = "1.0b4";
+
+
+function identify() {
+	// used for identifying a digilib instance
+	// Relato uses that function - lugi
+	return "Digilib 0.6";
+}
+
 
 /*
  * more parameter handling
@@ -291,6 +299,7 @@
 	alert("Only 8 marks are possible at the moment!");
 	return;
     }
+    window.focus();
 
     function markEvent(evt) {
 	// event handler adding a new mark
@@ -484,3 +493,11 @@
     }
     return hyperlinkRef;
 }
+
+function getRefWin(type, msg) {
+    // shows an alert with a reference to the current digilib set
+    if (! msg) {
+	msg = "Link for HTML documents";
+    }
+    prompt(msg, getRef());
+}