You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/10 14:33:11 UTC
svn commit: r1786351 [1/4] - in /openmeetings/application:
branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/
branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/
branches/3.2.x/openmee...
Author: solomax
Date: Fri Mar 10 14:33:11 2017
New Revision: 1786351
URL: http://svn.apache.org/viewvc?rev=1786351&view=rev
Log:
[OPENMEETINGS-1599] all admin panels are unified
Added:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java Fri Mar 10 14:33:11 2017
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.UUID;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.protocol.ws.api.registry.IKey;
@@ -35,7 +34,7 @@ import org.apache.wicket.protocol.ws.api
* @author solomax
*
*/
-public class Client implements IDataProviderEntity {
+public class Client implements IClient {
private static final long serialVersionUID = 1L;
public enum Activity {
Added: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java?rev=1786351&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/IClient.java Fri Mar 10 14:33:11 2017
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.db.entity.basic;
+
+import org.apache.openmeetings.db.entity.IDataProviderEntity;
+
+/**
+ * Temporary interface, will be removed after 2 types of cliens will be merged
+ * {@link org.apache.openmeetings.db.entity.room.Client}
+ * {@link org.apache.openmeetings.db.entity.basic.Client}
+ * @author solomax
+ *
+ */
+public interface IClient extends IDataProviderEntity {
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Fri Mar 10 14:33:11 2017
@@ -35,13 +35,13 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.openmeetings.db.entity.IDataProviderEntity;
+import org.apache.openmeetings.db.entity.basic.IClient;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.util.CalendarPatterns;
/**
* Can be configured to be stored in memory or in database
- *
+ *
* @author sebawagner
*/
@Entity
@@ -66,98 +66,98 @@ import org.apache.openmeetings.util.Cale
@Table(name = "client")
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
-public class Client implements IDataProviderEntity {
+public class Client implements IClient {
private static final long serialVersionUID = 1L;
-
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
-
+
/**
* @see Client#getUsername()
*/
@Column(name = "username")
private String username = "";
-
+
/**
* @see Client#getStreamid()
*/
@Column(name = "streamid")
private String streamid = "";
-
+
/**
* @see Client#getScope()
*/
@Column(name = "scope")
private String scope = "";
-
+
/**
* @see Client#getVWidth()
*/
@Column(name = "vwidth")
private int vWidth = 0;
-
+
/**
* @see Client#getVHeight()
*/
@Column(name = "vheight")
private int vHeight = 0;
-
+
/**
* @see Client#getVX()
*/
@Column(name = "vx")
private int vX = 0;
-
+
/**
* @see Client#getVY()
*/
@Column(name = "vy")
private int vY = 0;
-
+
/**
* @see Client#getStreamPublishName()
*/
@Column(name = "stream_publish_name")
private String streamPublishName = "";
-
+
/**
* @see Client#getPublicSID()
*/
@Column(name = "public_sid")
private String publicSID = "";
-
+
/**
* @see Client#getIsMod()
*/
@Column(name = "is_mod", nullable = false)
private boolean isMod = false;
-
+
/**
* @see Client#getIsSuperModerator()
*/
@Column(name = "is_supermoderator", nullable = false)
private boolean isSuperModerator = false;
-
+
/**
* @see Client#getCanDraw()
*/
@Column(name = "can_draw", nullable = false)
private boolean canDraw = false;
-
+
/**
* @see Client#getCanShare()
*/
@Column(name = "can_share", nullable = false)
private boolean canShare = false;
-
+
/**
* @see Client#getCanRemote()
*/
@Column(name = "can_remote", nullable = false)
private boolean canRemote = false;
-
+
/**
* @see Client#getCanGiveAudio()
*/
@@ -172,115 +172,115 @@ public class Client implements IDataProv
*/
@Column(name = "connected_since")
private Date connectedSince;
-
+
/**
* @see Client#getFormatedDate()
*/
@Column(name = "formated_date")
private String formatedDate;
-
+
/**
* @see Client#isScreenClient()
*/
@Column(name = "is_screenclient", nullable = false)
private boolean screenClient;
-
+
/**
* @see Client#getUsercolor()
*/
@Column(name = "usercolor")
private String usercolor;
-
+
/**
* @see Client#getUserpos()
*/
@Column(name = "userpos")
private Integer userpos;
-
+
/**
* @see Client#getUserip()
*/
@Column(name = "userip")
private String userip;
-
+
/**
* @see Client#getUserport()
*/
@Column(name = "userport")
private int userport;
-
+
/**
* @see Client#getRoomId()
*/
@Column(name = "room_id")
private Long roomId;
-
+
/**
* @see Client#getRoomEnter()
*/
@Column(name = "room_enter")
private Date roomEnter = null;
-
+
/**
* @see Client#getBroadCastID()
*/
@Column(name = "broadcast_id")
private long broadCastID = -2;
-
+
/**
* @see Client#getUserId()
*/
@Column(name = "user_id")
private Long userId = null;
-
+
/**
* @see Client#getFirstname()
*/
@Column(name = "firstname")
private String firstname = "";
-
+
/**
* @see Client#getLastname()
*/
@Column(name = "lastname")
private String lastname = "";
-
+
/**
* @see Client#getMail()
*/
@Column(name = "email")
private String email;
-
+
/**
* @see Client#getLastLogin()
*/
@Column(name = "last_login")
private String lastLogin;
-
+
/**
* @see Client#getSecurityCode()
*/
@Column(name = "security_code")
private String securityCode;
-
+
/**
* @see Client#getPicture_uri()
*/
@Column(name = "picture_uri")
private String picture_uri;
-
+
/**
* @see Client#getLanguage()
*/
@Column(name = "language")
private String language = "";
-
+
/**
* @see Client#getAvsettings()
*/
@Column(name = "avsettings")
private String avsettings = "";
-
+
/**
* @see Client#getSwfurl()
*/
@@ -299,97 +299,97 @@ public class Client implements IDataProv
*/
@Column(name = "is_recording", nullable = false)
private boolean isRecording = false;
-
+
/**
* @see Client#getRoomRecordingName()
*/
@Column(name = "room_recording_name")
private String roomRecordingName;
-
+
/**
* @see Client#getRecordingId()
*/
@Column(name = "recording_id")
private Long recordingId;
-
+
/**
* @see Client#getRecordingMetaDataId()
*/
@Column(name = "recording_metadata_id")
private Long recordingMetaDataId;
-
+
/**
* @see Client#isStartRecording()
*/
@Column(name = "start_recording", nullable = false)
private boolean startRecording = false;
-
+
/**
* @see Client#isStartStreaming()
*/
@Column(name = "start_streaming", nullable = false)
private boolean startStreaming = false;
-
+
/**
* @see Client#isScreenPublishStarted()
*/
@Column(name = "screen_publish_started", nullable = false)
private boolean screenPublishStarted = false;
-
+
/**
* @see Client#isStreamPublishStarted()
*/
@Column(name = "stream_publish_started", nullable = false)
private boolean streamPublishStarted = false;
-
+
/**
* @see Client#getIsBroadcasting()
*/
@Column(name = "is_broadcasting", nullable = false)
private boolean isBroadcasting = false;
-
+
/**
* @see Client#getExternalUserId()
*/
@Column(name = "external_user_id")
private String externalUserId;
-
+
/**
* @see Client#getExternalUserType()
*/
@Column(name = "external_user_type")
private String externalUserType;
-
+
/**
* @see Client#getInterviewPodId()
*/
@Column(name = "interview_pod_id")
private Integer interviewPodId = null;
-
+
/**
* @see Client#isAllowRecording()
*/
@Column(name = "allow_recording", nullable = false)
private boolean allowRecording = true;
-
+
/**
* @see Client#getZombieCheckFlag()
*/
@Column(name = "zombie_check_flag", nullable = false)
private boolean zombieCheckFlag = false;
-
+
/**
* @see Client#getMicMuted()
*/
@Column(name = "mic_muted", nullable = false)
private boolean micMuted = false;
-
+
/**
* @see Client#isSipTransport()
*/
@Column(name = "sip_transport", nullable = false)
private boolean sipTransport = false;
-
+
@Column(name = "mobile", nullable = false)
private boolean mobile = false;
@@ -426,7 +426,7 @@ public class Client implements IDataProv
this.firstname = firstname;
this.lastname = lastname;
}
-
+
@Override
public Long getId() {
return id;
@@ -452,7 +452,7 @@ public class Client implements IDataProv
public void setIsMod(boolean isMod) {
this.isMod = isMod;
}
-
+
public String getUsername() {
return username;
}
@@ -640,7 +640,7 @@ public class Client implements IDataProv
public String getPublicSID() {
return publicSID;
}
-
+
public void setPublicSID(String publicSID) {
this.publicSID = publicSID;
}
@@ -648,7 +648,7 @@ public class Client implements IDataProv
public boolean getZombieCheckFlag() {
return zombieCheckFlag;
}
-
+
public void setZombieCheckFlag(boolean zombieCheckFlag) {
this.zombieCheckFlag = zombieCheckFlag;
}
@@ -852,7 +852,7 @@ public class Client implements IDataProv
public void setSipTransport(boolean sipTransport) {
this.sipTransport = sipTransport;
}
-
+
public Server getServer() {
return server;
}
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html?rev=1786351&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html Fri Mar 10 14:33:11 2017
@@ -0,0 +1,40 @@
+<?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">
+<wicket:head>
+ <script type="text/javascript">
+ var ADMIN_TABLE_SHIIFT = 144;
+ function adminPanelInit() {
+ if (typeof extAdminPanelInit === 'function') {
+ extAdminPanelInit();
+ }
+ var documentHeight = $(document).height();
+ $('#adminForm').height(documentHeight - 114);
+ $('#adminTable').height(documentHeight - ADMIN_TABLE_SHIIFT);
+ };
+ </script>
+</wicket:head>
+<wicket:panel>
+ <div class="adminPanel">
+ <wicket:child/>
+ </div>
+</wicket:panel>
+</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java Fri Mar 10 14:33:11 2017
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.admi
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@AuthorizeInstantiation("Admin")
public abstract class AdminPanel extends BasePanel {
@@ -30,7 +31,14 @@ public abstract class AdminPanel extends
public AdminPanel(String id) {
super(id);
}
-
+
+ @Override
+ public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
+ super.onMenuPanelLoad(handler);
+ handler.appendJavaScript("adminPanelInit();");
+ return this;
+ }
+
protected StringBuilder getRowClass(Long id, Long selectedId) {
StringBuilder sb = new StringBuilder(ROW_CLASS);
if (id != null && id.equals(selectedId)) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html Fri Mar 10 14:33:11 2017
@@ -7,16 +7,16 @@
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">
<wicket:extend>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Fri Mar 10 14:33:11 2017
@@ -7,77 +7,66 @@
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">
- <wicket:head>
- <script type="text/javascript">
- function omConfigPanelInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
- }
- </script>
- </wicket:head>
- <wicket:panel>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview navigator]</span>
- <table class="adminListTable">
- <thead>
- <tr>
- <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="264" /></th>
- <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByKey"></span><wicket:message key="265" /></th>
- <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="598" /></th>
- </tr>
- </thead>
- </table>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="listContainer" >
- <tr wicket:id="configList">
- <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="key"></span></div></td>
- <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="266" /></legend>
- <div class="formelement">
- <label><wicket:message key="267" /></label><input type="text" wicket:id="key"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="271" /></label><input type="text" wicket:id="value"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="268" /></label><span wicket:id="updated"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="269" /></label><span wicket:id="user.login"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
- </div>
- </fieldset>
+<wicket:extend>
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="264" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByKey"></span><wicket:message key="265" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="598" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
+ <table class="adminListTable">
+ <tbody wicket:id="listContainer" >
+ <tr wicket:id="configList">
+ <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="key"></span></div></td>
+ <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="266" /></legend>
+ <div class="formelement">
+ <label><wicket:message key="267" /></label><input type="text" wicket:id="key"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="271" /></label><input type="text" wicket:id="value"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="268" /></label><span wicket:id="updated"/>
</div>
- </form>
+ <div class="formelement">
+ <label><wicket:message key="269" /></label><span wicket:id="user.login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ </div>
+ </fieldset>
</div>
- </div>
- </wicket:panel>
+ </form>
+ </div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Fri Mar 10 14:33:11 2017
@@ -22,7 +22,6 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
@@ -30,7 +29,6 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -46,13 +44,6 @@ public class ConfigsPanel extends AdminP
private ConfigForm form;
private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
- @Override
- public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
- super.onMenuPanelLoad(handler);
- handler.appendJavaScript("omConfigPanelInit();");
- return this;
- }
-
public ConfigsPanel(String id) {
super(id);
@@ -99,6 +90,5 @@ public class ConfigsPanel extends AdminP
form = new ConfigForm("form", listContainer, new Configuration());
form.showNewRecord();
add(form);
-
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html Fri Mar 10 14:33:11 2017
@@ -7,60 +7,52 @@
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">
-<wicket:panel>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview navigator]</span>
+<wicket:extend>
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="ui-widget-header one_sixth"><wicket:message key="599" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="600" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="601" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="602" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="603" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="1501" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
<table class="adminListTable">
- <thead>
- <tr>
- <th class="ui-widget-header"><wicket:message key="599" /></th>
- <th class="ui-widget-header"><wicket:message key="600" /></th>
- <th class="ui-widget-header"><wicket:message key="601" /></th>
- <th class="ui-widget-header"><wicket:message key="602" /></th>
- <th class="ui-widget-header"><wicket:message key="603" /></th>
- <th class="ui-widget-header"><wicket:message key="1501" /></th>
- </tr>
- </thead>
- <tbody wicket:id="container" >
+ <tbody wicket:id="container">
<tr wicket:id="clientList">
- <td wicket:id="streamid"></td>
- <td wicket:id="username"></td>
- <td wicket:id="connectedSince"></td>
- <td wicket:id="scope"></td>
- <td><a wicket:id="kick"><wicket:message key="603" /></a></td>
- <td wicket:id="server"></td>
- </tr>
- </tbody>
- <tbody wicket:id="containerWeb" >
- <tr wicket:id="clientListWeb">
- <td wicket:id="id"></td>
- <td wicket:id="login"></td>
- <td wicket:id="since"></td>
- <td wicket:id="scope"></td>
- <td><a wicket:id="kick"><wicket:message key="603" /></a></td>
- <td> </td>
+ <td class="one_sixth" wicket:id="streamid"></td>
+ <td class="one_sixth" wicket:id="login"></td>
+ <td class="one_sixth" wicket:id="since"></td>
+ <td class="one_sixth" wicket:id="scope"></td>
+ <td class="one_sixth"><a wicket:id="kick"><wicket:message key="603" /></a></td>
+ <td class="one_sixth" wicket:id="server"></td>
</tr>
</tbody>
</table>
</div>
- <div class="adminPanelColumnForm">
- <table wicket:id="details" style="width: 450px;">
- <tr wicket:id="line"><td wicket:id="name"></td><td wicket:id="value"></td></tr>
- </table>
- </div>
</div>
-</wicket:panel>
+ <div class="adminPanelColumnForm">
+ <table wicket:id="details" style="width: 450px;">
+ <tr wicket:id="line"><td wicket:id="name"></td><td wicket:id="value"></td></tr>
+ </table>
+ </div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Fri Mar 10 14:33:11 2017
@@ -29,11 +29,11 @@ import java.util.List;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.user.IUserService;
+import org.apache.openmeetings.db.entity.basic.IClient;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.SearchableDataProvider;
@@ -51,55 +51,80 @@ public class ConnectionsPanel extends Ad
public ConnectionsPanel(String id) {
super(id);
- SearchableDataProvider<Client> sdp = new SearchableDataProvider<Client>(null) {
+ SearchableDataProvider<IClient> sdp = new SearchableDataProvider<IClient>(null) {
private static final long serialVersionUID = 1L;
//FIXME add search
+ private List<IClient> list() {
+ List<IClient> l = new ArrayList<>();
+ l.addAll(getBean(ISessionManager.class).getClientsWithServer());
+ l.addAll(Application.getClients());
+ return l;
+ }
+
@Override
- public Iterator<? extends Client> iterator(long first, long count) {
+ public Iterator<? extends IClient> iterator(long first, long count) {
//FIXME add grouping by public SID
- List<Client> l = new ArrayList<>(getBean(ISessionManager.class).getClientsWithServer());
+ List<IClient> l = list();
return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator();
}
@Override
public long size() {
- return getBean(ISessionManager.class).getClients().size();
+ return list().size();
}
};
final WebMarkupContainer container = new WebMarkupContainer("container");
final WebMarkupContainer details = new WebMarkupContainer("details");
- SearchableDataView<Client> dataView = new SearchableDataView<Client>("clientList", sdp) {
+ SearchableDataView<IClient> dataView = new SearchableDataView<IClient>("clientList", sdp) {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final Item<Client> item) {
- Client c = item.getModelObject();
- item.add(new Label("streamid"));
- item.add(new Label("username"));
- item.add(new Label("connectedSince"));
- item.add(new Label("scope"));
- item.add(new Label("server", c.getServer() == null ? "no cluster" : c.getServer().getAddress())); //FIXME localization
- item.add(new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) {
+ protected void populateItem(final Item<IClient> item) {
+ IClient _c = item.getModelObject();
+ ConfirmableAjaxBorder confirm = new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) {
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
- Client c = item.getModelObject();
- getBean(IUserService.class).kickUserByStreamId(getSid(), c.getStreamid()
- , c.getServer() == null ? 0 : c.getServer().getId());
+ IClient _c = item.getModelObject();
+ if (_c instanceof Client) {
+ Client c = (Client)_c;
+ getBean(IUserService.class).kickUserByStreamId(getSid(), c.getStreamid()
+ , c.getServer() == null ? 0 : c.getServer().getId());
+ } else {
+ org.apache.openmeetings.db.entity.basic.Client c = (org.apache.openmeetings.db.entity.basic.Client)_c;
+ getBean(IUserService.class).kickUserBySessionId(getSid(), c.getUserId(), c.getSessionId());
+ }
target.add(container, details.setVisible(false));
}
- }.setEnabled(!c.isScreenClient()));
+ };
+ if (_c instanceof Client) {
+ Client c = (Client)_c;
+ item.add(new Label("streamid"));
+ item.add(new Label("login", c.getUsername()));
+ item.add(new Label("since", c.getConnectedSince()));
+ item.add(new Label("scope"));
+ item.add(new Label("server", c.getServer() == null ? "no cluster" : c.getServer().getAddress())); //FIXME localization
+ confirm.setEnabled(!c.isScreenClient());
+ } else {
+ org.apache.openmeetings.db.entity.basic.Client c = (org.apache.openmeetings.db.entity.basic.Client)_c;
+ item.add(new Label("streamid", ""));
+ item.add(new Label("login", c.getUser().getLogin()));
+ item.add(new Label("since", c.getConnectedSince()));
+ item.add(new Label("scope", c.getRoomId() == null ? "html5" : "" + c.getRoomId()));
+ item.add(new Label("server", ""));
+ }
+ item.add(confirm);
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- Field[] ff = Client.class.getDeclaredFields();
+ Field[] ff = item.getModelObject().getClass().getDeclaredFields();
RepeatingView lines = new RepeatingView("line");
- Client c = item.getModelObject();
+ IClient c = item.getModelObject();
for (Field f : ff) {
int mod = f.getModifiers();
if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
@@ -125,82 +150,12 @@ public class ConnectionsPanel extends Ad
}
};
add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true));
-
- SearchableDataProvider<org.apache.openmeetings.db.entity.basic.Client> sdpWeb = new SearchableDataProvider<org.apache.openmeetings.db.entity.basic.Client>(null) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Iterator<? extends org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long count) {
- List<org.apache.openmeetings.db.entity.basic.Client> l = Application.getClients();
- return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator();
- }
-
- @Override
- public long size() {
- return Application.getClientsSize();
- }
- };
-
- final WebMarkupContainer containerWeb = new WebMarkupContainer("containerWeb");
- SearchableDataView<org.apache.openmeetings.db.entity.basic.Client> dataViewWeb = new SearchableDataView<org.apache.openmeetings.db.entity.basic.Client>("clientListWeb", sdpWeb) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final Item<org.apache.openmeetings.db.entity.basic.Client> item) {
- org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject();
- item.add(new Label("id", ""));
- item.add(new Label("login", c.getUser().getLogin()));
- item.add(new Label("since", c.getConnectedSince()));
- item.add(new Label("scope", c.getRoomId() == null ? "html5" : "" + c.getRoomId()));
- item.add(new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject();
- getBean(IUserService.class).kickUserBySessionId(getSid(), c.getUserId(), c.getSessionId());
- target.add(containerWeb, details.setVisible(false));
- }
- }.setEnabled(!c.getSessionId().equals(WebSession.get().getId())));
- item.add(new AjaxEventBehavior("click") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- Field[] ff = org.apache.openmeetings.db.entity.basic.Client.class.getDeclaredFields();
- RepeatingView lines = new RepeatingView("line");
- org.apache.openmeetings.db.entity.basic.Client c = item.getModelObject();
- for (Field f : ff) {
- int mod = f.getModifiers();
- if (Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
- continue;
- }
- WebMarkupContainer line = new WebMarkupContainer(lines.newChildId());
- line.add(new Label("name", f.getName()));
- String val = "";
- try {
- f.setAccessible(true);
- val = "" + f.get(c);
- } catch (Exception e) {
- }
- line.add(new Label("value", val));
- lines.add(line);
- }
- details.addOrReplace(lines);
- target.add(details.setVisible(true));
- }
- });
- item.add(AttributeModifier.append("class", ROW_CLASS));
- }
- };
-
- add(containerWeb.add(dataViewWeb).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(container, containerWeb);
+ target.add(container);
}
});
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Fri Mar 10 14:33:11 2017
@@ -7,66 +7,64 @@
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">
-<wicket:panel>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview navigator]</span>
+<wicket:extend>
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByStatus"></span><wicket:message key="996" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderBySubject"></span><wicket:message key="215" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
<table class="adminListTable">
- <thead>
- <tr>
- <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="188" /></th>
- <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByStatus"></span><wicket:message key="996" /></th>
- <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderBySubject"></span><wicket:message key="215" /></th>
+ <tbody wicket:id="list">
+ <tr wicket:id="email">
+ <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="status"></span></div></td>
+ <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td>
</tr>
- </thead>
+ </tbody>
</table>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="list">
- <tr wicket:id="email">
- <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="status"></span></div></td>
- <td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div class="formSaveBar ui-widget-header">
- <div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:157"></div>
- </div>
- <div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="admin.email.group.label" /></legend>
- <div class="formelement">
- <label><wicket:message key="996" /></label><span class="input" wicket:id="status"></span>
- <label><wicket:message key="admin.email.recipients" /></label><span class="input" wicket:id="recipients"></span>
- <label><wicket:message key="215" /></label><span class="input" wicket:id="subject"></span>
- <label><wicket:message key="admin.email.body" /></label><span class="input" wicket:id="body"></span>
- <label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span>
- <label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span>
- <label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span>
- <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span>
- </div>
- </fieldset>
- </div>
- <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button>
- </form>
</div>
</div>
-</wicket:panel>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div class="formSaveBar ui-widget-header">
+ <div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:157"></div>
+ </div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="admin.email.group.label" /></legend>
+ <div class="formelement">
+ <label><wicket:message key="996" /></label><span class="input" wicket:id="status"></span>
+ <label><wicket:message key="admin.email.recipients" /></label><span class="input" wicket:id="recipients"></span>
+ <label><wicket:message key="215" /></label><span class="input" wicket:id="subject"></span>
+ <label><wicket:message key="admin.email.body" /></label><span class="input" wicket:id="body"></span>
+ <label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span>
+ <label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span>
+ <label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span>
+ <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span>
+ </div>
+ </fieldset>
+ </div>
+ <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button>
+ </form>
+ </div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Fri Mar 10 14:33:11 2017
@@ -7,91 +7,80 @@
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">
- <wicket:head>
- <script type="text/javascript">
- function groupsInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
- };
- </script>
- </wicket:head>
- <wicket:panel>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview navigator]</span>
- <table class="adminListTable">
- <tr>
- <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="164" /></th>
- <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="165" /></th>
- </tr>
- </table>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="listContainer">
- <tr wicket:id="groupList">
- <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
- <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="170" /></legend>
- <div class="formelement">
- <label><wicket:message key="171" /></label><input type="text" wicket:id="name" />
- </div>
- <div class="formelement">
- <label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group logo"></div>
- </div>
- <div class="formelement">
- <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" />
- </div>
- <div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div>
- </div>
- <div class="formelement">
- <div wicket:id="users"></div>
- </div>
- <div class="formelement">
- <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" />
- </div>
- <div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/>
- </div>
- <div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/>
- </div>
- <div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" />
- </div>
- <div class="formelement">
- <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/>
- </div>
- </fieldset>
+<wicket:extend>
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <tr>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="164" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="165" /></th>
+ </tr>
+ </table>
+ <div class="tableWrapper" id="adminTable">
+ <table class="adminListTable">
+ <tbody wicket:id="listContainer">
+ <tr wicket:id="groupList">
+ <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
+ <td class="two_column_layout_column2"><div class="two_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="170" /></legend>
+ <div class="formelement">
+ <label><wicket:message key="171" /></label><input type="text" wicket:id="name" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group logo"></div>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" />
+ </div>
+ <div class="formelement">
+ <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div>
+ </div>
+ <div class="formelement">
+ <div wicket:id="users"></div>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" />
</div>
- </form>
+ <div class="formelement" style="display:none">
+ <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/>
+ </div>
+ <div class="formelement" style="display:none">
+ <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/>
+ </div>
+ <div class="formelement" style="display:none">
+ <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/>
+ </div>
+ </fieldset>
</div>
- </div>
- </wicket:panel>
+ </form>
+ </div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Mar 10 14:33:11 2017
@@ -23,7 +23,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
@@ -32,7 +31,6 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -49,13 +47,6 @@ public class GroupsPanel extends AdminPa
private static final long serialVersionUID = 1L;
private GroupForm form;
- @Override
- public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
- super.onMenuPanelLoad(handler);
- handler.appendJavaScript("groupsInit();");
- return this;
- }
-
public GroupsPanel(String id) {
super(id);
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.html Fri Mar 10 14:33:11 2017
@@ -7,16 +7,16 @@
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">
<wicket:panel>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Fri Mar 10 14:33:11 2017
@@ -7,93 +7,91 @@
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">
- <wicket:panel>
- <div wicket:id="feedback"></div>
- <script type="text/javascript">
- function labelsInit() {
- $('#addLanguage').dialog({
- closeOnEscape: true
- , autoOpen: false
- , resizable: false
- });
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight - 114);
- $('#adminTable').height(documentHeight - 172);
- };
- </script>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <div>
- <div wicket:id="addLangBtn" class="addButton" wicket:message="title:362" ></div>
- <div wicket:id="deleteLangBtn" class="delButton" wicket:message="title:363"></div>
- <form wicket:id="langForm" class="addLanguagePanel">
- <table>
- <tr>
- <td>
- <select wicket:id="language"></select>
- </td>
- <td>
- <span wicket:id="export" class="btn"><wicket:message key="360"/></span>
- </td>
- <td>
- <div class="fileupload fileupload-new" data-provides="fileupload" style="margin: 0;">
- <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span class="ui-button-text"><wicket:message key="387"/></span><input type="file" accept="text/xml" wicket:id="fileInput"/></span>
- </div>
- <span wicket:id="progress">[progressbar]</span>
- </td>
- </tr>
- </table>
- </form>
- </div>
- <span wicket:id="navigator">[dataview navigator]</span>
- <table class="adminListTable">
- <thead>
- <tr>
- <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="351" /></th>
- <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="352" /></th>
- </tr>
- </thead>
- </table>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="listContainer" >
- <tr wicket:id="langList">
- <td class="two_column_layout_column1"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td>
- <td class="two_column_layout_column2"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="353" /></legend>
- <div class="formelement">
- <label><wicket:message key="354" /></label><input type="text" wicket:id="key"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea>
- </div>
- </fieldset>
+<wicket:head>
+ <script type="text/javascript">
+ function extAdminPanelInit() {
+ $('#addLanguage').dialog({
+ closeOnEscape: true
+ , autoOpen: false
+ , resizable: false
+ });
+ ADMIN_TABLE_SHIIFT = 172;
+ };
+ </script>
+</wicket:head>
+<wicket:extend>
+ <div wicket:id="feedback"></div>
+ <div class="adminPanelColumnTable">
+ <div>
+ <div wicket:id="addLangBtn" class="addButton" wicket:message="title:362" ></div>
+ <div wicket:id="deleteLangBtn" class="delButton" wicket:message="title:363"></div>
+ <form wicket:id="langForm" class="addLanguagePanel">
+ <table>
+ <tr>
+ <td>
+ <select wicket:id="language"></select>
+ </td>
+ <td>
+ <span wicket:id="export" class="btn"><wicket:message key="360"/></span>
+ </td>
+ <td>
+ <div class="fileupload fileupload-new" data-provides="fileupload" style="margin: 0;">
+ <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span class="ui-button-text"><wicket:message key="387"/></span><input type="file" accept="text/xml" wicket:id="fileInput"/></span>
+ </div>
+ <span wicket:id="progress">[progressbar]</span>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="351" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:message key="352" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
+ <table class="adminListTable">
+ <tbody wicket:id="listContainer" >
+ <tr wicket:id="langList">
+ <td class="two_column_layout_column1"><div class="three_column_layout_divcolumn2"><span wicket:id="key"></span></div></td>
+ <td class="two_column_layout_column2"><div class="three_column_layout_divcolumn3"><span wicket:id="value"></span></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="353" /></legend>
+ <div class="formelement">
+ <label><wicket:message key="354" /></label><input type="text" wicket:id="key"/>
</div>
- </form>
+ <div class="formelement">
+ <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea>
+ </div>
+ </fieldset>
</div>
- </div>
- <div wicket:id="addLang"></div>
- </wicket:panel>
+ </form>
+ </div>
+ <div wicket:id="addLang"></div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Fri Mar 10 14:33:11 2017
@@ -33,7 +33,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -46,7 +45,6 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -78,13 +76,6 @@ public class LangPanel extends AdminPane
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
Map.Entry<Long, Locale> language;
- @Override
- public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
- super.onMenuPanelLoad(handler);
- handler.appendJavaScript("labelsInit();");
- return this;
- }
-
public LangPanel(String id) {
super(id);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Fri Mar 10 14:33:11 2017
@@ -7,96 +7,85 @@
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">
- <wicket:head>
- <script type="text/javascript">
- function omLdapPanelInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
- }
- </script>
- </wicket:head>
- <wicket:panel>
- <div class="adminPanel">
- <div class="adminPanelColumnTable">
- <span wicket:id="navigator">[dataview navigator]</span>
- <table class="adminListTable">
- <thead>
- <tr>
- <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th>
- <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th>
- <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:message key="1106" /></th>
- </tr>
- </thead>
- </table>
- <div class="tableWrapper" id="adminTable">
- <table class="adminListTable">
- <tbody wicket:id="listContainer">
- <tr wicket:id="ldapList">
- <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="configFileName"></span></div></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <div class="scrollcontent" id="adminForm">
- <fieldset class="ui-widget-content">
- <legend class="ui-widget-header"><wicket:message key="1107" /></legend>
- <div class="formelement">
- <label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1111" /></label><span wicket:id="insertedby.login"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1112" /></label><span wicket:id="updated"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/>
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1114" /></div>
- <br/>
- <label><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/>
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1116" /></div>
- <br/>
- <label><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
- </div>
- </fieldset>
+<wicket:extend>
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:message key="1104" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:message key="1105" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:message key="1106" /></th>
+ </tr>
+ </thead>
+ </table>
+ <div class="tableWrapper" id="adminTable">
+ <table class="adminListTable">
+ <tbody wicket:id="listContainer">
+ <tr wicket:id="ldapList">
+ <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="configFileName"></span></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="adminPanelColumnForm">
+ <form wicket:id="form" class="adminForm">
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message key="1107" /></legend>
+ <div class="formelement">
+ <label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1111" /></label><span wicket:id="insertedby.login"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1112" /></label><span wicket:id="updated"/>
</div>
- </form>
+ <div class="formelement">
+ <label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/>
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1114" /></div>
+ <br/>
+ <label><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/>
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1116" /></div>
+ <br/>
+ <label><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ </div>
+ </fieldset>
</div>
- </div>
- </wicket:panel>
+ </form>
+ </div>
+</wicket:extend>
</html>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1786351&r1=1786350&r2=1786351&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Mar 10 14:33:11 2017
@@ -22,7 +22,6 @@ import org.apache.openmeetings.db.dao.se
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
-import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
@@ -30,7 +29,6 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -46,13 +44,6 @@ public class LdapsPanel extends AdminPan
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
- @Override
- public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
- super.onMenuPanelLoad(handler);
- handler.appendJavaScript("omLdapPanelInit();");
- return this;
- }
-
public LdapsPanel(String id) {
super(id);
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"