Author: bleny Date: 2011-01-06 11:11:16 +0000 (Thu, 06 Jan 2011) New Revision: 899 Log: fix layout for admin page Modified: trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2011-01-06 11:09:03 UTC (rev 898) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2011-01-06 11:11:16 UTC (rev 899) @@ -108,25 +108,28 @@ <input t:type="textfield" t:id="loginAdministration" value="userEdited.login" t:validate="required" /> </p:login> <p:password> + <label for="passwordAdministration">${message:wao.ui.form.definePasswordManually}</label> + <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> + </p:password> + <p:generatePassword> <label for="generatePassword">${message:wao.ui.form.generatePassword}</label> <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> - <span> ${message:wao.ui.form.definePasswordManually} </span> - <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> - </p:password> + </p:generatePassword> <p:userRole> <t:zone id="so-admin-userRoleZone" t:id="userRoleZone" t:update="show"> - <label for="userRole">${message:wao.ui.field.UserProfile.userRole}</label> - <select t:type="select" t:id="userRole" t:value="role" t:model="userRoleSelectModel" - t:zone="so-admin-userRoleZone"/> - - <label for="readOnly">${message:wao.ui.form.readOnly}</label> - <input t:type="checkbox" t:id="readOnly" t:value="readOnly" - t:mixins="ck/onEvent" t:event="change"/> - - <a t:type="actionlink" t:id="addRole" title="${message:wao.ui.form.addRole}" t:zone="so-admin-userRoleZone"> - <img src="${asset:context:img/add-16px.png}" alt="${message:wao.ui.form.addRole}"/> - </a> - <ul> + <label for="userRole">${message:wao.ui.form.roles}</label> + <div style="width: 48%; float: left;"> + <select t:type="select" t:id="userRole" t:value="role" t:model="userRoleSelectModel" + t:zone="so-admin-userRoleZone"/> + <br /> + <!--label for="readOnly">${message:wao.ui.form.readOnly} :</label--> + <span for="readOnly">${message:wao.ui.form.readOnly} :</span> + <input t:type="checkbox" t:id="readOnly" t:value="readOnly" t:mixins="ck/onEvent" t:event="change"/> + <a t:type="actionlink" t:id="addRole" title="${message:wao.ui.form.addRole}" t:zone="so-admin-userRoleZone"> + <img src="${asset:context:img/add-16px.png}" alt="${message:wao.ui.form.addRole}"/> + </a> + </div> + <ul style="clear: both;"> <li t:type="loop" t:source="editedUserProfiles" t:value="profile" t:index="profileIndex" t:volatile="true"> ${profile.description} <a t:type="actionlink" t:id="removeRole" t:context="profileIndex" title="${message:wao.ui.form.removeRole}" t:zone="so-admin-userRoleZone">