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 2014/04/01 05:26:12 UTC
svn commit: r1583520 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/
branches/3....
Author: solomax
Date: Tue Apr 1 03:26:11 2014
New Revision: 1583520
URL: http://svn.apache.org/r1583520
Log:
[OPENMEETINGS-958] is partially fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java Tue Apr 1 03:26:11 2014
@@ -41,14 +41,15 @@ public class MessageResolver extends Wic
if (tag instanceof WicketTag) {
WicketTag wtag = (WicketTag)tag;
if (TAG_NAME.equals(wtag.getName())) {
+ Boolean escapeKey = wtag.getAttributes().getAsBoolean("escape");
Long messageKey = wtag.getAttributes().getAsLong("key");
if (messageKey != null) {
final String id = "_message_" + container.getPage().getAutoIndex();
Label label = new Label(id, WebSession.getString(messageKey));
label.setRenderBodyOnly(container.getApplication()
.getMarkupSettings()
- .getStripWicketTags());
-
+ .getStripWicketTags()).setEscapeModelStrings(!Boolean.FALSE.equals(escapeKey));
+
return label;
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java Tue Apr 1 03:26:11 2014
@@ -338,6 +338,10 @@ public class WebSession extends Abstract
return Calendar.getInstance(get().tz);
}
+ public static Calendar getClientCalendar() {
+ return Calendar.getInstance(getClientTimeZone());
+ }
+
public static DateFormat getIsoDateFormat() {
return get().ISO8601FORMAT;
}
@@ -401,7 +405,7 @@ public class WebSession extends Abstract
return states.get(0);
}
- public String getClientTimeZone() {
+ public String getClientTZCode() {
TimeZone _zone = browserTz;
if (browserTz == null) {
try {
@@ -426,6 +430,11 @@ public class WebSession extends Abstract
return _zone == null ? null : _zone.getID();
}
+ public static TimeZone getClientTimeZone() {
+ String tzCode = get().getClientTZCode();
+ return tzCode == null ? null : TimeZone.getTimeZone(tzCode);
+ }
+
private void initDashboard() {
DashboardContext dashboardContext = getDashboardContext();
dashboard = dashboardContext.getDashboardPersiter().load();
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Apr 1 03:26:11 2014
@@ -75,7 +75,7 @@ public class RegisterDialog extends Abst
private String registerLbl = WebSession.getString(121);
private DialogButton registerBtn = new DialogButton(registerLbl);
private FeedbackPanel feedback = new FeedbackPanel("feedback");
- private final IModel<String> tzModel = Model.of(WebSession.get().getClientTimeZone());
+ private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
private RegisterForm form;
private SignInDialog s;
@@ -128,7 +128,7 @@ public class RegisterDialog extends Abst
}
public void setClientTimeZone() {
- tzModel.setObject(WebSession.get().getClientTimeZone());
+ tzModel.setObject(WebSession.get().getClientTZCode());
}
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Tue Apr 1 03:26:11 2014
@@ -426,7 +426,7 @@ public class InstallWizard extends Wizar
public void init() {
List<String> tzList = AVAILABLE_TIMEZONES;
- String tzId = WebSession.get().getClientTimeZone();
+ String tzId = WebSession.get().getClientTZCode();
option = AVAILABLE_TIMEZONE_SET.contains(tzId) ? tzId : tzList.get(0);
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarFunctionsBehavior.java Tue Apr 1 03:26:11 2014
@@ -35,7 +35,7 @@ import org.apache.wicket.resource.TextTe
import org.apache.wicket.util.collections.MicroMap;
public class CalendarFunctionsBehavior extends Behavior {
- private static final long serialVersionUID = 5455085536095081262L;
+ private static final long serialVersionUID = 1L;
private final String markupId;
public CalendarFunctionsBehavior(String markupId) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Tue Apr 1 03:26:11 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
+import static org.apache.openmeetings.web.app.WebSession.getClientTimeZone;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.text.SimpleDateFormat;
@@ -187,17 +188,16 @@ public class CalendarPanel extends UserP
target.appendJavaScript("setDatepickerDate('datepicker','" + formatDateJava.format(start) + "');");
Appointment a = getDefault();
if (CalendarView.month == view && start.equals(end)) {
- java.util.Calendar now = WebSession.getCalendar();
- now.setTime(start);
- java.util.Calendar cal = WebSession.getCalendar();
- cal.set(java.util.Calendar.YEAR, now.get(java.util.Calendar.YEAR));
- cal.set(java.util.Calendar.MONTH, now.get(java.util.Calendar.MONTH));
- cal.set(java.util.Calendar.DATE, now.get(java.util.Calendar.DATE));
- cal.set(java.util.Calendar.SECOND, 0);
- cal.set(java.util.Calendar.MILLISECOND, 0);
- a.setStart(cal.getTime());
- cal.add(java.util.Calendar.HOUR_OF_DAY, 1);
- a.setEnd(cal.getTime());
+ java.util.Calendar cNow = java.util.Calendar.getInstance(getClientTimeZone());
+ java.util.Calendar cStart = java.util.Calendar.getInstance(getClientTimeZone());
+ cStart.setTime(start);
+ cStart.set(java.util.Calendar.HOUR_OF_DAY, cNow.get(java.util.Calendar.HOUR_OF_DAY));
+ cStart.set(java.util.Calendar.MINUTE, cNow.get(java.util.Calendar.MINUTE));
+ cStart.set(java.util.Calendar.SECOND, 0);
+ cStart.set(java.util.Calendar.MILLISECOND, 0);
+ a.setStart(cStart.getTime());
+ cStart.add(java.util.Calendar.HOUR_OF_DAY, 1);
+ a.setEnd(cStart.getTime());
} else {
a.setStart(start);
a.setEnd(end);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js Tue Apr 1 03:26:11 2014
@@ -36,7 +36,7 @@ $(function() {
function addCalButton(where, text, id) {
var my_button = '<span class="fc-header-space"></span>' +
- '<span class="fc-button fc-button-nextYear fc-state-default fc-corner-right" unselectable="on">' +
+ '<span class="fc-button fc-state-default fc-corner-right fc-corner-left">' +
'<input type="text" id="' + id + '" value="' + text +'" /></span>';
$("td.fc-header-" + where).append(my_button);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html Tue Apr 1 03:26:11 2014
@@ -27,7 +27,7 @@
<div><div wicket:id="step4" class="clickable start_step4"><wicket:ommessage key="773"/></div></div>
<table>
<tr>
- <td><wicket:ommessage key="804"/></td>
+ <td><wicket:ommessage key="804" escape="false"/></td>
<td>
<button wicket:id="start" type="button"><wicket:ommessage key="788"/></button><br/>
<button wicket:id="calendar" type="button"><wicket:ommessage key="291"/></button>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/MessageResolver.java Tue Apr 1 03:26:11 2014
@@ -41,14 +41,15 @@ public class MessageResolver extends Wic
if (tag instanceof WicketTag) {
WicketTag wtag = (WicketTag)tag;
if (TAG_NAME.equals(wtag.getName())) {
+ Boolean escapeKey = wtag.getAttributes().getAsBoolean("escape");
Long messageKey = wtag.getAttributes().getAsLong("key");
if (messageKey != null) {
final String id = "_message_" + container.getPage().getAutoIndex();
Label label = new Label(id, WebSession.getString(messageKey));
label.setRenderBodyOnly(container.getApplication()
.getMarkupSettings()
- .getStripWicketTags());
-
+ .getStripWicketTags()).setEscapeModelStrings(!Boolean.FALSE.equals(escapeKey));
+
return label;
}
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java Tue Apr 1 03:26:11 2014
@@ -338,6 +338,10 @@ public class WebSession extends Abstract
return Calendar.getInstance(get().tz);
}
+ public static Calendar getClientCalendar() {
+ return Calendar.getInstance(getClientTimeZone());
+ }
+
public static DateFormat getIsoDateFormat() {
return get().ISO8601FORMAT;
}
@@ -401,7 +405,7 @@ public class WebSession extends Abstract
return states.get(0);
}
- public String getClientTimeZone() {
+ public String getClientTZCode() {
TimeZone _zone = browserTz;
if (browserTz == null) {
try {
@@ -426,6 +430,11 @@ public class WebSession extends Abstract
return _zone == null ? null : _zone.getID();
}
+ public static TimeZone getClientTimeZone() {
+ String tzCode = get().getClientTZCode();
+ return tzCode == null ? null : TimeZone.getTimeZone(tzCode);
+ }
+
private void initDashboard() {
DashboardContext dashboardContext = getDashboardContext();
dashboard = dashboardContext.getDashboardPersiter().load();
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Tue Apr 1 03:26:11 2014
@@ -75,7 +75,7 @@ public class RegisterDialog extends Abst
private String registerLbl = WebSession.getString(121);
private DialogButton registerBtn = new DialogButton(registerLbl);
private FeedbackPanel feedback = new FeedbackPanel("feedback");
- private final IModel<String> tzModel = Model.of(WebSession.get().getClientTimeZone());
+ private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
private RegisterForm form;
private SignInDialog s;
@@ -128,7 +128,7 @@ public class RegisterDialog extends Abst
}
public void setClientTimeZone() {
- tzModel.setObject(WebSession.get().getClientTimeZone());
+ tzModel.setObject(WebSession.get().getClientTZCode());
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Tue Apr 1 03:26:11 2014
@@ -426,7 +426,7 @@ public class InstallWizard extends Wizar
public void init() {
List<String> tzList = AVAILABLE_TIMEZONES;
- String tzId = WebSession.get().getClientTimeZone();
+ String tzId = WebSession.get().getClientTZCode();
option = AVAILABLE_TIMEZONE_SET.contains(tzId) ? tzId : tzList.get(0);
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java Tue Apr 1 03:26:11 2014
@@ -36,6 +36,7 @@ import com.googlecode.wicket.jquery.ui.w
public class AboutDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1400355222295594321L;
+
public AboutDialog(String id) {
super(id, WebSession.getString(1549));
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Tue Apr 1 03:26:11 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getBaseUrl;
+import static org.apache.openmeetings.web.app.WebSession.getClientTimeZone;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.text.SimpleDateFormat;
@@ -187,17 +188,16 @@ public class CalendarPanel extends UserP
target.appendJavaScript("setDatepickerDate('datepicker','" + formatDateJava.format(start) + "');");
Appointment a = getDefault();
if (CalendarView.month == view && start.equals(end)) {
- java.util.Calendar now = WebSession.getCalendar();
- now.setTime(start);
- java.util.Calendar cal = WebSession.getCalendar();
- cal.set(java.util.Calendar.YEAR, now.get(java.util.Calendar.YEAR));
- cal.set(java.util.Calendar.MONTH, now.get(java.util.Calendar.MONTH));
- cal.set(java.util.Calendar.DATE, now.get(java.util.Calendar.DATE));
- cal.set(java.util.Calendar.SECOND, 0);
- cal.set(java.util.Calendar.MILLISECOND, 0);
- a.setStart(cal.getTime());
- cal.add(java.util.Calendar.HOUR_OF_DAY, 1);
- a.setEnd(cal.getTime());
+ java.util.Calendar cNow = java.util.Calendar.getInstance(getClientTimeZone());
+ java.util.Calendar cStart = java.util.Calendar.getInstance(getClientTimeZone());
+ cStart.setTime(start);
+ cStart.set(java.util.Calendar.HOUR_OF_DAY, cNow.get(java.util.Calendar.HOUR_OF_DAY));
+ cStart.set(java.util.Calendar.MINUTE, cNow.get(java.util.Calendar.MINUTE));
+ cStart.set(java.util.Calendar.SECOND, 0);
+ cStart.set(java.util.Calendar.MILLISECOND, 0);
+ a.setStart(cStart.getTime());
+ cStart.add(java.util.Calendar.HOUR_OF_DAY, 1);
+ a.setEnd(cStart.getTime());
} else {
a.setStart(start);
a.setEnd(end);
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js Tue Apr 1 03:26:11 2014
@@ -36,7 +36,7 @@ $(function() {
function addCalButton(where, text, id) {
var my_button = '<span class="fc-header-space"></span>' +
- '<span class="fc-button fc-button-nextYear fc-state-default fc-corner-right" unselectable="on">' +
+ '<span class="fc-button fc-state-default fc-corner-right fc-corner-left">' +
'<input type="text" id="' + id + '" value="' + text +'" /></span>';
$("td.fc-header-" + where).append(my_button);
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html?rev=1583520&r1=1583519&r2=1583520&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html Tue Apr 1 03:26:11 2014
@@ -27,7 +27,7 @@
<div><div wicket:id="step4" class="clickable start_step4"><wicket:ommessage key="773"/></div></div>
<table>
<tr>
- <td><wicket:ommessage key="804"/></td>
+ <td><wicket:ommessage key="804" escape="false"/></td>
<td>
<button wicket:id="start" type="button"><wicket:ommessage key="788"/></button><br/>
<button wicket:id="calendar" type="button"><wicket:ommessage key="291"/></button>