Ignore:
Timestamp:
Jul 13, 2010, 6:26:50 PM (12 years ago)
Author:
vinlud
Message:

Multiple changes in structure/view/logic

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/simpleQuery/common/_query.gsp

    r647 r650  
    3030      </div>
    3131
    32       <h3><a href="#">Simple Assays</a></h3>
     32      <h3><a href="#">Simple Assays (optional)</a></h3>
    3333      <div class="element">
    3434        <div id="compoundGroup">
     
    3636          <g:if test="${showFirstRowCompounds}">
    3737          <div id="compoundRow1">
    38             <div class="descriptionSA">Compound</div>
    39             <div class="input"><g:textField name="sa_compound" value="${search_sa_compounds}"/></div>
    40             <div class="descriptionSA">Operator</div>
    41             <div class="input" id="operatorInput"><g:select name="operator" from="${operators}" value="="/></div>
    42             <div class="descriptionSA">Value</div>
    43             <div class="input"><g:textField name="sa_value" value="${search_sa_values}"/></div>
     38            <div class="descriptionSA">Compound</div><div class="input"><g:textField name="sa_compound" value=""/></div><div class="descriptionSA">Operator</div><div class="input" id="operatorInput"><g:select name="operator" from="${operators}" value="="/></div><div class="descriptionSA">Value</div><div class="input"><g:textField name="sa_value" value=""/></div>
    4439          </div>
    4540          </g:if>
     
    4843            <g:each status="i" in="${search_sa_compounds}" var="compound">
    4944            <div id="compoundRow${i}">
    50               <div class="descriptionSA">Compound (e.g. 'glucose')</div>
    51               <div class="input"><g:textField name="sa_compound" value="${compound}"/></div>
    52               <div class="descriptionSA">Type of regulations</div>
    53               <div class="input"><g:select name="operator" from="${operators}" value="="/></div>
    54               <div class="descriptionSA">Value</div>
    55               <div class="input"><g:textField name="sa_value" value="${search_sa_values[i]}"/></div>
     45              <div class="descriptionSA">Compound (e.g. 'glucose')</div><div class="input"><g:textField name="sa_compound" value="${search_sa_compounds.get(i)}"/></div><div class="descriptionSA">Type of regulations</div><div class="input"><g:select name="operator" from="${operators}" value="="/></div><div class="descriptionSA">Value</div><div class="input"><g:textField name="sa_value" value="${search_sa_values.get(i)}"/></div>
    5646            </div>
    5747            </g:each>
     
    6151      </div>
    6252
    63       <h3><a href="#">Transcriptomics</a></h3>
     53      <h3><a href="#">Transcriptomics (optional)</a></h3>
    6454
    6555      <div class="element">
    6656        <div id="transcriptomeGroup">
    6757          <div id="transcriptomeRow1">
    68             <div class="description">List of Gene IDs or pathway IDs</div>
    69             <div class="input"><g:textField name="genepath" value="" /></div>
    70             <div class="description">Type of regulations</div>
    71             <div class="input" id="regulationInput"><g:select name="regulation" from="" value="${regulation}" noSelection="['':'--- select regulation ---']"/></div>
     58            <div class="description">List of Gene IDs or pathway IDs</div><div class="input"><g:textField name="genepath" value="" /></div><div class="description">Type of regulations</div><div class="input" id="regulationInput"><g:select name="regulation" from="" value="${regulation}" noSelection="['':'--- select regulation ---']"/></div>
    7259          </div>
    7360        </div>
    74         <div id="addTranscriptome">Add transciptome</div>
     61        <div id="addTranscriptome" class="submit">Add transciptome</div>
    7562      </div>
    7663    </div>
     
    8168
    8269    <g:if test="${search_term}">
    83         <h1><g:message code="Search results for term ${search_term}"/></h1>
     70        <h1><g:message code="Search results for term '${search_term}'"/></h1>
    8471
    8572        <g:if test="${listStudies}">
     
    8875                <thead>
    8976                    <tr>
     77                        <g:sortableColumn property="id" title="${message(code: 'study.id', default: 'ID')}" />
    9078                        <g:sortableColumn property="title" title="${message(code: 'study.title.label', default: 'Study')}" />
     79                        <g:sortableColumn property="samples" title="${message(code: 'study.sample', default: 'Samples')}" />
    9180                    </tr>
    9281                </thead>
     
    9483                <g:each in="${listStudies}" var="Study" status="i" >
    9584                  <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
     85                    <td><g:link url="[action:'show',controller:'study']" id="${Study.id}">${fieldValue(bean: Study, field: "id")}</g:link></td>
    9686                    <td><g:link url="[action:'show',controller:'study']" id="${Study.id}">${fieldValue(bean: Study, field: "title")}</g:link></td>
     87                    <td><g:link url="[action:'show',controller:'study']" id="${Study.id}">${fieldValue(bean: Study, field: "samples")}</g:link></td>
    9788                  </tr>
    9889                </g:each>
Note: See TracChangeset for help on using the changeset viewer.