Menu
▾
▴
[jboss-cvs] jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages ...
|
From: Aron S. <bi...@gm...> - 2006-04-01 18:07:20
|
User: asogor
Date: 06/04/01 13:07:15
Modified: src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages
AddressListWithLabels.jsp EventInput.jsp
Added: src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages
InviteCreatePopup.jsp
Removed: src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages
InvitePopup.jsp InviteAddPopup.jsp
Log:
UI fixes
Revision Changes Path
1.2 +1 -23 jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages/AddressListWithLabels.jsp
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AddressListWithLabels.jsp
===================================================================
RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages/AddressListWithLabels.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AddressListWithLabels.jsp 23 Feb 2006 16:52:53 -0000 1.1
+++ AddressListWithLabels.jsp 1 Apr 2006 18:07:15 -0000 1.2
@@ -34,25 +34,3 @@
</table>
<%@ include file="AddressList.jsp" %>
-<!-- TEST:
- <logic:iterate id="address" length="length" name="Addresses">
- <tr>
- <td align="center">
- <html:link action="/secured/AddressEdit" paramName="address" paramProperty="recordId" paramId="recordId">
- <bean:write name="address" property="nickName" filter="true"/>
- </html:link>
- </td>
- <td align="center">
- <bean:write name="address" property="fullName" filter="true"/>
- </td>
- <td align="center">
- <bean:write name="address" property="organization" filter="true"/>
- </td>
- <td align="left">
- <html:link action="/secured/AddressDelete" paramName="address" paramProperty="recordId" paramId="recordId">
- <html:img page="/HTML_BASIC/images/redx.gif" height="15" width="15" titleKey="AddressList.deleteAddress" altKey="AddressList.deleteAddress"/>
- </html:link>
- </td>
- </tr>
- </logic:iterate>
--->
\ No newline at end of file
1.3 +12 -12 jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages/EventInput.jsp
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EventInput.jsp
===================================================================
RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages/EventInput.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EventInput.jsp 31 Mar 2006 05:33:19 -0000 1.2
+++ EventInput.jsp 1 Apr 2006 18:07:15 -0000 1.3
@@ -5,16 +5,6 @@
<table width="100%" class="bodyText">
- <!-- User messages Start -->
-
- <html:messages id="message">
- <tr>
- <td colspan="2"><bean:write name="message" /></td>
- </tr>
- </html:messages>
-
- <!-- User messages End -->
-
<tr>
<td colspan=2>
<table id="scheduleTable" class="schedule">
@@ -38,6 +28,16 @@
</td>
</tr>
+ <!-- User messages Start -->
+
+ <html:messages id="message">
+ <tr>
+ <td colspan="2"><bean:write name="message" /></td>
+ </tr>
+ </html:messages>
+
+ <!-- User messages End -->
+
<html:form action="/secured/EventSave">
<html:hidden property="action" />
<html:hidden property="eventId" />
@@ -52,7 +52,7 @@
<logic:notEqual name="EventInputForm" property="action" value="Create">
<tr>
<td colspan=2 align="left"><a class="hint" href="javascript://"
- onclick="openInviteAdd();return false;"> <bean:message
+ onclick="openEventUpdate();return false;"> <bean:message
key="EventInput.prompt.addInvites" /> </a></td>
</tr>
@@ -71,7 +71,7 @@
<logic:equal name="EventInputForm" property="action" value="Create">
<tr>
<td colspan=2 align="left"><a class="hint" href="javascript://"
- onclick="openInviteNew();return false;"> <bean:message
+ onclick="openEventCreate();return false;"> <bean:message
key="EventInput.prompt.addInvites" /> </a></td>
</tr>
</logic:equal>
1.1 date: 2006/04/01 18:07:15; author: asogor; state: Exp;jboss-mail/src/calendar/calendarwebapp/etc/layout/HTML_BASIC/pages/InviteCreatePopup.jsp
Index: InviteCreatePopup.jsp
===================================================================
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
<html>
<head>
<LINK href="<html:rewrite page="/HTML_BASIC/layout/hg.css"/>" rel="stylesheet" type="text/css">
<style>
#contactsPicker { width: 200px; float: left; text-align: left;}
#contacts { width: 200px; height: 300px; overflow: auto; border: 1px solid #666; }
#contacts #even {background-color: #DEEFFF;}
</style>
<script type="text/javascript">
var separator = ',';
var inviteField;
window.onload = function ()
{
inviteField = window.opener.document.EventInputForm.invitesAsString;
fields = inviteField.value.split(separator);
if(fields.length>0)
{
for (var i=0; i < fields.length; i++) {
if((document.contactForm.elements[fields[i]] != undefined)
&&(document.contactForm.elements[fields[i]].type == 'checkbox')) {
document.contactForm.elements[fields[i]].checked=true;
}
}
}
}
function appendValue(box)
{
if(box.checked){
window.opener.ajaxScheduleHandler.addInvite(box.value);
}else{
window.opener.ajaxScheduleHandler.deleteInvite(box.value);
}
}
function invite()
{
return window.opener.invite_close(self);
}
</script>
</head>
<body class="bodyText">
<FORM NAME="contactForm" ACTION="" METHOD="GET">
<div id="contactsPicker">
<div id="contacts">
<% boolean even=true;%>
<logic:iterate id="friend" length="length" name="Userlist">
<div id="<%=(even?"even":"odd")%>">
<input type="checkbox" name="<bean:write name="friend" property="userName" filter="true"/>" unchecked value='<bean:write name="friend" property="userName" filter="true"/>' onclick='appendValue(this)'/><bean:write name="friend" property="userName" filter="true"/><br/>
</div>
<% even=!even;%>
</logic:iterate>
<div id="<%=(even?"even":"odd")%>">
</div>
</div>
</div>
</FORM>
</body>
</html>
|