Author: solomax
Date: Thu Dec 24 18:53:17 2015
New Revision: 1721649
URL: http://svn.apache.org/viewvc?rev=1721649&view=rev
Log:
[OPENMEETINGS-1305] select2 related dialogs are partially fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Thu Dec
24 18:53:17 2015
@@ -128,7 +128,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.7-SNAPSHOT-server.zip</missing> <!-- TODO
should be in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.6-RELEASE-server.tar.gz</missing> <!--
TODO should be in-sync with global property -->
</file>
</activation>
<build>
@@ -145,7 +145,7 @@
</goals>
<configuration>
<url>https://github.com/Red5/red5-server/releases/download</url>
-
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.zip</fromFile>
+
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.tar.gz</fromFile>
<toDir>${red5-server-file.dir}</toDir>
<skip>${red5-server.dwnd.skip}</skip>
</configuration>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
Thu Dec 24 18:53:17 2015
@@ -59,7 +59,7 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
- <label
style="font-weight: bold;"><wicket:message key="178" /></label><input
type="hidden" wicket:id="user2add" class="input"/>
+ <label
style="font-weight: bold;"><wicket:message key="178" /></label><select
wicket:id="user2add" class="input"></select>
</div>
<div
class="formelement">
<div
wicket:id="users"></div>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Thu Dec 24 18:53:17 2015
@@ -133,7 +133,7 @@ public class RoomForm extends AdminBaseF
@Override
public void query(String term, int page,
Response<RoomGroup> response) {
for (RoomGroup or : orgRooms) {
- if (Strings.isEmpty(term) ||
(!Strings.isEmpty(term) && or.getGroup().getName().contains(term))) {
+ if (Strings.isEmpty(term) ||
or.getGroup().getName().contains(term)) {
response.add(or);
}
}
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=1721649&r1=1721648&r2=1721649&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
Thu Dec 24 18:53:17 2015
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<div
class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message
key="191" /></label><input type="hidden" class="input" wicket:id="roomGroups"
style="max-height: 80px"/>
+ <label><wicket:message
key="191" /></label><select class="input" wicket:id="roomGroups"></select>
</div>
</fieldset>
@@ -206,7 +206,7 @@
<label><wicket:message
key="640" /></label><input type="checkbox" class="formcheckbox"
wicket:id="moderated" />
</div>
<div class="formelement">
- <label><wicket:message
key="816" /></label><input type="hidden" wicket:id="moderator2add"
class="input"/>
+ <label><wicket:message
key="816" /></label><select wicket:id="moderator2add" class="input"></select>
</div>
<div class="formelement"
wicket:id="moderatorContainer">
<table
class="adminListTableSmall">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
Thu Dec 24 18:53:17 2015
@@ -53,7 +53,7 @@
wicket:id="forceTimeZoneCheck" />
</div>
<div class="formelement">
- <label><wicket:message key="881"
/></label><input type="hidden" class="input" wicket:id="rights" />
+ <label><wicket:message key="881"
/></label><select class="input" wicket:id="rights"></select>
</div>
</fieldset>
<fieldset class="ui-widget-content">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Thu Dec 24 18:53:17 2015
@@ -61,6 +61,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -203,7 +204,7 @@ public class UserForm extends AdminBaseF
@Override
public void query(String term, int page,
Response<Right> response) {
for (Right r : Right.values()) {
- if (r.name().contains(term)) {
+ if (Strings.isEmpty(term) ||
r.name().contains(term)) {
response.add(r);
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
Thu Dec 24 18:53:17 2015
@@ -68,7 +68,7 @@
<textarea wicket:id="address.comment" />
</div>
<div class="formelement">
- <label><wicket:message key="161" /></label><input type="hidden"
class="input" wicket:id="groupUsers" style="max-height: 80px" />
+ <label><wicket:message key="161" /></label><select
class="input" wicket:id="groupUsers"></select>
</div>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Thu Dec 24 18:53:17 2015
@@ -151,7 +151,7 @@ public class GeneralUserForm extends For
@Override
public void query(String term, int page,
Response<GroupUser> response) {
for (GroupUser ou : orgUsers) {
- if (Strings.isEmpty(term) ||
(!Strings.isEmpty(term) && ou.getGroup().getName().contains(term))) {
+ if (Strings.isEmpty(term) ||
ou.getGroup().getName().contains(term)) {
response.add(ou);
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
Thu Dec 24 18:53:17 2015
@@ -24,11 +24,11 @@
<table wicket:id="inviteeType">
<tr>
<td><input type="radio"
wicket:id="user"/><label wicket:for="recipients"><wicket:message key="216"
/></label></td>
- <td><input type="hidden" wicket:id="recipients"
class="input invitees" style="max-height: 80px"/></td>
+ <td><select wicket:id="recipients" class="input
invitees"></select></td>
</tr>
<tr wicket:id="groupContainer">
<td><input type="radio"
wicket:id="group"/><label wicket:for="groups"><wicket:message key="126"
/></label></td>
- <td><input type="hidden" wicket:id="groups"
class="input invitees" style="max-height: 80px"/></td>
+ <td><select wicket:id="groups" class="input
invitees"></select></td>
</tr>
<tr>
<td><label wicket:for="subject"><wicket:message
key="215" /></label></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Thu Dec 24 18:53:17 2015
@@ -113,14 +113,14 @@ public class InvitationDialog extends Ab
if
(WebSession.getRights().contains(User.Right.Admin)) {
List<Group> groups =
getBean(GroupDao.class).get(0, Integer.MAX_VALUE);
for (Group g : groups) {
- if
(g.getName().toLowerCase().contains(term.toLowerCase())) {
+ if
(Strings.isEmpty(term) ||
g.getName().toLowerCase().contains(term.toLowerCase())) {
response.add(g);
}
}
} else {
User u =
getBean(UserDao.class).get(getUserId());
for (GroupUser ou :
u.getGroupUsers()) {
- if
(ou.getGroup().getName().toLowerCase().contains(term.toLowerCase())) {
+ if
(Strings.isEmpty(term) ||
ou.getGroup().getName().toLowerCase().contains(term.toLowerCase())) {
response.add(ou.getGroup());
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
Thu Dec 24 18:53:17 2015
@@ -34,7 +34,7 @@
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1210"/></td>
- <td wicket:message="title:1588"><input
class="messages text to" type="hidden" wicket:id="to"/></td>
+ <td wicket:message="title:1588"><select
class="messages text to" wicket:id="to"></select></td>
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1211"/></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Thu Dec 24 18:53:17 2015
@@ -66,7 +66,7 @@
</tr>
<tr>
<td><wicket:message key="803" /></td>
- <td wicket:message="title:1588"><input
class="appointment attendees" type="hidden" wicket:id="attendees"/></td>
+ <td wicket:message="title:1588"><select
class="appointment attendees input" wicket:id="attendees"></select></td>
</tr>
<tr>
<td><wicket:message key="569" /></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
Thu Dec 24 18:53:17 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.db.util.F
import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONWriter;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.Validatable;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
@@ -44,34 +45,36 @@ public class UserChoiceProvider extends
public static User getUser(String value) {
User u = null;
- //FIXME refactor this
- String email = null;
- String fName = null;
- String lName = null;
- int idx = value.indexOf('<');
- if (idx > -1) {
- int idx1 = value.indexOf('>', idx);
- if (idx1 > -1) {
- email = value.substring(idx + 1, idx1);
-
- String name = value.substring(0,
idx).replace("\"", "");
- int idx2 = name.indexOf(' ');
- if (idx2 > -1) {
- fName = name.substring(0, idx2);
- lName = name.substring(idx2 + 1);
- } else {
- fName = "";
- lName = name;
+ if (!Strings.isEmpty(value)) {
+ //FIXME refactor this
+ String email = null;
+ String fName = null;
+ String lName = null;
+ int idx = value.indexOf('<');
+ if (idx > -1) {
+ int idx1 = value.indexOf('>', idx);
+ if (idx1 > -1) {
+ email = value.substring(idx + 1, idx1);
+
+ String name = value.substring(0,
idx).replace("\"", "");
+ int idx2 = name.indexOf(' ');
+ if (idx2 > -1) {
+ fName = name.substring(0, idx2);
+ lName = name.substring(idx2 +
1);
+ } else {
+ fName = "";
+ lName = name;
+ }
+
}
-
+ } else {
+ email = value;
+ }
+ Validatable<String> valEmail = new
Validatable<String>(email);
+
RfcCompliantEmailAddressValidator.getInstance().validate(valEmail);
+ if (valEmail.isValid()) {
+ u = getBean(UserDao.class).getContact(email,
fName, lName, getUserId());
}
- } else {
- email = value;
- }
- Validatable<String> valEmail = new Validatable<String>(email);
-
RfcCompliantEmailAddressValidator.getInstance().validate(valEmail);
- if (valEmail.isValid()) {
- u = getBean(UserDao.class).getContact(email, fName,
lName, getUserId());
}
return u;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/calendar.css
Thu Dec 24 18:53:17 2015
@@ -20,32 +20,20 @@
vertical-align: top;
}
-.appointmentPopUp input[name="appointmentName"] {
+.appointmentPopUp input[type="text"] {
width: 420px;
}
-.appointmentPopUp input[name="password"] {
+.appointmentPopUp input[type="password"] {
width: 420px;
}
-.appointmentPopUp input[name="appointmentLocation"] {
- width: 420px;
-}
-
-.appointmentPopUp textarea[name="appointmentDescription"] {
+.appointmentPopUp textarea {
width: 424px;
height: 80px;
}
-.appointmentPopUp select[name="reminder"] {
- width: 426px;
-}
-
-.appointmentPopUp select[name="room.type"] {
- width: 426px;
-}
-
-.appointmentPopUp select[name="room"] {
+.appointmentPopUp select {
width: 426px;
}
@@ -64,11 +52,3 @@
overflow-x: scroll;
float: left;
}
-
-.appointment.attendees {
- width: 100%;
-}
-.appointment.attendees.select2-container-multi .select2-choices {
- max-height: 100px;
- overflow-y: auto;
-}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/room.css
Thu Dec 24 18:53:17 2015
@@ -98,7 +98,7 @@
padding: 0;
overflow: hidden;
}
-.input.select2-container-multi .select2-choices {
+.input .select2-container {
max-height: 100px;
overflow-y: auto;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
Thu Dec 24 18:53:17 2015
@@ -510,8 +510,6 @@ table.messages td.main {
}
input[type="text"].messages.text, .messages.text.to {
width: 100%;
- max-height: 100px;
- overflow-y: auto;
}
textarea.messages.body {
width: 100%;
@@ -625,10 +623,6 @@ form .input {
padding-right: 0.2em;
padding-left: 0.2em;
}
-.invitees.select2-container-multi .select2-choices {
- max-height: 80px;
- overflow-y: auto;
-}
#contents .btn-file>input {
transform: translate(-30px, 0) scale(1);
}
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Thu Dec 24 18:53:17 2015
@@ -36,7 +36,7 @@
<wicket.mode>DEPLOYMENT</wicket.mode>
<om.quick.build>false</om.quick.build>
<db>derby</db>
- <spring.version>4.2.3.RELEASE</spring.version>
+ <spring.version>4.1.7.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
@@ -44,8 +44,8 @@
<wicket.version>7.2.0-SNAPSHOT</wicket.version>
<wicketju.version>7.1.1-SNAPSHOT</wicketju.version>
<wickets.version>7.2.0-SNAPSHOT</wickets.version>
- <red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
- <red5-client.version>1.0.7-SNAPSHOT</red5-client.version>
+ <red5-server.version>1.0.6-RELEASE</red5-server.version>
+ <red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
@@ -400,6 +400,10 @@
<version>${red5-server.version}</version>
<exclusions>
<exclusion>
+ <groupId>org</groupId>
+
<artifactId>jaudiotagger</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
@@ -428,6 +432,10 @@
<version>${red5-client.version}</version>
<exclusions>
<exclusion>
+ <groupId>org</groupId>
+
<artifactId>jaudiotagger</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
@@ -610,7 +618,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>8.0.26</version>
+ <version>8.0.28</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Thu Dec 24
18:53:17 2015
@@ -128,7 +128,7 @@
<id>prepare-red5-server</id>
<activation>
<file>
-
<missing>red5-server/red5-server-1.0.7-SNAPSHOT-server.zip</missing> <!-- TODO
should be in-sync with global property -->
+
<missing>red5-server/red5-server-1.0.6-RELEASE-server.tar.gz</missing> <!--
TODO should be in-sync with global property -->
</file>
</activation>
<build>
@@ -145,7 +145,7 @@
</goals>
<configuration>
<url>https://github.com/Red5/red5-server/releases/download</url>
-
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.zip</fromFile>
+
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.tar.gz</fromFile>
<toDir>${red5-server-file.dir}</toDir>
<skip>${red5-server.dwnd.skip}</skip>
</configuration>
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=1721649&r1=1721648&r2=1721649&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
Thu Dec 24 18:53:17 2015
@@ -59,7 +59,7 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
- <label
style="font-weight: bold;"><wicket:message key="178" /></label><input
type="hidden" wicket:id="user2add" class="input"/>
+ <label
style="font-weight: bold;"><wicket:message key="178" /></label><select
wicket:id="user2add" class="input"></select>
</div>
<div
class="formelement">
<div
wicket:id="users"></div>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Thu Dec 24 18:53:17 2015
@@ -133,7 +133,7 @@ public class RoomForm extends AdminBaseF
@Override
public void query(String term, int page,
Response<RoomGroup> response) {
for (RoomGroup or : orgRooms) {
- if (Strings.isEmpty(term) ||
(!Strings.isEmpty(term) && or.getGroup().getName().contains(term))) {
+ if (Strings.isEmpty(term) ||
or.getGroup().getName().contains(term)) {
response.add(or);
}
}
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=1721649&r1=1721648&r2=1721649&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
Thu Dec 24 18:53:17 2015
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<div
class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message
key="191" /></label><input type="hidden" class="input" wicket:id="roomGroups"
style="max-height: 80px"/>
+ <label><wicket:message
key="191" /></label><select class="input" wicket:id="roomGroups"></select>
</div>
</fieldset>
@@ -206,7 +206,7 @@
<label><wicket:message
key="640" /></label><input type="checkbox" class="formcheckbox"
wicket:id="moderated" />
</div>
<div class="formelement">
- <label><wicket:message
key="816" /></label><input type="hidden" wicket:id="moderator2add"
class="input"/>
+ <label><wicket:message
key="816" /></label><select wicket:id="moderator2add" class="input"></select>
</div>
<div class="formelement"
wicket:id="moderatorContainer">
<table
class="adminListTableSmall">
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
Thu Dec 24 18:53:17 2015
@@ -53,7 +53,7 @@
wicket:id="forceTimeZoneCheck" />
</div>
<div class="formelement">
- <label><wicket:message key="881"
/></label><input type="hidden" class="input" wicket:id="rights" />
+ <label><wicket:message key="881"
/></label><select class="input" wicket:id="rights"></select>
</div>
</fieldset>
<fieldset class="ui-widget-content">
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Thu Dec 24 18:53:17 2015
@@ -61,6 +61,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -203,7 +204,7 @@ public class UserForm extends AdminBaseF
@Override
public void query(String term, int page,
Response<Right> response) {
for (Right r : Right.values()) {
- if (r.name().contains(term)) {
+ if (Strings.isEmpty(term) ||
r.name().contains(term)) {
response.add(r);
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
Thu Dec 24 18:53:17 2015
@@ -68,7 +68,7 @@
<textarea wicket:id="address.comment" />
</div>
<div class="formelement">
- <label><wicket:message key="161" /></label><input type="hidden"
class="input" wicket:id="groupUsers" style="max-height: 80px" />
+ <label><wicket:message key="161" /></label><select
class="input" wicket:id="groupUsers"></select>
</div>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Thu Dec 24 18:53:17 2015
@@ -151,7 +151,7 @@ public class GeneralUserForm extends For
@Override
public void query(String term, int page,
Response<GroupUser> response) {
for (GroupUser ou : orgUsers) {
- if (Strings.isEmpty(term) ||
(!Strings.isEmpty(term) && ou.getGroup().getName().contains(term))) {
+ if (Strings.isEmpty(term) ||
ou.getGroup().getName().contains(term)) {
response.add(ou);
}
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
Thu Dec 24 18:53:17 2015
@@ -24,11 +24,11 @@
<table wicket:id="inviteeType">
<tr>
<td><input type="radio"
wicket:id="user"/><label wicket:for="recipients"><wicket:message key="216"
/></label></td>
- <td><input type="hidden" wicket:id="recipients"
class="input invitees" style="max-height: 80px"/></td>
+ <td><select wicket:id="recipients" class="input
invitees"></select></td>
</tr>
<tr wicket:id="groupContainer">
<td><input type="radio"
wicket:id="group"/><label wicket:for="groups"><wicket:message key="126"
/></label></td>
- <td><input type="hidden" wicket:id="groups"
class="input invitees" style="max-height: 80px"/></td>
+ <td><select wicket:id="groups" class="input
invitees"></select></td>
</tr>
<tr>
<td><label wicket:for="subject"><wicket:message
key="215" /></label></td>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Thu Dec 24 18:53:17 2015
@@ -113,14 +113,14 @@ public class InvitationDialog extends Ab
if
(WebSession.getRights().contains(User.Right.Admin)) {
List<Group> groups =
getBean(GroupDao.class).get(0, Integer.MAX_VALUE);
for (Group g : groups) {
- if
(g.getName().toLowerCase().contains(term.toLowerCase())) {
+ if
(Strings.isEmpty(term) ||
g.getName().toLowerCase().contains(term.toLowerCase())) {
response.add(g);
}
}
} else {
User u =
getBean(UserDao.class).get(getUserId());
for (GroupUser ou :
u.getGroupUsers()) {
- if
(ou.getGroup().getName().toLowerCase().contains(term.toLowerCase())) {
+ if
(Strings.isEmpty(term) ||
ou.getGroup().getName().toLowerCase().contains(term.toLowerCase())) {
response.add(ou.getGroup());
}
}
@@ -321,7 +321,7 @@ public class InvitationDialog extends Ab
groupContainer.add(
groups.setLabel(Model.of(Application.getString(126))).setRequired(true).add(new
AjaxFormComponentUpdatingBehavior("change") {
private static final long
serialVersionUID = 1L;
-
+
@Override
protected void
onUpdate(AjaxRequestTarget target) {
url.setModelObject(null);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
Thu Dec 24 18:53:17 2015
@@ -34,7 +34,7 @@
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1210"/></td>
- <td wicket:message="title:1588"><input
class="messages text to" type="hidden" wicket:id="to"/></td>
+ <td wicket:message="title:1588"><select
class="messages text to" wicket:id="to"></select></td>
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1211"/></td>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Thu Dec 24 18:53:17 2015
@@ -66,7 +66,7 @@
</tr>
<tr>
<td><wicket:message key="803" /></td>
- <td wicket:message="title:1588"><input
class="appointment attendees" type="hidden" wicket:id="attendees"/></td>
+ <td wicket:message="title:1588"><select
class="appointment attendees input" wicket:id="attendees"></select></td>
</tr>
<tr>
<td><wicket:message key="569" /></td>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
Thu Dec 24 18:53:17 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.db.util.F
import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONWriter;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.Validatable;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
@@ -44,34 +45,36 @@ public class UserChoiceProvider extends
public static User getUser(String value) {
User u = null;
- //FIXME refactor this
- String email = null;
- String fName = null;
- String lName = null;
- int idx = value.indexOf('<');
- if (idx > -1) {
- int idx1 = value.indexOf('>', idx);
- if (idx1 > -1) {
- email = value.substring(idx + 1, idx1);
-
- String name = value.substring(0,
idx).replace("\"", "");
- int idx2 = name.indexOf(' ');
- if (idx2 > -1) {
- fName = name.substring(0, idx2);
- lName = name.substring(idx2 + 1);
- } else {
- fName = "";
- lName = name;
+ if (!Strings.isEmpty(value)) {
+ //FIXME refactor this
+ String email = null;
+ String fName = null;
+ String lName = null;
+ int idx = value.indexOf('<');
+ if (idx > -1) {
+ int idx1 = value.indexOf('>', idx);
+ if (idx1 > -1) {
+ email = value.substring(idx + 1, idx1);
+
+ String name = value.substring(0,
idx).replace("\"", "");
+ int idx2 = name.indexOf(' ');
+ if (idx2 > -1) {
+ fName = name.substring(0, idx2);
+ lName = name.substring(idx2 +
1);
+ } else {
+ fName = "";
+ lName = name;
+ }
+
}
-
+ } else {
+ email = value;
+ }
+ Validatable<String> valEmail = new
Validatable<String>(email);
+
RfcCompliantEmailAddressValidator.getInstance().validate(valEmail);
+ if (valEmail.isValid()) {
+ u = getBean(UserDao.class).getContact(email,
fName, lName, getUserId());
}
- } else {
- email = value;
- }
- Validatable<String> valEmail = new Validatable<String>(email);
-
RfcCompliantEmailAddressValidator.getInstance().validate(valEmail);
- if (valEmail.isValid()) {
- u = getBean(UserDao.class).getContact(email, fName,
lName, getUserId());
}
return u;
}
@@ -90,7 +93,7 @@ public class UserChoiceProvider extends
public String getDisplayValue(User object) {
return FormatHelper.formatUser(object, true);
}
-
+
@Override
public void query(String term, int page, Response<User> response) {
User c = getUser(term);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/calendar.css
Thu Dec 24 18:53:17 2015
@@ -20,32 +20,20 @@
vertical-align: top;
}
-.appointmentPopUp input[name="appointmentName"] {
+.appointmentPopUp input[type="text"] {
width: 420px;
}
-.appointmentPopUp input[name="password"] {
+.appointmentPopUp input[type="password"] {
width: 420px;
}
-.appointmentPopUp input[name="appointmentLocation"] {
- width: 420px;
-}
-
-.appointmentPopUp textarea[name="appointmentDescription"] {
+.appointmentPopUp textarea {
width: 424px;
height: 80px;
}
-.appointmentPopUp select[name="reminder"] {
- width: 426px;
-}
-
-.appointmentPopUp select[name="room.type"] {
- width: 426px;
-}
-
-.appointmentPopUp select[name="room"] {
+.appointmentPopUp select {
width: 426px;
}
@@ -64,11 +52,3 @@
overflow-x: scroll;
float: left;
}
-
-.appointment.attendees {
- width: 100%;
-}
-.appointment.attendees.select2-container-multi .select2-choices {
- max-height: 100px;
- overflow-y: auto;
-}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Thu Dec 24 18:53:17 2015
@@ -98,7 +98,7 @@
padding: 0;
overflow: hidden;
}
-.input.select2-container-multi .select2-choices {
+.input .select2-container {
max-height: 100px;
overflow-y: auto;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Thu Dec 24 18:53:17 2015
@@ -510,8 +510,6 @@ table.messages td.main {
}
input[type="text"].messages.text, .messages.text.to {
width: 100%;
- max-height: 100px;
- overflow-y: auto;
}
textarea.messages.body {
width: 100%;
@@ -625,10 +623,6 @@ form .input {
padding-right: 0.2em;
padding-left: 0.2em;
}
-.invitees.select2-container-multi .select2-choices {
- max-height: 80px;
- overflow-y: auto;
-}
#contents .btn-file>input {
transform: translate(-30px, 0) scale(1);
}
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1721649&r1=1721648&r2=1721649&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Thu Dec 24 18:53:17 2015
@@ -36,7 +36,7 @@
<wicket.mode>DEPLOYMENT</wicket.mode>
<om.quick.build>false</om.quick.build>
<db>derby</db>
- <spring.version>4.2.3.RELEASE</spring.version>
+ <spring.version>4.1.7.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
@@ -44,8 +44,8 @@
<wicket.version>7.2.0-SNAPSHOT</wicket.version>
<wicketju.version>7.1.1-SNAPSHOT</wicketju.version>
<wickets.version>7.2.0-SNAPSHOT</wickets.version>
- <red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
- <red5-client.version>1.0.7-SNAPSHOT</red5-client.version>
+ <red5-server.version>1.0.6-RELEASE</red5-server.version>
+ <red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
@@ -400,6 +400,10 @@
<version>${red5-server.version}</version>
<exclusions>
<exclusion>
+ <groupId>org</groupId>
+
<artifactId>jaudiotagger</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
@@ -428,6 +432,10 @@
<version>${red5-client.version}</version>
<exclusions>
<exclusion>
+ <groupId>org</groupId>
+
<artifactId>jaudiotagger</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
@@ -610,7 +618,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>8.0.26</version>
+ <version>8.0.28</version>
<scope>provided</scope>
</dependency>
</dependencies>
