Changeset 976 for trunk/grails-app/views
- Timestamp:
- Oct 21, 2010, 5:28:04 PM (11 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 19 added
- 5 edited
-
common/_login_panel.gsp (modified) (2 diffs)
-
common/_topnav.gsp (modified) (2 diffs)
-
email (added)
-
email/_registrationConfirmationAdmin.gsp (added)
-
email/_registrationConfirmationUser.gsp (added)
-
login (added)
-
login/auth.gsp (added)
-
login/denied.gsp (added)
-
register (added)
-
register/forgotPassword.gsp (added)
-
register/index.gsp (added)
-
register/resetPassword.gsp (added)
-
study/list.gsp (modified) (1 diff)
-
study/show.gsp (modified) (2 diffs)
-
user (added)
-
user/create.gsp (added)
-
user/edit.gsp (added)
-
user/search.gsp (added)
-
userRegistration (added)
-
userRegistration/add.gsp (added)
-
userRegistration/confirmAdmin.gsp (added)
-
userRegistration/confirmUser.gsp (added)
-
userRegistration/index.gsp (added)
-
wizard/pages/_study.gsp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/common/_login_panel.gsp
r959 r976 14 14 <h1>Member Login</h1> 15 15 <label class="grey" for="username">Username:</label> 16 <input class="field" type="text" name="j_username" id=" username" value="${username}" size="23" />16 <input class="field" type="text" name="j_username" id="j_username" value="${username}" size="23" /> 17 17 <label class="grey" for="password">Password:</label> 18 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 19 <label><input type='checkbox' class='chk' name='_spring_security_remember_me' id='remember_me' 20 <g:if test='${hasCookie}'>checked='checked'</g:if> /> Remember me</label> 21 <div class="clear"></div> 22 22 <input type="submit" name="submit" value="Login" class="bt_login" /> 23 <a class="lost-pwd" href="<g:createLink url="[action:' passwordReminder',controller:'auth']" class="lost-pwd" />">Lost your password?</a>23 <a class="lost-pwd" href="<g:createLink url="[action:'forgotPassword',controller:'register']" class="lost-pwd" />">Lost your password?</a> 24 24 </g:form> 25 25 </div> 26 26 <div class="left right"> 27 <g:form url="[action:'signUp',controller:'auth']" class="clearfix">27 <g:form url="[action:'add',controller:'userRegistration']" class="clearfix"> 28 28 <input type="hidden" name="targetUri" value="${targetUri}" /> 29 29 <h1>Not a member yet? Sign Up!</h1> 30 30 <label class="grey" for="signup">Username:</label> 31 <input class="field" type="text" name=" signup" id="signup" value="${username}" size="23" />31 <input class="field" type="text" name="username" id="username" value="${username}" size="23" /> 32 32 <label class="grey" for="email">Email:</label> 33 33 <input class="field" type="text" name="email" id="email" value="${email}" size="23" /> 34 <label>A password will be e-mailed to you.</label> 34 <label>A password will be e-mailed to you</label> 35 35 36 <input type="submit" name="submit" value="Register" class="bt_register" /> 36 37 </g:form> 37 38 </div> 38 39 </div> … … 41 42 <ul class="login"> 42 43 <li class="left"> </li> 43 <li>Hello < authentication:isLoggedIn><authentication:loggedInUsername/></authentication:isLoggedIn>44 < authentication:isNotLoggedIn>Guest</authentication:isNotLoggedIn>!</li>44 <li>Hello <sec:ifLoggedIn><sec:username/></sec:ifLoggedIn> 45 <sec:ifNotLoggedIn>Guest</sec:ifNotLoggedIn>!</li> 45 46 <li class="sep">|</li> 46 47 <li id="toggle"> 47 < authentication:isLoggedIn><g:link controller="logout" action="index">sign out</g:link></authentication:isLoggedIn>48 <authentication:isNotLoggedIn>49 50 51 </authentication:isNotLoggedIn>48 <sec:ifLoggedIn><g:link controller="logout" action="index">sign out</g:link></sec:ifLoggedIn> 49 <sec:ifNotLoggedIn> 50 <a id="open" class="open" href="#">Log In | Register</a> 51 <a id="close" style="display: none;" class="close" href="#">Close Panel</a> 52 </sec:ifNotLoggedIn> 52 53 </li> 53 54 <li class="right"> </li> -
trunk/grails-app/views/common/_topnav.gsp
r959 r976 3 3 <ul class="topnav"> 4 4 <li><g:link controller="home" action="index">Home</g:link></li> 5 < n:isLoggedIn>6 <li><g:link controller="study" action=" list">My studies</g:link></li>7 </ n:isLoggedIn> <li>5 <sec:ifLoggedIn> 6 <li><g:link controller="study" action="myStudies">My studies</g:link></li> 7 </sec:ifLoggedIn> <li> 8 8 <a href="#">Studies</a> 9 9 <ul class="subnav"> … … 38 38 </li> 39 39 </g:if> 40 <n:isAdministrator>40 <sec:ifAllGranted roles="ROLE_ADMIN"> 41 41 <li> 42 42 <a href="#">User administation</a> 43 43 <ul class="subnav"> 44 <li><g:link controller="admins" action="index" class="icon icon_user_suit">Manage Administrators</g:link></li> 45 <li><g:link controller="user" action="list" class="icon icon_user">List Users</g:link></li> 44 <li><g:link controller="user" class="icon icon_user">List Users</g:link></li> 46 45 <li><g:link controller="user" action="create" class="icon icon_user_add">Create User</g:link></li> 47 <li><g:link controller="role" action="list"class="icon icon_cog">List Roles</g:link></li>46 <li><g:link controller="role" class="icon icon_cog">List Roles</g:link></li> 48 47 <li><g:link controller="role" action="create" class="icon icon_cog_add">Create Role</g:link></li> 49 <li><g:link controller="group" action="list" class="icon icon_group">List Groups</g:link></li> 50 <li><g:link controller="group" action="create" class="icon icon_group_add">Create Group</g:link></li> 51 <li><g:link controller="auth" action="logout" class="icon icon_cross">Sign out</g:link></li> 48 <li><g:link controller="logout" class="icon icon_cross">Sign out</g:link></li> 52 49 </ul> 53 50 </li> 54 </n:isAdministrator>51 </sec:ifAllGranted> 55 52 </ul> 56 53 <!-- /TOPNAV //--> -
trunk/grails-app/views/study/list.gsp
r959 r976 77 77 </div> 78 78 <div class="buttons"> 79 <span class="button"><g:link class="create" controller="wizard" params="[jump:'create']"><g:message code="default.new.label" args="[entityName]" /></g:link></span> 79 <sec:ifLoggedIn> 80 <span class="button"><g:link class="create" controller="wizard" params="[jump:'create']"><g:message code="default.new.label" args="[entityName]" /></g:link></span> 81 </sec:ifLoggedIn> 80 82 </div> 81 83 <div class="paginateButtons"> -
trunk/grails-app/views/study/show.gsp
r968 r976 273 273 </g:each> 274 274 </tr> 275 <tr>276 <td>Owner</td>277 <g:each in="${studyList}" var="studyInstance">278 <td>279 <g:if test="${studyInstance.owner}">280 <g:link controller="user" action="show" id="${studyInstance.owner.id}">${studyInstance.owner?.encodeAsHTML()}</g:link>281 </g:if>282 <g:else>283 -284 </g:else>285 </td>286 </g:each>287 </tr>288 275 <tr> 289 <td> Members</td>276 <td>Public</td> 290 277 <g:each in="${studyList}" var="studyInstance"> 291 278 <td> 292 <% /* <g:if test="${studyInstance.getAllMemberUsers()==0}"> 279 ${studyInstance.publicstudy} 280 </td> 281 </g:each> 282 </tr> 283 <tr> 284 <td>Owner</td> 285 <g:each in="${studyList}" var="studyInstance"> 286 <td> 287 ${studyInstance.owner.username} 288 </td> 289 </g:each> 290 </tr> 291 <tr> 292 <td>Readers</td> 293 <g:each in="${studyList}" var="studyInstance"> 294 <td> 295 <g:if test="${studyInstance.readers.size() == 0}"> 293 296 - 294 297 </g:if> 295 298 <g:else> 296 <g:each in="${studyInstance.getAllMemberUsers()}" var="memberuser" status="i"> 297 <g:if test="${i > 0}">, </g:if> 298 <g:link controller="user" action="show" id="${memberuser.id}">${memberuser?.encodeAsHTML()}</g:link> 299 </g:each> 299 ${studyInstance.readers.username.join( ", " )} 300 300 </g:else> 301 */ %> 301 </td> 302 </g:each> 303 </tr> 304 <tr> 305 <td>Writers</td> 306 <g:each in="${studyList}" var="studyInstance"> 307 <td> 308 <g:if test="${studyInstance.writers.size()==0}"> 309 - 310 </g:if> 311 <g:else> 312 ${studyInstance.writers.username.join( ", " )} 313 </g:else> 302 314 </td> 303 315 </g:each> … … 845 857 <g:set var="studyInstance" value="${studyList[0]}" /> 846 858 <g:hiddenField name="id" value="${studyInstance?.id}" /> 847 <span class="button"><g:link class="edit" controller="wizard" params="[jump:'edit']" id="${studyInstance?.id}">${message(code: 'default.button.edit.label', default: 'Edit')}</g:link></span> 848 <span class="button"><g:actionSubmit class="delete" action="delete" value="${message(code: 'default.button.delete.label', default: 'Delete')}" onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');" /></span> 849 </g:if> 859 <g:if test="${studyInstance.canWrite(loggedInUser)}"> 860 <span class="button"><g:link class="edit" controller="wizard" params="[jump:'edit']" id="${studyInstance?.id}">${message(code: 'default.button.edit.label', default: 'Edit')}</g:link></span> 861 </g:if> 862 <g:if test="${studyInstance.isOwner(loggedInUser)}"> 863 <span class="button"><g:actionSubmit class="delete" action="delete" value="${message(code: 'default.button.delete.label', default: 'Delete')}" onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');" /></span> 864 </g:if> 865 </g:if> 850 866 <span class="button"><g:link class="backToList" action="list">Back to list</g:link></span> 851 867 </g:form> -
trunk/grails-app/views/wizard/pages/_study.gsp
r959 r976 31 31 <wizard:publicationSelectElement name="publication" value="${study?.publications}" /> 32 32 <wizard:contactSelectElement name="contacts" value="${study?.persons}" /> 33 </g:if> 33 34 <br /> 35 <div class="element"> 36 <div class="description">Public </div> 37 <div class="input"><g:checkBox name="publicstudy" value="${study?.publicstudy}" /></div> 38 </div> 39 40 <wizard:userSelectElement name="readers" description="Readers" value="${study?.readers}" /> 41 <wizard:userSelectElement name="writers" description="Writers" value="${study?.writers}" /> 42 43 </g:if> 34 44 35 45 </wizard:pageContent>
Note: See TracChangeset
for help on using the changeset viewer.
