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 [2/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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original)
+++ openmeetings/application/branches/3.1.x/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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/branches/3.1.x/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
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.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 omServerPanelInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight-114);
- $('#adminTable').height(documentHeight-144);
- }
- </script>
- </wicket:head>
+ <script type="text/javascript">
+ function omServerPanelInit() {
+ var documentHeight = $(document).height();
+ $('#adminForm').height(documentHeight-114);
+ $('#adminTable').height(documentHeight-144);
+ }
+ </script>
+ </wicket:head>
<wicket:panel>
<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="serverList">
+ <tr wicket:id="serverList">
<td class="three_column_layout_column1"><div class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="address"></span></div></td>
@@ -60,53 +60,53 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1502" /></legend>
<div class="formelement">
- <label><wicket:message key="1500" /></label><input type="text" wicket:id="name"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" />
- </div>
- <div class="formelement">
- <label><wicket:message key="1501" /></label><input type="text" wicket:id="address"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1519" /></label><input type="text" wicket:id="port"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1520" /></label><input type="text" wicket:id="user"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/>
- </div>
- <div class="formelement">
- <label><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/>
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:message key="1518" /></div>
- <br/>
- <label><wicket:message key="1517" /></label><span wicket:id="lastPing"/>
- <!-- br/>
- <label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/-->
- </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">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
- </div>
- </fieldset>
- </div>
+ <label><wicket:message key="1500" /></label><input type="text" wicket:id="name"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" />
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1501" /></label><input type="text" wicket:id="address"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1519" /></label><input type="text" wicket:id="port"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1520" /></label><input type="text" wicket:id="user"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/>
+ </div>
+ <div class="formelement">
+ <div class="info-text"><wicket:message key="1518" /></div>
+ <br/>
+ <label><wicket:message key="1517" /></label><span wicket:id="lastPing"/>
+ <!-- br/>
+ <label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/-->
+ </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">
+ <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ </div>
+ </fieldset>
+ </div>
</form>
</div>
</div>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Sat Apr 2 05:04:19 2016
@@ -60,9 +60,9 @@ public class ServersPanel extends AdminP
@Override
protected void populateItem(final Item<Server> item) {
final Server server = item.getModelObject();
- item.add(new Label("id", "" + server.getId()));
- item.add(new Label("name", "" + server.getName()));
- item.add(new Label("address", "" + server.getAddress()));
+ item.add(new Label("id"));
+ item.add(new Label("name"));
+ item.add(new Label("address"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -73,8 +73,7 @@ public class ServersPanel extends AdminP
target.appendJavaScript("omServerPanelInit();");
}
});
- 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())));
}
};
@@ -96,7 +95,7 @@ public class ServersPanel extends AdminP
form = new ServerForm("form", listContainer, new Server());
form.showNewRecord();
- add(form);
+ add(form);
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html Sat Apr 2 05:04:19 2016
@@ -48,7 +48,7 @@
<tr wicket:id="userList">
<td class="four_column_layout_column1"><div
class="four_column_layout_divcolumn1">
- <span wicket:id="userId"></span>
+ <span wicket:id="id"></span>
</div></td>
<td class="four_column_layout_column2"><div
class="four_column_layout_divcolumn2">
@@ -56,11 +56,11 @@
</div></td>
<td class="four_column_layout_column3"><div
class="four_column_layout_divcolumn3">
- <span wicket:id="firstName"></span>
+ <span wicket:id="firstname"></span>
</div></td>
<td class="four_column_layout_column4"><div
class="four_column_layout_divcolumn4">
- <span wicket:id="lastName"></span>
+ <span wicket:id="lastname"></span>
</div></td>
</tr>
</tbody>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Sat Apr 2 05:04:19 2016
@@ -72,10 +72,10 @@ public class UsersPanel extends AdminPan
protected void populateItem(Item<User> item) {
User u = item.getModelObject();
final long userId = u.getId();
- item.add(new Label("userId", "" + u.getId()));
- item.add(new Label("login", u.getLogin()));
- item.add(new Label("firstName", u.getFirstname()));
- item.add(new Label("lastName", u.getLastname()));
+ item.add(new Label("id"));
+ item.add(new Label("login"));
+ item.add(new Label("firstname"));
+ item.add(new Label("lastname"));
item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -85,8 +85,7 @@ public class UsersPanel extends AdminPan
form.update(target);
}
});
- item.add(AttributeModifier.append("class", "clickable ui-widget-content"
- + (u.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+ item.add(AttributeModifier.append("class", getRowClass(u.getId(), form.getModelObject().getId())));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Sat Apr 2 05:04:19 2016
@@ -365,6 +365,10 @@ public class Application extends Authent
return getString(id, WebSession.getLanguage());
}
+ public static String getString(String id) {
+ return getString(id, WebSession.getLanguage());
+ }
+
public static Locale getLocale(final long languageId) {
Locale loc = LabelDao.languages.get(languageId);
if (loc == null) {
@@ -429,19 +433,19 @@ public class Application extends Authent
public static WicketTester getWicketTester(long langId) {
Application app = new Application();
-
+
WicketTester tester = new WicketTester(app);
ServletContext sc = app.getServletContext();
- XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
- xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
- xmlContext.setServletContext(sc);
- xmlContext.refresh();
- sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
- if (langId > 0) {
- WebSession.get().setLanguage(langId);
- }
- InitializationContainer.initComplete = true;
- return tester;
+ XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
+ xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
+ xmlContext.setServletContext(sc);
+ xmlContext.refresh();
+ sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
+ if (langId > 0) {
+ WebSession.get().setLanguage(langId);
+ }
+ InitializationContainer.initComplete = true;
+ return tester;
}
public static void destroy(WicketTester tester) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Yes/No</entry>
<entry key="poll.type.numeric">Numeric 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">ÙعÙ
/ Ùا</entry>
<entry key="poll.type.numeric">عدد٠1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ðа/Ðе</entry>
<entry key="poll.type.numeric">ЧиÑлов 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">SÃ/No</entry>
<entry key="poll.type.numeric">Valor numèric [1-10]</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ano/Ne</entry>
<entry key="poll.type.numeric">ÄÃsla 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ja/Nej</entry>
<entry key="poll.type.numeric">Numerisk 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sat Apr 2 05:04:19 2016
@@ -1888,4 +1888,15 @@
<entry key="poll.type.yesNo">Ja/Nein</entry>
<entry key="poll.type.numeric">Numerisch 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Îαι/ÎÏι</entry>
<entry key="poll.type.numeric">ÎÏιθμÏÏ 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sat Apr 2 05:04:19 2016
@@ -1872,4 +1872,15 @@
<entry key="poll.type.yesNo">SÃ/No</entry>
<entry key="poll.type.numeric">Valor numérico [1-10]</entry>
<entry key="wizard.button.finish">Finalizar</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ø®Ùر/بÙÙ</entry>
<entry key="poll.type.numeric">1-10 اعداد</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Kyllä/Ei</entry>
<entry key="poll.type.numeric">Numeerinen 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sat Apr 2 05:04:19 2016
@@ -1844,4 +1844,15 @@
<entry key="poll.type.yesNo">Oui/Non</entry>
<entry key="poll.type.numeric">Numérique 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">SÃ/Non</entry>
<entry key="poll.type.numeric">Valor numérico 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sat Apr 2 05:04:19 2016
@@ -1866,4 +1866,15 @@
<entry key="poll.type.yesNo">Igen/Nem</entry>
<entry key="poll.type.numeric">Szám 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ya/Tidak</entry>
<entry key="poll.type.numeric">Angka dari 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Si/No</entry>
<entry key="poll.type.numeric">Numerico 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">ã¯ã/ããã</entry>
<entry key="poll.type.numeric">1ï½10ã®æ°å</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Sat Apr 2 05:04:19 2016
@@ -1880,4 +1880,15 @@
<entry key="poll.type.yesNo">ë¤/ìëì¤</entry>
<entry key="poll.type.numeric">ì«ì 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ja/Nee</entry>
<entry key="poll.type.numeric">Getal 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Tak/Nie</entry>
<entry key="poll.type.numeric">Liczba 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Sim/Não</entry>
<entry key="poll.type.numeric">Numérico 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Sim/Não</entry>
<entry key="poll.type.numeric">Numérico 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sat Apr 2 05:04:19 2016
@@ -1884,4 +1884,15 @@
<entry key="poll.type.yesNo">Ðа/ÐеÑ</entry>
<entry key="poll.type.numeric">ЧиÑло 1 - 10</entry>
<entry key="wizard.button.finish">ÐаконÑиÑÑ</entry>
+ <entry key="main.menu.admin.email">УпÑавление пиÑÑмами</entry>
+ <entry key="main.menu.admin.email.desc">ÐÑовеÑка ÑÑаÑÑÑа оÑоÑланнÑÑ
пиÑем</entry>
+ <entry key="admin.email.group.label">ÐоÑÑовое ÑообÑение</entry>
+ <entry key="admin.email.status.NONE">ÐеÑ</entry>
+ <entry key="admin.email.status.SENDING">ÐоÑÑлаеÑÑÑ</entry>
+ <entry key="admin.email.status.ERROR">ÐÑибка</entry>
+ <entry key="admin.email.status.DONE">ÐоÑово</entry>
+ <entry key="admin.email.recipients">ÐолÑÑаÑели</entry>
+ <entry key="admin.email.body">ТекÑÑ</entry>
+ <entry key="admin.email.errorCount">ÐолиÑеÑÑво оÑибок</entry>
+ <entry key="admin.email.lastError">ÐоÑледнÑÑ Ð¾Ñибка</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ãno/Nie</entry>
<entry key="poll.type.numeric">ÄÃsla 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Ja/Nej</entry>
<entry key="poll.type.numeric">Numerisk 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">à¹à¸à¹/à¹à¸¡à¹</entry>
<entry key="poll.type.numeric">à¹à¸¥à¸ 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Evet/Hayır</entry>
<entry key="poll.type.numeric">Sayısal 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">Так/ÐÑ</entry>
<entry key="poll.type.numeric">Ð ÑиÑÐ»Ð¾Ð²Ð¾Ð¼Ñ Ð¿Ð¾ÑÑÐ´ÐºÑ 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sat Apr 2 05:04:19 2016
@@ -1848,4 +1848,15 @@
<entry key="poll.type.yesNo">æ¯/å¦</entry>
<entry key="poll.type.numeric">æ°å 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sat Apr 2 05:04:19 2016
@@ -1878,4 +1878,15 @@
<entry key="poll.type.yesNo">æ¯/å¦</entry>
<entry key="poll.type.numeric">æ¸åç 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
+ <entry key="main.menu.admin.email">Email management</entry>
+ <entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
+ <entry key="admin.email.group.label">Email message</entry>
+ <entry key="admin.email.status.NONE">None</entry>
+ <entry key="admin.email.status.SENDING">Sending</entry>
+ <entry key="admin.email.status.ERROR">Error</entry>
+ <entry key="admin.email.status.DONE">Done</entry>
+ <entry key="admin.email.recipients">Recipients</entry>
+ <entry key="admin.email.body">Body</entry>
+ <entry key="admin.email.errorCount">Error Count</entry>
+ <entry key="admin.email.lastError">Last Error</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java Sat Apr 2 05:04:19 2016
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.admin.backup.BackupPanel;
import org.apache.openmeetings.web.admin.configurations.ConfigsPanel;
import org.apache.openmeetings.web.admin.connection.ConnectionsPanel;
+import org.apache.openmeetings.web.admin.email.EmailPanel;
import org.apache.openmeetings.web.admin.groups.GroupsPanel;
import org.apache.openmeetings.web.admin.labels.LangPanel;
import org.apache.openmeetings.web.admin.ldaps.LdapsPanel;
@@ -68,6 +69,7 @@ public class OmUrlFragment implements Se
public static final String TYPE_BACKUP = "backup";
public static final String TYPE_SERVER = "server";
public static final String TYPE_OAUTH2 = "oauth2";
+ public static final String TYPE_EMAIL = "email";
public static final OmUrlFragment DASHBOARD = new OmUrlFragment(AreaKeys.user, TYPE_DASHBOARD);
public static final OmUrlFragment PROFILE_EDIT = new OmUrlFragment(AreaKeys.profile, TYPE_EDIT);
public static final OmUrlFragment PROFILE_MESSAGES = new OmUrlFragment(AreaKeys.profile, TYPE_MESSAGES);
@@ -100,6 +102,7 @@ public class OmUrlFragment implements Se
, adminModuleBackup
, adminModuleServers
, adminModuleOAuth
+ , adminModuleEmail
}
public enum MenuParams {
@@ -202,6 +205,11 @@ public class OmUrlFragment implements Se
case adminModuleOAuth:
setArea(AreaKeys.admin);
setType(TYPE_OAUTH2);
+ break;
+ case adminModuleEmail:
+ setArea(AreaKeys.admin);
+ setType(TYPE_EMAIL);
+ break;
}
}
@@ -245,6 +253,8 @@ public class OmUrlFragment implements Se
basePanel = new ServersPanel(CHILD_ID);
} else if (TYPE_OAUTH2.equals(type)) {
basePanel = new OAuthPanel(CHILD_ID);
+ } else if (TYPE_EMAIL.equals(type)) {
+ basePanel = new EmailPanel(CHILD_ID);
}
break;
case profile:
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css Sat Apr 2 05:04:19 2016
@@ -264,28 +264,32 @@ table.adminListTable td div.four_column_
.adminForm .btn {
width: 280px;
}
-.adminForm input {
+.adminForm .input, .adminForm input, .adminForm input.formcheckbox
+ ,.adminForm textarea, .adminForm select, .adminForm label
+ {
display: block;
float: left;
font-size: 14px;
padding: 0px 0px;
+ margin: 2px 2px;
+}
+.adminForm .input {
+ border: solid 1px #aacfe4;
+ width: 280px;
+ min-height: 20px;
+}
+.adminForm input {
border: solid 1px #aacfe4;
width: 280px;
height: 20px;
- margin: 2px 2px;
}
.adminForm input[type=checkbox], .adminForm input[type=radio] {
width: auto;
}
.adminForm input.formcheckbox {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
border: none;
width: 20px;
height: 20px;
- margin: 2px 2px;
}
.adminForm fieldset {
@@ -301,14 +305,9 @@ table.adminListTable td div.four_column_
}
.adminForm textarea {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
border: solid 1px #aacfe4;
width: 280px;
height: 60px;
- margin: 2px 2px;
}
.adminForm div.formelement {
@@ -318,23 +317,15 @@ table.adminListTable td div.four_column_
}
.adminForm select {
- float: left;
height: 20px;
- font-size: 14px;
- padding: 0px 0px;
border: solid 1px #aacfe4;
width: 282px;
- margin: 2px 2px 2px;
}
.adminForm label {
- display: block;
- font-size: 14px;
font-weight: bold;
text-align: right;
width: 180px;
- float: left;
- margin: 4px 2px 2px;
}
.adminBackupForm div.formelement {
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Sat Apr 2 05:04:19 2016
@@ -270,11 +270,11 @@ public class MailHandler {
public void sendMails() throws Exception {
init();
log.debug("sendMails enter ...");
- List<MailMessage> list = mailMessageDao.get(0, 1);
+ List<MailMessage> list = mailMessageDao.get(0, 1, MailMessage.Status.NONE);
log.debug("Number of emails in init queue " + list.size());
while (!list.isEmpty()) {
send(list.get(0), true);
- list = mailMessageDao.get(0, 1);
+ list = mailMessageDao.get(0, 1, MailMessage.Status.NONE);
}
log.debug("... sendMails done.");
}