Changeset 1923
- Timestamp:
- 09-06-11 17:02:13 (4 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 2 modified
-
grails-app/views/study/list.gsp (modified) (3 diffs)
-
grails-app/views/study/show.gsp (modified) (4 diffs)
-
web-app/css/tipTip.css (added)
-
web-app/js/jquery.tipTip.minified.js (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/study/list.gsp
r1906 r1923 6 6 <g:set var="entityName" value="${message(code: 'study.label', default: 'Study')}"/> 7 7 <title><g:message code="default.list.label" args="[entityName]"/></title> 8 <link rel="stylesheet" href="${resource(dir: 'css', file: 'tipTip.css')}"/> 9 <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.tipTip.minified.js')}"></script> 10 <script type="text/javascript"> 11 $(document).ready(function() { 12 $("a.linktips").tipTip(); 13 }); 14 </script> 8 15 </head> 9 16 <body> … … 31 38 <g:each in="${studyInstanceList}" var="studyInstance" status="i"> 32 39 <tr class="${(i % 2) == 0 ? 'odd' : 'even'}"> 33 34 40 <td><input type="checkbox" name="id" value="${studyInstance.id}" id="${studyInstance.title}"></td> 35 <td><g:link action="show" title="View study" id="${studyInstance?.id}"><img src='${fam.icon(name: 'page')}' border="0" alt="view study" /></g:link></td>41 <td><g:link class="linktips" action="show" title="View this study" id="${studyInstance?.id}"><img src='${fam.icon(name: 'magnifier')}' border="0" alt="view study" /></g:link></td> 36 42 <td><g:if test="${studyInstance.canWrite(loggedInUser)}"> 37 <g:link class="edit " title="Editstudy" controller="studyWizard" params="[jump:'edit']" id="${studyInstance?.id}">38 <img src='${fam.icon(name: ' page_edit')}' border="0" alt="Editstudy" /></g:link>43 <g:link class="edit linktips" title="Edit this study" controller="studyWizard" params="[jump:'edit']" id="${studyInstance?.id}"> 44 <img src='${fam.icon(name: 'wand')}' border="0" alt="Edit this study" /></g:link> 39 45 </g:if><g:else><img src='${fam.icon(name: 'lock')}' border="0" alt="you have no write access to shis study" /></g:else> 40 46 </td> 41 47 <td><g:if test="${studyInstance.canWrite(loggedInUser)}"> 42 <g:link class="edit " title="Edit study using simple wizard" controller="simpleWizard" action="index" id="${studyInstance?.id}">43 <img src='${fam.icon(name: 'p age_paintbrush')}' border="0" alt="Edit study using simple wizard" /></g:link>48 <g:link class="edit linktips" title="Import straightforward study data into this study" controller="simpleWizard" action="index" id="${studyInstance?.id}"> 49 <img src='${fam.icon(name: 'pencil')}' border="0" alt="Import a study with a straightforward design" /></g:link> 44 50 </g:if><g:else><img src='${fam.icon(name: 'lock')}' border="0" alt="you have no write access to shis study" /></g:else> 45 51 </td> … … 86 92 <div class="buttons"> 87 93 <sec:ifLoggedIn> 88 <span class="button"><g:link class="create " controller="studyWizard" params="[jump:'create']"><g:message code="default.new.label" args="[entityName]"/></g:link></span>89 <span class="button"><g:link class="create " controller="simpleWizard">Simple wizard</g:link></span>90 <span class="button"><a class="compare " href="#" onClick="$( 'form#list_extended' ).first().submit(); return false;">Compare selected studies</a></span>94 <span class="button"><g:link class="create linktips" title="Create a new study" controller="studyWizard" params="[jump:'create']"><g:message code="default.new.label" args="[entityName]"/></g:link></span> 95 <span class="button"><g:link class="create linktips" title="Import a new study with a straightforward design" controller="simpleWizard">Simple Study Import</g:link></span> 96 <span class="button"><a class="compare linktips" title="Compare the selected studies" href="#" onClick="$( 'form#list_extended' ).first().submit(); return false;">Compare selected studies</a></span> 91 97 </sec:ifLoggedIn> 92 93 98 </div> 94 99 <div class="paginateButtons"> -
trunk/grails-app/views/study/show.gsp
r1609 r1923 10 10 <g:set var="entityName" value="${message(code: 'study.label', default: 'Study')}"/> 11 11 <title><g:message code="default.show.label" args="[entityName]"/></title> 12 <script type="text/javascript"> 12 <link rel="stylesheet" href="${resource(dir: 'css', file: 'tipTip.css')}"/> 13 <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.tipTip.minified.js')}"></script> 14 <script type="text/javascript"> 15 $(document).ready(function() { 16 $("a.linktips").tipTip(); 17 }); 18 13 19 // Flag whether the timelines have been loaded 14 20 var timelineloaded = false; … … 63 69 <div id="tabs"> 64 70 <ul> 65 <li ><a href="#study">Study Information</a></li>66 <li ><a href="<g:createLink action="show_subjects" id="${studyList.id.join(',')}"/>" title="Subjects"><span>Subjects</span></a></li>67 <li ><a href="#events-timeline"><span>Events timeline</span></a></li>68 <li ><a href="<g:createLink action="show_events_table" id="${studyList.id.join(',')}"/>" title="Events table"><span>Events table</span></a></li>69 <li ><a href="<g:createLink action="show_assays" id="${studyList.id.join(',')}"/>" title="Assays"><span>Assays</span></a></li>70 <li ><a href="<g:createLink action="show_samples" id="${studyList.id.join(',')}"/>" title="Samples"><span>Samples</span></a></li>71 <li ><a href="<g:createLink action="show_persons" id="${studyList.id.join(',')}"/>" title="Persons"><span>Persons</span></a></li>72 <li ><a href="<g:createLink action="show_publications" id="${studyList.id.join(',')}"/>" title="Publications"><span>Publications</span></a></li>71 <li tab="study"><a href="#study">Study Information</a></li> 72 <li tab="subjects"><a href="<g:createLink action="show_subjects" id="${studyList.id.join(',')}"/>" title="Subjects"><span>Subjects</span></a></li> 73 <li tab="events"><a href="#events-timeline"><span>Events timeline</span></a></li> 74 <li tab="events"><a href="<g:createLink action="show_events_table" id="${studyList.id.join(',')}"/>" title="Events table"><span>Events table</span></a></li> 75 <li tab="assays"><a href="<g:createLink action="show_assays" id="${studyList.id.join(',')}"/>" title="Assays"><span>Assays</span></a></li> 76 <li tab="samples"><a href="<g:createLink action="show_samples" id="${studyList.id.join(',')}"/>" title="Samples"><span>Samples</span></a></li> 77 <li tab="study"><a href="<g:createLink action="show_persons" id="${studyList.id.join(',')}"/>" title="Persons"><span>Persons</span></a></li> 78 <li tab="study"><a href="<g:createLink action="show_publications" id="${studyList.id.join(',')}"/>" title="Publications"><span>Publications</span></a></li> 73 79 </ul> 74 80 … … 215 221 <g:hiddenField name="id" value="${studyInstance?.id}"/> 216 222 <g:if test="${studyInstance.canWrite(loggedInUser)}"> 217 <span class="button"><g:link class="edit" controller="simpleWizard" action="index" id="${studyInstance?.id}">Simple edit</g:link></span> 218 <span class="button"><g:link class="edit" controller="studyWizard" params="[jump:'edit']" id="${studyInstance?.id}">${message(code: 'default.button.edit.label', default: 'Edit')}</g:link></span> 223 <span class="button"> 224 <g:link class="edit linktips" title="Edit this stuy" onclick="getTab(); return false;"> 225 ${message(code: 'default.button.edit.label', default: 'Edit')} 226 </g:link> 227 </span> 228 <span class="button"><g:link class="edit linktips" title="Edit the basic properties of this study" controller="simpleWizard" action="index" id="${studyInstance?.id}">Simple edit</g:link></span> 219 229 </g:if> 220 230 <g:if test="${studyInstance.isOwner(loggedInUser)}"> … … 222 232 </g:if> 223 233 </g:if> 234 235 <script type="text/javascript"> 236 function getTab() { 237 var tab = $('li.ui-state-active', $('ul.ui-tabs-nav')).attr('tab'); 238 var url = '<g:createLink controller="studyWizard" params="[jump:'edit']" id="${studyInstance?.id}" />&tab='+tab; 239 document.location = url; 240 } 241 </script> 242 224 243 <span class="button"><g:link class="backToList" action="list">Back to list</g:link></span> 225 244 </g:form>
