Update of /cvsroot/roller/roller/web/weblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22549/web/weblog
Modified Files:
CategoriesForm.jsp referers.jsp
Log Message:
Continued main page development, i18n changes, and UI cleanups
Still not done... more changes on the way today.
Index: CategoriesForm.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/CategoriesForm.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CategoriesForm.jsp 26 Feb 2004 23:03:47 -0000 1.3
--- CategoriesForm.jsp 28 Feb 2004 17:48:18 -0000 1.4
***************
*** 24,28 ****
</script>
! <h3>
<fmt:message key="categoriesForm.parent" />:
<c:if test="${empty category}">
--- 24,28 ----
</script>
! <h1>
<fmt:message key="categoriesForm.parent" />:
<c:if test="${empty category}">
***************
*** 32,36 ****
<c:out value="${category.name}" />
</c:if>
! </h3>
<%-- Category path --%>
--- 32,36 ----
<c:out value="${category.name}" />
</c:if>
! </h1>
<%-- Category path --%>
***************
*** 70,74 ****
<p>
<%-- Add Category link --%>
! <img src="images/FolderNew16.png" valign="absmiddle" border="0"alt="icon" />
<roller:link page="/CategoryEdit.do">
<roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
--- 70,74 ----
<p>
<%-- Add Category link --%>
! <img src="images/FolderNew16.png" border="0"alt="icon" />
<roller:link page="/CategoryEdit.do">
<roller:linkparam id="<%= RollerRequest.PARENTID_KEY %>"
***************
*** 102,120 ****
</p>
! <table class="rTable">
! <tr class="rHeaderTr">
! <td width="5%"> </td>
! <td width="5%"> </td>
! <td width="30%"><fmt:message key="categoriesForm.name" /></td>
! <td width="45%"><fmt:message key="categoriesForm.description" /></td>
! <td width="10%"><fmt:message key="categoriesForm.edit" /></td>
</tr>
<%-- Categories --%>
<c:forEach var="category" items="${categories}" >
! <roller:row oddStyleClass="rOddTr" evenStyleClass="rEvenTr">
! <td class="rTd">
<html:multibox property="selectedCategories">
<c:out value="${category.id}" />
--- 102,121 ----
</p>
! <table class="rollertable">
! <tr class="rollertable">
! <th class="rollertable" width="5%"> </td>
! <th class="rollertable" width="5%"> </td>
! <th class="rollertable" width="30%"><fmt:message
key="categoriesForm.name" /></td>
! <th class="rollertable" width="45%"><fmt:message
key="categoriesForm.description" /></td>
! <th class="rollertable" width="5%"><fmt:message
key="categoriesForm.edit" /></td>
! <th class="rollertable" width="5%"><fmt:message
key="categoriesForm.remove" /></td>
</tr>
<%-- Categories --%>
<c:forEach var="category" items="${categories}" >
! <roller:row oddStyleClass="rollertable_odd"
evenStyleClass="rollertable_even">
! <td class="rollertable">
<html:multibox property="selectedCategories">
<c:out value="${category.id}" />
***************
*** 123,129 ****
! <td class="rTd" align="center"><img
src="images/Folder16.png"alt="icon" /></td>
! <td class="rTd">
<roller:link page="/Categories.do">
<roller:linkparam id="method" value="selectCategory" />
--- 124,130 ----
! <td class="rollertable" align="center"><img
src="images/Folder16.png"alt="icon" /></td>
! <td class="rollertable">
<roller:link page="/Categories.do">
<roller:linkparam id="method" value="selectCategory" />
***************
*** 135,143 ****
</td>
! <td class="rTd">
<str:truncateNicely lower="30" upper="35" ><c:out
value="${category.description}" /></str:truncateNicely>
</td>
! <td class="rTd" align="center">
<roller:link page="/CategoryEdit.do">
<roller:linkparam
--- 136,144 ----
</td>
! <td class="rollertable">
<str:truncateNicely lower="30" upper="35" ><c:out
value="${category.description}" /></str:truncateNicely>
</td>
! <td class="rollertable" align="center">
<roller:link page="/CategoryEdit.do">
<roller:linkparam
***************
*** 146,149 ****
--- 147,153 ----
<img src="images/Edit16.png" border="0" alt="icon" />
</roller:link>
+ </td>
+
+ <td class="rollertable" align="center">
<roller:link page="/CategoryDelete.do">
<roller:linkparam
Index: referers.jsp
===================================================================
RCS file: /cvsroot/roller/roller/web/weblog/referers.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** referers.jsp 26 Feb 2004 23:03:47 -0000 1.3
--- referers.jsp 28 Feb 2004 17:48:18 -0000 1.4
***************
*** 1,39 ****
-
<%@ include file="/theme/header.jsp" %>
!
! <h3>Hit Counters</h3>
!
! <p>Page hits: <bean:write name="pageHits"/></p>
!
! <p>All-time Total hits: <bean:write name="totalHits"/></p>
!
! <html:form action="/referers" method="post">
! <input type="hidden" name="method" value="reset" />
! <html:submit value="Reset Today's Hits"/></input>
! </html:form>
!
! <h3>Today's Referer Rankings</h3>
!
<html:form action="/referers" method="post">
! <input type="hidden" name="method" value="delete" />
! <table width="75%" class="rTable" >
! <tr class="tableRowHeader">
! <td class="rTd"></th>
! <td class="rTd">ref url</th>
! <td class="rTd">day hits</th>
</tr>
! <logic:iterate id="referer" name="referers">
<tr>
! <td><input type="checkbox" name="id"
! value="<bean:write name="referer" property="id"/>"></td>
! <td><bean:write name="referer" property="displayUrl"
filter="false"/></td>
! <td><bean:write name="referer" property="dayHits"/></td>
</tr>
! </logic:iterate>
</table>
! <html:submit value="Delete Selected Referers"/></input>
</html:form>
--- 1,41 ----
<%@ include file="/theme/header.jsp" %>
! <%-- Form allows deleting of referers --%>
! <h1><fmt:message key="referers.todaysReferers" /></h1>
<html:form action="/referers" method="post">
! <input type="hidden" name="method" value="delete" />
! <%-- Table of referers, with check box for each --%>
! <table width="75%" class="rollertable" >
! <tr class="rollertable">
! <th class="rollertable"></th>
! <th class="rollertable"><fmt:message key="referers.url" /></th>
! <th class="rollertable"><fmt:message key="referers.hits" /></th>
</tr>
!
! <c:forEach var="referer" items="${referers}">
<tr>
! <td class="rollertable">
! <input type="checkbox" name="id" value='<c:out
value="${referer.id}" />' />
! </td>
! <td class="rollertable">
! <c:out value="${referer.displayUrl}" escapeXml="false" />
! </td>
! <td class="rollertable"><c:out value="${referer.dayHits}" /></td>
</tr>
! </c:forEach>
!
</table>
! <br />
! <input type="submit" value='<fmt:message key="referers.deleteSelected" />'
/></input>
! </html:form>
!
! <%-- Form allows reset of day hits --%>
! <h2><fmt:message key="referers.hitCounters" /></h2>
! <p><fmt:message key="referers.hits" />: <c:out value="${pageHits}"/></p>
! <html:form action="/referers" method="post">
! <input type="hidden" name="method" value="reset" />
! <input type="submit" value='<fmt:message key="referers.reset" />'
/></input>
</html:form>
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
|
