Changeset 936 for trunk/grails-app/views
- Timestamp:
- Oct 11, 2010, 10:23:13 PM (12 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/common/_login_panel.gsp
r611 r936 4 4 <div class="content clearfix"> 5 5 <div class="left"> 6 <h1>Welcome to the Generic Study Capture Framework</h1>6 <h1>Welcome to the Metabolomics Data Support Platform</h1> 7 7 <h2>version <b>${meta(name: 'app.version')}</b></h2> 8 8 <p class="grey">Please use the forms on the right to either log in if you already have an account, or sign up if you think this data support platform suits your needs.</p> … … 11 11 </div> 12 12 <div class="left"> 13 <g:form url="[action:'signin',controller:'auth']" class="clearfix"> 14 <input type="hidden" name="targetUri" value="${targetUri}" /> 13 <g:form controller="." action="j_spring_security_check" method='POST' class="clearfix"> 15 14 <h1>Member Login</h1> 16 15 <label class="grey" for="username">Username:</label> 17 <input class="field" type="text" name=" username" id="username" value="${username}" size="23" />16 <input class="field" type="text" name="j_username" id="username" value="${username}" size="23" /> 18 17 <label class="grey" for="password">Password:</label> 19 <input class="field" type="password" name="password" id="password" size="23" /> 20 <label><g:checkBox name="rememberMe" value="${rememberMe}" /> Remember me</label> 18 <input class="field" type="password" name="j_password" id="password" size="23" /> 19 <label><input type='checkbox' class='chk' name='${rememberMeParameter}' id='remember_me' 20 <g:if test='${hasCookie}'>checked='checked'</g:if> /></label> 21 21 <div class="clear"></div> 22 22 <input type="submit" name="submit" value="Login" class="bt_login" /> … … 24 24 </g:form> 25 25 </div> 26 <div class="left right"> 26 <div class="left right"> 27 27 <g:form url="[action:'signUp',controller:'auth']" class="clearfix"> 28 28 <input type="hidden" name="targetUri" value="${targetUri}" /> 29 <h1>Not a member yet? Sign Up!</h1> 29 <h1>Not a member yet? Sign Up!</h1> 30 30 <label class="grey" for="signup">Username:</label> 31 31 <input class="field" type="text" name="signup" id="signup" value="${username}" size="23" /> … … 40 40 <div class="tab"> 41 41 <ul class="login"> 42 <li class="left"> </li> 43 <li>Hello <n:isLoggedIn><n:principal/></n:isLoggedIn><n:isNotLoggedIn>Guest</n:isNotLoggedIn>!</li> 42 <li class="left"> </li> 43 <% /* <li>Hello <authentication:isLoggedIn><authentication:loggedInUsername/></authentication:isLoggedIn> 44 <authentication:isNotLoggedIn>Guest</authentication:isNotLoggedIn>!</li> 44 45 <li class="sep">|</li> 45 46 <li id="toggle"> 46 <n:isLoggedIn><g:link controller="auth" action="signout">sign out</g:link></n:isLoggedIn>47 < n:isNotLoggedIn>47 <authentication:isLoggedIn><g:link controller="logout" action="index">sign out</g:link></authentication:isLoggedIn> 48 <authentication:isNotLoggedIn> 48 49 <a id="open" class="open" href="#">Log In | Register</a> 49 <a id="close" style="display: none;" class="close" href="#">Close Panel</a> 50 </n:isNotLoggedIn>51 </li> 50 <a id="close" style="display: none;" class="close" href="#">Close Panel</a> 51 </authentication:isNotLoggedIn> 52 </li>*/ %> 52 53 <li class="right"> </li> 53 </ul> 54 </div> 55 </div> 54 </ul> 55 </div> 56 </div> 56 57 <!-- /LOGIN PANEL --> -
trunk/grails-app/views/study/show.gsp
r899 r936 287 287 </tr> 288 288 <tr> 289 <td> Readers</td>289 <td>Members <permissions:manage entity="${studyList[0]}">manage</permissions:manage></td> 290 290 <g:each in="${studyList}" var="studyInstance"> 291 291 <td> 292 <g:if test="${studyInstance. readers?.size()==0}">292 <g:if test="${studyInstance.getAllMemberUsers()==0}"> 293 293 - 294 294 </g:if> 295 295 <g:else> 296 <g:each in="${studyInstance. readers}" var="r" status="i">296 <g:each in="${studyInstance.getAllMemberUsers()}" var="memberuser" status="i"> 297 297 <g:if test="${i > 0}">, </g:if> 298 <g:link controller="user" action="show" id="${ r.id}">${r?.encodeAsHTML()}</g:link>298 <g:link controller="user" action="show" id="${memberuser.id}">${memberuser?.encodeAsHTML()}</g:link> 299 299 </g:each> 300 300 </g:else> … … 302 302 </g:each> 303 303 </tr> 304 <tr>305 <td>Editors</td>306 <g:each in="${studyList}" var="studyInstance">307 <td>308 <g:if test="${studyInstance.editors?.size()==0}">309 -310 </g:if>311 <g:else>312 <g:each in="${studyInstance.editors}" var="r" status="i">313 <g:if test="${i > 0}">, </g:if>314 <g:link controller="user" action="show" id="${r.id}">${r?.encodeAsHTML()}</g:link>315 </g:each>316 </g:else>317 </td>318 </g:each>319 </tr>320 321 304 </table> 322 305 </div>
Note: See TracChangeset
for help on using the changeset viewer.