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/01/20 08:14:32 UTC
svn commit: r1725677 - in /openmeetings/application: branches/3.1.x/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/
branches/3.1.x/...
Author: solomax
Date: Wed Jan 20 07:14:32 2016
New Revision: 1725677
URL: http://svn.apache.org/viewvc?rev=1725677&view=rev
Log:
[OPENMEETINGS-1311] jquery.ui.menubar is replaced with jqueryui menu component
Added:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/menu.css
Removed:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/js/jquery.ui.menubar.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/menu-functions.js
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/jquery.ui.menubar-rtl.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/jquery.ui.menubar.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/js/jquery.ui.menubar.js
Modified:
openmeetings/application/branches/3.1.x/LICENSE
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme-rtl.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/LICENSE
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/pom.xml
Modified: openmeetings/application/branches/3.1.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/LICENSE?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/LICENSE (original)
+++ openmeetings/application/branches/3.1.x/LICENSE Wed Jan 20 07:14:32 2016
@@ -218,10 +218,9 @@ webapps/openmeetings/css/admin-rtl.css
webapps/openmeetings/css/calendar.css
webapps/openmeetings/css/forms.css
webapps/openmeetings/css/history.css
-webapps/openmeetings/css/jquery.ui.menubar.css
-webapps/openmeetings/css/jquery.ui.menubar-rtl.css
webapps/openmeetings/css/theme.css
webapps/openmeetings/css/theme-rtl.css
+webapps/openmeetings/css/menu.css
webapps/openmeetings/docs/*
webapps/openmeetings/js/openmeetings_functions.js
@@ -1679,8 +1678,6 @@ For components:
coin-slider-styles.css
colorbox.css
-jquery.ui.menubar.js
-jquery.ui.menubar.css
coin-slider.min.js
jquery.colorbox.js
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java Wed Jan 20 07:14:32 2016
@@ -37,7 +37,6 @@ public class MainMenuItem extends MenuIt
params = m.getParams() != null ? MenuParams.valueOf(m.getParams()) : MenuParams.publicTabButton;
}
- @Override
public void onClick(MainPage page, AjaxRequestTarget target) {
page.updateContents(new OmUrlFragment(action, params), target);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java Wed Jan 20 07:14:32 2016
@@ -18,41 +18,27 @@
*/
package org.apache.openmeetings.web.common.menu;
-import java.io.Serializable;
import java.util.List;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
-public abstract class MenuItem implements Serializable {
+public class MenuItem extends com.googlecode.wicket.jquery.ui.widget.menu.MenuItem {
private static final long serialVersionUID = 1L;
- protected String name;
protected String desc;
- protected String cssClass;
- protected boolean active = true;
- protected List<MenuItem> children = null;
- public MenuItem() {}
+ public MenuItem(String title) {
+ super(title);
+ }
- public MenuItem(String name) {
- this(name, null);
+ public MenuItem(String title, List<IMenuItem> items) {
+ super(title, items);
}
- public MenuItem(String name, String desc) {
- this.name = name;
+ public MenuItem(String title, String desc) {
+ super(title);
this.desc = desc;
}
- public abstract void onClick(MainPage page, AjaxRequestTarget target);
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
public String getDesc() {
return desc;
}
@@ -60,28 +46,4 @@ public abstract class MenuItem implement
public void setDesc(String desc) {
this.desc = desc;
}
-
- public boolean isActive() {
- return active;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
- public List<MenuItem> getChildren() {
- return children;
- }
-
- public void setChildren(List<MenuItem> children) {
- this.children = children;
- }
-
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html Wed Jan 20 07:14:32 2016
@@ -20,16 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <ul wicket:id="menuContainer">
- <li wicket:id="mainItem">
- <a href="#" wicket:id="link"><span wicket:id="label"></span></a>
- <ul wicket:id="childItems">
- <li wicket:id="childItem"><a>
- <span class="menuName" wicket:id="name"></span><br />
- <span class="menuDesc" wicket:id="description"></span>
- </a></li>
- </ul>
- </li>
- </ul>
+ <div wicket:id="menu" class="ui-widget-header"></div>
</wicket:panel>
</html>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java Wed Jan 20 07:14:32 2016
@@ -21,19 +21,14 @@ package org.apache.openmeetings.web.comm
import java.util.List;
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.util.string.Strings;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
+
/**
* Loads the menu items into the main area
*
@@ -42,73 +37,27 @@ import org.apache.wicket.util.string.Str
*/
public class MenuPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer menuContainer = new WebMarkupContainer("menuContainer");
- private final MenuFunctionsBehavior mfb;
- public MenuPanel(String id, List<MenuItem> menus) {
+ public MenuPanel(String id, List<IMenuItem> menus) {
super(id);
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
-
- add(menuContainer.setOutputMarkupId(true));
- menuContainer.add(new ListView<MenuItem>("mainItem", menus) {
+ add(new Menu("menu", menus, new Options().set("icons", "{ submenu: 'ui-icon-triangle-1-s' }")
+ .set("position", "{ my: 'left top', at: 'left bottom'}"))
+ {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<MenuItem> item) {
- final MenuItem gl = item.getModelObject();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
- private static final long serialVersionUID = 1L;
-
- public void onClick(AjaxRequestTarget target) {
- gl.onClick(getMainPage(), target);
- };
- };
- if (null != gl.getChildren()) {
- link.add(new AttributeAppender("click", "return false;"));
- }
- item.add(link.add(new Label("label", gl.getName()).setRenderBodyOnly(true)));
- if (!Strings.isEmpty(gl.getCssClass())) {
- link.add(AttributeAppender.append("class", gl.getCssClass()));
- }
- if (!Strings.isEmpty(gl.getDesc())) {
- link.add(AttributeAppender.append("title", gl.getDesc()));
+ protected void addMenuItem(ListItem<IMenuItem> item, IMenuItem menuItem) {
+ super.addMenuItem(item, menuItem);
+ MenuItem m = (MenuItem)menuItem;
+ if (Strings.isEmpty(m.getDesc())) {
+ item.add(AttributeAppender.append("class", "top"));
+ } else {
+ item.add(AttributeAppender.append("class", "sub"));
+ item.add(AttributeAppender.append("title", m.getDesc()));
}
- item.setVisible(gl.isActive());
- item.add(new WebMarkupContainer("childItems").add(new ListView<MenuItem>("childItem", gl.getChildren()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final ListItem<MenuItem> item1) {
- final MenuItem m = item1.getModelObject();
- item1.setVisible(m.isActive());
- item1.add(new Label("name", m.getName()), new Label("description", m.getDesc()));
- item1.add(new AjaxEventBehavior("click") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- m.onClick(getMainPage(), target);
- }
- });
- }
- }).setVisible(null != gl.getChildren()));
}
});
- add(mfb = new MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
- }
-
- public void update(IPartialPageRequestHandler target) {
- target.add(menuContainer);
- //target.appendJavaScript(String.format("$(function() {%s;});", mfb.getInitScript()));
- target.appendJavaScript(mfb.getInitScript());
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- if (isRtl()) {
- response.render(CssHeaderItem.forUrl("css/jquery.ui.menubar-rtl.css"));
- }
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java Wed Jan 20 07:14:32 2016
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.web.common.menu;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
public class RoomMenuItem extends MenuItem {
private static final long serialVersionUID = 1L;
@@ -32,17 +29,8 @@ public class RoomMenuItem extends MenuIt
this(name, desc, true);
}
- public RoomMenuItem(String name, String desc, boolean active) {
- super(name, desc);
- this.active = active;
- }
-
- public RoomMenuItem(String name, String desc, String cssClass) {
+ public RoomMenuItem(String name, String desc, boolean enabled) {
super(name, desc);
- this.cssClass = cssClass;
- }
-
- @Override
- public void onClick(MainPage page, AjaxRequestTarget target) {
+ setEnabled(enabled);
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html Wed Jan 20 07:14:32 2016
@@ -25,6 +25,7 @@
<link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
<title wicket:id="pageTitle">[title]</title>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/menu.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/chat.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/forms.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/calendar.css"/>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html Wed Jan 20 07:14:32 2016
@@ -20,8 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <link media="screen" type="text/css" rel="stylesheet" href="css/jquery.ui.menubar.css"/>
- <script type="text/javascript" src="js/jquery.ui.menubar.js"></script>
<script type="text/javascript">
function showBusyIndicator() {
$('#busy_indicator').show();
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Wed Jan 20 07:14:32 2016
@@ -82,6 +82,7 @@ import org.slf4j.Logger;
import org.wicketstuff.urlfragment.UrlFragment;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
@@ -250,23 +251,21 @@ public class MainPage extends BaseInited
});
}
- private List<MenuItem> getMainMenu() {
- List<MenuItem> menu = new ArrayList<MenuItem>();
+ private List<IMenuItem> getMainMenu() {
+ List<IMenuItem> menu = new ArrayList<>();
for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()))) {
- MenuItem g = new MenuItem(Application.getString(gl.getLabelId())) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(MainPage page, AjaxRequestTarget terget) {}
- };
- List<MenuItem> l = new ArrayList<MenuItem>();
+ List<IMenuItem> l = new ArrayList<>();
for (Navimain nm : gl.getMainnavi()) {
- l.add(new MainMenuItem(nm));
- }
- if (!l.isEmpty()) {
- g.setChildren(l);
+ l.add(new MainMenuItem(nm) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClick(MainPage.this, target);
+ }
+ });
}
- menu.add(g);
+ menu.add(new MenuItem(Application.getString(gl.getLabelId()), l));
}
return menu;
}
Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/menu.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/menu.css?rev=1725677&view=auto
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/menu.css (added)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/menu.css Wed Jan 20 07:14:32 2016
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+.ui-menu:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+.ui-menu .ui-menu-item {
+ display: inline-block;
+ margin: 0;
+ line-height: 1.2em !important;
+ padding: .4em 2.1em .4em 1em;
+ font-weight: normal;
+}
+.ui-menu .ui-menu-item.sub {
+ width: 250px;
+ font-weight: bold;
+}
+.ui-menu .ui-menu-item.top {
+ border: 0 !important;
+}
+.ui-menu.ui-widget.ui-widget-content.ui-menu-icons {
+ border: 0;
+}
+#menu.ui-menu, #roomMenu.ui-menu {
+ max-height: 30px;
+ min-height: 30px;
+}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme-rtl.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme-rtl.css?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme-rtl.css (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme-rtl.css Wed Jan 20 07:14:32 2016
@@ -35,7 +35,8 @@
border-left: none;
}
#busy_indicator {
- float: left !important;
+ right: initial !important;
+ left: 0 !important;
}
#chatPanel {
right: initial !important;
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=1725677&r1=1725676&r2=1725677&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 Wed Jan 20 07:14:32 2016
@@ -46,33 +46,8 @@ html, body {
#topLinks span:last-child {
border-right: none;
}
-
-#menu, #roomMenu {
- background-color: #AFCBFB;
- max-height: 30px;
- overflow-y: hidden;
-}
-#menu .ui-menubar.ui-widget-header.ui-helper-clearfix, #roomMenu .ui-menubar.ui-widget-header.ui-helper-clearfix {
- border-right: 0;
-}
-.ui-menubar .ui-menu {
- width: 250px;
-}
-.ui-menu .ui-menu-item a {
- line-height: 1.2em !important;
- padding-bottom: 5px !important;
-}
-.menuName {
- font-weight: bold;
-}
-.menuDesc {
- font-size: smaller;
- line-height: 1em !important;
-}
-
#busy_indicator {
display: none;
- float: right;
z-index: 1000;
width: 200px;
font-weight: bold;
@@ -81,6 +56,9 @@ html, body {
color: #FF0000;
height: 30px;
border: 0;
+ position: absolute;
+ right: 0;
+ margin: 2px;
}
#busy_indicator span {
vertical-align: sub;
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Wed Jan 20 07:14:32 2016
@@ -42,7 +42,7 @@
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.2.0-SNAPSHOT</wicket.version>
- <wicketju.version>7.1.1-SNAPSHOT</wicketju.version>
+ <wicketju.version>7.2.0-SNAPSHOT</wicketju.version>
<wickets.version>7.2.0-SNAPSHOT</wickets.version>
<red5-server.version>1.0.6-RELEASE</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
@@ -876,14 +876,6 @@
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
<licenses>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT+GPL</licenseFamilyCategory>
- <licenseFamilyName>MIT and GPL v2</licenseFamilyName>
- <notes></notes>
- <patterns>
- <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
- </patterns>
- </license>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<licenseFamilyCategory>MIT</licenseFamilyCategory>
<licenseFamilyName>MIT</licenseFamilyName>
<notes></notes>
@@ -894,9 +886,6 @@
</licenses>
<licenseFamilies>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>MIT and GPL v2</familyName>
- </licenseFamily>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<familyName>MIT</familyName>
</licenseFamily>
</licenseFamilies>
Modified: openmeetings/application/trunk/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/LICENSE?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/LICENSE (original)
+++ openmeetings/application/trunk/LICENSE Wed Jan 20 07:14:32 2016
@@ -218,10 +218,9 @@ webapps/openmeetings/css/admin-rtl.css
webapps/openmeetings/css/calendar.css
webapps/openmeetings/css/forms.css
webapps/openmeetings/css/history.css
-webapps/openmeetings/css/jquery.ui.menubar.css
-webapps/openmeetings/css/jquery.ui.menubar-rtl.css
webapps/openmeetings/css/theme.css
webapps/openmeetings/css/theme-rtl.css
+webapps/openmeetings/css/menu.css
webapps/openmeetings/docs/*
webapps/openmeetings/js/openmeetings_functions.js
@@ -1679,8 +1678,6 @@ For components:
coin-slider-styles.css
colorbox.css
-jquery.ui.menubar.js
-jquery.ui.menubar.css
coin-slider.min.js
jquery.colorbox.js
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MainMenuItem.java Wed Jan 20 07:14:32 2016
@@ -37,7 +37,6 @@ public class MainMenuItem extends MenuIt
params = m.getParams() != null ? MenuParams.valueOf(m.getParams()) : MenuParams.publicTabButton;
}
- @Override
public void onClick(MainPage page, AjaxRequestTarget target) {
page.updateContents(new OmUrlFragment(action, params), target);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java Wed Jan 20 07:14:32 2016
@@ -18,39 +18,25 @@
*/
package org.apache.openmeetings.web.common.menu;
-import java.io.Serializable;
import java.util.List;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
-public abstract class MenuItem implements Serializable {
+public class MenuItem extends com.googlecode.wicket.jquery.ui.widget.menu.MenuItem {
private static final long serialVersionUID = 1L;
- protected String name;
protected String desc;
- protected String cssClass;
- protected boolean active = true;
- protected List<MenuItem> children = null;
- public MenuItem() {}
-
- public MenuItem(String name) {
- this(name, null);
+ public MenuItem(String title) {
+ super(title);
}
- public MenuItem(String name, String desc) {
- this.name = name;
- this.desc = desc;
+ public MenuItem(String title, List<IMenuItem> items) {
+ super(title, items);
}
- public abstract void onClick(MainPage page, AjaxRequestTarget target);
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
+ public MenuItem(String title, String desc) {
+ super(title);
+ this.desc = desc;
}
public String getDesc() {
@@ -60,28 +46,4 @@ public abstract class MenuItem implement
public void setDesc(String desc) {
this.desc = desc;
}
-
- public boolean isActive() {
- return active;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
- public List<MenuItem> getChildren() {
- return children;
- }
-
- public void setChildren(List<MenuItem> children) {
- this.children = children;
- }
-
- public String getCssClass() {
- return cssClass;
- }
-
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
- }
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html Wed Jan 20 07:14:32 2016
@@ -20,16 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <ul wicket:id="menuContainer">
- <li wicket:id="mainItem">
- <a href="#" wicket:id="link"><span wicket:id="label"></span></a>
- <ul wicket:id="childItems">
- <li wicket:id="childItem"><a>
- <span class="menuName" wicket:id="name"></span><br />
- <span class="menuDesc" wicket:id="description"></span>
- </a></li>
- </ul>
- </li>
- </ul>
+ <div wicket:id="menu" class="ui-widget-header"></div>
</wicket:panel>
</html>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java Wed Jan 20 07:14:32 2016
@@ -21,19 +21,14 @@ package org.apache.openmeetings.web.comm
import java.util.List;
import org.apache.openmeetings.web.common.BasePanel;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.util.string.Strings;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
+import com.googlecode.wicket.jquery.ui.widget.menu.Menu;
+
/**
* Loads the menu items into the main area
*
@@ -42,73 +37,27 @@ import org.apache.wicket.util.string.Str
*/
public class MenuPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer menuContainer = new WebMarkupContainer("menuContainer");
- private final MenuFunctionsBehavior mfb;
- public MenuPanel(String id, List<MenuItem> menus) {
+ public MenuPanel(String id, List<IMenuItem> menus) {
super(id);
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
-
- add(menuContainer.setOutputMarkupId(true));
- menuContainer.add(new ListView<MenuItem>("mainItem", menus) {
+ add(new Menu("menu", menus, new Options().set("icons", "{ submenu: 'ui-icon-triangle-1-s' }")
+ .set("position", "{ my: 'left top', at: 'left bottom'}"))
+ {
private static final long serialVersionUID = 1L;
@Override
- protected void populateItem(final ListItem<MenuItem> item) {
- final MenuItem gl = item.getModelObject();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
- private static final long serialVersionUID = 1L;
-
- public void onClick(AjaxRequestTarget target) {
- gl.onClick(getMainPage(), target);
- };
- };
- if (null != gl.getChildren()) {
- link.add(new AttributeAppender("click", "return false;"));
- }
- item.add(link.add(new Label("label", gl.getName()).setRenderBodyOnly(true)));
- if (!Strings.isEmpty(gl.getCssClass())) {
- link.add(AttributeAppender.append("class", gl.getCssClass()));
- }
- if (!Strings.isEmpty(gl.getDesc())) {
- link.add(AttributeAppender.append("title", gl.getDesc()));
+ protected void addMenuItem(ListItem<IMenuItem> item, IMenuItem menuItem) {
+ super.addMenuItem(item, menuItem);
+ MenuItem m = (MenuItem)menuItem;
+ if (Strings.isEmpty(m.getDesc())) {
+ item.add(AttributeAppender.append("class", "top"));
+ } else {
+ item.add(AttributeAppender.append("class", "sub"));
+ item.add(AttributeAppender.append("title", m.getDesc()));
}
- item.setVisible(gl.isActive());
- item.add(new WebMarkupContainer("childItems").add(new ListView<MenuItem>("childItem", gl.getChildren()) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void populateItem(final ListItem<MenuItem> item1) {
- final MenuItem m = item1.getModelObject();
- item1.setVisible(m.isActive());
- item1.add(new Label("name", m.getName()), new Label("description", m.getDesc()));
- item1.add(new AjaxEventBehavior("click") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- m.onClick(getMainPage(), target);
- }
- });
- }
- }).setVisible(null != gl.getChildren()));
}
});
- add(mfb = new MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
- }
-
- public void update(IPartialPageRequestHandler target) {
- target.add(menuContainer);
- //target.appendJavaScript(String.format("$(function() {%s;});", mfb.getInitScript()));
- target.appendJavaScript(mfb.getInitScript());
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- if (isRtl()) {
- response.render(CssHeaderItem.forUrl("css/jquery.ui.menubar-rtl.css"));
- }
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java Wed Jan 20 07:14:32 2016
@@ -18,9 +18,6 @@
*/
package org.apache.openmeetings.web.common.menu;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
public class RoomMenuItem extends MenuItem {
private static final long serialVersionUID = 1L;
@@ -32,17 +29,8 @@ public class RoomMenuItem extends MenuIt
this(name, desc, true);
}
- public RoomMenuItem(String name, String desc, boolean active) {
- super(name, desc);
- this.active = active;
- }
-
- public RoomMenuItem(String name, String desc, String cssClass) {
+ public RoomMenuItem(String name, String desc, boolean enabled) {
super(name, desc);
- this.cssClass = cssClass;
- }
-
- @Override
- public void onClick(MainPage page, AjaxRequestTarget target) {
+ setEnabled(enabled);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html Wed Jan 20 07:14:32 2016
@@ -25,6 +25,7 @@
<link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
<title wicket:id="pageTitle">[title]</title>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/menu.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/chat.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/forms.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/calendar.css"/>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html Wed Jan 20 07:14:32 2016
@@ -20,8 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <link media="screen" type="text/css" rel="stylesheet" href="css/jquery.ui.menubar.css"/>
- <script type="text/javascript" src="js/jquery.ui.menubar.js"></script>
<script type="text/javascript">
function showBusyIndicator() {
$('#busy_indicator').show();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Wed Jan 20 07:14:32 2016
@@ -83,6 +83,7 @@ import org.slf4j.Logger;
import org.wicketstuff.urlfragment.UrlFragment;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
@AuthorizeInstantiation({"Admin", "Dashboard", "Room"})
public class MainPage extends BaseInitedPage {
@@ -256,23 +257,21 @@ public class MainPage extends BaseInited
});
}
- private List<MenuItem> getMainMenu() {
- List<MenuItem> menu = new ArrayList<MenuItem>();
+ private List<IMenuItem> getMainMenu() {
+ List<IMenuItem> menu = new ArrayList<>();
for (Naviglobal gl : getBean(NavigationDao.class).getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()))) {
- MenuItem g = new MenuItem(Application.getString(gl.getLabelId())) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(MainPage page, AjaxRequestTarget terget) {}
- };
- List<MenuItem> l = new ArrayList<MenuItem>();
+ List<IMenuItem> l = new ArrayList<>();
for (Navimain nm : gl.getMainnavi()) {
- l.add(new MainMenuItem(nm));
- }
- if (!l.isEmpty()) {
- g.setChildren(l);
+ l.add(new MainMenuItem(nm) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClick(MainPage.this, target);
+ }
+ });
}
- menu.add(g);
+ menu.add(new MenuItem(Application.getString(gl.getLabelId()), l));
}
return menu;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme-rtl.css Wed Jan 20 07:14:32 2016
@@ -35,7 +35,8 @@
border-left: none;
}
#busy_indicator {
- float: left !important;
+ right: initial !important;
+ left: 0 !important;
}
#chatPanel {
right: initial !important;
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=1725677&r1=1725676&r2=1725677&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 Wed Jan 20 07:14:32 2016
@@ -46,33 +46,8 @@ html, body {
#topLinks span:last-child {
border-right: none;
}
-
-#menu, #roomMenu {
- background-color: #AFCBFB;
- max-height: 30px;
- overflow-y: hidden;
-}
-#menu .ui-menubar.ui-widget-header.ui-helper-clearfix, #roomMenu .ui-menubar.ui-widget-header.ui-helper-clearfix {
- border-right: 0;
-}
-.ui-menubar .ui-menu {
- width: 250px;
-}
-.ui-menu .ui-menu-item a {
- line-height: 1.2em !important;
- padding-bottom: 5px !important;
-}
-.menuName {
- font-weight: bold;
-}
-.menuDesc {
- font-size: smaller;
- line-height: 1em !important;
-}
-
#busy_indicator {
display: none;
- float: right;
z-index: 1000;
width: 200px;
font-weight: bold;
@@ -81,6 +56,9 @@ html, body {
color: #FF0000;
height: 30px;
border: 0;
+ position: absolute;
+ right: 0;
+ margin: 2px;
}
#busy_indicator span {
vertical-align: sub;
Modified: openmeetings/application/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1725677&r1=1725676&r2=1725677&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Jan 20 07:14:32 2016
@@ -42,7 +42,7 @@
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.2.0-SNAPSHOT</wicket.version>
- <wicketju.version>7.1.1-SNAPSHOT</wicketju.version>
+ <wicketju.version>7.2.0-SNAPSHOT</wicketju.version>
<wickets.version>7.2.0-SNAPSHOT</wickets.version>
<red5-server.version>1.0.6-RELEASE</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
@@ -876,14 +876,6 @@
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
<licenses>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
- <licenseFamilyCategory>MIT+GPL</licenseFamilyCategory>
- <licenseFamilyName>MIT and GPL v2</licenseFamilyName>
- <notes></notes>
- <patterns>
- <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
- </patterns>
- </license>
- <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<licenseFamilyCategory>MIT</licenseFamilyCategory>
<licenseFamilyName>MIT</licenseFamilyName>
<notes></notes>
@@ -894,9 +886,6 @@
</licenses>
<licenseFamilies>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
- <familyName>MIT and GPL v2</familyName>
- </licenseFamily>
- <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<familyName>MIT</familyName>
</licenseFamily>
</licenseFamilies>