Subversion Repositories general

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1252 → Rev 1251

/PhotoAlbum/trunk/webapp/index.jsp
44,11 → 44,11
<logic:equal name="entry" property="isDir" value="true">
 
<div class="Photo" align="center">
<div class="dirImgBorder" align="center"><a href="index.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"><img src="dir.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"
<div class="dirImgBorder" 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?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"
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">
61,11 → 61,11
<logic:equal name="entry" property="isDir" value="false">
 
<div class="Photo" align="center">
<div class="imgBorder" align="center"><a href="page.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"><img src="small.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"
<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?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"
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">
95,7 → 95,7
<td align=left class="IndexPage" style="width:150px">&nbsp;</td>
</logic:notPresent>
<logic:present name="prevPage">
<td align=left class="IndexPage" style="width:150px"><a href="index.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />" class="ImagePaneRow"><img
<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>
</logic:present>
 
106,7 → 106,7
<span style="color:black">[&nbsp;<bean:write name="p" property="displayNumber" />&nbsp;]</span>
</logic:equal>
<logic:equal name="p" property="isCurrent" value="false">
<a href="index.do?branch=<bean:write name="indexForm" property="branch" />&amp;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" />" class="ImagePaneRow"><bean:write name="p" property="displayNumber" /></a>
</logic:equal>
&bull;
</logic:iterate>
116,7 → 116,7
<td align=right class="IndexPage" style="width:150px">&nbsp;</td>
</logic:notPresent>
<logic:present name="nextPage">
<td align=right class="IndexPage" style="width:150px"><a href="index.do?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />" class="ImagePaneRow"><img
<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>
</logic:present>
 
136,7 → 136,7
<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?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="top" property="path" />"
<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>
146,7 → 146,7
<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?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />" class="ImagePaneRow"><img
<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>
155,7 → 155,7
<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?branch=<bean:write name="indexForm" property="branch" />&amp;path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />" class="ImagePaneRow"><img
<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>
/PhotoAlbum/trunk/webapp/WEB-INF/conf/photos.xml.example
File deleted
/PhotoAlbum/trunk/webapp/WEB-INF/conf
Property changes:
Deleted: svn:ignore
-photos.xml
-
/PhotoAlbum/trunk/webapp/WEB-INF/web.xml
30,9 → 30,42
<servlet-name>init</servlet-name>
<servlet-class>ak.photoalbum.webapp.InitServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>WEB-INF/conf/photos.xml</param-value>
<param-name>images root</param-name>
<param-value>/home/data/photos</param-value>
</init-param>
<init-param>
<param-name>images mask</param-name>
<param-value>*.jpeg;*.jpg</param-value>
</init-param>
<init-param>
<param-name>cache dir</param-name>
<param-value>/home/data/photos/.cache</param-value>
</init-param>
<init-param>
<param-name>thumbnail format</param-name>
<param-value>jpg</param-value>
</init-param>
<init-param>
<param-name>columns</param-name>
<param-value>6</param-value>
</init-param>
<init-param>
<param-name>rows</param-name>
<param-value>5</param-value>
</init-param>
<init-param>
<param-name>dir template</param-name>
<param-value>/home/tomcat/webapps/26th.net/photos/images/dir_template.gif</param-value>
</init-param>
<init-param>
<param-name>dir thumbnails positions</param-name>
<param-value>
5, 9,40,40,c,c;
47, 9,40,40,c,c;
5,50,40,40,c,c;
47,50,40,40,c,c
</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
 
/PhotoAlbum/trunk/webapp/page.jsp
24,7 → 24,7
<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?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="index" property="path" />" class="ImagePaneRow"><img
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>
36,10 → 36,10
<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?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="nextEntry" property="path" />"
href="index.do?path=<bean:write name="nextEntry" property="path" />"
</logic:equal>
<logic:equal name="nextEntry" property="isDir" value="false">
href="page.do?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="nextEntry" property="path" />"
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>
52,10 → 52,10
<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?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="prevEntry" property="path" />"
href="index.do?path=<bean:write name="prevEntry" property="path" />"
</logic:equal>
<logic:equal name="prevEntry" property="isDir" value="false">
href="page.do?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="prevEntry" property="path" />"
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>
98,8 → 98,8
</logic:notEmpty>
</div>
<div id="divMain" align="center">
<a href="origin.do?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />" target="_blank"><img
src="medium.do?branch=<bean:write name="pathForm" property="branch" />&amp;path=<bean:write name="entry" property="path" />"
<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" />"