Subversion Repositories general

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1244 → Rev 1243

//PhotoAlbum/trunk/webapp/res/MainBGBlue.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/styles.css
File deleted
//PhotoAlbum/trunk/webapp/res/1x1.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/JAlbum.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/OrderPrints.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/folder.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/movie.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/ImagePaneHeaderOpenOlive.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/FolderUp.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/ImagePaneHeaderOpen.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/FolderLarge.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/InfoPaneHeaderOpenOlive.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/ImagePaneHeaderOpenBlue.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/InfoPaneHeaderOpen.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/MainBGOlive.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/MainBG.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/ImageLarge.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/Back.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/Slideshow.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/InfoPaneHeaderOpenBlue.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/res/Forward.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
//PhotoAlbum/trunk/webapp/page.jsp
2,111 → 2,64
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
 
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
 
<head>
<title><bean:write name="entry" property="title" /></title>
<link href="res/styles.css" rel="stylesheet">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
 
<body bgcolor="white" id="slide">
<body bgcolor="white">
 
<div id="divActivity">
<div id="divImageActivity">
<table border="0" cellspacing="0" cellpadding="0" width="185">
<tr>
<td colspan="3" width="185" class="ImagePaneHeader">Image activities</td>
</tr>
<h1><bean:write name="entry" property="title" /></h1>
 
<logic:present name="index" property="path">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a
href="index.do?path=<bean:write name="index" property="path" />" class="ImagePaneRow"><img
src="res/FolderUp.gif" border="0" align="absmiddle"
style="margin-right: 5px;"/>Back to index page</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:present>
<logic:notEmpty name="entry" property="subtitle">
<p><bean:write name="entry" property="subtitle" /></p>
</logic:notEmpty>
 
<logic:notEmpty name="nextEntry" property="path">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a
<logic:equal name="nextEntry" property="isDir" value="true">
href="index.do?path=<bean:write name="nextEntry" property="path" />"
</logic:equal>
<logic:equal name="nextEntry" property="isDir" value="false">
href="page.do?path=<bean:write name="nextEntry" property="path" />"
</logic:equal>
class="ImagePaneRow"><img
src="res/Forward.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Next image</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:notEmpty>
<logic:notEmpty name="entry" property="comment">
<p><bean:write name="entry" property="comment" /></p>
</logic:notEmpty>
 
<logic:notEmpty name="prevEntry" property="path">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a
<logic:equal name="prevEntry" property="isDir" value="true">
href="index.do?path=<bean:write name="prevEntry" property="path" />"
</logic:equal>
<logic:equal name="prevEntry" property="isDir" value="false">
href="page.do?path=<bean:write name="prevEntry" property="path" />"
</logic:equal>
class="ImagePaneRow"><img
src="res/Back.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Previous image</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:notEmpty>
<p>
<logic:empty name="prevEntry" property="path">
&lt;&lt;
</logic:empty>
<logic:notEmpty name="prevEntry" property="path">
<logic:equal name="prevEntry" property="isDir" value="true">
<a href="index.do?path=<bean:write name="prevEntry" property="path" />">&lt;&lt;</a>
</logic:equal>
<logic:equal name="prevEntry" property="isDir" value="false">
<a href="page.do?path=<bean:write name="prevEntry" property="path" />">&lt;&lt;</a>
</logic:equal>
</logic:notEmpty>
 
<tr>
<td width="185" colspan="3" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</table>
</div>
<logic:notPresent name="index" property="path">
&nbsp;
</logic:notPresent>
<logic:present name="index" property="path">
<a href="index.do?path=<bean:write name="index" property="path" />">Index</a>
</logic:present>
 
<div id="divInfoActivity">
<table border="0" cellspacing="0" cellpadding="0" width="185" ID="Table1">
<tr>
<td colspan="3" width="185" class="InfoPaneHeader">Information</td>
</tr>
<logic:empty name="nextEntry" property="path">
&gt;&gt;
</logic:empty>
<logic:notEmpty name="nextEntry" property="path">
<logic:equal name="nextEntry" property="isDir" value="true">
<a href="index.do?path=<bean:write name="nextEntry" property="path" />">&gt;&gt;</a>
</logic:equal>
<logic:equal name="nextEntry" property="isDir" value="false">
<a href="page.do?path=<bean:write name="nextEntry" property="path" />">&gt;&gt;</a>
</logic:equal>
</logic:notEmpty>
</p>
 
<tr>
<td width="1" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="InfoPaneRow">
<logic:notEmpty name="entry" property="comment">
<bean:write name="entry" property="comment" />
</logic:notEmpty>
</td>
<td width="1" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
<p><a href="origin.do?path=<bean:write name="entry" property="path" />"
><img src="medium.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border=0></a></p>
 
<tr>
<td width="185" colspan="3" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</table>
</div>
</div>
 
