Commit dd0a10d5 authored by Ryan Graham's avatar Ryan Graham Committed by ryan

new page layouts for group-create.jsp and group-edit.jsp. They still need the...

new page layouts for group-create.jsp and group-edit.jsp. They still need the text put in i18n, delete button on group-edit.jsp still needs to be turned into a javascript alert, and group-create.jsp needs work so it can be re-used as an edit screen for group name and desc.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5280 b35dd754-fafc-0310-a699-88a17e54d16e
parent 5473595a
......@@ -130,17 +130,16 @@
%>
<html>
<head>
<title><fmt:message key="group.create.title"/></title>
<meta name="pageID" content="group-create"/>
<meta name="helpPage" content="create_a_group.html"/>
</head>
<body>
<head>
<title><fmt:message key="group.create.title"/></title>
<meta name="pageID" content="group-create"/>
<meta name="helpPage" content="create_a_group.html"/>
</head>
<body>
<c:set var="submit" value="${param.create}"/>
<% if (errors.get("general") != null) { %>
<div class="jive-error">
<table cellpadding="0" cellspacing="0" border="0">
<tbody>
......@@ -155,20 +154,22 @@
</tbody>
</table>
</div><br>
<% } %>
<p>
<fmt:message key="group.create.form" />
Use the form below to create your new group. Once you've created the group you will proceed to another
screen where you can add members and set up group contact list.
<!--<fmt:message key="group.create.form" />-->
</p>
<form name="f" action="group-create.jsp" method="post">
<fieldset>
<legend><fmt:message key="group.create.new_group_title" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<!-- BEGIN create group -->
<div class="jive-contentBoxHeader">
<fmt:message key="group.create.new_group_title" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top">
<td width="1%" nowrap>
<label for="gname"><fmt:message key="group.create.group_name" /></label> *
......@@ -217,145 +218,31 @@
<% } %>
<tr>
<td nowrap width="1%" valign="top">
<fmt:message key="group.create.label_initial_member" />
</td>
<td nowrap class="c1" align="left">
<textarea name="users" cols="30" rows="3" id="users"
><%= ((users != null) ? users : "") %></textarea>
</td>
</tr>
</table>
<br>
<p><b><fmt:message key="group.create.share_groups_title" /></b></p>
<p>
<fmt:message key="group.create.share_groups_info" />
</p>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td width="1%">
<input type="radio" name="enableRosterGroups" value="false" id="rb201" <%= !enableRosterGroups ? "checked" : "" %>>
</td>
<td width="99%">
<label for="rb201"><fmt:message key="group.create.disable_share_group" /></label>
</td>
</tr>
<tr>
<td width="1%">
<input type="radio" name="enableRosterGroups" value="true" id="rb202" <%= enableRosterGroups ? "checked" : "" %>>
</td>
<td width="99%">
<label for="rb202"><fmt:message key="group.create.enable_share_group" /></label>
</td>
</tr>
<tr>
<td width="1%">
&nbsp;
</td>
<td width="99%">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td width="1%" nowrap>
<fmt:message key="group.create.group_display_name" />
</td>
<td width="99%">
<input type="text" name="groupDisplayName" size="30" maxlength="100" value="<%= (groupDisplayName != null ? groupDisplayName : "") %>"
onchange="this.form.enableRosterGroups[1].checked=true;">
<% if (errors.get("groupDisplayName") != null) { %>
<span class="jive-error-text"><fmt:message key="group.create.enter_a_group_name" /></span>
<% } %>
</td>
</tr>
</tbody>
</table>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td width="1%" nowrap>
<input type="radio" name="showGroup" value="everybody" id="rb002"
onclick="this.form.enableRosterGroups[1].checked=true;"
<%= ("everybody".equals(showGroup) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb002"><fmt:message key="group.create.show_group_in_all_users" /></label>
</td>
</tr>
<tr>
<td width="1%" nowrap>
<input type="radio" name="showGroup" value="onlyGroup" id="rb001"
onclick="this.form.enableRosterGroups[1].checked=true;"
<%= ("onlyGroup".equals(showGroup) && (groupNames == null || groupNames.length == 0) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb001"><fmt:message key="group.create.show_group_in_group_members" /></label>
</td>
</tr>
<tr>
<td width="1%" nowrap>
<input type="radio" name="showGroup" value="spefgroups" id="rb003"
onclick="this.form.enableRosterGroups[1].checked=true;"
<%= (groupNames != null && groupNames.length > 0) ? "checked" : "" %>>
</td>
<td width="99%">
<label for="rb003"><fmt:message key="group.create.show_group_in_roster_group" /></label>
</td>
</tr>
<tr>
<td width="1%" nowrap>
&nbsp;
</td>
<td width="99%">
<select name="groupNames" size="6" onclick="this.form.showGroup[2].checked=true;this.form.enableRosterGroups[1].checked=true;"
multiple style="width:300px;font-family:verdana,arial,helvetica,sans-serif;font-size:8pt;">
<% for (Group group : webManager.getGroupManager().getGroups()) { %>
<option value="<%= URLEncoder.encode(group.getName(), "UTF-8") %>"
<%= (contains(groupNames, group.getName()) ? "selected" : "") %>
><%= group.getName() %></option>
<% } %>
</select>
</td>
</tr>
</tbody>
</table>
<tr>
<td></td>
<td>
</td>
</tr>
</tbody>
<input type="submit" name="create" value="<fmt:message key="group.create.create" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
</td>
</tr>
</table>
</div>
<span class="jive-description">* <fmt:message key="group.create.required_fields" /> </span>
<!-- END create group -->
<br>
<span class="jive-description">* <fmt:message key="group.create.required_fields" /> </span>
</div>
</fieldset>
<br><br>
<input type="submit" name="create" value="<fmt:message key="group.create.create" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
</form>
<script language="JavaScript" type="text/javascript">
document.f.name.focus();
</script>
</body>
</body>
</html>
<%!
......
This diff is collapsed.
......@@ -35,6 +35,7 @@ FIELDSET LEGEND {
color : #000;
}
/* --------------------------------------------- */
/* Header */
/* --------------------------------------------- */
......@@ -141,7 +142,7 @@ FIELDSET LEGEND {
margin-top: 0px;
color: #006699;
text-decoration: none;
background-color: EAF1F8;
background-color: #EAF1F8;
padding-top: 3px;
padding-bottom: 3px;
}
......@@ -323,6 +324,47 @@ html>body #jive-main #jive-sidebar a {
margin-left : 1em;
}
/* --------------------------------------------- */
/* Back link */
/* --------------------------------------------- */
a.jive-link-back {
font-size: 9pt;
}
a.jive-link-back span {
font-size: 10pt;
}
/* --------------------------------------------- */
/* Edit & Delete links */
/* --------------------------------------------- */
a.jive-link-edit,
a.jive-link-delete {
display: block;
font-size: 8pt;
padding-left: 19px;
margin: 3px 5px 6px 0px;
}
a.jive-link-edit {
background: transparent url(../images/edit-16x16.gif) no-repeat left;
}
a.jive-link-delete {
background: transparent url(../images/delete-16x16.gif) no-repeat left;
}
/* --------------------------------------------- */
/* Hoizontal Rule */
/* --------------------------------------------- */
.jive-horizontalRule {
height: 1px;
background-color: #dcdcdc;
margin: 20px 0px 10px 0px;
padding: 0px;
overflow: hidden;
}
/* --------------------------------------------- */
/* Older styles */
......@@ -583,4 +625,107 @@ A.cal:Hover {
background-repeat : no-repeat;
background-position : 5px 5px;
-moz-border-radius: 3px;
}
\ No newline at end of file
}
/* --------------------------------------------- */
/* Content Box */
/* --------------------------------------------- */
.jive-contentBox {
display: block;
margin: 0px 0px 20px 0px;
padding: 12px 10px 12px 10px;
border: 1px solid #dcdcdc;
background-color: #fff;
-moz-border-radius:0px 0px 4px 4px ;
}
.jive-contentBoxHeader {
display: block;
padding: 4px 4px 4px 6px;
margin: 8px 0px 0px 0px;
font-size: 9pt;
font-weight: bold;
background-color: #f3f7fa;
border: 1px solid #dcdcdc;
border-bottom: none;
}
.jive-contentBoxGrey {
/* commenting out the below, for now */
/*background: #f5f5f5 url(../images/setup_contentbox_bg.gif) repeat-x top;*/
background-color: #f9f9f9;
}
.jive-contentBox h3 {
margin: 0px;
padding: 0px 0px 5px 0px;
font-size: 10pt;
color: #09345b;
}
.jive-contentBox form {
margin: 0px;
padding: 0px;
}
.jive-contentBox table {
margin: 0px 0px 0px 0px;
padding: 0px;
}
.jive-contentBox table td {
padding: 2px 2px 2px 2px;
}
.jive-contentBox table th {
background-color: #f3f7fa;
padding: 4px;
}
th.jive-table-th-center {
text-align: center;
}
.jive-contentBox table td.jive-formLabel {
font-weight: bold;
text-align: right;
color: #09345b;
padding-right: 5px;
white-space: nowrap;
}
.jive-contentBox-toolbox {
float: right;
margin-left: 20px;
}
.jive-contentBox-plain {
display: block;
margin: 0px 0px 5px 0px;
padding: 12px 0px 12px 0px;
}
.jive-contentBox-plain h3 {
font-size: 14pt;
color: #34679a;
margin: 2px 0px 2px 0px;
}
.jive-contentBox-plain p {
font-size: 9pt;
margin: 0px 0px 10px 0px;
}
/* --------------------------------------------- */
/* Roster box (in Group Settings page */
/* --------------------------------------------- */
#jive-roster {
display: block;
width: 390px;
margin: 3px 0px 4px 0px;
padding: 12px;
border: 1px solid #dcdcdc;
background-color: #f9f9f9;
-moz-border-radius: 4px;
font-size: 9pt;
}
#jive-roster b {
display: block;
font-size: 8pt;
color: #09345b;
padding: 0px 0px 3px 0px;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment