Author: solomax
Date: Fri Dec 25 07:41:01 2015
New Revision: 1721662
URL: http://svn.apache.org/viewvc?rev=1721662&view=rev
Log:
[OPENMEETINGS-1305] select2 styles are fixed
Modified:
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/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/common/GeneralUserForm.html
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/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/webapp/css/theme.css
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/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/common/GeneralUserForm.html
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/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/webapp/css/theme.css
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 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><select
wicket:id="user2add" class="input"></select>
+ <label
style="font-weight: bold;"><wicket:message key="178" /></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
</div>
<div
class="formelement">
<div
wicket:id="users"></div>
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<div
class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message
key="191" /></label><select class="input" wicket:id="roomGroups"></select>
+
<label><wicket:message key="191" /></label><div class="om-select2"><select
class="input" wicket:id="roomGroups"></select></div>
</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><select wicket:id="moderator2add" class="input"></select>
+
<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">
<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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -53,7 +53,7 @@
wicket:id="forceTimeZoneCheck" />
</div>
<div class="formelement">
- <label><wicket:message key="881"
/></label><select class="input" wicket:id="rights"></select>
+ <label><wicket:message key="881" /></label><div
class="om-select2"><select class="input" wicket:id="rights"></select></div>
</div>
</fieldset>
<fieldset class="ui-widget-content">
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -68,7 +68,7 @@
<textarea wicket:id="address.comment" />
</div>
<div class="formelement">
- <label><wicket:message key="161" /></label><select
class="input" wicket:id="groupUsers"></select>
+ <label><wicket:message key="161" /></label><div
class="om-select2"><select class="input" wicket:id="groupUsers"></select></div>
</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/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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 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><select wicket:id="recipients" class="input
invitees"></select></td>
+ <td class="om-select2"><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><select wicket:id="groups" class="input
invitees"></select></td>
+ <td class="om-select2"><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/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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -34,7 +34,7 @@
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1210"/></td>
- <td wicket:message="title:1588"><select
class="messages text to" wicket:id="to"></select></td>
+ <td wicket:message="title:1588"
class="om-select2 full-width"><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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -66,7 +66,7 @@
</tr>
<tr>
<td><wicket:message key="803" /></td>
- <td wicket:message="title:1588"><select
class="appointment attendees input" wicket:id="attendees"></select></td>
+ <td wicket:message="title:1588"
class="om-select2"><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/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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -508,7 +508,7 @@ table.messages td.main {
width: 20px;
min-height: inherit;
}
-input[type="text"].messages.text, .messages.text.to {
+input[type="text"].messages.text {
width: 100%;
}
textarea.messages.body {
@@ -556,22 +556,25 @@ select.messages.selector {
background-color: rgb(248, 248, 248);
border-bottom: 5px solid white;
}
-.select2-results .select2-result .select2-result-label .user.external
-, .select2-results .select2-result .select2-result-label .user.internal
-, .select2-choices .select2-search-choice .user.external
-, .select2-choices .select2-search-choice .user.internal {
+.select2-results .user.external, .select2-selection .user.external
+, .select2-results .user.internal, .select2-selection .user.internal {
padding-left: 18px;
background-repeat: no-repeat;
background-position: 0px 2px;
}
-.select2-results .select2-result .select2-result-label .user.external
-, .select2-choices .select2-search-choice .user.external {
+.select2-results .user.external, .select2-selection .user.external {
background-image: url(images/user_go.png);
}
-.select2-results .select2-result .select2-result-label .user.internal
-, .select2-choices .select2-search-choice .user.internal {
+.select2-results .user.internal, .select2-selection .user.internal {
background-image: url(images/user.png);
}
+.om-select2 .select2.select2-container {
+ max-height: 80px;
+ overflow-y: auto;
+}
+.om-select2.full-width .select2.select2-container {
+ width: 100% !important;
+}
.page.recording {
padding-top: 40px;
}
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 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><select
wicket:id="user2add" class="input"></select>
+ <label
style="font-weight: bold;"><wicket:message key="178" /></label><div
class="om-select2"><select wicket:id="user2add" class="input"></select></div>
</div>
<div
class="formelement">
<div
wicket:id="users"></div>
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -86,7 +86,7 @@
</div>
<div class="formelement">
<div
class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message
key="191" /></label><select class="input" wicket:id="roomGroups"></select>
+
<label><wicket:message key="191" /></label><div class="om-select2"><select
class="input" wicket:id="roomGroups"></select></div>
</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><select wicket:id="moderator2add" class="input"></select>
+
<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">
<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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -53,7 +53,7 @@
wicket:id="forceTimeZoneCheck" />
</div>
<div class="formelement">
- <label><wicket:message key="881"
/></label><select class="input" wicket:id="rights"></select>
+ <label><wicket:message key="881" /></label><div
class="om-select2"><select class="input" wicket:id="rights"></select></div>
</div>
</fieldset>
<fieldset class="ui-widget-content">
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -68,7 +68,7 @@
<textarea wicket:id="address.comment" />
</div>
<div class="formelement">
- <label><wicket:message key="161" /></label><select
class="input" wicket:id="groupUsers"></select>
+ <label><wicket:message key="161" /></label><div
class="om-select2"><select class="input" wicket:id="groupUsers"></select></div>
</div>
</wicket:panel>
</html>
\ No newline at end of file
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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 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><select wicket:id="recipients" class="input
invitees"></select></td>
+ <td class="om-select2"><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><select wicket:id="groups" class="input
invitees"></select></td>
+ <td class="om-select2"><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/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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -34,7 +34,7 @@
</tr>
<tr>
<td class="messages column
label"><wicket:message key="1210"/></td>
- <td wicket:message="title:1588"><select
class="messages text to" wicket:id="to"></select></td>
+ <td wicket:message="title:1588"
class="om-select2 full-width"><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=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -66,7 +66,7 @@
</tr>
<tr>
<td><wicket:message key="803" /></td>
- <td wicket:message="title:1588"><select
class="appointment attendees input" wicket:id="attendees"></select></td>
+ <td wicket:message="title:1588"
class="om-select2"><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/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1721662&r1=1721661&r2=1721662&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
Fri Dec 25 07:41:01 2015
@@ -508,7 +508,7 @@ table.messages td.main {
width: 20px;
min-height: inherit;
}
-input[type="text"].messages.text, .messages.text.to {
+input[type="text"].messages.text {
width: 100%;
}
textarea.messages.body {
@@ -556,22 +556,25 @@ select.messages.selector {
background-color: rgb(248, 248, 248);
border-bottom: 5px solid white;
}
-.select2-results .select2-result .select2-result-label .user.external
-, .select2-results .select2-result .select2-result-label .user.internal
-, .select2-choices .select2-search-choice .user.external
-, .select2-choices .select2-search-choice .user.internal {
+.select2-results .user.external, .select2-selection .user.external
+, .select2-results .user.internal, .select2-selection .user.internal {
padding-left: 18px;
background-repeat: no-repeat;
background-position: 0px 2px;
}
-.select2-results .select2-result .select2-result-label .user.external
-, .select2-choices .select2-search-choice .user.external {
+.select2-results .user.external, .select2-selection .user.external {
background-image: url(images/user_go.png);
}
-.select2-results .select2-result .select2-result-label .user.internal
-, .select2-choices .select2-search-choice .user.internal {
+.select2-results .user.internal, .select2-selection .user.internal {
background-image: url(images/user.png);
}
+.om-select2 .select2.select2-container {
+ max-height: 80px;
+ overflow-y: auto;
+}
+.om-select2.full-width .select2.select2-container {
+ width: 100% !important;
+}
.page.recording {
padding-top: 40px;
}
