This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 0fb2700 [OPENMEETINGS-2165] jquery-ui CSS is added back, minor CSS
issues are fixed
0fb2700 is described below
commit 0fb2700fca8a6de0b6ca73102c7690f70729237e
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 17 13:29:52 2020 +0700
[OPENMEETINGS-2165] jquery-ui CSS is added back, minor CSS issues are fixed
---
.../main/java/org/apache/openmeetings/web/pages/BasePage.java | 3 +++
.../org/apache/openmeetings/web/pages/auth/SignInDialog.java | 9 +--------
.../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 10 +++++-----
.../java/org/apache/openmeetings/web/user/chat/ChatPanel.java | 4 ++--
openmeetings-web/src/main/webapp/css/raw-general.css | 3 +++
5 files changed, 14 insertions(+), 15 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 6c2656a..9f33150 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -22,6 +22,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationN
import static org.apache.openmeetings.util.OpenmeetingsVariables.getGaCode;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
import static org.apache.openmeetings.web.app.Application.isInstalled;
+import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.util.HashMap;
import java.util.Map;
@@ -125,6 +126,8 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
protected void internalRenderHead(IHeaderResponse response) {
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
super.renderHead(response);
+ final String suffix = DEVELOPMENT ==
getApplication().getConfigurationType() ? "" : ".min";
+
response.render(CssHeaderItem.forUrl(String.format("css/theme_om/jquery-ui%s.css",
suffix)));
response.render(CssHeaderItem.forUrl("css/theme.css"));
if (!Strings.isEmpty(getGaCode())) {
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(BasePage.class, "om-ga.js"))));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index c1d2684..5da1e55 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -66,8 +66,6 @@ import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.googlecode.wicket.jquery.ui.effect.JQueryEffectBehavior;
-
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -132,10 +130,6 @@ public class SignInDialog extends Modal<String> {
this.f = f;
}
- private void shake(AjaxRequestTarget target) {
- target.appendJavaScript(JQueryEffectBehavior.toString("#" +
getMarkupId(), "shake"));
- }
-
class SignInForm extends StatelessForm<String> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer credentials = new
WebMarkupContainer("credentials");
@@ -235,7 +229,7 @@ public class SignInDialog extends Modal<String> {
}
protected void onError(AjaxRequestTarget target) {
- shake(target);
+ target.add(feedback);
}
@Override
@@ -276,7 +270,6 @@ public class SignInDialog extends Modal<String> {
log.error("Unexpected exception while
sleeping", e);
}
strategy.remove();
- shake(target);
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 4161b48..96f7c60 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -498,7 +498,7 @@ var Wb = function() {
canvas.requestRenderAll();
});
});
- };
+ }
function toOmJson(o) {
const r = o.toJSON(extraProps);
@@ -533,7 +533,7 @@ var Wb = function() {
wbId: wb.id
, obj: json
}});
- };
+ }
function objAddedHandler(e) {
const o = e.target;
if (o.loaded === true) {
@@ -550,7 +550,7 @@ var Wb = function() {
o.selectable = this.selection;
break;
}
- };
+ }
function objModifiedHandler(e) {
const o = e.target, items = [];
if (role === NONE && o.omType !== 'pointer') {
@@ -573,7 +573,7 @@ var Wb = function() {
wbId: wb.id
, obj: items
}});
- };
+ }
function objSelectedHandler(e) {
const o = e.target;
settings.find('.wb-dim-x').val(o.left);
@@ -601,7 +601,7 @@ var Wb = function() {
o.path.slide = this.slide;
o.path.omType = 'freeDraw';
objCreatedHandler(o.path);
- };
+ }
function scrollHandler() {
if (scrollTimeout !== null) {
clearTimeout(scrollTimeout);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
index 58b042b..11b1702 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
@@ -48,7 +48,7 @@ public class ChatPanel extends Panel {
}
StringBuilder sb = new StringBuilder("$(function() {");
if (!chat.isShowDashboardChat()) {
- sb.append("$('#chatPanel,#chat').show();");
+ sb.append("$('#chatPanel').show();");
}
sb.append("Chat.setRoomMode(true);")
.append(chat.addRoom(r))
@@ -66,7 +66,7 @@ public class ChatPanel extends Panel {
StringBuilder sb = new StringBuilder("$(function() {")
.append("Chat.setRoomMode(false);");
if (!chat.isShowDashboardChat()) {
- sb.append("$('#chatPanel,#chat').hide();");
+ sb.append("$('#chatPanel').hide();");
}
sb.append("});");
handler.appendJavaScript(sb);
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css
b/openmeetings-web/src/main/webapp/css/raw-general.css
index fc60dde..f6c8f86 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -201,6 +201,9 @@ html, body {
clear: both;
}
.om-icon {
+ background-repeat: no-repeat !important;
+ background-position: 0 0 !important;
+ background-size: 16px;
width: 18px;
height: 18px;
border: none;
