[Join-cvs] join1/src/web/jsp/environment machines.jsp, 1.1, 1.2 resources.jsp, 1.3, 1.4 resourcever
Brought to you by:
lbroudoux
Menu
▾
▴
[Join-cvs] join1/src/web/jsp/environment machines.jsp, 1.1, 1.2 resources.jsp, 1.3, 1.4 resourceversions.jsp, 1.2, 1.3
|
From: Laurent B. <lbr...@us...> - 2008-02-03 23:00:00
|
Update of /cvsroot/join/join1/src/web/jsp/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9210/jsp/environment Modified Files: machines.jsp resources.jsp resourceversions.jsp Log Message: Add ajax support and nifty cubes for nice rounded corners ! Index: resources.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/resources.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** resources.jsp 1 Mar 2007 00:04:09 -0000 1.3 --- resources.jsp 3 Feb 2008 22:59:56 -0000 1.4 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 54,84 **** <br/><br/> <div align="center"> ! <display:table id="row" htmlId="doctab" name="requestScope.resources" export="true" ! requestURI="/action/resource?op=search"> ! <display:column titleKey="label.resource.name" property="name" sortable="true"/> ! <display:column titleKey="label.resource.machine" property="machine.name" sortable="true"/> ! <logic:present name="row"> ! <logic:equal name="row" property="category" value="EIS"> ! <display:column titleKey="label.resource.version" property="activeVersionUpdate.version.name"/> ! <display:column headerClass="empty" media="html" url="/action/resourceUpdate?op=form" ! paramId="resourceName" paramProperty="name"> ! <html:img page="/images/16x16/reload.gif" alt="Update resource version"/> ! </display:column> ! </logic:equal> ! <logic:equal name="row" property="category" value="VersionedResource"> ! <display:column titleKey="label.resource.version" property="activeVersionUpdate.version.name"/> ! <display:column headerClass="empty" media="html" url="/action/resourceUpdate?op=form" ! paramId="resourceName" paramProperty="name"> ! <html:img page="/images/16x16/reload.gif" alt="Update resource version"/> ! </display:column> ! </logic:equal> ! </logic:present> ! <display:column headerClass="empty" media="html" ! url="<%= "/action/resource?op=load&category=" + request.getParameter("category") ! + "&resourceTypeKey=" + request.getParameter("resourceTypeKey") %>" ! paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit resource properties"/> ! </display:column> ! </display:table> </div> --- 59,91 ---- <br/><br/> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.resources" export="true" ! requestURI="/action/resource?rd=none"> ! <display:column titleKey="label.resource.name" property="name" sortable="true"/> ! <display:column titleKey="label.resource.machine" property="machine.name" sortable="true"/> ! <logic:present name="row"> ! <logic:equal name="row" property="category" value="EIS"> ! <display:column titleKey="label.resource.version" property="activeVersionUpdate.version.name"/> ! <display:column headerClass="empty" media="html" url="/action/resourceUpdate?op=form" ! paramId="resourceName" paramProperty="name"> ! <html:img page="/images/16x16/reload.gif" alt="Update resource version"/> ! </display:column> ! </logic:equal> ! <logic:equal name="row" property="category" value="VersionedResource"> ! <display:column titleKey="label.resource.version" property="activeVersionUpdate.version.name"/> ! <display:column headerClass="empty" media="html" url="/action/resourceUpdate?op=form" ! paramId="resourceName" paramProperty="name"> ! <html:img page="/images/16x16/reload.gif" alt="Update resource version"/> ! </display:column> ! </logic:equal> ! </logic:present> ! <display:column headerClass="empty" media="html" ! url="<%= "/action/resource?op=load&category=" + request.getParameter("category") ! + "&resourceTypeKey=" + request.getParameter("resourceTypeKey") %>" ! paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit resource properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> Index: resourceversions.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/resourceversions.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** resourceversions.jsp 1 Mar 2007 00:04:09 -0000 1.2 --- resourceversions.jsp 3 Feb 2008 22:59:56 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 36,53 **** <br/><br/> <div align="center"> ! <display:table id="row" htmlId="doctab" name="requestScope.resourceVersions" export="true" ! requestURI="/action/resourceVersion?op=search"> ! <display:column titleKey="label.resourceversion.name" property="name" sortable="true"/> ! <display:column titleKey="label.resourceversion.creationdate" sortable="true"> ! <bean:write name="row" property="creationDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <display:column titleKey="label.resourceversion.description" property="description" maxLength="40"/> ! <display:column headerClass="empty" media="html" ! url="<%= "/action/resourceVersion?op=load&category=" + request.getParameter("category") ! + "&resourceTypeKey=" + request.getParameter("resourceTypeKey") %>" ! paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit resource version properties"/> ! </display:column> ! </display:table> </div> --- 41,60 ---- <br/><br/> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.resourceVersions" export="true" ! requestURI="/action/resourceVersion?rd=none"> ! <display:column titleKey="label.resourceversion.name" property="name" sortable="true"/> ! <display:column titleKey="label.resourceversion.creationdate" sortable="true" width="110"> ! <bean:write name="row" property="creationDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <display:column titleKey="label.resourceversion.description" property="description" maxLength="40"/> ! <display:column headerClass="empty" media="html" ! url="<%= "/action/resourceVersion?op=load&category=" + request.getParameter("category") ! + "&resourceTypeKey=" + request.getParameter("resourceTypeKey") %>" ! paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit resource version properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> Index: machines.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/machines.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** machines.jsp 30 Jul 2006 19:39:16 -0000 1.1 --- machines.jsp 3 Feb 2008 22:59:56 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3><html:img page="/images/22x22/machine.gif" align="absmiddle"/> <bean:message bundle="gui" key="title.machine"/></h3> *************** *** 17,34 **** <h4><bean:message bundle="gui" key="title.machine.managed"/></h4> <div align="center"> ! <display:table id="row" htmlId="doctab" name="machines" export="true" ! requestURI="/action/machine" excludedParams="*"> ! <display:column titleKey="label.machine.name" property="name" sortable="true" maxLength="100"/> ! <display:column titleKey="label.machine.ipaddress" property="ipAddress" width="90" sortable="true"/> ! <display:column titleKey="label.machine.osinfo" property="osInfo" maxLength="100"/> ! <display:column headerClass="empty" media="html" ! url="/action/machine?op=details" paramId="idStr" paramProperty="id"> ! <html:img page="/images/16x16/details.gif" alt="View hosted resources"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/machine?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit machine properties"/> ! </display:column> ! </display:table> </div> </div> --- 22,41 ---- <h4><bean:message bundle="gui" key="title.machine.managed"/></h4> <div align="center"> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="machines" export="true" ! requestURI="/action/machine?rd=none" excludedParams="*"> ! <display:column titleKey="label.machine.name" property="name" sortable="true" maxLength="100"/> ! <display:column titleKey="label.machine.ipaddress" property="ipAddress" width="90" sortable="true"/> ! <display:column titleKey="label.machine.osinfo" property="osInfo" maxLength="100"/> ! <display:column headerClass="empty" media="html" ! url="/action/machine?op=details" paramId="idStr" paramProperty="id"> ! <html:img page="/images/16x16/details.gif" alt="View hosted resources"/> ! </display:column> ! <display:column headerClass="empty" media="html" ! url="/action/machine?op=load" paramId="idStr" paramProperty="id"> ! <html:img page="/images/redo.gif" alt="Edit machine properties"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> </div> |
