Fixes to member pages.
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
index 8eeaff7..fff1064 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
@@ -23,7 +23,7 @@
radios = document.getElementsByTagName("input");
var removing = false;
for (var i=0; i<radios.length; i++) {
- if (radios[i].value == -1 && radios[i].checked) {
+ if (radios[i].value === -1 && radios[i].checked) {
removing = true;
}
}
@@ -80,7 +80,7 @@
</s:else>
<td class="rollertable">
- <img src='<s:url value="/images/user.png"/>' border="0" alt="icon" />
+ <span class="glyphicon glyphicon-user"></span>
<s:property value="#perm.user.userName" />
</td>
<td class="rollertable">
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
index 9fbe57a..0f3aabe 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
@@ -17,12 +17,6 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script>
-// <!--
-<%@ include file="/roller-ui/scripts/ajax-user.js" %>
-// -->
-</script>
-
<p class="subtitle"><s:text name="inviteMember.subtitle" /></p>
<p><s:text name="inviteMember.prompt" /></p>
@@ -35,14 +29,14 @@
<s:text name="inviteMember.userName" /></label>
<div>
<input name="userName" id="userName" size="30" maxlength="30"
- onfocus="onUserNameFocus(true)" onkeyup="onUserNameChange(true)" /><br />
+ onfocus="onMemberNameFocus(true)" onkeyup="onMemberNameChange(true)" /><br />
</div>
</div>
<div class="formrow">
<label class="formrow" /> </label>
<div>
- <select id="userList" size="10" onchange="onUserSelected()" style="width:400px"></select>
+ <select id="userList" size="10" onchange="onMemberSelected()" style="width:400px"></select>
</div>
</div>
@@ -58,14 +52,56 @@
</div>
<br />
- <s:submit value="%{getText('inviteMember.button.save')}" cssClass="btn btn-default"/>
+ <s:submit id="inviteButton" value="%{getText('inviteMember.button.save')}" cssClass="btn btn-default"/>
<s:submit value="%{getText('generic.cancel')}" action="invite!cancel" cssClass="btn"/>
</s:form>
-<%-- this forces focus to the userName field --%>
<script>
-<!--
-document.getElementById('userName').focus();
-// -->
+
+ <%@ include file="/roller-ui/scripts/ajax-user.js" %>
+
+ $(document).ready(function () {
+ $('#userName').focus();
+ $('#inviteButton').attr("disabled", true);
+ });
+
+ function onMemberNameChange(enabled) {
+ u = userURL;
+ if (enabled != null) {
+ u = u + "&enabled=" + enabled;
+ }
+
+ userName = $('#userName').val();
+ if (userName.length > 0) {
+ u = u + "&startsWith=" + userName;
+ }
+
+ sendUserRequest(u);
+ }
+
+ function onMemberSelected() {
+ userName = $('#userList').children("option:selected").val();
+ if (userName !== '') {
+ $('#inviteButton').attr("disabled", false);
+ }
+ }
+
+ function onMemberNameFocus(enabled) {
+ if (!init) {
+ init = true;
+ u = userURL;
+
+ if (enabled != null) {
+ u = u + "&enabled=" + enabled;
+ }
+
+ sendUserRequest(u);
+
+ } else {
+ $('#inviteButton').attr("disabled", false);
+ }
+ }
+
+
</script>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
index 77eef0a..7313eea 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
@@ -20,7 +20,7 @@
<h3><s:text name="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
-<img src='<s:url value="/images/email_edit.png"/>' alt="mail-icon" align="bottom" />
+<span class="glyphicon glyphicon-plus"></span>
<s:url action="invite" var="inviteUrl">
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
