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 2016/04/02 07:04:20 UTC
svn commit: r1737459 [3/4] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/
branches/3.1.x/openmeetings-...
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java Sat Apr 2 05:04:19 2016
@@ -41,10 +41,15 @@ public class MailMessageDao implements
@Override
public List<MailMessage> get(int start, int count) {
- return em.createNamedQuery("getMailMessages", MailMessage.class).setParameter("status", Status.NONE)
+ return em.createNamedQuery("getMailMessages", MailMessage.class)
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ public List<MailMessage> get(int start, int count, Status status) {
+ return em.createNamedQuery("getMailMessagesByStatus", MailMessage.class).setParameter("status", status)
+ .setFirstResult(start).setMaxResults(count).getResultList();
+ }
+
@Override
public List<MailMessage> get(String search, int start, int count, String order) {
return get(start, count);
@@ -52,8 +57,7 @@ public class MailMessageDao implements
@Override
public long count() {
- return em.createNamedQuery("countMailMessages", Long.class).setParameter("status", Status.NONE)
- .getSingleResult();
+ return em.createNamedQuery("countMailMessages", Long.class).getSingleResult();
}
@Override
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/NavigationDao.java Sat Apr 2 05:04:19 2016
@@ -59,17 +59,13 @@ public class NavigationDao {
.getResultList();
}
- public void addGlobalStructure(String action, int naviorder, long labelId, boolean isleaf, boolean isopen, long levelId,
- String name, boolean deleted, Long tooltipLabelId) {
+ public void addGlobalStructure(int naviorder, String labelId, long levelId, String name, String tooltipLabelId) {
Naviglobal ng = new Naviglobal();
- ng.setAction(action);
ng.setComment("");
ng.setIcon("");
ng.setNaviorder(naviorder);
ng.setLabelId(labelId);
- ng.setIsleaf(isleaf);
- ng.setIsopen(isopen);
- ng.setDeleted(deleted);
+ ng.setDeleted(false);
ng.setLevelId(levelId);
ng.setName(name);
ng.setInserted(new Date());
@@ -79,8 +75,8 @@ public class NavigationDao {
em.persist(ng);
}
- public void addMainStructure(String action, String params, int naviorder, long labelId, boolean isleaf, boolean isopen,
- long levelId, String name, long globalId, boolean deleted, Long tooltipLabelId) {
+ public void addMainStructure(String action, String params, int naviorder, String labelId,
+ long levelId, String name, long globalId, String tooltipLabelId) {
Naviglobal ng = getGlobalMenuEntry(globalId);
List<Navimain> mainEntries = ng.getMainnavi();
mainEntries = (mainEntries == null) ? new ArrayList<Navimain>() : mainEntries;
@@ -91,12 +87,10 @@ public class NavigationDao {
nm.setComment("");
nm.setIcon("");
nm.setLabelId(labelId);
- nm.setIsleaf(isleaf);
nm.setNaviorder(naviorder);
- nm.setIsopen(isopen);
nm.setLevelId(levelId);
nm.setName(name);
- nm.setDeleted(deleted);
+ nm.setDeleted(false);
nm.setGlobalId(globalId);
nm.setInserted(new Date());
nm.setTooltipLabelId(tooltipLabelId);
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Sat Apr 2 05:04:19 2016
@@ -37,8 +37,9 @@ import org.apache.openmeetings.db.entity
@Entity
@NamedQueries({
@NamedQuery(name = "getMailMessageById", query = "SELECT m FROM MailMessage m WHERE m.id = :id")
- , @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
- , @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m WHERE m.status = :status")
+ , @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m ORDER BY m.updated, m.inserted")
+ , @NamedQuery(name = "getMailMessagesByStatus", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
+ , @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m")
})
@Table(name = "email_queue")
public class MailMessage implements IDataProviderEntity {
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Naviglobal.java Sat Apr 2 05:04:19 2016
@@ -59,15 +59,6 @@ public class Naviglobal implements IData
@Column(name = "icon")
private String icon;
- @Column(name = "isleaf")
- private Boolean isleaf;
-
- @Column(name = "isopen")
- private Boolean isopen;
-
- @Column(name = "action")
- private String action;
-
@Column(name = "updated")
private Date updated;
@@ -87,10 +78,10 @@ public class Naviglobal implements IData
private boolean deleted;
@Column(name = "label_id")
- private Long labelId;
+ private String labelId;
@Column(name = "tooltip_label_id")
- private Long tooltipLabelId;
+ private String tooltipLabelId;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "global_id")
@@ -106,14 +97,6 @@ public class Naviglobal implements IData
this.id = id;
}
- public String getAction() {
- return action;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
public String getComment() {
return comment;
}
@@ -130,22 +113,6 @@ public class Naviglobal implements IData
this.icon = icon;
}
- public Boolean getIsleaf() {
- return isleaf;
- }
-
- public void setIsleaf(Boolean isleaf) {
- this.isleaf = isleaf;
- }
-
- public Boolean getIsopen() {
- return isopen;
- }
-
- public void setIsopen(Boolean isopen) {
- this.isopen = isopen;
- }
-
public Date getInserted() {
return inserted;
}
@@ -202,25 +169,25 @@ public class Naviglobal implements IData
this.mainnavi = mainnavi;
}
- public Long getLabelId() {
+ public String getLabelId() {
return labelId;
}
- public void setLabelId(Long labelId) {
+ public void setLabelId(String labelId) {
this.labelId = labelId;
}
- public Long getTooltipLabelId() {
+ public String getTooltipLabelId() {
return tooltipLabelId;
}
- public void setTooltipLabelId(Long tooltipLabelId) {
+ public void setTooltipLabelId(String tooltipLabelId) {
this.tooltipLabelId = tooltipLabelId;
}
@Override
public String toString() {
- return "Naviglobal [id=" + id + ", name=" + name + ", action=" + action + ", naviorder=" + naviorder + ", deleted="
+ return "Naviglobal [id=" + id + ", name=" + name + ", naviorder=" + naviorder + ", deleted="
+ deleted + ", labelId=" + labelId + ", tooltipLabelId=" + tooltipLabelId + "]";
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Navimain.java Sat Apr 2 05:04:19 2016
@@ -48,12 +48,6 @@ public class Navimain implements IDataPr
@Column(name = "icon")
private String icon;
- @Column(name = "isleaf")
- private Boolean isleaf;
-
- @Column(name = "isopen")
- private Boolean isopen;
-
@Column(name = "action")
private String action;
@@ -76,13 +70,13 @@ public class Navimain implements IDataPr
private Long levelId;
@Column(name = "label_id")
- private Long labelId;
+ private String labelId;
@Column(name = "deleted")
private boolean deleted;
@Column(name = "tooltip_label_id")
- private Long tooltipLabelId;
+ private String tooltipLabelId;
public Long getId() {
return id;
@@ -132,22 +126,6 @@ public class Navimain implements IDataPr
this.icon = icon;
}
- public Boolean getIsleaf() {
- return isleaf;
- }
-
- public void setIsleaf(Boolean isleaf) {
- this.isleaf = isleaf;
- }
-
- public Boolean getIsopen() {
- return isopen;
- }
-
- public void setIsopen(Boolean isopen) {
- this.isopen = isopen;
- }
-
public Date getInserted() {
return inserted;
}
@@ -188,19 +166,19 @@ public class Navimain implements IDataPr
this.naviorder = naviorder;
}
- public Long getLabelId() {
+ public String getLabelId() {
return labelId;
}
- public void setLabelId(Long labelId) {
+ public void setLabelId(String labelId) {
this.labelId = labelId;
}
- public Long getTooltipLabelId() {
+ public String getTooltipLabelId() {
return tooltipLabelId;
}
- public void setTooltipLabelId(Long tooltipLabelId) {
+ public void setTooltipLabelId(String tooltipLabelId) {
this.tooltipLabelId = tooltipLabelId;
}
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Sat Apr 2 05:04:19 2016
@@ -103,7 +103,6 @@ public class ImportInitvalues {
@Autowired
private RoomDao roomDao;
-
private int progress = 0;
public int getProgress() {
@@ -114,104 +113,39 @@ public class ImportInitvalues {
/*
* ######################## Dashboard Menu Points
*/
- navimanagement.addGlobalStructure("home", 1, 124, false, true, 1,
- "home", false, 582L);
- navimanagement.addMainStructure("dashboardModuleStartScreen", null, 1,
- 290, true, false, 1, "Dashboard Module", 1, false, 1450L);
- navimanagement.addMainStructure("dashboardModuleCalendar", null, 2,
- 291, true, false, 1, "Module Calendar", 1, false, 1451L);
+ navimanagement.addGlobalStructure(1, "124", 1, "home", "582");
+ navimanagement.addMainStructure("dashboardModuleStartScreen", null, 1, "290", 1, "Dashboard", 1, "1450");
+ navimanagement.addMainStructure("dashboardModuleCalendar", null, 2, "291", 1, "Calendar", 1, "1451");
/*
* ######################## Conference Menu Points
*/
-
- navimanagement.addGlobalStructure("meetings", 2, 792, false, true, 1,
- "List of Conference Rooms Global Navi", false, 793L);
-
- navimanagement.addMainStructure("conferenceModuleRoomList",
- "publicTabButton", 1, 777, true, false, 1,
- "List of Conference Rooms Main Navi", 2, false, 1506L);
-
- navimanagement.addMainStructure("conferenceModuleRoomList",
- "privateTabButton", 2, 779, true, false, 1,
- "List of Conference Rooms Main Navi", 2, false, 1507L);
-
- navimanagement.addMainStructure("conferenceModuleRoomList",
- "myTabButton", 3, 781, true, false, 1,
- "List of Conference Rooms Main Navi", 2, false, 1508L);
-
- /*
- * ######################## Recording Menu Points - disabled by default
- */
-
- navimanagement.addGlobalStructure("record", 3, 395, false, true, 1,
- "record", false, 583L);
- navimanagement.addMainStructure("recordModule", null, 1, 395, true,
- false, 1, "Module Recording Player", 3, false, 1452L);
+ navimanagement.addGlobalStructure(2, "792", 1, "Conference Rooms", "793");
+ navimanagement.addMainStructure("conferenceModuleRoomList", "publicTabButton", 1, "777", 1, "Public Rooms", 2, "1506");
+ navimanagement.addMainStructure("conferenceModuleRoomList", "privateTabButton", 2, "779", 1, "Private Rooms", 2, "1507");
+ navimanagement.addMainStructure("conferenceModuleRoomList", "myTabButton", 3, "781", 1, "My Rooms", 2, "1508");
/*
- * ######################## Event Menu Points
+ * ######################## Recording Menu Points
*/
-
- navimanagement.addGlobalStructure("events", 4, 3, false, true, 1,
- "List of Event Rooms Global Navi", true, 585L);
-
- navimanagement
- .addMainStructure("eventModuleRoomList", null, 1, 3, true,
- false, 1, "List of Event Rooms Main Navi", 4, false,
- null);
-
- /*
- * ######################## Moderation Menu Points - disabled by default
- */
- navimanagement.addGlobalStructure("moderate", 5, 649L, false, true, 2,
- "Moderation Menu", true, 660L);
-
- navimanagement.addMainStructure("moderatorModuleUser", null, 1, 650,
- true, false, 1, "Moderate Users", 5, false, null);
-
- navimanagement.addMainStructure("moderatorModuleRoom", null, 1, 651,
- true, false, 1, "Moderate Rooms", 5, false, null);
+ navimanagement.addGlobalStructure(3, "395", 1, "record", "583");
+ navimanagement.addMainStructure("recordModule", null, 1, "395", 1, "Recordings", 3, "1452");
/*
* ######################## Administration Menu Points
*/
-
- navimanagement.addGlobalStructure("admin", 6, 6, false, true, 3,
- "Administration Menu", false, 586L);
-
- navimanagement.addMainStructure("adminModuleUser", null, 14, 125, true,
- false, 2, "Administration of Users", 6, false, 1454L);
-
- navimanagement.addMainStructure("adminModuleConnections", null, 15,
- 597, true, false, 3, "Aministration of Connections", 6, false,
- 1455L);
-
- navimanagement.addMainStructure("adminModuleOrg", null, 16, 127, true,
- false, 3, "Administration of Groups", 6, false, 1456L);
-
- navimanagement.addMainStructure("adminModuleRoom", null, 17, 186, true,
- false, 3, "Administration of Rooms", 6, false, 1457L);
-
- navimanagement.addMainStructure("adminModuleConfiguration", null, 18,
- 263, true, false, 3, "Administration of Configuration", 6,
- false, 1458L);
-
- navimanagement.addMainStructure("adminModuleLanguages", null, 19, 348,
- true, false, 3, "Administration of Languages", 6, false, 1459L);
-
- navimanagement.addMainStructure("adminModuleLDAP", null, 20, 1103,
- true, false, 3, "Administration of LDAP Configs", 6, false,
- 1460L);
-
- navimanagement.addMainStructure("adminModuleOAuth", null, 21, 1571,
- true, false, 3, "Administration of OAuth2 servers", 6, false, 1572L);
-
- navimanagement.addMainStructure("adminModuleBackup", null, 22, 367,
- true, false, 3, "Administration of Backups", 6, false, 1461L);
-
- navimanagement.addMainStructure("adminModuleServers", null, 23, 1498,
- true, false, 3, "Administration of Servers", 6, false, 1499L);
+ navimanagement.addGlobalStructure(6, "6", 3, "Administration Menu", "586");
+ navimanagement.addMainStructure("adminModuleUser", null, 14, "125", 2, "Administration of Users", 6, "1454");
+ navimanagement.addMainStructure("adminModuleConnections", null, 15, "597", 3, "Aministration of Connections", 6, "1455");
+ navimanagement.addMainStructure("adminModuleOrg", null, 16, "127", 3, "Administration of Groups", 6, "1456");
+ navimanagement.addMainStructure("adminModuleRoom", null, 17, "186", 3, "Administration of Rooms", 6, "1457");
+ navimanagement.addMainStructure("adminModuleConfiguration", null, 18, "263", 3, "Administration of Configuration", 6, "1458");
+ navimanagement.addMainStructure("adminModuleLanguages", null, 19, "348", 3, "Administration of Languages", 6, "1459");
+ navimanagement.addMainStructure("adminModuleLDAP", null, 20, "1103", 3, "Administration of LDAP Configs", 6, "1460");
+ navimanagement.addMainStructure("adminModuleOAuth", null, 21, "1571", 3, "Administration of OAuth2 servers", 6, "1572");
+ navimanagement.addMainStructure("adminModuleBackup", null, 22, "367", 3, "Administration of Backups", 6, "1461");
+ navimanagement.addMainStructure("adminModuleServers", null, 23, "1498", 3, "Administration of Servers", 6, "1499");
+ navimanagement.addMainStructure("adminModuleEmail", null, 24, "main.menu.admin.email", 3, "Administration of Emails", 6, "main.menu.admin.email.desc");
log.debug("MainMenu ADDED");
}
Modified: openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/templates.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/templates.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/templates.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/src/main/assembly/components/templates.xml Sat Apr 2 05:04:19 2016
@@ -28,6 +28,7 @@
<include>**/*.js</include>
<include>**/*.css</include>
<include>**/*.xml</include>
+ <include>**/*.properties</include>
</includes>
</fileSet>
<fileSet>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.java Sat Apr 2 05:04:19 2016
@@ -24,8 +24,17 @@ import org.apache.wicket.authroles.autho
@AuthorizeInstantiation("Admin")
public abstract class AdminPanel extends BasePanel {
private static final long serialVersionUID = 1L;
+ protected final static String ROW_CLASS = "clickable ui-widget-content %s";
public AdminPanel(String id) {
super(id);
}
+
+ protected StringBuilder getRowClass(Long id, Long selectedId) {
+ StringBuilder sb = new StringBuilder(ROW_CLASS);
+ if (id != null && id.equals(selectedId)) {
+ sb.append(" ui-state-default");
+ }
+ return sb;
+ }
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Sat Apr 2 05:04:19 2016
@@ -20,14 +20,14 @@
-->
<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>
+ <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">
@@ -44,7 +44,7 @@
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer" >
- <tr wicket:id="configList">
+ <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>
@@ -60,20 +60,20 @@
<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>
+ <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>
</div>
</form>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Sat Apr 2 05:04:19 2016
@@ -61,9 +61,9 @@ public class ConfigsPanel extends AdminP
@Override
protected void populateItem(final Item<Configuration> item) {
final Configuration c = item.getModelObject();
- item.add(new Label("id", c.getId()));
- item.add(new Label("key", c.getKey()));
- item.add(new Label("value", c.getValue()));
+ item.add(new Label("id"));
+ item.add(new Label("key"));
+ item.add(new Label("value"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -74,8 +74,7 @@ public class ConfigsPanel extends AdminP
target.appendJavaScript("omConfigPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (c.getId().equals(form.getModelObject().getId()) ? " ui-state-default" : "")));
+ item.add(AttributeModifier.replace("class", getRowClass(c.getId(), form.getModelObject().getId())));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
@@ -96,7 +95,7 @@ public class ConfigsPanel extends AdminP
form = new ConfigForm("form", listContainer, new Configuration());
form.showNewRecord();
- add(form);
+ add(form);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html Sat Apr 2 05:04:19 2016
@@ -36,9 +36,9 @@
</thead>
<tbody wicket:id="container" >
<tr wicket:id="clientList">
- <td wicket:id="id"></td>
- <td wicket:id="login"></td>
- <td wicket:id="since"></td>
+ <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>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Sat Apr 2 05:04:19 2016
@@ -80,10 +80,10 @@ public class ConnectionsPanel extends Ad
@Override
protected void populateItem(final Item<Client> item) {
Client c = item.getModelObject();
- item.add(new Label("id", c.getStreamid()));
- item.add(new Label("login", c.getUsername()));
- item.add(new Label("since", c.getConnectedSince()));
- item.add(new Label("scope", c.getScope()));
+ 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")) {
private static final long serialVersionUID = 1L;
@@ -125,7 +125,7 @@ public class ConnectionsPanel extends Ad
target.add(details.setVisible(true));
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"));
+ item.add(AttributeModifier.append("class", ROW_CLASS));
}
};
add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true));
@@ -195,7 +195,7 @@ public class ConnectionsPanel extends Ad
target.add(details.setVisible(true));
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"));
+ item.add(AttributeModifier.append("class", ROW_CLASS));
}
};
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java?rev=1737459&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java Sat Apr 2 05:04:19 2016
@@ -0,0 +1,59 @@
+/*
+ * 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.web.admin.email;
+
+import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
+
+import java.util.Date;
+
+import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
+
+public class EmailForm extends Form<MailMessage> {
+ private static final long serialVersionUID = 1L;
+ private final DateLabel inserted;
+ private final DateLabel updated;
+ private final Label status;
+
+ public EmailForm(String id, MailMessage m) {
+ super(id, new CompoundPropertyModel<>(m));
+ add(status = new Label("status", Model.of("")));
+ add(new Label("subject"));
+ add(new Label("recipients"));
+ add(new Label("body").setEscapeModelStrings(false));
+ add(inserted = forDatePattern("inserted", Model.of((Date)null), WEB_DATE_PATTERN));
+ add(updated = forDatePattern("updated", Model.of((Date)null), WEB_DATE_PATTERN));
+ add(new Label("errorCount"));
+ add(new Label("lastError"));
+ }
+
+ @Override
+ protected void onModelChanged() {
+ super.onModelChanged();
+ MailMessage m = getModelObject();
+ status.setDefaultModelObject(getString("admin.email.status." + m.getStatus().name()));
+ inserted.setModelObject(m.getInserted().getTime());
+ updated.setModelObject(m.getInserted().getTime());
+ }
+}
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1737459&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Sat Apr 2 05:04:19 2016
@@ -0,0 +1,68 @@
+<?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: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="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">
+ <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="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 class="input" wicket:id="lastError"></span>
+ </div>
+ </fieldset>
+ </div>
+ </form>
+ </div>
+ </div>
+</wicket:panel>
+</html>
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java?rev=1737459&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java Sat Apr 2 05:04:19 2016
@@ -0,0 +1,94 @@
+/*
+ * 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.web.admin.email;
+
+import org.apache.openmeetings.db.dao.basic.MailMessageDao;
+import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
+import org.apache.openmeetings.web.common.PagedEntityListPanel;
+import org.apache.openmeetings.web.data.DataViewContainer;
+import org.apache.openmeetings.web.data.OmOrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+
+public class EmailPanel extends AdminPanel {
+ private static final long serialVersionUID = 1L;
+ private final WebMarkupContainer list = new WebMarkupContainer("list");
+ private final EmailForm form;
+
+ public EmailPanel(String id) {
+ super(id);
+ SearchableDataView<MailMessage> dataView = new SearchableDataView<MailMessage>("email",
+ new SearchableDataProvider<MailMessage>(MailMessageDao.class))
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(Item<MailMessage> item) {
+ final MailMessage m = item.getModelObject();
+ item.add(new Label("id"));
+ item.add(new Label("status", getString("admin.email.status." + m.getStatus().name())));
+ item.add(new Label("subject"));
+ //TODO color for Error
+ item.add(new AjaxEventBehavior("click") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ form.setModelObject(m);
+ target.add(form, list);
+ }
+ });
+ item.add(AttributeModifier.replace("class", getRowClass(m)));
+ }
+ };
+ add(list.add(dataView).setOutputMarkupId(true));
+ final PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID = -1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(list);
+ }
+ };
+ DataViewContainer<MailMessage> container = new DataViewContainer<MailMessage>(list, dataView, navigator);
+ container.addLink(new OmOrderByBorder<MailMessage>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<MailMessage>("orderBySubject", "subject", container))
+ .addLink(new OmOrderByBorder<MailMessage>("orderByStatus", "status", container));
+ add(container.getLinks());
+ add(navigator);
+
+ form = new EmailForm("form", new MailMessage());
+ add(form);
+ }
+
+ private StringBuilder getRowClass(final MailMessage m) {
+ StringBuilder sb = getRowClass(m.getId(), form.getModelObject().getId());
+ if (MailMessage.Status.ERROR == m.getStatus()) {
+ sb.append(" ui-state-error");
+ }
+ return sb;
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html Sat Apr 2 05:04:19 2016
@@ -23,23 +23,23 @@
<div class="usergroupspanel">
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable" style="min-width: 440px; max-width: 440px" >
- <tr>
- <th class="ui-widget-header" style="width: 34px; max-width: 34px; overflow: hidden;" wicket:message="title:98"><wicket:message key="98" /></th>
- <th class="ui-widget-header" style="width: 360px"><wicket:message key="177" /></th>
- <th class="ui-widget-header" style="width: 34px"><wicket:message key="275" /></th>
- </tr>
- </table>
- <div class="tableWrapper" style="width: 460px; height: 460px;">
- <table class="adminListTable" style="min-width: 440px; max-width: 440px">
- <tbody>
- <tr wicket:id="userList" class="ui-widget-content">
- <td style="width: 34px"><input type="checkbox" wicket:id="isModerator"/></td>
- <td style="width: 360px"><div style="width: 360px"><span wicket:id="label"></span></div></td>
- <td style="width: 34px"><div style="width: 34px"><div class="formCancelButton" wicket:id="deleteUserBtn" wicket:message="title:274"></div></div></td>
- </tr>
- </tbody>
- </table>
- </div>
+ <tr>
+ <th class="ui-widget-header" style="width: 34px; max-width: 34px; overflow: hidden;" wicket:message="title:98"><wicket:message key="98" /></th>
+ <th class="ui-widget-header" style="width: 360px"><wicket:message key="177" /></th>
+ <th class="ui-widget-header" style="width: 34px"><wicket:message key="275" /></th>
+ </tr>
+ </table>
+ <div class="tableWrapper" style="width: 460px; height: 460px;">
+ <table class="adminListTable" style="min-width: 440px; max-width: 440px">
+ <tbody>
+ <tr wicket:id="userList" class="ui-widget-content">
+ <td style="width: 34px"><input type="checkbox" wicket:id="isModerator"/></td>
+ <td style="width: 360px"><div style="width: 360px"><span wicket:id="label"></span></div></td>
+ <td style="width: 34px"><div style="width: 34px"><div class="formCancelButton" wicket:id="deleteUserBtn" wicket:message="title:274"></div></div></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
</wicket:panel>
</html>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Sat Apr 2 05:04:19 2016
@@ -23,8 +23,8 @@
<script type="text/javascript">
function groupsInit() {
var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
+ $('#adminForm').height(documentHeight-114);
+ $('#adminTable').height(documentHeight-144);
};
</script>
</wicket:head>
@@ -41,7 +41,7 @@
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer">
- <tr wicket:id="groupList">
+ <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>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Sat Apr 2 05:04:19 2016
@@ -55,20 +55,20 @@ public class GroupsPanel extends AdminPa
public GroupsPanel(String id) {
super(id);
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
-
+
//Adding the Group Form
form = new GroupForm("form", listContainer, new Group());
- add(form);
+ add(form);
- //List view
- SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableDataProvider<Group>(GroupDao.class)) {
+ //List view
+ SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableDataProvider<Group>(GroupDao.class)) {
private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<Group> item) {
final Group o = item.getModelObject();
- item.add(new Label("id", "" + o.getId()));
- item.add(new Label("name", "" + o.getName()));
+ item.add(new Label("id"));
+ item.add(new Label("name"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -80,8 +80,7 @@ public class GroupsPanel extends AdminPa
target.appendJavaScript("groupsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"
- + (o.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.append("class", getRowClass(o.getId(), form.getModelObject().getId())));
}
};
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Sat Apr 2 05:04:19 2016
@@ -29,8 +29,8 @@
, resizable: false
});
var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight - 114);
- $('#adminTable').height(documentHeight - 172);
+ $('#adminForm').height(documentHeight - 114);
+ $('#adminTable').height(documentHeight - 172);
};
</script>
<div class="adminPanel">
@@ -72,8 +72,8 @@
<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="name"></span></div></td>
+ <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>
@@ -86,12 +86,12 @@
<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 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>
+ <div class="formelement">
+ <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea>
+ </div>
</fieldset>
</div>
</form>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Sat Apr 2 05:04:19 2016
@@ -117,8 +117,8 @@ public class LangPanel extends AdminPane
@Override
protected void populateItem(final Item<StringLabel> item) {
final StringLabel fv = item.getModelObject();
- item.add(new Label("name", fv.getKey()));
- item.add(new Label("value", fv.getValue()));
+ item.add(new Label("key"));
+ item.add(new Label("value"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -129,7 +129,7 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content" + (fv.getKey().equals(form.getModelObject().getKey()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.append("class", getRowClass(fv.getId(), form.getModelObject().getId())));
}
};
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Sat Apr 2 05:04:19 2016
@@ -20,14 +20,14 @@
-->
<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>
+ <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">
@@ -44,7 +44,7 @@
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer">
- <tr wicket:id="ldapList">
+ <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>
@@ -60,41 +60,41 @@
<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>
- </div>
+ <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>
+ </div>
</form>
</div>
</div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Sat Apr 2 05:04:19 2016
@@ -60,9 +60,9 @@ public class LdapsPanel extends AdminPan
@Override
protected void populateItem(final Item<LdapConfig> item) {
final LdapConfig lc = item.getModelObject();
- item.add(new Label("id", "" + lc.getId()));
- item.add(new Label("name", "" + lc.getName()));
- item.add(new Label("configFileName", "" + lc.getConfigFileName()));
+ item.add(new Label("id"));
+ item.add(new Label("name"));
+ item.add(new Label("configFileName"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -73,8 +73,7 @@ public class LdapsPanel extends AdminPan
target.appendJavaScript("omLdapPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (lc.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.replace("class", getRowClass(lc.getId(), form.getModelObject().getId())));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
@@ -95,7 +94,7 @@ public class LdapsPanel extends AdminPan
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
- add(form);
+ add(form);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html Sat Apr 2 05:04:19 2016
@@ -20,14 +20,14 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <script type="text/javascript">
- function oauthPanelInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
- }
- </script>
- </wicket:head>
+ <script type="text/javascript">
+ function oauthPanelInit() {
+ var documentHeight = $(document).height();
+ $('#adminForm').height(documentHeight-114);
+ $('#adminTable').height(documentHeight-144);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
<div class="adminPanel">
<div class="adminPanelColumnTable">
@@ -43,8 +43,8 @@
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer">
- <tr wicket:id="oauthServersList">
- <td class="two_column_layout_column1"><div class="two_column_layout_divcolumn1"><span wicket:id="oauthServerId"></span></div></td>
+ <tr wicket:id="oauthServersList">
+ <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>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Sat Apr 2 05:04:19 2016
@@ -41,15 +41,15 @@ public class OAuthPanel extends AdminPan
public OAuthPanel(String id) {
super(id);
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
- new SearchableDataProvider<OAuthServer>(OAuth2Dao.class)) {
-
+ new SearchableDataProvider<OAuthServer>(OAuth2Dao.class))
+ {
private static final long serialVersionUID = 1L;
@Override
protected void populateItem(Item<OAuthServer> item) {
final OAuthServer server = item.getModelObject();
- item.add(new Label("oauthServerId", String.valueOf(server.getId())));
- item.add(new Label("name", server.getName()));
+ item.add(new Label("id"));
+ item.add(new Label("name"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -61,8 +61,7 @@ public class OAuthPanel extends AdminPan
target.appendJavaScript("oauthPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (server.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
}
};
@@ -77,14 +76,14 @@ public class OAuthPanel extends AdminPan
}
};
DataViewContainer<OAuthServer> container = new DataViewContainer<OAuthServer>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "oauthServerId", container))
+ container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "id", container))
.addLink(new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
add(container.getLinks());
add(navigator);
form = new OAuthForm("form", listContainer, new OAuthServer());
form.showNewRecord();
- add(form);
+ add(form);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Sat Apr 2 05:04:19 2016
@@ -35,7 +35,7 @@
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
<tbody wicket:id="listContainer">
- <tr wicket:id="roomList">
+ <tr wicket:id="roomList">
<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="ispublic"></span></div></td>
@@ -53,116 +53,116 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="187" /></legend>
<div class="formelement">
- <label><wicket:message key="193" /></label><input type="text" wicket:id="name" />
+ <label><wicket:message key="193" /></label><input type="text" wicket:id="name" />
</div>
<div class="formelement">
- <label><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="194" /></label><select wicket:id="type"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" />
- </div>
- </fieldset>
-
- <!-- Groups -->
+ <label><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="194" /></label><select wicket:id="type"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" />
+ </div>
+ </fieldset>
+
+ <!-- Groups -->
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="191" /></legend>
- <div class="formelement">
- <label><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="828" /></div>
+ <div class="formelement">
+ <label><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="828" /></div>
<label><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
- </div>
- </fieldset>
-
- <!-- Limitations -->
+ </div>
+ </fieldset>
+
+ <!-- Limitations -->
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="830" /></legend>
- <div class="formelement">
- <label><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
- </div>
- <div class="formelement">
- <label><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" />
- </div>
+ <div class="formelement">
+ <label><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" />
+ </div>
</fieldset>
<!-- Rights -->
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="881" /></legend>
- <div class="formelement">
- <label><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
- </div>
- <div class="formelement">
- <wicket:message key="880" />
- <br/>
- <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" />
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1077" /></div>
- <label><wicket:message key="1531" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowFontStyles" />
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1101" /></div>
- <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" />
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1102" /></div>
- <br/>
- <label><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" />
- </div>
+ <div class="formelement">
+ <label><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
+ </div>
+ <div class="formelement">
+ <wicket:message key="880" />
+ <br/>
+ <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" />
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1077" /></div>
+ <label><wicket:message key="1531" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowFontStyles" />
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1101" /></div>
+ <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" />
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1102" /></div>
+ <br/>
+ <label><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" />
+ </div>
</fieldset>
<!-- Room Layout options -->
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1443" /></legend>
<div class="formelement">
- <label><wicket:message key="1357" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideTopBar" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1436" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatHidden" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1437" /></label><input type="checkbox" class="formcheckbox" wicket:id="activitiesHidden" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1438" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideFilesExplorer" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1439" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideActionsMenu" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1440" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideScreenSharing" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1441" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideWhiteboard" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1442" /></label><input type="checkbox" class="formcheckbox" wicket:id="showMicrophoneStatus" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1526" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" />
- </div>
+ <label><wicket:message key="1357" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideTopBar" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1436" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatHidden" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1437" /></label><input type="checkbox" class="formcheckbox" wicket:id="activitiesHidden" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1438" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideFilesExplorer" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1439" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideActionsMenu" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1440" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideScreenSharing" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1441" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideWhiteboard" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1442" /></label><input type="checkbox" class="formcheckbox" wicket:id="showMicrophoneStatus" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1526" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" />
+ </div>
</fieldset>
<!-- Users in this Room -->
@@ -180,7 +180,7 @@
<div class="tableWrapperSmall" id="adminTableSmall">
<table class="adminListTable">
<tbody wicket:id="clientsContainer">
- <tr wicket:id="clients">
+ <tr wicket:id="clients">
<td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="clientId"></span></div></td>
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="clientLogin"></span></div></td>
<td class="three_column_layout_column3"><div class="formCancelButton" wicket:id="clientDelete" wicket:message="title:604"></div></td>
@@ -192,14 +192,14 @@
<!-- Default moderators -->
<fieldset class="ui-widget-content">
- <div class="formelement">
- <div class="info-text"><wicket:message key="823" /></div>
- <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" />
- </div>
- <div class="formelement">
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="823" /></div>
+ <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" />
+ </div>
+ <div class="formelement">
<label><wicket:message key="816" /></label><div class="om-select2"><select wicket:id="moderator2add" class="input"></select></div>
- </div>
- <div class="formelement" wicket:id="moderatorContainer">
+ </div>
+ <div class="formelement" wicket:id="moderatorContainer">
<table class="adminListTableSmall">
<thead>
<tr>
@@ -214,37 +214,37 @@
<div class="tableWrapperSmall" id="adminTableSmall">
<table class="adminListTableSmall">
<tbody>
- <tr wicket:id="moderators">
+ <tr wicket:id="moderators">
<td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><input type="checkbox" wicket:id="superModerator"/></div></td>
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="userId"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="uName"></span></div></td>
<td class="three_column_layout_column4"><div class="three_column_layout_divcolumn4" style="overflow: hidden;"><span wicket:id="email"></span></div></td>
- <td style="width: 50px"><div style="width: 50px"><div class="formCancelButton" wicket:id="delete" wicket:message="title:274"></div></div></td>
+ <td style="width: 50px"><div style="width: 50px"><div class="formCancelButton" wicket:id="delete" wicket:message="title:274"></div></div></td>
</tr>
</tbody>
</table>
</div>
</div>
</fieldset>
- <!--SIP Settings -->
+ <!--SIP Settings -->
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1001" /></legend>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1002" /></div>
- <br/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1003" /></label><input type="text" wicket:id="confno" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1004" /></label><input type="text" wicket:id="pin" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" />
- </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1002" /></div>
+ <br/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1003" /></label><input type="text" wicket:id="confno" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1004" /></label><input type="text" wicket:id="pin" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" />
+ </div>
</fieldset>
</div>
</form>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Sat Apr 2 05:04:19 2016
@@ -60,9 +60,9 @@ public class RoomsPanel extends AdminPan
protected void populateItem(final Item<Room> item) {
Room room = item.getModelObject();
final long roomId = room.getId();
- item.add(new Label("id", "" + room.getId()));
- item.add(new Label("name", "" + room.getName()));
- item.add(new Label("ispublic", "" + room.getIspublic()));
+ item.add(new Label("id"));
+ item.add(new Label("name"));
+ item.add(new Label("ispublic"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -74,8 +74,7 @@ public class RoomsPanel extends AdminPan
target.appendJavaScript("omRoomPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
- + (room.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
}
};
@@ -95,7 +94,7 @@ public class RoomsPanel extends AdminPan
add(container.getLinks());
add(navigator);
- add(form = new RoomForm("form", listContainer, new Room()));
+ add(form = new RoomForm("form", listContainer, new Room()));
}
@Override