You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/06/03 06:13:04 UTC
svn commit: r1488842 - in /openmeetings/trunk/singlewebapp: ivy.xml
src/org/apache/openmeetings/web/pages/MainPage.html
src/org/apache/openmeetings/web/pages/MainPage.java
Author: vdegtyarev
Date: Mon Jun 3 04:13:04 2013
New Revision: 1488842
URL: http://svn.apache.org/r1488842
Log:
HTML: Wicket DebugBar is added
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1488842&r1=1488841&r2=1488842&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Mon Jun 3 04:13:04 2013
@@ -247,6 +247,9 @@
<dependency org="org.apache.wicket" name="wicket-datetime" rev="6.8.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <include type="jar" />
+ </dependency>
<dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="0.9" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html?rev=1488842&r1=1488841&r2=1488842&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.html Mon Jun 3 04:13:04 2013
@@ -43,7 +43,9 @@
id="profile"><a wicket:id="profile"><wicket:ommessage key="5"/></a></span><span
id="logout"><a wicket:id="logout"><wicket:ommessage key="310"/></a></span><span
id="reportBug"><a target="_blank" wicket:id="bug"><wicket:ommessage key="284"/></a></span><span><a
- wicket:id="about"><wicket:ommessage key="1549"/></a></span></div>
+ wicket:id="about"><wicket:ommessage key="1549"/></a></span>
+ </div>
+ <div wicket:id="dev" />
<div id="busy_indicator"><wicket:ommessage key="1554"/></div>
<div wicket:id="menu"></div>
<div wicket:id="contents"><div wicket:id="child"></div></div>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?rev=1488842&r1=1488841&r2=1488842&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Mon Jun 3 04:13:04 2013
@@ -38,8 +38,10 @@ import org.apache.wicket.ajax.AbstractAj
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
@@ -56,6 +58,7 @@ public class MainPage extends BaseInited
private final MenuPanel menu;
private final MarkupContainer contents;
private final AbstractAjaxTimerBehavior areaBehavior;
+ private DebugBar dev = null;
public MainPage() {
contents = new WebMarkupContainer("contents");
@@ -97,6 +100,12 @@ public class MainPage extends BaseInited
}
});
add(about);
+ if (getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled()) {
+ add(dev = new DebugBar("dev"));
+ dev.setOutputMarkupId(true);
+ } else {
+ add(new EmptyPanel("dev").setVisible(false));
+ }
add(new ExternalLink("bug", "https://issues.apache.org/jira/browse/OPENMEETINGS"));//FIXME hardcoded
add(new ChatPanel("chatPanel"));
@@ -137,6 +146,9 @@ public class MainPage extends BaseInited
uf.set(f.getArea().name(), f.getType());
panel.onMenuPanelLoad(target);
}
+ if (dev != null){
+ target.add(dev);
+ }
}
@Override