Author: solomax
Date: Thu Sep 13 03:33:19 2012
New Revision: 1384197
URL: http://svn.apache.org/viewvc?rev=1384197&view=rev
Log:
Menu styles are corrected;
Wicket generalization: common form buttons are moved to the separate panel;
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jMenu.jquery.css
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.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.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jMenu.jquery.css
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jMenu.jquery.css?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jMenu.jquery.css
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/jMenu.jquery.css
Thu Sep 13 03:33:19 2012
@@ -12,7 +12,7 @@
/********************/
#jMenu li {
display: table-cell;
- background-color: #322f32;
+ background-color: #BDC0DB;
margin: 0; //
float: left;
width: 120px;
@@ -24,7 +24,8 @@
background-color: transparent;
color: #fff;
text-transform: uppercase;
- cursor: pointer;
+ text-decoration: none;
+ cursor: default;
font-size: 12px;
}
@@ -44,14 +45,14 @@
}
#jMenu li ul li {
- background-color: #322f32;
+ background-color: #BDC0DB;
display: block;
border-bottom: 1px solid #484548;
padding: 0
}
#jMenu li ul li.arrow {
- background: #322f32 url('images/arrow_down.png') no-repeat center
center;
+ background: #BDC0DB url('images/arrow_down.png') no-repeat center
center;
height: 6px;
padding: 0;
border-bottom: none;
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=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
Thu Sep 13 03:33:19 2012
@@ -38,3 +38,7 @@
text-align: center;
font-size: 1em;
}
+
+.adminPanel {
+ width: 100%;
+}
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.html
Thu Sep 13 03:33:19 2012
@@ -47,7 +47,7 @@
</script>
<ul id="jMenu">
<li wicket:id="mainItem">
- <a class="fNiv" href="#"><span
wicket:id="label"></span></a>
+ <a class="fNiv" href="#" onclick="return
false;"><span wicket:id="label"></span></a>
<ul wicket:enclosure="childItem">
<li class="arrow" style="width: 97px;
"></li>
<li wicket:id="childItem">
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=1384197&r1=1384196&r2=1384197&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 Sep 13 03:33:19 2012
@@ -137,7 +137,7 @@ public class MenuPanel extends BasePanel
break;
case
adminModuleServers:
target.add(contents.replace(new ServersPanel("child")));
-
hash = "#admin/ldaps";
+
hash = "#admin/servers";
break;
}
target.appendJavaScript("window.location.hash = '" +
JavaScriptUtils.escapeQuotes(hash) + "';");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
Thu Sep 13 03:33:19 2012
@@ -18,10 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
/**
@@ -38,76 +35,7 @@ public class AdminBaseForm<T> extends Fo
public AdminBaseForm(String id, IModel<T> object) {
super(id, object);
- setOutputMarkupId(true);
-
- final FeedbackPanel feedback = new FeedbackPanel("feedback");
- feedback.setOutputMarkupId(true);
- add(feedback);
-
- // add a button that can be used to submit the form via ajax
- add(new AjaxButton("ajax-save-button", this) {
- private static final long serialVersionUID =
839803820502260006L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so that it is
hidden
- target.add(feedback);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so errors are
shown
- target.add(feedback);
- }
- });
-
- add(new AjaxButton("ajax-new-button", this) {
- private static final long serialVersionUID =
839803820502260006L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so that it is
hidden
- target.add(feedback);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so errors are
shown
- target.add(feedback);
- }
- });
-
- add(new AjaxButton("ajax-refresh-button", this) {
- private static final long serialVersionUID =
839803820502260006L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so that it is
hidden
- target.add(feedback);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so errors are
shown
- target.add(feedback);
- }
- });
-
- add(new AjaxButton("ajax-cancel-button", this) {
- private static final long serialVersionUID =
839803820502260006L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so that it is
hidden
- target.add(feedback);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target,
Form<?> form) {
- // repaint the feedback panel so errors are
shown
- target.add(feedback);
- }
- });
+ add(new AdminBaseFormPanel<T>("buttons", this));
}
}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html?rev=1384197&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.html
Thu Sep 13 03:33:19 2012
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
+ lang="en">
+ <wicket:panel>
+ <div class="formSaveBar">
+ <div class="formSaveButton">
+ <input type="submit" value=""
wicket:id="ajax-save-button" />
+ </div>
+ <div class="formNewButton">
+ <input type="submit" value=""
wicket:id="ajax-new-button" />
+ </div>
+ <div class="formRefreshButton">
+ <input type="submit" value=""
wicket:id="ajax-refresh-button" />
+ </div>
+ <div class="formCancelButton">
+ <input type="submit" value=""
wicket:id="ajax-cancel-button" />
+ </div>
+ </div>
+ <br />
+ <div wicket:id="feedback">[[ feedback ]]</div>
+ <wicket:child />
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java?rev=1384197&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
Thu Sep 13 03:33:19 2012
@@ -0,0 +1,85 @@
+package org.apache.openmeetings.web.components.admin;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+
+public class AdminBaseFormPanel<T> extends AdminPanel {
+ private static final long serialVersionUID = 8361623159373532543L;
+
+ public AdminBaseFormPanel(String id, final AdminBaseForm<T> form) {
+ super(id);
+
+ setOutputMarkupId(true);
+
+ final FeedbackPanel feedback = new FeedbackPanel("feedback");
+ feedback.setOutputMarkupId(true);
+ add(feedback);
+
+ // add a button that can be used to submit the form via ajax
+ add(new AjaxButton("ajax-save-button", form) {
+ private static final long serialVersionUID =
839803820502260006L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so that it is
hidden
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so errors are
shown
+ target.add(feedback);
+ }
+ });
+
+ add(new AjaxButton("ajax-new-button", form) {
+ private static final long serialVersionUID =
839803820502260006L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so that it is
hidden
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so errors are
shown
+ target.add(feedback);
+ }
+ });
+
+ add(new AjaxButton("ajax-refresh-button", form) {
+ private static final long serialVersionUID =
839803820502260006L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so that it is
hidden
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so errors are
shown
+ target.add(feedback);
+ }
+ });
+
+ add(new AjaxButton("ajax-cancel-button", form) {
+ private static final long serialVersionUID =
839803820502260006L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so that it is
hidden
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target,
Form<?> form) {
+ // repaint the feedback panel so errors are
shown
+ target.add(feedback);
+ }
+ });
+ }
+}
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=1384197&r1=1384196&r2=1384197&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 Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -39,24 +39,8 @@
</table>
</td>
<td>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
</form>
</td>
</tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -37,24 +37,8 @@
</table>
</td>
<td>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
</form>
</td>
</tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td valign="top">
<span wicket:id="navigator">[dataview
navigator]</span>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -39,24 +39,8 @@
</table>
</td>
<td>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
</form>
</td>
</tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -39,25 +39,8 @@
</table>
</td>
<td>
- <span wicket:id="selected"></span>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
</form>
</td>
</tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java
Thu Sep 13 03:33:19 2012
@@ -33,14 +33,10 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
public class RoomsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
- @SuppressWarnings("unused")
- private String selectedText = "Click on the table to change the room";
- private Label selected = null;
private RoomForm form;
public RoomsPanel(String id) {
@@ -83,9 +79,6 @@ public class RoomsPanel extends AdminPan
});
}
};
- selected = new Label("selected", new
PropertyModel<String>(this, "selectedText"));
- selected.setOutputMarkupId(true);
- add(selected);
dataView.setItemsPerPage(8); //FIXME need to be parametrized
add(dataView);
add(new AjaxPagingNavigator("navigator", dataView));
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -39,24 +39,8 @@
</table>
</td>
<td>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
</form>
</td>
</tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
Thu Sep 13 03:33:19 2012
@@ -21,7 +21,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<wicket:panel>
- <table>
+ <table class="adminPanel">
<tr>
<td valign="top">
<span wicket:id="navigator">[dataview
navigator]</span>
@@ -41,24 +41,8 @@
</table>
</td>
<td>
- <br/>
<form wicket:id="form">
- <div class="formSaveBar">
- <div class="formSaveButton">
- <input type="submit" value=""
wicket:id="ajax-save-button"/>
- </div>
- <div class="formNewButton">
- <input type="submit" value=""
wicket:id="ajax-new-button"/>
- </div>
- <div class="formRefreshButton">
- <input type="submit" value=""
wicket:id="ajax-refresh-button"/>
- </div>
- <div class="formCancelButton">
- <input type="submit" value=""
wicket:id="ajax-cancel-button"/>
- </div>
- </div>
- <br/>
- <div wicket:id="feedback">[[
feedback ]]</div>
+ <div wicket:id="buttons"></div>
<wicket:ommessage key="132" />: <input
type="text" wicket:id="login"/>
<br/>
<wicket:ommessage key="133" />: <input
type="password" />
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java?rev=1384197&r1=1384196&r2=1384197&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Thu Sep 13 03:33:19 2012
@@ -37,7 +37,6 @@ import org.apache.wicket.model.IModel;
public class UsersPanel extends AdminPanel {
private static final long serialVersionUID = -4463107742579790120L;
- @SuppressWarnings("unused")
private UserForm form = null;
public UsersPanel(String id) {
