You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/10/18 20:12:32 UTC
svn commit: r1399760 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/ src/org/apache/openmeetings/web/components/
src/org/apache/openmeetings/web/components/admin/backup/
src/org/apache/openmeetings/web/components/admin/con...
Author: sebawagner
Date: Thu Oct 18 18:12:31 2012
New Revision: 1399760
URL: http://svn.apache.org/viewvc?rev=1399760&view=rev
Log:
Update method for calling JavaScript component when Panel is loaded,
add some CSS and modify fields.
Make User area take up the whole screen and fix form layout as far as possible
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Thu Oct 18 18:12:31 2012
@@ -17,222 +17,304 @@
* under the License.
*/
#topLinks {
- position: absolute;
- top: 10px;
- right: 10px;
+ position: absolute;
+ top: 10px;
+ right: 10px;
}
#topLinks span {
- padding-right: 5px;
- padding-left: 5px;
- border-right: 1px solid black;
+ padding-right: 5px;
+ padding-left: 5px;
+ border-right: 1px solid black;
}
#topLinks span:last-child {
- border-right: none;
+ border-right: none;
}
#menu {
- background-color: #BDC0DB;
- margin-top: 10px;
+ background-color: #BDC0DB;
+ margin-top: 10px;
}
.menuName {
- font-weight: bold;
+ font-weight: bold;
}
.menuDesc {
- font-size: smaller;
+ font-size: smaller;
}
#busy_indicator {
- display: none;
- float: right;
- background: rgb(255, 241, 168);
- margin-top: 5px;
- z-index: 1000;
- width: 200;
- font-weight: bold;
- text-align: center;
- font-size: 1em;
+ display: none;
+ float: right;
+ background: rgb(255, 241, 168);
+ margin-top: 5px;
+ z-index: 1000;
+ width: 200;
+ font-weight: bold;
+ text-align: center;
+ font-size: 1em;
}
.adminPanel {
- table-layout: fixed;
- width: 100%;
+ table-layout: fixed;
+ width: 100%;
}
#chat {
- position: fixed;
- z-index: 2000;
- bottom: 0px;
- right: 100px;
+ position: fixed;
+ z-index: 2000;
+ bottom: 0px;
+ right: 100px;
}
/*
- ################################
- Column layout admin section
- ################################
+ ################################
+ Column layout admin section
+ ################################
*/
.adminPanelColumnTable {
- vertical-align: top;
+ vertical-align: top;
}
table.adminListTable {
- max-width: 518px;
- min-width: 518px;
+ max-width: 518px;
+ min-width: 518px;
}
table.adminListTable th {
- background: #BDC0DB;
- color: #ffffff;
+ background: #BDC0DB;
+ color: #ffffff;
}
table.adminListTable th.two_column_layout_column1 {
- width: 136px;
+ width: 136px;
}
table.adminListTable th.two_column_layout_column2 {
- width: 354px;
+ width: 354px;
}
table.adminListTable td.two_column_layout_column1 {
- width: 136px;
+ width: 136px;
}
table.adminListTable td.two_column_layout_column2 {
- width: 354px;
+ width: 354px;
}
table.adminListTable td div.two_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 136px;
+ word-wrap: break-word;
+ width: 136px;
}
table.adminListTable td div.two_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 354px;
+ word-wrap: break-word;
+ width: 354px;
}
-
table.adminListTable th.three_column_layout_column1 {
- width: 36px;
+ width: 36px;
}
table.adminListTable th.three_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable th.three_column_layout_column3 {
- width: 304px;
+ width: 304px;
}
table.adminListTable td.three_column_layout_column1 {
- width: 36px;
+ width: 36px;
}
table.adminListTable td.three_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable td.three_column_layout_column3 {
- width: 304px;
+ width: 304px;
}
table.adminListTable td div.three_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 36px;
+ word-wrap: break-word;
+ width: 36px;
}
table.adminListTable td div.three_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 150px;
+ word-wrap: break-word;
+ width: 150px;
}
table.adminListTable td div.three_column_layout_divcolumn3 {
- word-wrap: break-word;
- width: 304px;
+ word-wrap: break-word;
+ width: 304px;
}
-
table.adminListTable th.four_column_layout_column1 {
- width: 36px;
+ width: 36px;
}
table.adminListTable th.four_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable th.four_column_layout_column3 {
- width: 152px;
+ width: 152px;
}
table.adminListTable th.four_column_layout_column4 {
- width: 152px;
+ width: 152px;
}
table.adminListTable td.four_column_layout_column1 {
- width: 36px;
+ width: 36px;
}
table.adminListTable td.four_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable td.four_column_layout_column3 {
- width: 152px;
+ width: 152px;
}
table.adminListTable td.four_column_layout_column4 {
- width: 152px;
+ width: 152px;
}
table.adminListTable td div.four_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 36px;
+ word-wrap: break-word;
+ width: 36px;
}
table.adminListTable td div.four_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 150px;
+ word-wrap: break-word;
+ width: 150px;
}
table.adminListTable td div.four_column_layout_divcolumn3 {
- word-wrap: break-word;
- width: 152px;
+ word-wrap: break-word;
+ width: 152px;
}
table.adminListTable td div.four_column_layout_divcolumn4 {
- word-wrap: break-word;
- width: 152px;
+ word-wrap: break-word;
+ width: 152px;
}
table.adminListTable tr.even {
- background-color: #ffebcd;
+ background-color: #ffebcd;
}
table.adminListTable tr.odd {
- background-color: #ffffff;
+ background-color: #ffffff;
}
div.tableWrapper {
- width: 536px;
- height: 500px;
- overflow-y: scroll;
+ width: 536px;
+ height: 500px;
+ overflow-y: scroll;
}
.adminPanelColumnForm {
- vertical-align: top;
+ vertical-align: top;
+}
+
+.adminPanelColumnForm div.scrollcontent {
+ vertical-align: top;
+ height: 500px;
+ overflow-y: scroll;
}
.adminForm {
-
+
+}
+
+.adminForm input {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 200px;
+ height: 20px;
+ margin: 2px 2px;
+}
+
+.adminForm input.formcheckbox {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: none;
+ width: 200px;
+ height: 20px;
+ margin: 2px 2px;
+}
+
+.adminForm fieldset {
+ border: solid 1px #aacfe4;
+ margin-top: 4px;
+ padding: 4px;
+}
+
+.adminForm legend {
+ padding: 0.2em 0.5em;
+ margin: 0px 10px;
+ border: solid 1px #aacfe4;
+ color: #000000;
+ font-size: 90%;
+ text-align: right;
+}
+
+.adminForm textarea {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 2px;
+ border: solid 1px #aacfe4;
+ width: 200px;
+ height: 60px;
+ margin: 0px 2px;
+}
+
+.adminForm div.formelement {
+ display: block;
+ clear: both;
+}
+
+.formelementradiobox input {
+ margin: 0px 0px;
+ border: none;
+}
+
+.adminForm select {
+ float: left;
+ height: 20px;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 200px;
+ margin: 2px 2px;
+}
+
+.adminForm label {
+ display: block;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: right;
+ width: 220px;
+ float: left;
+ margin: 4px 2px 2px;
}
.clickable {
- cursor: pointer;
+ cursor: pointer;
}
.adminForm select {
- max-width: 200px;
+ max-width: 200px;
}
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java Thu Oct 18 18:12:31 2012
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.components;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.panel.Panel;
public abstract class BasePanel extends Panel {
@@ -27,5 +28,15 @@ public abstract class BasePanel extends
super(id);
setOutputMarkupId(true);
}
-
+
+ /**
+ * Overwrite this method to execute Java code after Panel is loaded by the
+ * {@link MenuPanel}
+ *
+ * @param target
+ */
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+
+ }
+
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java Thu Oct 18 18:12:31 2012
@@ -46,6 +46,12 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+/**
+ * Loads the menu items into the main area
+ *
+ * @author sebawagner
+ *
+ */
public class MenuPanel extends BasePanel {
private static final long serialVersionUID = 6626039612808753514L;
@@ -106,17 +112,19 @@ public class MenuPanel extends BasePanel
}
public void onClick(AjaxRequestTarget target) {
+
+ BasePanel basePanel = null;
+
switch(action) {
case dashboardModuleStartScreen:
break;
case dashboardModuleCalendar:
- target.add(contents.replace(new CalendarPanel("child")));
- target.appendJavaScript("calendarInit();");
+ basePanel = new CalendarPanel("child");
break;
case recordModule:
break;
case conferenceModuleRoomList:
- target.add(contents.replace(new UserRoomsPanel("child", params)));
+ basePanel = new UserRoomsPanel("child", params);
break;
case eventModuleRoomList:
break;
@@ -125,34 +133,38 @@ public class MenuPanel extends BasePanel
case moderatorModuleRoom:
break;
case adminModuleUser:
- target.add(contents.replace(new UsersPanel("child")));
+ basePanel = new UsersPanel("child");
break;
case adminModuleConnections:
break;
case adminModuleOrg:
- target.add(contents.replace(new GroupsPanel("child")));
- target.appendJavaScript("groupsInit();");
+ basePanel = new GroupsPanel("child");
break;
case adminModuleRoom:
- target.add(contents.replace(new RoomsPanel("child")));
+ basePanel = new RoomsPanel("child");
break;
case adminModuleConfiguration:
- target.add(contents.replace(new ConfigsPanel("child")));
+ basePanel = new ConfigsPanel("child");
break;
case adminModuleLanguages:
- target.add(contents.replace(new LangPanel("child")));
- target.appendJavaScript("labelsInit();");
+ basePanel = new LangPanel("child");
break;
case adminModuleLDAP:
- target.add(contents.replace(new LdapsPanel("child")));
+ basePanel = new LdapsPanel("child");
break;
case adminModuleBackup:
- target.add(contents.replace(new BackupPanel("child")));
+ basePanel = new BackupPanel("child");
break;
case adminModuleServers:
- target.add(contents.replace(new ServersPanel("child")));
+ basePanel = new ServersPanel("child");
break;
}
+
+ if (basePanel != null) {
+ target.add(contents.replace(basePanel));
+ basePanel.onMenuPanelLoad(target);
+ }
+
target.appendJavaScript("location.hash = '" + JavaScriptUtils.escapeQuotes(hash) + "';");
};
}.add(AttributeModifier.replace("href", hash)));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java Thu Oct 18 18:12:31 2012
@@ -145,7 +145,7 @@ public class BackupPanel extends AdminPa
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
FileUpload upload = fileUploadField.getFileUpload();
try {
- if (upload.getInputStream() == null) {
+ if (upload == null || upload.getInputStream() == null) {
uploadFeedback.error("File is empty");
return;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html Thu Oct 18 18:12:31 2012
@@ -21,7 +21,14 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
<wicket:head>
- </wicket:head>
+ <script type="text/javascript">
+ function omComponentInit() {
+ var documentHeight = $(document).height();
+ $(adminForm).height(documentHeight-114);
+ $(adminTable).height(documentHeight-150);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
<table class="adminPanel">
<tr>
@@ -36,7 +43,7 @@
</tr>
</thead>
</table>
- <div class="tableWrapper">
+ <div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer" >
<tr wicket:id="configList">
@@ -51,19 +58,26 @@
<td class="adminPanelColumnForm">
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
- <fieldset>
- <legend><wicket:ommessage key="266" /></legend>
- <wicket:ommessage key="267" />: <input type="text" wicket:id="conf_key"/>
- <br/>
- <wicket:ommessage key="271" />: <input type="text" wicket:id="conf_value"/>
- <br/>
- <wicket:ommessage key="268" />: <span wicket:id="updatetime"/>
- <br/>
- <wicket:ommessage key="269" />: <span wicket:id="user.login"/>
- <br/>
- <wicket:ommessage key="270" />: <textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
- <br/>
- </fieldset>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset>
+ <legend><wicket:ommessage key="266" /></legend>
+ <div class="formelement">
+ <label><wicket:ommessage key="267" /></label><input type="text" wicket:id="conf_key"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="271" /></label><input type="text" wicket:id="conf_value"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="268" /></label><span wicket:id="updatetime"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="269" /></label><span wicket:id="user.login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="270" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
+ </div>
+ </fieldset>
+ </div>
</form>
</td>
</tr>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java Thu Oct 18 18:12:31 2012
@@ -32,8 +32,14 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
public class GroupsPanel extends AdminPanel {
+
private static final long serialVersionUID = -5170400556006464830L;
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.appendJavaScript("groupsInit();");
+ }
+
public GroupsPanel(String id) {
super(id);
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java Thu Oct 18 18:12:31 2012
@@ -50,6 +50,11 @@ public class LangPanel extends AdminPane
FieldLanguage language;
final WebMarkupContainer listContainer;
private LangForm langForm;
+
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.appendJavaScript("labelsInit();");
+ }
public LangPanel(String id) {
super(id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.html Thu Oct 18 18:12:31 2012
@@ -20,6 +20,15 @@
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd" lang="en">
+ <wicket:head>
+ <script type="text/javascript">
+ function omUserPanelInit() {
+ var documentHeight = $(document).height();
+ $('#adminForm').height(documentHeight-114);
+ $('#adminTable').height(documentHeight-160);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
<table class="adminPanel">
<tr>
@@ -35,7 +44,7 @@
</tr>
</thead>
</table>
- <div class="tableWrapper">
+ <div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer">
<tr wicket:id="userList">
@@ -49,70 +58,95 @@
</div>
</td>
<td class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
+ <form wicket:id="form" class="adminForm" >
<div wicket:id="buttons"></div>
- <fieldset>
- <legend><wicket:ommessage key="143" /></legend>
- <wicket:ommessage key="132" />: <input type="text" wicket:id="login"/>
- <br/>
- <wicket:ommessage key="133" />: <input type="password" wicket:id="password"/>
- <br/>
- <wicket:ommessage key="135" />: <select wicket:id="salutations_id" style="width: 70px;"/> <input type="text" wicket:id="firstname"/>
- <br/>
- <wicket:ommessage key="136" />: <input type="text" wicket:id="lastname"/>
- <br/>
- <wicket:ommessage key="1143" />: <select wicket:id="omTimeZone"/>
- <br/>
- <wicket:ommessage key="111" />: <select wicket:id="language_id"/>
- <br/>
- <wicket:ommessage key="1110" />: <span wicket:id="starttime"/>
- <br/>
- <wicket:ommessage key="1112" />: <span wicket:id="updatetime"/>
- <br/>
- <wicket:ommessage key="1149" />
- <br/>
- <wicket:ommessage key="1148" />: <input type="checkbox" wicket:id="forceTimeZoneCheck" />
- <br/>
- <wicket:ommessage key="137" />: <input type="text" wicket:id="adresses.email"/>
- <br/>
- <wicket:ommessage key="607" />: <input type="text" wicket:id="adresses.phone"/>
- <br/>
- <wicket:ommessage key="1503" />: <input type="checkbox" wicket:id="sendSMS"/>
- <br/>
- <wicket:ommessage key="138" />: <input type="text" wicket:id="age"/>
- <br/>
- <wicket:ommessage key="139" />: <input type="text" wicket:id="adresses.street"/> <input type="text" wicket:id="adresses.additionalname"/>
- <br/>
- <wicket:ommessage key="140" />: <input type="text" wicket:id="adresses.zip"/> <input type="text" wicket:id="adresses.town"/>
- <br/>
- <wicket:ommessage key="141" />: <select wicket:id="adresses.states"/>
- <br/>
- <wicket:ommessage key="158" />: <select wicket:id="status"/>
- <br/>
- <wicket:ommessage key="169" />: <select wicket:id="level_id"/>
- <br/>
- <wicket:ommessage key="142" />: <textarea wicket:id="adresses.comment"/>
- <br/>
- <wicket:ommessage key="161" />: <select wicket:id="organisation_users"/>
- <br/>
- <wicket:ommessage key="1502" />: <select wicket:id="server"/>
- <br/>
- </fieldset>
- <fieldset>
- <legend><wicket:ommessage key="1159" /></legend>
- <wicket:ommessage key="1159" />
- <br/>
- <span wicket:id="community_settings">
- <input type="radio"/>
- <input type="radio"/>
- <input type="radio"/>
- </span>
- <br/>
- <wicket:ommessage key="1162" />: <textarea wicket:id="userOffers"/>
- <br/>
- <wicket:ommessage key="1163" />: <textarea wicket:id="userSearchs"/>
- <br/>
- </fieldset>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset>
+ <legend><wicket:ommessage key="143" /></legend>
+ <div class="formelement">
+ <label><wicket:ommessage key="132" /></label><input type="text" wicket:id="login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="133" /></label><input type="password" wicket:id="password"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="135" /></label><select wicket:id="salutations_id" style="width: 60px;"/><input type="text" wicket:id="firstname" style="width: 136px;"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="136" /></label><input type="text" wicket:id="lastname"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1143" /></label><select wicket:id="omTimeZone"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="111" /></label><select wicket:id="language_id"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1110" /></label><span wicket:id="starttime"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1112" /></label><span wicket:id="updatetime"/>
+ </div>
+ <div class="formelement">
+ <wicket:ommessage key="1149" />
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1148" /></label><input class="formcheckbox" type="checkbox" wicket:id="forceTimeZoneCheck" />
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="137" /></label><input type="text" wicket:id="adresses.email"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="607" /></label><input type="text" wicket:id="adresses.phone"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1503" /></label><input class="formcheckbox" type="checkbox" wicket:id="sendSMS"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="138" /></label><input type="text" wicket:id="age" style="width: 180px;"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="139" /></label><input type="text" wicket:id="adresses.street" style="width: 164px;"/> <input type="text" wicket:id="adresses.additionalname" style="width: 30px;"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="140" /></label><input type="text" wicket:id="adresses.zip" style="width: 60px;"/> <input type="text" wicket:id="adresses.town" style="width: 134px;"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="141" /></label><select wicket:id="adresses.states"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="158" /></label><select wicket:id="status"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="169" /></label><select wicket:id="level_id"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="142" /></label><textarea wicket:id="adresses.comment"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="161" /></label><select wicket:id="organisation_users"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1502" /></label><select wicket:id="server"/>
+ </div>
+ </fieldset>
+ <fieldset>
+ <legend><wicket:ommessage key="1159" /></legend>
+ <div class="formelementradiobox">
+ <span wicket:id="community_settings">
+ <input type="radio"/>
+ <input type="radio"/>
+ <input type="radio"/>
+ </span>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1162" /></label><textarea wicket:id="userOffers"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1163" /></label><textarea wicket:id="userSearchs"/>
+ </div>
+ </fieldset>
+ </div>
</form>
</td>
</tr>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UsersPanel.java Thu Oct 18 18:12:31 2012
@@ -37,6 +37,11 @@ public class UsersPanel extends AdminPan
private static final long serialVersionUID = -4463107742579790120L;
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.appendJavaScript("omUserPanelInit();");
+ }
+
private UserForm form;
public UsersPanel(String id) {
@@ -62,6 +67,8 @@ public class UsersPanel extends AdminPan
form.setModelObject(u);
form.hideNewRecord();
target.add(form);
+ //re-initialize height
+ target.appendJavaScript("omUserPanelInit();");
}
});
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java?rev=1399760&r1=1399759&r2=1399760&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.java Thu Oct 18 18:12:31 2012
@@ -44,8 +44,14 @@ import org.apache.wicket.model.CompoundP
import org.apache.wicket.request.handler.TextRequestHandler;
public class CalendarPanel extends UserPanel {
+
private static final long serialVersionUID = -6536379497642291437L;
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.appendJavaScript("calendarInit();");
+ }
+
public CalendarPanel(String id) {
super(id);
WebMarkupContainer calendar = new WebMarkupContainer("calendar");