<div id="divMainSlideHeader"><bean:write name="entry" property="title" />
<logic:notEmpty name="entry" property="subtitle">
<div id="divMainSlideSubtitle"><bean:write name="entry" property="subtitle" /></div>
</logic:notEmpty>
</div>
<div id="divMain" align="center">
<a href="origin.do?path=<bean:write name="entry" property="path" />" target="_blank"><img
src="medium.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border=0></a></p>
<br>
</div>
 
</body>
 
</html>
//PhotoAlbum/trunk/webapp/index.jsp
2,187 → 2,152
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
 
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
 
<head>
<link href="res/styles.css" rel="stylesheet">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<logic:empty name="current" property="title">
<title>Index</title>
</logic:empty>
<logic:notEmpty name="current" property="title">
<title><bean:write name="current" property="title" /></title>
<title>Index of <bean:write name="current" property="title" /></title>
</logic:notEmpty>
</head>
 
<body bgcolor="white" id="index">
<body bgcolor="white">
 
<script language="javascript">
if (navigator.userAgent.indexOf('Gecko')!=-1)
document.write('<style>\ndiv.Photo {\n display: table-cell;\n}\n</style>');
</script>
<logic:empty name="current" property="title">
<h1>Index</h1>
</logic:empty>
<logic:notEmpty name="current" property="title">
<h1>Index of <bean:write name="current" property="title" /></h1>
</logic:notEmpty>
 
<div id="divMainHeader">
<logic:empty name="current" property="title">Index</logic:empty>
<logic:notEmpty name="current" property="title"><bean:write name="current" property="title" /></logic:notEmpty>
<logic:notEmpty name="current" property="subtitle">
<div id="divMainSubtitle"><bean:write name="current" property="subtitle" filter="false" /></div>
<p><bean:write name="current" property="subtitle" filter="false" /></p>
</logic:notEmpty>
</div>
 
<div id="divMain">
<logic:notEmpty name="current" property="comment">
<p><bean:write name="current" property="comment" filter="false" /></p>
</logic:notEmpty>
 
<logic:iterate name="index" id="row">
<logic:iterate name="row" id="entry">
<logic:present name="entry">
<logic:equal name="entry" property="isDir" value="true">
<p>
Directory:
<logic:empty name="prevEntry" property="path">
&lt;&lt;
</logic:empty>
<logic:notEmpty name="prevEntry" property="path">
<logic:equal name="prevEntry" property="isDir" value="true">
<a href="index.do?path=<bean:write name="prevEntry" property="path" />">&lt;&lt;</a>
</logic:equal>
<logic:equal name="prevEntry" property="isDir" value="false">
<a href="page.do?path=<bean:write name="prevEntry" property="path" />">&lt;&lt;</a>
</logic:equal>
</logic:notEmpty>
 
<div class="Photo" align="center">
<div class="imgBorder" align="center"><a href="index.do?path=<bean:write name="entry" property="path" />"><img src="dir.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border="0"/></a></div><a href="index.do?path=<bean:write name="entry" property="path" />"
class="Photo">
<bean:write name="entry" property="title" />
<logic:notEmpty name="entry" property="subtitle">
<br><bean:write name="entry" property="subtitle" filter="false" />
</logic:notEmpty>
</a>
</div>
<logic:notPresent name="top" property="path">
&nbsp;
</logic:notPresent>
<logic:present name="top" property="path">
<a href="index.do?path=<bean:write name="top" property="path" />">Index</a>
</logic:present>
 
</logic:equal>
<logic:equal name="entry" property="isDir" value="false">
<logic:empty name="nextEntry" property="path">
&gt;&gt;
</logic:empty>
<logic:notEmpty name="nextEntry" property="path">
<logic:equal name="nextEntry" property="isDir" value="true">
<a href="index.do?path=<bean:write name="nextEntry" property="path" />">&gt;&gt;</a>
</logic:equal>
<logic:equal name="nextEntry" property="isDir" value="false">
<a href="page.do?path=<bean:write name="nextEntry" property="path" />">&gt;&gt;</a>
</logic:equal>
</logic:notEmpty>
</p>
 
<div class="Photo" align="center">
<div class="imgBorder" align="center"><a href="page.do?path=<bean:write name="entry" property="path" />"><img src="small.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border="0"/></a></div><a href="page.do?path=<bean:write name="entry" property="path" />"
class="Photo">
<bean:write name="entry" property="title" />
<logic:notEmpty name="entry" property="subtitle">
<br><bean:write name="entry" property="subtitle" filter="false" />
</logic:notEmpty>
</a>
</div>
</logic:equal>
</logic:present>
</logic:iterate>
<p>
Pages:
<logic:equal name="firstPage" property="isCurrent" value="true">
&lt;&lt;
</logic:equal>
<logic:equal name="firstPage" property="isCurrent" value="false">
<a href="index.do?path=<bean:write name="indexForm" property="path" />">&lt;&lt;</a>
</logic:equal>
 
<script language="JavaScript">
if (navigator.userAgent.indexOf('Gecko')!=-1)
document.writeln('<br/>');
</script>
 
</logic:iterate>
 
<logic:equal name="severalPages" value="true">
<table style="width:610px" border=0>
<tr>
 
<logic:notPresent name="prevPage">
<td align=left class="IndexPage" style="width:150px">&nbsp;</td>
&lt;
</logic:notPresent>
<logic:present name="prevPage">
<td align=left class="IndexPage" style="width:150px"><a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />" class="ImagePaneRow"><img
src="res/Back.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Previous page</a></td>
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />">&lt;</a>
</logic:present>
 
<td align=center class="IndexPage">
&sdot;
<logic:iterate name="pages" id="p">
<logic:equal name="p" property="isCurrent" value="true">
<span style="color:black"><bean:write name="p" property="displayNumber" /></span>
<bean:write name="p" property="displayNumber" />
</logic:equal>
<logic:equal name="p" property="isCurrent" value="false">
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="p" property="number" />" class="ImagePaneRow"><bean:write name="p" property="displayNumber" /></a>
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="p" property="number" />"><bean:write name="p" property="displayNumber" /></a>
</logic:equal>
&sdot;
</logic:iterate>
</td>
 
<logic:notPresent name="nextPage">
<td align=right class="IndexPage" style="width:150px">&nbsp;</td>
&gt;
</logic:notPresent>
<logic:present name="nextPage">
<td align=right class="IndexPage" style="width:150px"><a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />" class="ImagePaneRow"><img
src="res/Forward.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Next page</a></td>
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />">&gt;</a>
</logic:present>
 
</tr>
</table>
<logic:equal name="lastPage" property="isCurrent" value="true">
&gt;&gt;
</logic:equal>
<logic:equal name="lastPage" property="isCurrent" value="false">
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="lastPage" property="number" />">&gt;&gt;</a>
</logic:equal>
</p>
 
</div>
 
<div id="divActivity">
<div id="divImageActivity">
<table border="0" cellspacing="0" cellpadding="0" width="185">
<tr>
<td colspan="3" width="185" class="ImagePaneHeader">Image activities</td>
</tr>
 
<logic:present name="top" property="path">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a href="index.do?path=<bean:write name="top" property="path" />"
class="ImagePaneRow"><img
src="res/FolderUp.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Up one level</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:present>
 
<logic:present name="nextPage">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />" class="ImagePaneRow"><img
src="res/Forward.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Next page</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:present>
 
<logic:present name="prevPage">
<tr>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="ImagePaneRow"><a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />" class="ImagePaneRow"><img
src="res/Back.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Previous page</a></td>
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</logic:present>
 
<tr>
<td width="185" colspan="3" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</table>
</div>
 
<div id="divInfoActivity">
<table border="0" cellspacing="0" cellpadding="0" width="185">
<tr>
<td colspan="3" width="185" class="InfoPaneHeader">Information</td>
</tr>
<tr>
<td width="1" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
<td width="183" class="InfoPaneRow">
<logic:notEmpty name="current" property="comment">
<p><bean:write name="current" property="comment" filter="false" /></p>
</logic:notEmpty>
<br>
<table border=1 width=100%>
<logic:iterate name="index" id="row">
<tr>
<logic:iterate name="row" id="entry">
<logic:present name="entry">
<logic:equal name="entry" property="isDir" value="true">
<td width=20%>
<a href="index.do?path=<bean:write name="entry" property="path" />">
<img src="dir.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border=0><br>
<bean:write name="entry" property="title" />
<logic:notEmpty name="entry" property="subtitle">
<br><bean:write name="entry" property="subtitle" filter="false" />
</logic:notEmpty>
</a>
</td>
<td width="1" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
<tr>
<td width="185" colspan="3" class="InfoPaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td>
</tr>
</table>
</div>
</div>
</logic:equal>
<logic:equal name="entry" property="isDir" value="false">
<td width=20%>
<a href="page.do?path=<bean:write name="entry" property="path" />">
<img src="small.do?path=<bean:write name="entry" property="path" />"
alt="<bean:write name="entry" property="title" />"
width="<bean:write name="entry" property="width" />"
height="<bean:write name="entry" property="height" />"
border=0><br>
<bean:write name="entry" property="title" />
<logic:notEmpty name="entry" property="subtitle">
<br><bean:write name="entry" property="subtitle" filter="false" />
</logic:notEmpty>
</a>
</td>
</logic:equal>
</logic:present>
<logic:notPresent name="entry">
<td width=20%>&nbsp;</td>
</logic:notPresent>
</logic:iterate>
</tr>
</logic:iterate>
</table>
 
</body>
 
</html>