Changeset 647


Ignore:
Timestamp:
Jul 13, 2010, 10:09:35 AM (7 years ago)
Author:
vinlud
Message:

Changes accordion simpleQuery

Location:
trunk
Files:
3 edited

Legend:

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

    r642 r647  
     1<%@ page import="dbnp.studycapturing.Study" %>
    12<%--
    23  Created by IntelliJ IDEA.
     
    1112    <g:form action="pages" name="simpleQueryForm" id="simpleQueryForm">
    1213    <g:if test="${search_term}"><g:set var="preterm" value="${search_term}" /></g:if>
    13     <div class="content">
    14       <div class="element">
    15         <div class="description">Search term (e.g. 'paracetamol')</div>
    16         <div class="input"><g:textField name="search_term" value="${preterm}" /></div>
    17       </div>
    18       <div class="element">
    19         <div class="description">Species (e.g. 'rattus norvegicus')</div>
    20         <div class="input"><g:select name="species" from="${species}" value="" noSelection="['':'--- select a species ---']"/></div>
    21       </div>
    22       <div class="element">
    23         <div class="description">Organ (e.g. 'liver')</div>
    24         <div class="input"><g:select name="organ" from="" value="${organ}" noSelection="['':'--- select organ/tissue ---']"/></div>
    25       </div>
    26     </div>
    27 
    28     <br>
    29 
    30     <g:submitButton name="search" value="Search"  /> <g:if test="${search_term}"><g:submitButton name="reset" value="Clear" /></g:if>
    31 
    32     <br><br>
    3314
    3415    <div id="accordion">
     16      <h3><a href="#">Search term</a></h3>
     17      <div>
     18        <div class="element">
     19          <div class="description">Search term (e.g. 'paracetamol')</div>
     20          <div class="input"><g:textField name="search_term" value="${preterm}" /></div>
     21        </div>
     22        <div class="element">
     23          <div class="description">Species (e.g. 'rattus norvegicus')</div>
     24          <div class="input"><g:select name="species" from="${species}" value="" noSelection="['':'--- select a species ---']"/></div>
     25        </div>
     26        <div class="element">
     27          <div class="description">Organ (e.g. 'liver')</div>
     28          <div class="input"><g:select name="organ" from="" value="${organ}" noSelection="['':'--- select organ/tissue ---']"/></div>
     29        </div>
     30      </div>
     31
    3532      <h3><a href="#">Simple Assays</a></h3>
    3633      <div class="element">
     
    7875      </div>
    7976    </div>
     77
     78    <g:submitButton name="search" value="Search"  /> <g:if test="${search_term}"><g:submitButton name="reset" value="Reset" /></g:if>
     79
    8080    </g:form>
    81 
    82     <br><br>
    8381
    8482    <g:if test="${search_term}">
     
    9694                <g:each in="${listStudies}" var="Study" status="i" >
    9795                  <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
    98                     <td><g:link action="show" id="${Study.id}">${fieldValue(bean: Study, field: "title")}</g:link></td>
     96                    <td><g:link url="[action:'show',controller:'study']" id="${Study.id}">${fieldValue(bean: Study, field: "title")}</g:link></td>
    9997                  </tr>
    10098                </g:each>
  • trunk/web-app/css/simpleQuery.css

    r642 r647  
    5555    white-space: nowrap;
    5656}
     57
     58.simplequery h1 {
     59    padding: 0px 0px 12px 0px;
     60}
     61
     62.simplequery #accordion {
     63    margin-bottom: 20px;
     64}
  • trunk/web-app/js/simpleQuery.js

    r642 r647  
    1919    $("#accordion").accordion({collapsible: true,
    2020        autoHeight: false,
    21         active: false});
     21        active: 0});
    2222
    2323    $('#addCompound').click(function() {
Note: See TracChangeset for help on using the changeset viewer.