Author: solomax
Date: Tue Dec 22 02:38:22 2015
New Revision: 1721294
URL: http://svn.apache.org/viewvc?rev=1721294&view=rev
Log:
[OPENMEETINGS-1303] report bug URL is moved to HTML
Modified:
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/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
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=1721294&r1=1721293&r2=1721294&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
Tue Dec 22 02:38:22 2015
@@ -45,7 +45,7 @@
id="contactsAndMessages"><a
wicket:id="messages"><wicket:message key="1188"/></a></span><span
id="profile"><a wicket:id="profile"><wicket:message
key="5"/></a></span><span
id="logout"><a wicket:id="logout"
href="#"><wicket:message key="310"/></a></span><span
- id="reportBug"><a target="_blank"
wicket:id="bug"><wicket:message key="284"/></a></span><span><a
+ id="reportBug"><a target="_blank"
href="https://issues.apache.org/jira/browse/OPENMEETINGS"><wicket:message
key="284"/></a></span><span><a
wicket:id="about"><wicket:message
key="1549"/></a></span>
</div>
<div wicket:id="dev" id="devMenu"/>
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=1721294&r1=1721293&r2=1721294&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
Tue Dec 22 02:38:22 2015
@@ -69,7 +69,6 @@ import org.apache.wicket.markup.head.Jav
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
@@ -148,7 +147,6 @@ public class MainPage extends BaseInited
dev = null;
add(new EmptyPanel("dev").setVisible(false));
}
- topLinks.add(new ExternalLink("bug",
"https://issues.apache.org/jira/browse/OPENMEETINGS"));//FIXME hardcoded
add(chat = new ChatPanel("chatPanel"));
add(newMessage = new MessageDialog("newMessageDialog", new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
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=1721294&r1=1721293&r2=1721294&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
Tue Dec 22 02:38:22 2015
@@ -45,7 +45,7 @@
id="contactsAndMessages"><a
wicket:id="messages"><wicket:message key="1188"/></a></span><span
id="profile"><a wicket:id="profile"><wicket:message
key="5"/></a></span><span
id="logout"><a wicket:id="logout"
href="#"><wicket:message key="310"/></a></span><span
- id="reportBug"><a target="_blank"
wicket:id="bug"><wicket:message key="284"/></a></span><span><a
+ id="reportBug"><a target="_blank"
href="https://issues.apache.org/jira/browse/OPENMEETINGS"><wicket:message
key="284"/></a></span><span><a
wicket:id="about"><wicket:message
key="1549"/></a></span>
</div>
<div wicket:id="dev" id="devMenu"/>
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=1721294&r1=1721293&r2=1721294&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
Tue Dec 22 02:38:22 2015
@@ -70,7 +70,6 @@ import org.apache.wicket.markup.head.Jav
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
@@ -149,7 +148,6 @@ public class MainPage extends BaseInited
dev = null;
add(new EmptyPanel("dev").setVisible(false));
}
- topLinks.add(new ExternalLink("bug",
"https://issues.apache.org/jira/browse/OPENMEETINGS"));//FIXME hardcoded
add(chat = new ChatPanel("chatPanel"));
add(newMessage = new MessageDialog("newMessageDialog", new
CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {