Author: solomax
Date: Mon Sep 14 10:56:30 2015
New Revision: 1702903
URL: http://svn.apache.org/r1702903
Log:
OM menu is fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/trunk/singlewebapp/pom.xml
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html?rev=1702903&r1=1702902&r2=1702903&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.html
Mon Sep 14 10:56:30 2015
@@ -41,12 +41,10 @@
<li wicket:id="mainItem">
<a class="fNiv" href="#" onclick="return
false;"><span wicket:id="label"></span></a>
<ul wicket:enclosure="childItem">
- <li wicket:id="childItem">
- <a wicket:id="link" href="#">
- <span class="menuName"
wicket:id="name"></span><br />
- <span class="menuDesc"
wicket:id="description"></span>
- </a>
- </li>
+ <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>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java?rev=1702903&r1=1702902&r2=1702903&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/MenuPanel.java
Mon Sep 14 10:56:30 2015
@@ -28,8 +28,8 @@ import org.apache.openmeetings.web.pages
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuActions;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
@@ -68,14 +68,12 @@ public class MenuPanel extends BasePanel
final String desc =
getString("" + m.getTooltip_fieldvalues_id());
final MenuActions action =
MenuActions.valueOf(m.getAction());
final MenuParams params =
m.getParams() != null ? MenuParams.valueOf(m.getParams()) :
MenuParams.publicTabButton;
- item.add(new
AjaxLink<Void>("link") {
+ item.add(new Label("name",
name), new Label("description", desc));
+ item.add(new
AjaxEventBehavior("click") {
private static final
long serialVersionUID = 1L;
- {
- add(new
Label("name", name));
- add(new
Label("description", desc));
- }
-
- public void
onClick(AjaxRequestTarget target) {
+
+ @Override
+ protected void
onEvent(AjaxRequestTarget target) {
((MainPage)getPage()).updateContents(new OmUrlFragment(action, params), target);
}
});
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html?rev=1702903&r1=1702902&r2=1702903&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
Mon Sep 14 10:56:30 2015
@@ -24,12 +24,10 @@
<li wicket:id="mainItem">
<a href="#" wicket:id="link"><span
wicket:id="label"></span></a>
<ul wicket:id="childItems">
- <li wicket:id="childItem">
- <a wicket:id="link" href="#">
- <span class="menuName"
wicket:id="name"></span><br />
- <span class="menuDesc"
wicket:id="description"></span>
- </a>
- </li>
+ <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>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1702903&r1=1702902&r2=1702903&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
Mon Sep 14 10:56:30 2015
@@ -21,6 +21,7 @@ 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;
@@ -81,14 +82,12 @@ public class MenuPanel extends BasePanel
protected void
populateItem(final ListItem<MenuItem> item1) {
final MenuItem m =
item1.getModelObject();
item1.setVisible(m.isActive());
- item1.add(new
AjaxLink<Void>("link") {
+ item1.add(new
Label("name", m.getName()), new Label("description", m.getDesc()));
+ item1.add(new
AjaxEventBehavior("click") {
private static
final long serialVersionUID = 1L;
- {
- add(new
Label("name", m.getName()));
- add(new
Label("description", m.getDesc()));
- }
-
- public void
onClick(AjaxRequestTarget target) {
+
+ @Override
+ protected void
onEvent(AjaxRequestTarget target) {
m.onClick(getMainPage(), target);
}
});
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1702903&r1=1702902&r2=1702903&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon Sep 14 10:56:30 2015
@@ -722,19 +722,6 @@
</execution>
</executions>
</plugin>
- <!-- plugin>
- <groupId>org.apache.creadur.whisker</groupId>
-
<artifactId>apache-whisker-plugin4maven</artifactId>
- <executions>
- <execution>
- <id>generate-licensing-docs</id>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
</plugins>
<pluginManagement>
<plugins>
@@ -921,14 +908,6 @@
</licenseFamilies>
</configuration>
</plugin>
- <!-- plugin>
-
<groupId>org.apache.creadur.whisker</groupId>
-
<artifactId>apache-whisker-plugin4maven</artifactId>
- <version>0.2-SNAPSHOT</version>
- <configuration>
-
<descriptor>openmeetings.xml</descriptor>
- </configuration>
- </plugin-->
<!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
<plugin>
