From: <jbo...@li...> - 2006-02-16 16:35:48
|
Author: aron.gombas Date: 2006-02-16 11:35:30 -0500 (Thu, 16 Feb 2006) New Revision: 2490 Modified: trunk/labs/kosmos/web-portlet/WEB-INF/tags/listExpander.tag trunk/labs/kosmos/web-portlet/WEB-INF/tags/zoomableImage.tag trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_assignee_details.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_committer_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp Log: Zoomable image toggle implemented Modified: trunk/labs/kosmos/web-portlet/WEB-INF/tags/listExpander.tag =================================================================== --- trunk/labs/kosmos/web-portlet/WEB-INF/tags/listExpander.tag 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/WEB-INF/tags/listExpander.tag 2006-02-16 16:35:30 UTC (rev 2490) @@ -4,27 +4,27 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> -<%@ attribute name="index" required="true" description="Index of this list in the page. It must match the 'id' of the appropriate 'tr' elements." %> +<%@ attribute name="id" required="true" description="ID of this list in the page. It must match the 'id' of the appropriate 'tr' elements." %> <%@ attribute name="size" required="true" description="Size of the list." %> <c:if test="${size > 10}"> <script src="<c:url value="/pages/scripts/scriptaculous/prototype.js"/>" language="javascript"></script> - <script src="<c:url value="/pages/scripts/scriptaculous/scriptaculous.js"/>" language="javascript"></script> + <script src="<c:url value="/pages/scripts/scriptaculous/scriptaculous.js?load=effects"/>" language="javascript"></script> <script src="<c:url value="/pages/scripts/kosmos.js"/>" language="javascript"></script> <img src="<c:url value="/pages/images/table.gif"/>"/> - <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${index}-', ${size}, 10);"> + <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 10);"> <fmt:message key="action.show"/> 10 </a> | <c:if test="${size > 25}"> - <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${index}-', ${size}, 25);"> + <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 25);"> <fmt:message key="action.show"/> 25 </a> | </c:if> - <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${index}-', ${size}, ${size});"> + <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, ${size});"> <fmt:message key="action.showAll"/> ${size} </a> </c:if> Modified: trunk/labs/kosmos/web-portlet/WEB-INF/tags/zoomableImage.tag =================================================================== --- trunk/labs/kosmos/web-portlet/WEB-INF/tags/zoomableImage.tag 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/WEB-INF/tags/zoomableImage.tag 2006-02-16 16:35:30 UTC (rev 2490) @@ -2,13 +2,24 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ attribute name="id" required="true" description="ID of this zoomable image in the page." %> <%@ attribute name="locator" required="true" type="hu.midori.kosmos.model.ZoomableImageLocator" description="Specifies the URLs for both versions of the image." %> <%@ attribute name="titleKey" description="Resource bundle key of the title string to display hovering the images." %> -<link href="<c:url value="/pages/styles/lightbox.css"/>" rel="stylesheet" type="text/css"> -<script src="<c:url value="/pages/scripts/lightbox/lightbox.js"/>" language="javascript"></script> +<script src="<c:url value="/pages/scripts/scriptaculous/prototype.js"/>" language="javascript"></script> +<script src="<c:url value="/pages/scripts/scriptaculous/scriptaculous.js?load=effects"/>" language="javascript"></script> +<script src="<c:url value="/pages/scripts/kosmos.js"/>" language="javascript"></script> -<a href="${locator.hiresUrl}" title="<fmt:message key="${titleKey}"/>" rel="lightbox"> - <img src="${locator.loresUrl}" title="<fmt:message key="${titleKey}"/>" border="0"/> -</a> +<span id="zoomable-<portlet:namespace/>-${id}-lo"> + <a href="javascript:void(0);" onclick="javascript:toggleZoomableImage('zoomable-<portlet:namespace/>-${id}-lo', 'zoomable-<portlet:namespace/>-${id}-hi');"> + <img src="${locator.loresUrl}" title="<fmt:message key="${titleKey}"/>" border="0"/> + </a> +</span> + +<span id="zoomable-<portlet:namespace/>-${id}-hi" style="display: none;"> + <a href="javascript:void(0);" onclick="javascript:toggleZoomableImage('zoomable-<portlet:namespace/>-${id}-lo', 'zoomable-<portlet:namespace/>-${id}-hi');"> + <img src="${locator.hiresUrl}" title="<fmt:message key="${titleKey}"/>" border="0"/> + </a> +</span> Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -43,9 +43,9 @@ </tr> <tr class="portlet-section-alternate"> <td valign="top"><fmt:message key="ccproject.testsPerCategory"/>:</td> - <td valign="top"><ui:zoomableImage locator="${project.testsPerCategoryChartLocator}" titleKey="ccproject.testsPerCategory"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${project.testsPerCategoryChartLocator}" titleKey="ccproject.testsPerCategory"/></td> <td valign="top"> - <ui:listExpander index="0" size="${fn:length(project.testCases)}"/> + <ui:listExpander id="0" size="${fn:length(project.testCases)}"/> <table> <c:forEach var="testcase" items="${project.testCases}" varStatus="status"> <c:choose> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_assignee_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_assignee_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_assignee_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -6,9 +6,9 @@ <table> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="jiraproject.openIssuesByAssignee"/>:</td> - <td valign="top"><ui:zoomableImage locator="${project.openIssuesPerAssigneeChartLocator}" titleKey="jiraproject.openIssuesByAssignee"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${project.openIssuesPerAssigneeChartLocator}" titleKey="jiraproject.openIssuesByAssignee"/></td> <td valign="top"> - <ui:listExpander index="0" size="${fn:length(project.openIssuesPerAssignee)}"/> + <ui:listExpander id="0" size="${fn:length(project.openIssuesPerAssignee)}"/> <table> <c:forEach var="item" items="${project.openIssuesPerAssignee}" varStatus="status"> <c:choose> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -6,7 +6,7 @@ <table> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="jiraproject.openIssuesByPriority"/>:</td> - <td valign="top"><ui:zoomableImage locator="${project.openIssuesPerPriorityChartLocator}" titleKey="jiraproject.openIssuesByPriority"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${project.openIssuesPerPriorityChartLocator}" titleKey="jiraproject.openIssuesByPriority"/></td> <td valign="top"> <table> <tr class="portlet-section-alternate"> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -14,7 +14,7 @@ </tr> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="jiraproject.issuesByStatus"/>:</td> - <td valign="top"><ui:zoomableImage locator="${project.issuesPerStatusChartLocator}" titleKey="jiraproject.issuesByStatus"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${project.issuesPerStatusChartLocator}" titleKey="jiraproject.issuesByStatus"/></td> <td valign="top"> <table> <tr class="portlet-section-alternate"> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -30,9 +30,9 @@ </tr> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="svnrepository.commitHistory"/>:</td> - <td valign="top"><ui:zoomableImage locator="${repository.commitsPerWeekChartLocator}" titleKey="svnrepository.commitHistory"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${repository.commitsPerWeekChartLocator}" titleKey="svnrepository.commitHistory"/></td> <td valign="top" colspan="2"> - <ui:listExpander index="0" size="${fn:length(repository.commits)}"/> + <ui:listExpander id="0" size="${fn:length(repository.commits)}"/> <table> <c:forEach var="commit" items="${repository.commits}" varStatus="status"> <c:choose> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_committer_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_committer_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_committer_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -6,9 +6,9 @@ <table> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="svnrepository.mostActiveCommitters"/>:</td> - <td valign="top"><ui:zoomableImage locator="${repository.commitsPerAuthorChartLocator}" titleKey="svnrepository.mostActiveCommitters"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${repository.commitsPerAuthorChartLocator}" titleKey="svnrepository.mostActiveCommitters"/></td> <td valign="top"> - <ui:listExpander index="0" size="${fn:length(repository.commitsPerAuthor)}"/> + <ui:listExpander id="0" size="${fn:length(repository.commitsPerAuthor)}"/> <table> <c:forEach var="item" items="${repository.commitsPerAuthor}" varStatus="status"> <c:choose> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -26,14 +26,14 @@ </tr> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="svnrepository.repositoryEntryHistory"/>:</td> - <td valign="top"><ui:zoomableImage locator="${repository.repoEntriesPerWeekChartLocator}" titleKey="svnrepository.repositoryEntryHistory"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${repository.repoEntriesPerWeekChartLocator}" titleKey="svnrepository.repositoryEntryHistory"/></td> <td/> </tr> <tr class="portlet-section-alternate"> <td valign="top"><fmt:message key="svnrepository.filesByFileType"/>:</td> - <td valign="top"><ui:zoomableImage locator="${repository.filesPerFileTypeChartLocator}" titleKey="svnrepository.filesByFileType"/></td> + <td valign="top"><ui:zoomableImage id="1" locator="${repository.filesPerFileTypeChartLocator}" titleKey="svnrepository.filesByFileType"/></td> <td valign="top"> - <ui:listExpander index="0" size="${fn:length(repository.filesPerFileType)}"/> + <ui:listExpander id="0" size="${fn:length(repository.filesPerFileType)}"/> <table> <c:forEach var="item" items="${repository.filesPerFileType}" varStatus="status"> <c:choose> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2006-02-16 15:54:14 UTC (rev 2489) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2006-02-16 16:35:30 UTC (rev 2490) @@ -6,9 +6,9 @@ <table> <tr class="portlet-section-body"> <td valign="top"><fmt:message key="svnrepository.mostActiveFiles"/>:</td> - <td valign="top"><ui:zoomableImage locator="${repository.commitsPerFileChartLocator}" titleKey="svnrepository.mostActiveFiles"/></td> + <td valign="top"><ui:zoomableImage id="0" locator="${repository.commitsPerFileChartLocator}" titleKey="svnrepository.mostActiveFiles"/></td> <td valign="top"> - <ui:listExpander index="0" size="${fn:length(repository.commitsPerFile)}"/> + <ui:listExpander id="0" size="${fn:length(repository.commitsPerFile)}"/> <table> <c:forEach var="item" items="${repository.commitsPerFile}" varStatus="status"> <c:choose> |