Author: sebawagner
Date: Tue Oct 23 17:38:07 2012
New Revision: 1401357
URL: http://svn.apache.org/viewvc?rev=1401357&view=rev
Log:
OPENMEETINGS-428 Fixes server admin section
Loads custom PagingNavigator component with icons,
adds custom IStringResourceLoader to handle wicket properties to OpenMeetings
translations
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_first.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_last.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_next.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_previous.png
(with props)
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/LabelResourceLoader.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.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/servers/ServersPanel.java
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_first.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_first.png?rev=1401357&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_first.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_last.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_last.png?rev=1401357&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_last.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_next.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_next.png?rev=1401357&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_next.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_previous.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_previous.png?rev=1401357&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/images/forms/resultset_previous.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1401357&r1=1401356&r2=1401357&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
Tue Oct 23 17:38:07 2012
@@ -17,55 +17,55 @@
* 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: #AFCBFB;
- margin-top: 10px;
+ background-color: #AFCBFB;
+ 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 {
- min-width: 1070px;
+ min-width: 1070px;
}
#chat {
- position: fixed;
- z-index: 2000;
- bottom: 0px;
- right: 100px;
+ position: fixed;
+ z-index: 2000;
+ bottom: 0px;
+ right: 100px;
}
/*
@@ -75,265 +75,265 @@
*/
.adminPanelColumnTable {
display: inline-block;
- vertical-align: top;
+ vertical-align: top;
}
table.adminListTable {
- max-width: 518px;
- min-width: 518px;
+ max-width: 518px;
+ min-width: 518px;
}
table.adminListTable th {
- background: #AFCBFB;
- color: #ffffff;
+ background: #AFCBFB;
+ 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: 96px;
+ width: 96px;
}
table.adminListTable th.three_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable th.three_column_layout_column3 {
- width: 244px;
+ width: 244px;
}
table.adminListTable td.three_column_layout_column1 {
- width: 96px;
+ width: 96px;
}
table.adminListTable td.three_column_layout_column2 {
- width: 150px;
+ width: 150px;
}
table.adminListTable td.three_column_layout_column3 {
- width: 244px;
+ width: 244px;
}
table.adminListTable td div.three_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 96px;
+ word-wrap: break-word;
+ width: 96px;
}
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: 244px;
+ word-wrap: break-word;
+ width: 244px;
}
table.adminListTable th.four_column_layout_column1 {
- width: 96px;
+ width: 96px;
}
table.adminListTable th.four_column_layout_column2 {
- width: 130px;
+ width: 130px;
}
table.adminListTable th.four_column_layout_column3 {
- width: 132px;
+ width: 132px;
}
table.adminListTable th.four_column_layout_column4 {
- width: 132px;
+ width: 132px;
}
table.adminListTable td.four_column_layout_column1 {
- width: 96px;
+ width: 96px;
}
table.adminListTable td.four_column_layout_column2 {
- width: 130px;
+ width: 130px;
}
table.adminListTable td.four_column_layout_column3 {
- width: 132px;
+ width: 132px;
}
table.adminListTable td.four_column_layout_column4 {
- width: 132px;
+ width: 132px;
}
table.adminListTable td div.four_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 96px;
+ word-wrap: break-word;
+ width: 96px;
}
table.adminListTable td div.four_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 130px;
+ word-wrap: break-word;
+ width: 130px;
}
table.adminListTable td div.four_column_layout_divcolumn3 {
- word-wrap: break-word;
- width: 132px;
+ word-wrap: break-word;
+ width: 132px;
}
table.adminListTable td div.four_column_layout_divcolumn4 {
- word-wrap: break-word;
- width: 132px;
+ word-wrap: break-word;
+ width: 132px;
}
table.adminListTable tr.even {
- background-color: #EDF2FF;
+ background-color: #EDF2FF;
}
table.adminListTable tr.odd {
- background-color: #F2FAFF;
+ background-color: #F2FAFF;
}
table.adminListTable tr:hover {
- background-color: #CCDCE8;
+ background-color: #CCDCE8;
}
.clickable {
- cursor: pointer;
+ cursor: pointer;
}
div.tableWrapper {
background-color: #FFFFFF;
border: solid 1px #aacfe4;
- width: 536px;
- height: 500px;
- overflow-y: scroll;
+ width: 536px;
+ height: 500px;
+ overflow-y: scroll;
}
.adminPanelColumnForm {
display: inline-block;
- vertical-align: top;
- margin-top: 2px;
+ vertical-align: top;
+ margin-top: 2px;
}
.adminPanelColumnForm div.scrollcontent {
- vertical-align: top;
- height: 500px;
- overflow-y: scroll;
+ 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: 280px;
- height: 20px;
- margin: 2px 2px;
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 280px;
+ height: 20px;
+ margin: 2px 2px;
}
.adminForm input.formcheckbox {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
- border: none;
- width: 20px;
- height: 20px;
- margin: 2px 2px;
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: none;
+ width: 20px;
+ height: 20px;
+ margin: 2px 2px;
}
.adminForm fieldset {
background-color: #F2FAFF;
- border: solid 1px #aacfe4;
- margin-top: 4px;
- padding: 4px;
+ border: solid 1px #aacfe4;
+ margin-top: 4px;
+ padding: 4px;
}
.adminForm legend {
background-color: #F2FAFF;
- padding: 0.2em 0.5em;
- margin: 0px 10px;
- border: solid 1px #aacfe4;
- color: #000000;
- font-style: italic;
- text-align: right;
+ padding: 0.2em 0.5em;
+ margin: 0px 10px;
+ border: solid 1px #aacfe4;
+ color: #000000;
+ font-style: italic;
+ text-align: right;
}
.adminForm textarea {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 280px;
- height: 60px;
- margin: 2px 2px;
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 280px;
+ height: 60px;
+ margin: 2px 2px;
}
.adminForm div.formelement {
- display: block;
- clear: both;
- max-width: 490px;
+ display: block;
+ clear: both;
+ max-width: 490px;
}
.adminForm select {
- float: left;
- height: 20px;
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 282px;
- margin: 2px 2px 2px;
+ float: left;
+ height: 20px;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 282px;
+ margin: 2px 2px 2px;
}
.adminForm label {
- display: block;
- font-size: 14px;
- font-weight: bold;
- text-align: right;
- width: 180px;
- float: left;
- margin: 4px 2px 2px;
+ display: block;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: right;
+ width: 180px;
+ float: left;
+ margin: 4px 2px 2px;
}
.formelementradiobox {
- margin-left: 100px;
+ margin-left: 100px;
}
.formelementradiobox input {
- margin: 0px 0px;
- border: none;
- width: 20px;
+ margin: 0px 0px;
+ border: none;
+ width: 20px;
}
.formelementradiobox label {
- width: 260px;
- margin: 0px
+ width: 260px;
+ margin: 0px
}
.addLanguagePanel {
@@ -341,15 +341,16 @@ div.tableWrapper {
}
.addLanguagePanel select {
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 140px;
- font-size: 12px;
- margin-left: 2px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 140px;
+ font-size: 12px;
+ margin-left: 2px;
}
.pagedEntityListPanel {
margin-left: 2px;
+ display: inline-block;
}
.pagedEntityListPanel .searchForm {
@@ -358,50 +359,147 @@ div.tableWrapper {
.pagedEntityListPanel select {
padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 40px;
- font-size: 12px;
- display: inline;
- float: none;
+ border: solid 1px #aacfe4;
+ width: 40px;
+ font-size: 12px;
+ display: inline;
+ float: none;
}
.pagedEntityListPanel input {
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 100px;
- height: 20px;
- margin: 2px 2px;
- display: inline;
- float: none;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 100px;
+ height: 20px;
+ margin: 2px 2px;
+ display: inline;
+ float: none;
}
.ui-dialog {
- -moz-box-shadow: 3px 3px 4px #000;
- -webkit-box-shadow: 3px 3px 4px #000;
- /* For IE 8 */
- -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4,
Direction=135, Color='#000000')";
- /* For IE 5.5 - 7 */
- filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4,
Direction=135, Color='#000000');
+ -moz-box-shadow: 3px 3px 4px #000;
+ -webkit-box-shadow: 3px 3px 4px #000;
+ /* For IE 8 */
+ -ms-filter:
+ "progid:DXImageTransform.Microsoft.Shadow(Strength=4,
Direction=135, Color='#000000')";
+ /* For IE 5.5 - 7 */
+ filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4,
Direction=135,
+ Color='#000000' );
box-shadow: 3px 3px 4px #000;
}
.info-icon {
background: url(images/information.png) no-repeat;
- float: left;
- cursor: default;
- width: 18px;
- height: 18px;
- border: none;
- margin-left: 2px;
- margin-top: 2px;
+ float: left;
+ cursor: default;
+ width: 18px;
+ height: 18px;
+ border: none;
+ margin-left: 2px;
+ margin-top: 2px;
}
/* .adminForm select {
max-width: 200px;
} */
-
.sort-icon {
display: inline-block !important;
text-indent: 0px !important;
}
+
+.pagedEntityListPanel :LINK {
+ text-decoration: none;
+}
+
+.pagedEntityListPanel :HOVER {
+ text-decoration: none;
+}
+
+.pagedEntityListPanel span.prev {
+ background: url(images/forms/resultset_previous.png) no-repeat;
+ display: inline-block;
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel span.next {
+ background: url(images/forms/resultset_next.png) no-repeat;
+ display: inline-block;
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel span.first {
+ background: url(images/forms/resultset_first.png) no-repeat;
+ display: inline-block;
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel span.last {
+ background: url(images/forms/resultset_last.png) no-repeat;
+ display: inline-block;
+ opacity:0.4;
+ filter:alpha(opacity=40); /* For IE8 and earlier */
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel a.prev {
+ background: url(images/forms/resultset_previous.png) no-repeat;
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel a.next {
+ background: url(images/forms/resultset_next.png) no-repeat;
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel a.first {
+ background: url(images/forms/resultset_first.png) no-repeat;
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+.pagedEntityListPanel a.last {
+ background: url(images/forms/resultset_last.png) no-repeat;
+ display: inline-block;
+ width: 14px;
+ height: 14px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+}
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1401357&r1=1401356&r2=1401357&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java
Tue Oct 23 17:38:07 2012
@@ -56,7 +56,14 @@ public class Application extends Authent
return mp;
}
});
+
+ //Add custom resource loader at the beginning, so it will be
checked first in the
+ //chain of Resource Loaders, if not found it will search in
Wicket's internal
+ //Resource Loader for a the property key
+ getResourceSettings().getStringResourceLoaders().add(0, new
LabelResourceLoader());
+
super.init();
+
mountPage("signin", getSignInPageClass());
getRootRequestMapperAsCompound().add(new
HomePageMapper(getHomePage()) {
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/LabelResourceLoader.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/LabelResourceLoader.java?rev=1401357&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/LabelResourceLoader.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/LabelResourceLoader.java
Tue Oct 23 17:38:07 2012
@@ -0,0 +1,44 @@
+package org.apache.openmeetings.web.app;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.resource.loader.IStringResourceLoader;
+
+/**
+ * Map property values to OpenMeetings labelid's and get the string
+ *
+ * @author swagner
+ *
+ */
+public class LabelResourceLoader implements IStringResourceLoader {
+
+ private static Map<String,Long> STRING_LABEL_MAPPING = new
HashMap<String,Long>();
+
+ static {
+ STRING_LABEL_MAPPING.put("PagingNavigator.first", 368L);
+ STRING_LABEL_MAPPING.put("PagingNavigator.previous", 369L);
+ STRING_LABEL_MAPPING.put("PagingNavigator.next", 370L);
+ STRING_LABEL_MAPPING.put("PagingNavigator.last", 371L);
+ }
+
+ public String loadStringResource(Class<?> clazz, String key, Locale
locale,
+ String style, String variation) {
+ return getStringByPropertyKey(key);
+ }
+
+ public String loadStringResource(Component component, String key,
+ Locale locale, String style, String variation) {
+ return getStringByPropertyKey(key);
+ }
+
+ private String getStringByPropertyKey(String key) {
+ Long labelId = STRING_LABEL_MAPPING.get(key);
+ if (labelId == null)
+ return null;
+ return WebSession.getString(labelId);
+ }
+
+}
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html?rev=1401357&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
Tue Oct 23 17:38:07 2012
@@ -0,0 +1,30 @@
+<?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:wicket="http://wicket.apache.org";>
+<body>
+<wicket:panel>
+ <a wicket:id="first" class="first"></a>
+ <a wicket:id="prev" class="prev"></a>
+ <span wicket:id="navigation" class="goto">
+ <a wicket:id="pageLink" href="#"><span
wicket:id="pageNumber">5</span></a>
+ </span>
+ <a wicket:id="next" class="next"></a>
+ <a wicket:id="last" class="last"></a>
+</wicket:panel>
+</body>
+</html>
\ No newline at end of file
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java?rev=1401357&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
Tue Oct 23 17:38:07 2012
@@ -0,0 +1,14 @@
+package org.apache.openmeetings.web.components.admin;
+
+import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
+import org.apache.wicket.markup.html.navigation.paging.IPageable;
+
+public class AdminPagingNavigator extends AjaxPagingNavigator {
+
+ private static final long serialVersionUID = 1L;
+
+ public AdminPagingNavigator(String id, IPageable pageable) {
+ super(id, pageable);
+ }
+
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java?rev=1401357&r1=1401356&r2=1401357&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
Tue Oct 23 17:38:07 2012
@@ -26,7 +26,6 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
@@ -43,7 +42,8 @@ public abstract class PagedEntityListPan
dataView.setItemsPerPage(entitiesPerPage);
final Form<Void> f = new Form<Void>("pagingForm");
f.setOutputMarkupId(true);
- f.add(new AjaxPagingNavigator("navigator",
dataView).setOutputMarkupId(true))
+
+ f.add(new AdminPagingNavigator("navigator",
dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new
PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
.add(new
AjaxFormComponentUpdatingBehavior("onchange") {
private static final long
serialVersionUID = -7754441983330112248L;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java?rev=1401357&r1=1401356&r2=1401357&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServerForm.java
Tue Oct 23 17:38:07 2012
@@ -75,12 +75,14 @@ public class ServerForm extends AdminBas
hideNewRecord();
target.add(this);
target.add(listContainer);
+ target.appendJavaScript("omServerPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
setModelObject(new Server());
target.add(this);
+ target.appendJavaScript("omServerPanelInit();");
}
@Override
@@ -94,6 +96,7 @@ public class ServerForm extends AdminBas
}
setModelObject(server);
target.add(this);
+ target.appendJavaScript("omServerPanelInit();");
}
@Override
@@ -103,6 +106,7 @@ public class ServerForm extends AdminBas
this.setModelObject(new Server());
target.add(listContainer);
target.add(this);
+ target.appendJavaScript("omServerPanelInit();");
}
}
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=1401357&r1=1401356&r2=1401357&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
Tue Oct 23 17:38:07 2012
@@ -20,55 +20,71 @@
-->
<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 omServerPanelInit() {
+ var documentHeight = $(document).height();
+ $('#adminForm').height(documentHeight-114);
+ $('#adminTable').height(documentHeight-144);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
- <table class="adminPanel">
- <tr>
- <td class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview
navigator]</span>
+ <div class="adminPanel">
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview
navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th
class="three_column_layout_column1"><span
wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
+ <th
class="three_column_layout_column2"><span
wicket:id="orderByName"></span><wicket:ommessage key="1500" /></th>
+ <th
class="three_column_layout_column3"><span
wicket:id="orderByAddress"></span><wicket:ommessage key="1501" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
<table class="adminListTable">
- <thead>
- <tr>
- <th
class="three_column_layout_column1"><span
wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
- <th
class="three_column_layout_column2"><span
wicket:id="orderByName"></span><wicket:ommessage key="1500" /></th>
- <th
class="three_column_layout_column3"><span
wicket:id="orderByAddress"></span><wicket:ommessage key="1501" /></th>
- </tr>
- </thead>
+ <tbody
wicket:id="listContainer">
+ <tr wicket:id="serverList">
+ <td
class="three_column_layout_column1"><div
class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
+ <td
class="three_column_layout_column2"><div
class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
+ <td
class="three_column_layout_column3"><div
class="three_column_layout_divcolumn3"><span
wicket:id="address"></span></div></td>
+ </tr>
+ </tbody>
</table>
- <div class="tableWrapper">
- <table class="adminListTable">
- <tbody
wicket:id="listContainer">
- <tr
wicket:id="serverList">
- <td
class="three_column_layout_column1"><div
class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
- <td
class="three_column_layout_column2"><div
class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
- <td
class="three_column_layout_column3"><div
class="three_column_layout_divcolumn3"><span
wicket:id="address"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </td>
- <td class="adminPanelColumnForm">
- <form wicket:id="form"
class="adminForm">
- <div wicket:id="buttons"></div>
+ </div>
+ </div>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent"
id="adminForm">
<fieldset>
<legend><wicket:ommessage key="1502" /></legend>
- <wicket:ommessage
key="1500" /><input type="text" wicket:id="name"/>
- <br/>
- <wicket:ommessage key="1501"
/><input type="text" wicket:id="address"/>
- <br/>
- <wicket:ommessage
key="1110" /><span wicket:id="inserted"/>
- <br/>
- <wicket:ommessage key="1111"
/><span wicket:id="insertedby.login"/>
- <br/>
- <wicket:ommessage key="1112"
/><span wicket:id="updated"/>
- <br/>
- <wicket:ommessage key="1113"
/><span wicket:id="updatedby.login"/>
- <br/>
- <wicket:ommessage key="270"
/><textarea wicket:id="comment"/>
- <br/>
+ <div
class="formelement">
+ <label><wicket:ommessage key="1500"
/></label><input type="text" wicket:id="name"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1501"
/></label><input type="text" wicket:id="address"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1110"
/></label><span wicket:id="inserted"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1111"
/></label><span wicket:id="insertedby.login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1112"
/></label><span wicket:id="updated"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1113"
/></label><span wicket:id="updatedby.login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="270"
/></label><textarea wicket:id="comment"/>
+ </div>
</fieldset>
- </form>
- </td>
- </tr>
- </table>
+ </div>
+ </form>
+ </div>
+ </div>
</wicket:panel>
</html>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1401357&r1=1401356&r2=1401357&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java
Tue Oct 23 17:38:07 2012
@@ -43,6 +43,11 @@ public class ServersPanel extends AdminP
private static final long serialVersionUID = -2197334608577346569L;
private ServerForm form;
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ target.appendJavaScript("omServerPanelInit();");
+ }
+
@SuppressWarnings("unchecked")
public ServersPanel(String id) {
super(id);
@@ -63,6 +68,7 @@ public class ServersPanel extends AdminP
form.setModelObject(Server);
form.hideNewRecord();
target.add(form);
+
target.appendJavaScript("omServerPanelInit();");
}
});
item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
