Changeset 15 for trunk/grails-app
- Timestamp:
- Feb 16, 2011, 4:28:12 PM (13 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 6 edited
-
assay/_addRunDialog.gsp (modified) (2 diffs)
-
common/_topnav.gsp (modified) (1 diff)
-
layouts/main.gsp (modified) (2 diffs)
-
run/_addAssayDialog.gsp (modified) (2 diffs)
-
run/_addSamplesDialog.gsp (modified) (2 diffs)
-
run/show.gsp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/assay/_addRunDialog.gsp
r7 r15 27 27 <thead> 28 28 <tr> 29 <th class="nonsortable">< /th>29 <th class="nonsortable"><input type="checkbox" id="checkAll" onClick="checkAllPaginated(this);" /></th> 30 30 <th nowrap>name</th> 31 31 <th nowrap>date</th> … … 37 37 <g:each in="${otherRuns}" var="run"> 38 38 <tr> 39 <td><g:checkBox name="runs" value="${run.id}" checked="${false}" /></td>39 <td><g:checkBox name="runs" value="${run.id}" checked="${false}" onClick="updateCheckAll(this);" /></td> 40 40 <td>${run.name}</td> 41 41 <td><g:formatDate format="dd-MM-yyyy" date="${run.date}"/></td> -
trunk/grails-app/views/common/_topnav.gsp
r14 r15 17 17 </ul> 18 18 </li> 19 <g:if env="development"> 20 <li><g:link controller="query" action="index">query database</g:link></li> 21 </g:if> 19 20 <li class="user_info"> 21 Hello ${session?.user?.username} | 22 <g:link controller="logout" action="index">sign out</g:link> 23 </li> 22 24 </ul> 23 25 <!-- /TOPNAV //--> -
trunk/grails-app/views/layouts/main.gsp
r14 r15 7 7 8 8 <link rel="stylesheet" href="${resource(dir: 'css', file: session.style + '.css')}"/> 9 <link rel="stylesheet" href="${resource(dir: 'css', file: 'login_panel.css')}"/>10 9 <link rel="stylesheet" href="${resource(dir: 'css', file: 'buttons.css')}"/> 11 10 <link rel="shortcut icon" href="${resource(dir: 'images', file: 'favicon.ico')}" type="image/x-icon"/> … … 28 27 </head> 29 28 <body> 30 <g:render template="/common/login_panel"/> 29 <div id="header"> 30 <div id="logo">Metagenomics</div> 31 <g:render template="/common/topnav"/> 32 <br clear="all" /> 33 </div> 31 34 <div class="container"> 32 <div id="header">33 <g:render template="/common/topnav"/>34 <g:render template="/common/info"/>35 </div>36 37 35 <div id="content"> 38 36 <g:if test="${lastSynchronized}"> -
trunk/grails-app/views/run/_addAssayDialog.gsp
r7 r15 9 9 <thead> 10 10 <tr> 11 <th class="nonsortable">< /th>11 <th class="nonsortable"><input type="checkbox" id="checkAll" onClick="checkAllPaginated(this);" /></th> 12 12 <th nowrap>name</th> 13 13 <th nowrap>study</th> … … 18 18 <g:each in="${writableAssays}" var="assay"> 19 19 <tr> 20 <td><g:checkBox name="assays" value="${assay.id}" checked="${false}" /></td>20 <td><g:checkBox name="assays" value="${assay.id}" checked="${false}" onClick="updateCheckAll(this);" /></td> 21 21 <td>${assay.name}</td> 22 22 <td>${assay.study?.name}</td> -
trunk/grails-app/views/run/_addSamplesDialog.gsp
r12 r15 11 11 <thead> 12 12 <tr> 13 <th class="nonsortable">< /th>13 <th class="nonsortable"><input type="checkbox" id="checkAll" onClick="checkAllPaginated(this);" /></th> 14 14 <th>Sample</th> 15 15 <th>Assay</th> … … 22 22 <g:if test="${!assaySample.run?.equals(run)}"> 23 23 <tr> 24 <td><g:checkBox name="assaySamples" value="${assaySample.id}" checked="${false}" /></td>24 <td><g:checkBox name="assaySamples" value="${assaySample.id}" checked="${false}" onClick="updateCheckAll(this);" /></td> 25 25 <td>${assaySample.sample.name}</td> 26 26 <td>${assaySample.assay.name}</td> -
trunk/grails-app/views/run/show.gsp
r13 r15 84 84 <!-- Samples --> 85 85 <h2>Samples</h2> 86 <g:if test="${run.assaySamples == null || run.assaySamples.size() == 0}"> 86 <% def assaySamples = run.assaySamples ? run.assaySamples.findAll { it.assay?.study.canRead( session.user ) }.toList().sort { it.sample.name } : []; %> 87 <g:if test="${assaySamples.size() == 0}"> 87 88 No samples found in run. 88 89 </g:if> … … 102 103 </thead> 103 104 <tbody> 104 <% def assaySamples = run.assaySamples.findAll { it.assay?.study.canRead( session.user ) }.toList().sort { it.sample.name }; %>105 105 <g:each in="${assaySamples}" var="assaySample"> 106 106 <tr> … … 138 138 </tbody> 139 139 </table> 140 <g:if test="${editable}">141 <p class="options">142 <% def writableAssaySamples = assaySamples.findAll { it.assay.study.canWrite( session.user ) } %>143 <a class="addAssociation" onClick="showAddSamplesDialog();" href="#">Add samples</a>144 145 <g:if test="${writableAssaySamples.size() > 0}">146 <a class="editAssociation" onClick="showEnterTagsDialog();" href="#">Edit sample data</a>147 </g:if>148 <g:else>149 <a class="editAssociation disabled" onClick="return false;" href="#">Edit sample data</a>150 </g:else>151 152 <g:if test="${writableAssaySamples.size() == 0 || !run.assays?.size()}">153 <a class="addSequences disabled" onClick="return false;" href="#">Add sequence files</a>154 </g:if>155 <g:else>156 <a class="addSequences" onClick="showAddFilesDialog();" href="#">Add sequence files</a>157 </g:else>158 159 </p>160 <g:if test="${writableAssaySamples.size() > 0}">161 <g:render template="enterTagsDialog" model="[run: run, writableAssaySamples: writableAssaySamples]" />162 <g:render template="addFilesDialog" model="[run: run]" />163 </g:if>164 165 <g:render template="addSamplesDialog" model="[run: run]" />166 167 </g:if>168 140 <div id="showSampleDialog" class="dialog"></div> 169 141 </g:else> 142 <g:if test="${editable}"> 143 <p class="options"> 144 <% def writableAssaySamples = assaySamples.findAll { it.assay.study.canWrite( session.user ) } %> 145 <a class="addAssociation" onClick="showAddSamplesDialog();" href="#">Add samples</a> 146 147 <g:if test="${writableAssaySamples.size() > 0}"> 148 <a class="editAssociation" onClick="showEnterTagsDialog();" href="#">Edit sample data</a> 149 </g:if> 150 <g:else> 151 <a class="editAssociation disabled" onClick="return false;" href="#">Edit sample data</a> 152 </g:else> 153 154 <g:if test="${writableAssaySamples.size() == 0 || !run.assays?.size()}"> 155 <a class="addSequences disabled" onClick="return false;" href="#">Add sequence files</a> 156 </g:if> 157 <g:else> 158 <a class="addSequences" onClick="showAddFilesDialog();" href="#">Add sequence files</a> 159 </g:else> 160 161 </p> 162 <g:if test="${writableAssaySamples.size() > 0}"> 163 <g:render template="enterTagsDialog" model="[run: run, writableAssaySamples: writableAssaySamples]" /> 164 <g:render template="addFilesDialog" model="[run: run]" /> 165 </g:if> 166 167 <g:render template="addSamplesDialog" model="[run: run]" /> 168 169 </g:if> 170 171 170 172 171 173 <!-- Runs -->
Note: See TracChangeset
for help on using the changeset viewer.
