Repository: openmeetings Updated Branches: refs/heads/master ad7d14ca8 -> 417fdd64f
[OPENMEETINGS-980] wicketstuff and jqueryui were updated Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/417fdd64 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/417fdd64 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/417fdd64 Branch: refs/heads/master Commit: 417fdd64fc46451d30b8451ea20ff96865d5ba48 Parents: ad7d14c Author: Maxim Solodovnik <[email protected]> Authored: Thu Jun 29 09:38:31 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jun 29 09:38:31 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/app/Application.java | 1 - .../apache/openmeetings/web/user/chat/ChatToolbar.html | 12 ++++++------ pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/417fdd64/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 72021fc..7b68bf9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -187,7 +187,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica // add dashboard context injector getComponentInstantiationListeners().add(new DashboardContextInjector(dashboardContext)); DashboardSettings dashboardSettings = DashboardSettings.get(); - dashboardSettings.setIncludeJQuery(false); dashboardSettings.setIncludeJQueryUI(false); getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/417fdd64/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html index f6d05bc..2fc75db 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html @@ -35,7 +35,7 @@ <wicket:panel> <div wicket:id="toolbar" class="btn-toolbar" data-role="editor-toolbar"> <div class="btn-group"> - <a id="emoticons" class="chat btn emt dropdown-toggle" data-toggle="dropdown" title="Emoticons"></a> + <a id="emoticons" class="chat btn btn-default emt dropdown-toggle" data-toggle="dropdown" title="Emoticons"></a> <ul class="chat dropdown-menu" > <li> <table id="emotMenuList"> @@ -44,16 +44,16 @@ </ul> </div> <div class="btn-group"> - <a id="fontSize" class="chat btn dropdown-toggle" data-toggle="dropdown" title="Font Size"> A <b class="caret"></b></a> + <a id="fontSize" class="chat btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"> A <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a data-edit="fontSize 5"><font size="3">Huge</font></a></li> <li><a data-edit="fontSize 3"><font size="2">Normal</font></a></li> <li><a data-edit="fontSize 1"><font size="1">Small</font></a></li> </ul> - <a id="bold" class="chat btn" data-edit="bold" title="Bold (Ctrl/Cmd+B)"> B </a> <a - id="italic" class="chat btn" data-edit="italic" title="Italic (Ctrl/Cmd+I)" style="font-style: italic;"> I </a> <a - id="strikethrough" class="chat btn" data-edit="strikethrough" title="Strikethrough" style="text-decoration: line-through;"> S </a> <a - id="underline" class="chat btn" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a> + <a id="bold" class="chat btn btn-default" data-edit="bold" title="Bold (Ctrl/Cmd+B)"> B </a> <a + id="italic" class="chat btn btn-default" data-edit="italic" title="Italic (Ctrl/Cmd+I)" style="font-style: italic;"> I </a> <a + id="strikethrough" class="chat btn btn-default" data-edit="strikethrough" title="Strikethrough" style="text-decoration: line-through;"> S </a> <a + id="underline" class="chat btn btn-default" data-edit="underline" title="Underline (Ctrl/Cmd+U)" style="text-decoration: underline;"> U </a> </div> </div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/417fdd64/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 829f42d..194d7f2 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ <maven.surefire.version>2.20</maven.surefire.version> <maven-site.version>3.3</maven-site.version> <wicket.version>8.0.0-M6</wicket.version> - <wicketju.version>8.0.0-M6</wicketju.version> - <wickets.version>8.0.0-M6</wickets.version> + <wicketju.version>8.0.0-SNAPSHOT</wicketju.version> + <wickets.version>8.0.0-SNAPSHOT</wickets.version> <red5-server.version>1.0.9-M6</red5-server.version> <red5-client.version>1.0.9-M6</red5-client.version> <spring.version>4.3.6.RELEASE</spring.version>
