Author: solomax
Date: Sun Apr 20 16:16:17 2014
New Revision: 1588788
URL: http://svn.apache.org/r1588788
Log:
[OPENMEETINGS-897] basic non functional menu is added
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/exit_button.png
(with props)
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
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=1588788&r1=1588787&r2=1588788&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
Sun Apr 20 16:16:17 2014
@@ -62,6 +62,9 @@ public class MenuPanel extends BasePanel
link.add(new
AttributeAppender("onclick", "return false;"));
}
item.add(link.add(new Label("label",
gl.getName()).setRenderBodyOnly(true)));
+ if (gl.getCssClass() != null) {
+
link.add(AttributeAppender.append("class", gl.getCssClass()));
+ }
item.add(new WebMarkupContainer("childItems")
.add(new
ListView<MenuItem>("childItem", gl.getChildren()) {
private static final
long serialVersionUID = 1L;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1588788&r1=1588787&r2=1588788&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Sun Apr 20 16:16:17 2014
@@ -26,25 +26,13 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.menu.MenuItem;
import org.apache.openmeetings.web.common.menu.MenuPanel;
import org.apache.openmeetings.web.common.menu.RoomMenuItem;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.Behavior;
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private final Behavior menuBehavior = new AbstractDefaultAjaxBehavior()
{
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- // TODO Auto-generated method stub
-
- }
- };
public RoomPanel(String id, long roomId) {
super(id);
- add(menuBehavior);
add(new MenuPanel("menu", getMenu()));
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1588788&r1=1588787&r2=1588788&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
Sun Apr 20 16:16:17 2014
@@ -264,8 +264,8 @@ public class OmUrlFragment implements Se
pp.add("wicketsid", getSid());
pp.add("wicketroomid", roomId);
pp.add("language",
getLanguage());
- basePanel = new
RoomPanel(CHILD_ID, roomId);
basePanel = new
SwfRoomPanel(CHILD_ID, pp);
+ basePanel = new
RoomPanel(CHILD_ID, roomId);
}
} catch(NumberFormatException ne) {
//skip it, bad roomid passed
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/exit_button.png
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/exit_button.png?rev=1588788&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/exit_button.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css?rev=1588788&r1=1588787&r2=1588788&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
Sun Apr 20 16:16:17 2014
@@ -19,3 +19,10 @@
.room.container {
width: 100%;
}
+
+.room.menu.exit {
+ padding-left: 20px;
+ background-image: url(images/exit_button.png);
+ background-repeat: no-repeat;
+ background-position-x: 5px;
+}
