Changeset 16257

Show
Ignore:
Timestamp:
18/07/08 14:45:53 (1 month ago)
Author:
contrino
Message:

modencode tiles: added submissions tile. minor improvements elsewhere

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/intermine/webapp/main/resources/webapp/WEB-INF/tags/querylink.tag

    r13655 r16257  
    2424      <img border="0" class="arrow" src="images/right-arrow.gif" title="-&gt;"/> 
    2525    </c:if> 
     26 
     27<%-- 
     28<%@ attribute name="showImage" required="false" type="java.lang.String" %> 
     29 
     30this is not working, not sure why. 
     31    ${showImage} 
     32    <c:when test="${showImage == 'arrow'}"/> 
     33      <img border="0" class="arrow" src="images/right-arrow.gif" title="-&gt;"/> 
     34      </c:when> 
     35    --%> 
    2636  </span> 
    2737</html:link> 

  • trunk/modmine/dbmodel/resources/modencode-metadata_additions.xml

    r16172 r16257  
    4242        <attribute name="qualityControl" type="java.lang.String" /> 
    4343        <attribute name="replicate" type="java.lang.String" /> 
    44                 <attribute name="experimentDate" type="java.util.Date" /> 
    45                 <attribute name="publicReleaseDate" type="java.util.Date" /> 
     44    <attribute name="experimentDate" type="java.util.Date" /> 
     45    <attribute name="publicReleaseDate" type="java.util.Date" /> 
     46        <!-- temp. changed to string...  
     47    <attribute name="experimentDate" type="java.lang.String" /> 
     48    <attribute name="publicReleaseDate" type="java.lang.String" /> 
     49    --> 
    4650        <reference name="organism" 
    4751            referenced-type="org.flymine.model.genomic.Organism" /> 

  • trunk/modmine/webapp/resources/struts-config-model.xml

    r16216 r16257  
    44<action path="/sequenceExporter" 
    55    type="org.intermine.bio.web.struts.SequenceExportAction" /> 
    6  
     6     
    77<action path="/chartRenderer" type="org.flymine.web.ChartRenderer" 
    88    parameter="method" /> 
    …… 
    1414<action path="/initProjectList" 
    1515  type="org.modmine.web.ProjectsController" /> 
     16 
     17<action path="/initSubmissions" 
     18  type="org.modmine.web.SubmissionsController" /> 
    1619 
    1720 

  • trunk/modmine/webapp/resources/tiles-defs-model.xml

    r16216 r16257  
    33<definition name="projects.tile" path="/model/projects.jsp"  
    44        controllerUrl="/initProjects.do"/> 
     5<definition name="submissions.tile" path="/model/submissions.jsp"  
     6        controllerUrl="/initSubmissions.do"/> 
    57 
    68<definition name="projectList.tile" path="/model/projectList.jsp"  

  • trunk/modmine/webapp/resources/webapp/begin.jsp

    r16216 r16257  
    105105</div> 
    106106</td></tr> 
     107 
     108 
     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<%-- 
    107118<tr> 
    108119<td> 
    …… 
    129140          </tr></table> 
    130141    </im:boxarea> 
     142--%> 
    131143 
    132144</td></tr></table> 

  • trunk/modmine/webapp/resources/webapp/model/GO.jsp

    r16083 r16257  
    1515   <a href="javascript:toggleDiv('hiddenDiv1');"> 
    1616    <img id='hiddenDiv1Toggle' src="images/disclosed.gif"/> 
    17     GO annotation in modENCODEMine ... 
     17    GO annotation in modMine ... 
    1818   </a> 
    1919 </h4> 

  • trunk/modmine/webapp/resources/webapp/model/genomics.jsp

    r16083 r16257  
    3939         <li> 
    4040              <i>Drosophila melanogaster</i> - Genome annotation release 5.1 from <a href="http://www.flybase.org" target="_new"> 
    41                 <html:img src="images/FlyBase_logo_mini.png" title="Click here to view FlyBase's website" /> </a>. 
     41                <html:img src="images/FlyBase_logo_mini.png" title="Click here to view FlyBase's website" />FlyBase</a>. 
    4242    </ul> 
    4343