KATOH Yasufumi
karma****@users*****
2007年 2月 13日 (火) 21:51:20 JST
Update of /cvsroot/pal/weather/src/webapp/WEB-INF/view In directory sf-cvs:/tmp/cvs-serv18106/src/webapp/WEB-INF/view Modified Files: weather.jsp Removed Files: twodaysview.jsp Log Message: 3日分の天気を表示可能とした．jspファイルを一本化した． weather/src/webapp/WEB-INF/view/weather.jsp 1.5 -> 1.6 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/weather.jsp.diff?r1=1.5&r2=1.6 weather/src/webapp/WEB-INF/view/twodaysview.jsp 1.2 -> NONE (removed) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/weather/src/webapp/WEB-INF/view/twodaysview.jsp?rev=1.2&content-type=text/vnd.viewcvs-markup =================================================================== RCS file: weather/src/webapp/WEB-INF/view/weather.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- weather.jsp 2007/02/13 07:45:43 1.5 +++ weather.jsp 2007/02/13 12:51:20 1.6 @@ -16,7 +16,9 @@ <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> <%@ page import="java.util.*"%> -<jsp:useBean id="weather" class="jp.sf.pal.weather.Weather" scope="request" /> +<jsp:useBean id="todayweather" class="jp.sf.pal.weather.Weather" scope="request" /> +<jsp:useBean id="tomorrowweather" class="jp.sf.pal.weather.Weather" scope="request" /> +<jsp:useBean id="dayaftertomorrowweather" class="jp.sf.pal.weather.Weather" scope="request" /> <fmt:setBundle basename="jp.sf.pal.weather.resources.WeatherResources" /> <portlet:defineObjects/> @@ -24,8 +26,10 @@ <table width="100%" border="1"> <tr> <td colspan="2" align="center"> - <a href="<jsp:getProperty name="weather" property="link" />" style="font-size:x-small;"> - <jsp:getProperty name="weather" property="title" /> + <a href="<jsp:getProperty name="todayweather" property="link" />" style="font-size: x-small"> + <jsp:getProperty name="todayweather" property="pref" /> + <jsp:getProperty name="todayweather" property="city" /> + <fmt:message key="weather.label.OfWeather" /> </a> </td> </tr> @@ -33,45 +37,104 @@ <td colspan="2" align="center"> <span style="font-size:x-small">( <fmt:message key="weather.label.Publictime"/>: - <jsp:getProperty name="weather" property="publictime" /> + <jsp:getProperty name="todayweather" property="publictime" /> ) </span> </td> </tr> <tr> <td align="center" colspan="2"> - <a href="<jsp:getProperty name="weather" property="imgLink" />"> - <img src="<jsp:getProperty name="weather" property="imgUrl" />" - alt="<jsp:getProperty name="weather" property="imgTitle" />" - width="<jsp:getProperty name="weather" property="imgWidth" />" - height="<jsp:getProperty name="weather" property="imgHeight" />" + <!-- Display Weather --> + <table width="100%"> + <tr> +<% + Boolean isTodayDisp = (Boolean)renderRequest.getAttribute("istodaydisplay"); + if (isTodayDisp.booleanValue()) { +%> + <td align="center" style="font-size: x-small;"> + <fmt:message key="weather.label.Today"/><br /> + <a href="<jsp:getProperty name="todayweather" property="imgLink" />"> + <img src="<jsp:getProperty name="todayweather" property="imgUrl" />" + alt="<jsp:getProperty name="todayweather" property="imgTitle" />" + width="<jsp:getProperty name="todayweather" property="imgWidth" />" + height="<jsp:getProperty name="todayweather" property="imgHeight" />" border="0" /> </a> + <br /> + <jsp:getProperty name="todayweather" property="telop" /> + <br /> + <span style="color: red"> + <fmt:message key="weather.label.High" />: + <jsp:getProperty name="todayweather" property="tempMaxOutput" /></span> + + <span style="color: blue" /><fmt:message key="weather.label.Low" />: + <jsp:getProperty name="todayweather" property="tempMinOutput" /></span> + </td> +<% + } + Boolean isTomorrowDisp = (Boolean)renderRequest.getAttribute("istomorrowdisplay"); + if (isTomorrowDisp.booleanValue()) { +%> + <td align="center" style="font-size: x-small;"> + <fmt:message key="weather.label.Tomorrow"/><br /> + <a href="<jsp:getProperty name="tomorrowweather" property="imgLink" />"> + <img src="<jsp:getProperty name="tomorrowweather" property="imgUrl" />" + alt="<jsp:getProperty name="tomorrowweather" property="imgTitle" />" + width="<jsp:getProperty name="tomorrowweather" property="imgWidth" />" + height="<jsp:getProperty name="tomorrowweather" property="imgHeight" />" + border="0" /> + </a> + <br /> + <jsp:getProperty name="tomorrowweather" property="telop" /> + <br /> + <span style="color: red"> + <fmt:message key="weather.label.High" />: + <jsp:getProperty name="tomorrowweather" property="tempMaxOutput" /></span> + + <span style="color: blue" /><fmt:message key="weather.label.Low" />: + <jsp:getProperty name="tomorrowweather" property="tempMinOutput" /></span> + </td> +<% + } + Boolean isDayAfterTomorrowDisp = (Boolean)renderRequest.getAttribute("isdayaftertomorrowdisplay"); + if (isDayAfterTomorrowDisp.booleanValue()) { +%> + <td align="center" style="font-size: x-small;"> + <fmt:message key="weather.label.DayAfterTomorrow"/><br /> + <a href="<jsp:getProperty name="dayaftertomorrowweather" property="imgLink" />"> + <img src="<jsp:getProperty name="dayaftertomorrowweather" property="imgUrl" />" + alt="<jsp:getProperty name="dayaftertomorrowweather" property="imgTitle" />" + width="<jsp:getProperty name="dayaftertomorrowweather" property="imgWidth" />" + height="<jsp:getProperty name="dayaftertomorrowweather" property="imgHeight" />" + border="0" /> + </a> + <br /> + <jsp:getProperty name="dayaftertomorrowweather" property="telop" /> + <br /> + <span style="color: red"> + <fmt:message key="weather.label.High" />: + <jsp:getProperty name="dayaftertomorrowweather" property="tempMaxOutput" /></span> + + <span style="color: blue" /><fmt:message key="weather.label.Low" />: + <jsp:getProperty name="dayaftertomorrowweather" property="tempMinOutput" /></span> + </td> +<% + } +%> + </tr> + </table> + <!-- Display Weather --> </td> - </tr> - <tr> - <td align="center" colspan="2" style="font-size: x-small;"> - <jsp:getProperty name="weather" property="telop" /></td> - </tr> - <tr> - <td align="center" colspan="2" style="font-size: x-small;"> - <span style="color: red"> - <fmt:message key="weather.label.High" />: - <jsp:getProperty name="weather" property="tempMaxOutput" /></span> - - <span style="color: blue" /><fmt:message key="weather.label.Low" />: - <jsp:getProperty name="weather" property="tempMinOutput" /></span> - </td> </tr> <% - Boolean isDisplayDescription = (Boolean)renderRequest.getAttribute("description") ; - if (isDisplayDescription.booleanValue()) { + Boolean isDescription = (Boolean)renderRequest.getAttribute("description") ; + if (isDescription.booleanValue()) { %> <tr> <td align="right" style="font-size: x-small;" width="10%"> <fmt:message key="weather.label.Overview"/>:</td> <td align="left" style="font-size: x-small"> - <jsp:getProperty name="weather" property="description" /> + <jsp:getProperty name="todayweather" property="description" /> </td> </tr> <% @@ -79,8 +142,8 @@ %> <tr> <td align="center" colspan="2"> - <a href="<jsp:getProperty name="weather" property="copyrightLink" />" style="font-size:x-small"> - <jsp:getProperty name="weather" property="copyrightTitle" /> + <a href="<jsp:getProperty name="todayweather" property="copyrightLink" />" style="font-size:x-small"> + <jsp:getProperty name="todayweather" property="copyrightTitle" /> </a> </td> </tr>
