Changeset 4 for trunk/grails-app/views
- Timestamp:
- Jan 17, 2011, 3:49:20 PM (12 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 6 added
- 3 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/assay/_addRunDialog.gsp
r2 r4 31 31 <th nowrap>date</th> 32 32 <th nowrap>other assays</th> 33 <th class="nonsortable"></th> 33 34 </tr> 34 35 </thead> … … 49 50 </g:else> 50 51 </td> 52 <td> 53 <g:if test="${run.sequenceData?.size()}"> 54 <img src="${fam.icon(name: 'delete')}" class="disabled" title="You can't delete this run because samples are associated with this run." /> 55 </g:if> 56 <g:else> 57 <g:if test="${run.assays?.size() > 0}"> 58 <g:link onClick="return confirm( 'Are you sure you want to delete this run from the system? If you delete this run, it will also be deleted from the other assays it is associated to!' );" controller="run" action="delete" id="${run.id}" params="[assayId: assay.id]"><img src="${fam.icon(name: 'delete')}" /></g:link> 59 </g:if> 60 <g:else> 61 <g:link onClick="return confirm( 'Are you sure you want to delete this run from the system?' );" controller="run" action="delete" id="${run.id}" params="[assayId: assay.id]"><img src="${fam.icon(name: 'delete')}" /></g:link> 62 </g:else> 63 </g:else> 64 </td> 51 65 </tr> 52 66 </g:each> -
trunk/grails-app/views/assay/show.gsp
r3 r4 27 27 </g:each> 28 28 29 $(function() { 30 $('.uploadedFile').each( function( idx, el ) { 29 function initializeUploadedFiles( selector ) { 30 if( selector == undefined ) 31 selector = ""; 32 33 $( selector + ' .uploadedFile').each( function( idx, el ) { 31 34 $(el).html( createFileHTML( $(el).text(), 'getPermanent' ) ); 32 35 }); 33 }); 36 } 37 38 // Initializefiles on load 39 $(function() { initializeUploadedFiles(); }); 34 40 </script> 35 41 </head> … … 97 103 <g:render template="addFilesDialog" model="[assay: assay]" /> 98 104 </g:if> 99 < g:render template="showSampleDialog" model="[assay: assay]" />105 <div id="showSampleDialog" class="dialog"></div> 100 106 </g:else> 101 107 … … 140 146 </td> 141 147 <td class="button"><a href="#" onClick="showEditRunDialog( ${run.id}, '${run.name?.encodeAsJavaScript()}', '${run.date ? run.date.format( 'yyyy-mm-dd' ).encodeAsJavaScript() : ''}', '${run.machine?.encodeAsJavaScript()}', '${run.supplier?.encodeAsJavaScript()}', '${run.parameterFile?.encodeAsJavaScript()}' ); return false;"><img src="${fam.icon(name: 'application_edit')}" /></a></td> 142 <td class="button"><g:link onClick="return confirm( 'Are you sure you want to remove the selected run from this assay?' );" controller="assay" action="removeRun" id="${assay.id}" params="${[run_id: run.id]}" ><img src="${fam.icon(name: 'application_delete')}" /></g:link></td> 148 <td class="button"> 149 <g:if test="${run.samples(assay.id).size()}"> 150 <img src="${fam.icon(name: 'application_delete')}" class="disabled" title="You can't remove this assay because sequences from this assay are coupled to this run." /> 151 </g:if> 152 <g:else> 153 <g:link onClick="return confirm( 'Are you sure you want to remove the selected run from this assay?' );" controller="assay" action="removeRun" id="${assay.id}" params="${[run_id: run.id]}" ><img src="${fam.icon(name: 'application_delete')}" /></g:link> 154 </g:else> 155 </td> 143 156 </tr> 144 157 </g:each> … … 149 162 <input type="button" value="Add run" onClick="showAddRunDialog();"> 150 163 <g:render template="addRunDialog" model="[assay: assay]" /> 151 < g:render template="editRunDialog" model="[assay: assay]" />164 <div id="editRunDialog" class="dialog"></div> 152 165 </g:if> 153 <g:render template="showRunDialog" model="[assay: assay]" /> 154 166 <div id="showRunDialog" class="dialog"></div> 155 167 </body> 156 168 </html>
Note: See TracChangeset
for help on using the changeset viewer.