Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1242 → Rev 1243

/PhotoAlbum/trunk/webapp/WEB-INF/struts-config.xml
10,6 → 10,11
name="pathForm"
type="ak.photoalbum.webapp.PathForm"
/>
 
<form-bean
name="indexForm"
type="ak.photoalbum.webapp.IndexForm"
/>
</form-beans>
 
<global-forwards>
23,7 → 28,7
<action
path="/index"
type="ak.photoalbum.webapp.IndexAction"
name="pathForm"
name="indexForm"
validate="true"
scope="request"
>
/PhotoAlbum/trunk/webapp/WEB-INF/web.xml
31,7 → 31,7
<servlet-class>ak.photoalbum.webapp.InitServlet</servlet-class>
<init-param>
<param-name>images root</param-name>
<param-value>/opt/data/photos</param-value>
<param-value>/home/data/photos</param-value>
</init-param>
<init-param>
<param-name>images mask</param-name>
39,7 → 39,7
</init-param>
<init-param>
<param-name>cache dir</param-name>
<param-value>/opt/data/photos/.cache</param-value>
<param-value>/home/data/photos/.cache</param-value>
</init-param>
<init-param>
<param-name>thumbnail format</param-name>
47,11 → 47,15
</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/common/prog/PhotoAlbum/webapp/images/dir_template.gif</param-value>
<param-value>/home/www/26th.net-java/html/photos/images/dir_template.gif</param-value>
</init-param>
<init-param>
<param-name>dir thumbnails positions</param-name>
/PhotoAlbum/trunk/webapp/page.jsp
12,6 → 12,14
 
<h1><bean:write name="entry" property="title" /></h1>
 
<logic:notEmpty name="entry" property="subtitle">
<p><bean:write name="entry" property="subtitle" /></p>
</logic:notEmpty>
 
<logic:notEmpty name="entry" property="comment">
<p><bean:write name="entry" property="comment" /></p>
</logic:notEmpty>
 
<p>
<logic:empty name="prevEntry" property="path">
&lt;&lt;
/PhotoAlbum/trunk/webapp/index.jsp
5,24 → 5,33
<html>
 
<head>
<logic:empty name="dir">
<logic:empty name="current" property="title">
<title>Index</title>
</logic:empty>
<logic:notEmpty name="dir">
<title>Index of <bean:write name="dir" /></title>
<logic:notEmpty name="current" property="title">
<title>Index of <bean:write name="current" property="title" /></title>
</logic:notEmpty>
</head>
 
<body bgcolor="white">
 
<logic:empty name="dir">
<logic:empty name="current" property="title">
<h1>Index</h1>
</logic:empty>
<logic:notEmpty name="dir">
<h1>Index of <bean:write name="dir" /></h1>
<logic:notEmpty name="current" property="title">
<h1>Index of <bean:write name="current" property="title" /></h1>
</logic:notEmpty>
 
<logic:notEmpty name="current" property="subtitle">
<p><bean:write name="current" property="subtitle" filter="false" /></p>
</logic:notEmpty>
 
<logic:notEmpty name="current" property="comment">
<p><bean:write name="current" property="comment" filter="false" /></p>
</logic:notEmpty>
 
<p>
Directory:
<logic:empty name="prevEntry" property="path">
&lt;&lt;
</logic:empty>
55,6 → 64,46
</logic:notEmpty>
</p>
 
<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>
 
<logic:notPresent name="prevPage">
&lt;
</logic:notPresent>
<logic:present name="prevPage">
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="prevPage" property="number" />">&lt;</a>
</logic:present>
 
<logic:iterate name="pages" id="p">
<logic:equal name="p" property="isCurrent" value="true">
<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" />"><bean:write name="p" property="displayNumber" /></a>
</logic:equal>
</logic:iterate>
 
<logic:notPresent name="nextPage">
&gt;
</logic:notPresent>
<logic:present name="nextPage">
<a href="index.do?path=<bean:write name="indexForm" property="path" />&amp;page=<bean:write name="nextPage" property="number" />">&gt;</a>
</logic:present>
 
<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>
 
<table border=1 width=100%>
<logic:iterate name="index" id="row">
<tr>
69,6 → 118,9
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>
81,6 → 133,9
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>