Changeset 16261
- Timestamp:
- 18/07/08 16:35:09 (1 month ago)
- Files:
-
- trunk/intermine/webapp/main/resources/webapp/WEB-INF/tags/querylink.tag (modified) (1 diff)
- trunk/modmine/webapp/resources/webapp/begin.jsp (modified) (2 diffs)
- trunk/modmine/webapp/resources/webapp/model/submissions.jsp (modified) (3 diffs)
- trunk/modmine/webapp/src/org/modmine/web/SubmissionsController.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/intermine/webapp/main/resources/webapp/WEB-INF/tags/querylink.tag
r16257 r16261 27 27 <%-- 28 28 <%@ attribute name="showImage" required="false" type="java.lang.String" %> 29 ${showImage} 29 30 30 31 this is not working, not sure why. 31 ${showImage} 32 <c:when test="${showImage == 'arrow'}"/> 32 33 <c:choose> 34 <c:when test="${showImage == 'fly'}"/> 33 35 <img border="0" class="arrow" src="images/right-arrow.gif" title="->"/> 34 36 </c:when> 37 </c:choose> 38 39 nor this does.. 40 <c:if test="${showImage == 'fly'}"/> 41 <img border="0" class="arrow" src="images/right-arrow.gif" title="->"/> 42 </c:if> 35 43 --%> 36 44 </span> trunk/modmine/webapp/resources/webapp/begin.jsp
r16257 r16261 14 14 <td valign="top"> 15 15 <!-- First column --> 16 16 17 <im:boxarea title="Projects" titleLink="/${WEB_PROPERTIES['webapp.path']}/projects.do" stylename="plainbox" floatValue="left" fixedWidth="300px"> 17 <em><p><fmt:message key="projects.intro"/></p></em> 18 19 18 <em><p><fmt:message key="projects.intro"/></p></em> 20 19 <tiles:insert name="projectList.tile"/> 21 22 <%-- 20 </im:boxarea> 21 22 <im:boxarea title="Submissions" titleLink="/${WEB_PROPERTIES['webapp.path']}/providers.do" stylename="plainbox" floatValue="left" fixedWidth="300px"> 23 <%-- <em><p><fmt:message key="projects.intro"/></p></em> --%> 24 <tiles:insert name="submissions.tile"/> 25 </im:boxarea> 26 27 <%-- 28 <im:boxarea title="Data Categories" titleLink="/${WEB_PROPERTIES['webapp.path']}/dataCategories.do" stylename="plainbox" floatValue="left" fixedWidth="300px"> 29 <em><p><fmt:message key="begin.data"/></p></em> 30 <c:set var="numPerCol" value="${fn:length(ASPECTS)/2}"/> 23 31 <table cellpadding="0" cellspacing="0" border="0"><tr> 24 <c:forEach var="entry" items="${providers}" varStatus="status"> 32 <c:forEach var="entry" items="${ASPECTS}" varStatus="status"> 33 <c:set var="set" value="${entry.value}"/> 34 <c:if test="${status.count%2 == '1'}"></tr><tr></c:if> 35 <td style="height:80px;padding:4px"> 36 <a href="/${WEB_PROPERTIES['webapp.path']}/aspect.do?name=${set.name}"> 37 <img src="<html:rewrite page="/${set.iconImage}"/>" class="aspectIcon" 38 title="Click here to view the ${set.name} Data Category" 39 width="40px" height="40px" /> 40 </a> 41 </td> 25 42 <td> 26 <a href="/${WEB_PROPERTIES['webapp.path']}/ objectDetails.do?id=${entry.key.id}">27 ${ entry.key.name}43 <a href="/${WEB_PROPERTIES['webapp.path']}/aspect.do?name=${set.name}"> 44 ${set.name} 28 45 </a> 29 46 </td> 30 47 </c:forEach> 31 48 </tr></table> 32 --%>33 34 49 </im:boxarea> 50 --%> 51 35 52 36 53 <div id="rightColumn"> 37 <td rowspan="2"valign="top">54 <td valign="top"> 38 55 <!-- Second column - elastic --> 39 <im:boxarea title="Templates" titleLink="/${WEB_PROPERTIES['webapp.path']}/templates.do" stylename="gradientbox"> 56 57 <div><tiles:insert name="tipWrapper.tile" /> 58 <tiles:insert name="news.tile"> 59 <tiles:put name="rss" 60 value="${WEB_PROPERTIES['project.sitePrefix']}/rss.xml" /> 61 </tiles:insert></div> 62 63 64 <im:boxarea title="Templates" titleLink="/${WEB_PROPERTIES['webapp.path']}/templates.do" stylename="gradientbox"> 40 65 <em><p><fmt:message key="begin.templates"/></p></em> 41 66 <br/> … … 107 132 108 133 109 110 <tr><td> 111 <im:boxarea title="Submissions" titleLink="/${WEB_PROPERTIES['webapp.path']}/providers.do" stylename="plainbox" floatValue="left" fixedWidth="300px"> 112 <%-- <em><p><fmt:message key="projects.intro"/></p></em> --%> 113 <tiles:insert name="submissions.tile"/> 114 </im:boxarea> 115 116 117 <%-- 118 <tr> 119 <td> 120 <im:boxarea title="Data Categories" titleLink="/${WEB_PROPERTIES['webapp.path']}/dataCategories.do" stylename="plainbox" floatValue="left" fixedWidth="300px"> 121 <em><p><fmt:message key="begin.data"/></p></em> 122 <c:set var="numPerCol" value="${fn:length(ASPECTS)/2}"/> 123 <table cellpadding="0" cellspacing="0" border="0"><tr> 124 <c:forEach var="entry" items="${ASPECTS}" varStatus="status"> 125 <c:set var="set" value="${entry.value}"/> 126 <c:if test="${status.count%2 == '1'}"></tr><tr></c:if> 127 <td style="height:80px;padding:4px"> 128 <a href="/${WEB_PROPERTIES['webapp.path']}/aspect.do?name=${set.name}"> 129 <img src="<html:rewrite page="/${set.iconImage}"/>" class="aspectIcon" 130 title="Click here to view the ${set.name} Data Category" 131 width="40px" height="40px" /> 132 </a> 133 </td> 134 <td> 135 <a href="/${WEB_PROPERTIES['webapp.path']}/aspect.do?name=${set.name}"> 136 ${set.name} 137 </a> 138 </td> 139 </c:forEach> 140 </tr></table> 141 </im:boxarea> 142 --%> 143 144 </td></tr></table> 134 </table> 145 135 </div> 146 136 trunk/modmine/webapp/resources/webapp/model/submissions.jsp
r16257 r16261 32 32 33 33 <c:set var="LIMIT" value="5"/> 34 < i>${LIMIT} most recent submissions:</i>34 <em>${LIMIT} most recent submissions:</em> 35 35 36 36 … … 62 62 title="Click here to view the Data Category" width="40px" 63 63 height="40px" /> </a></td> 64 65 <im:querylink text="Fly" showArrow="true" showImage="fly" skipBuilder="true"> 66 64 67 --%> 65 68 <td> 66 <im:querylink text=" 69 <im:querylink text="Fly" showArrow="true" skipBuilder="true"> 67 70 <query name="" model="genomic" 68 71 view="ExperimentSubmission.title ExperimentSubmission.design ExperimentSubmission.factorName ExperimentSubmission.factorType ExperimentSubmission.publicReleaseDate ExperimentSubmission.description" … … 85 88 <td> 86 89 87 <im:querylink text=" 90 <im:querylink text="Worm" showArrow="true" skipBuilder="true"> 88 91 <query name="" model="genomic" 89 92 view="ExperimentSubmission.title ExperimentSubmission.design ExperimentSubmission.factorName ExperimentSubmission.factorType ExperimentSubmission.publicReleaseDate ExperimentSubmission.description" trunk/modmine/webapp/src/org/modmine/web/SubmissionsController.java
r16257 r16261 71 71 Map< Integer, ExperimentSubmission> subs = 72 72 new LinkedHashMap<Integer, ExperimentSubmission>(); 73 // Map<ModEncodeProject, Integer> nr =74 // new LinkedHashMap<ModEncodeProject, Integer>();75 76 73 // get all submission by date desc 77 74 Integer order = 0; … … 80 77 order++; 81 78 ExperimentSubmission sub = (ExperimentSubmission) i.next(); 82 // Set<ModEncodeProvider> providers = project.getProviders();83 79 subs.put(order, sub); 84 // Integer subNr = 0;85 // // for each provider, get its experiments86 // Iterator p = providers.iterator();87 // while (p.hasNext()) {88 // ModEncodeProvider provider = (ModEncodeProvider) p.next();89 // Set<ExperimentSubmission> subs = provider.getExperimentSubmissions();90 // subNr = subNr + subs.size();91 // }92 // nr.put(project, subNr);93 80 } 94 81 request.setAttribute("subs", subs); 95 // request.setAttribute("counts", nr);96 82 } catch (Exception err) { 97 83 err.printStackTrace();
