Changeset 482 for trunk


Ignore:
Timestamp:
May 27, 2010, 8:36:24 AM (13 years ago)
Author:
keesvb
Message:

solved compilation error, added relative date type, restructured menu's, changed topnav layout to also scrolldown on click on main buttons

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/controllers/dbnp/query/QueryController.groovy

    r480 r482  
    22
    33import org.compass.core.engine.SearchEngineQueryParseException
    4 
    5 import mytest.MyManager
    64
    75/*

  • trunk/grails-app/domain/dbnp/studycapturing/TemplateFieldType.groovy

    r397 r482  
    1616        STRINGLIST('List of items'),
    1717        ONTOLOGYTERM('Ontology Reference'),
    18         DATE('Date')
     18        DATE('Date'),
     19    RELDATE('Relative date') // relative date, e.g. days since start of study
    1920
    2021        String name
    … …  
    2526
    2627        static list() {
    27                 [STRING, TEXT, INTEGER, FLOAT, DOUBLE, STRINGLIST, ONTOLOGYTERM, DATE]
     28                [STRING, TEXT, INTEGER, FLOAT, DOUBLE, STRINGLIST, ONTOLOGYTERM, DATE, RELDATE]
    2829        }
    2930
    … …  
    4445                        case DATE:
    4546                                return null
     47            case RELDATE:
     48                return null
    4649                        default:
    4750                                throw new NoSuchFieldException("Field type ${fieldType} not recognized")

  • trunk/grails-app/views/common/_topnav.gsp

    r361 r482  
    1313     </li>
    1414     <li>
    15       <a href="#">Events</a>
    16       <ul class="subnav">
    17         <li><g:link controller="protocol" action="list">View protocols</g:link></li>
    18         <li><g:link controller="eventDescription" action="list">View event descriptions</g:link></li>
    19       </ul>
    20      </li>
    21      <li>
    2215      <a href="#">Contacts</a>
    2316      <ul class="subnav">
    … …  
    2720      </ul>
    2821     </li>
    29 
     22    <li>
     23    <a href="#">Publications</a>
     24    <ul class="subnav">
     25      <li><g:link controller="publication" action="list">View publications</g:link></li>
     26      <li><g:link controller="publication" action="add">Add publication</g:link></li>
     27    </ul>
     28   </li>
    3029         <li><g:link controller="importer" action="index">Import data</g:link></li>
    3130    <g:if env="development">

  • trunk/web-app/js/topnav.js

    r359 r482  
    11$(document).ready(function(){
    22    $("ul.subnav").parent().append("<span></span>"); //Only shows drop down trigger when js is enabled (Adds empty span tag after ul.subnav*)
    3     $("ul.topnav li span").click(function() { //When trigger is clicked...
     3    $("ul.topnav li").click(function() { //When trigger is clicked...
    44        //Following events are applied to the subnav itself (moving subnav up and down)
    5         $(this).parent().find("ul.subnav").slideDown('fast').show(); //Drop down the subnav on click
     5        $(this).find("ul.subnav").slideDown('fast').show(); //Drop down the subnav on click
    66        $(this).parent().hover(function() {
    77        }, function(){
Note: See TracChangeset for help on using the changeset viewer.