http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
index 6d97152..3040e0f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
@@ -1,97 +1,97 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import static 
org.apache.openmeetings.core.rss.LoadAtomRssFeed.getFeedConnection;
-import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
-import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
-import static org.apache.openmeetings.web.app.Application.getBean;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.wicket.behavior.AbstractAjaxBehavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
-import org.apache.wicket.request.resource.ContentDisposition;
-import org.apache.wicket.util.resource.AbstractResourceStream;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class RssWidgetView extends WidgetView {
-       private static final long serialVersionUID = 1L;
-       private RSSFeedBehavior feed1; 
-       private RSSFeedBehavior feed2; 
-
-       public RssWidgetView(String id, Model<Widget> model) {
-               super(id, model);
-               ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
-               add(feed1 = new 
RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED1_KEY, String.class, "")));
-               add(feed2 = new 
RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED2_KEY, String.class, "")));
-       }
-       
-       @Override
-       public void renderHead(IHeaderResponse response) {
-               super.renderHead(response);
-               response.render(OnDomReadyHeaderItem.forScript("loadRssTab('" + 
feed1.getCallbackUrl() + "',"
-                               + "'" + feed2.getCallbackUrl() + "');")) ;
-       }
-       
-       static class RSSFeedBehavior extends AbstractAjaxBehavior {
-               private static final long serialVersionUID = 1L;
-               private String url;
-
-               RSSFeedBehavior(String url) {
-                       this.url = url;
-               }
-               
-               @Override
-               public void onRequest() {
-                       ResourceStreamRequestHandler handler = new 
ResourceStreamRequestHandler(new AbstractResourceStream() {
-                               private static final long serialVersionUID = 1L;
-                               transient HttpURLConnection con;
-                               
-                               @Override
-                               public InputStream getInputStream() throws 
ResourceStreamNotFoundException {
-                                       try {
-                                               con = getFeedConnection(url);
-                                               con.connect();
-                                               return con.getInputStream();
-                                       } catch (IOException e) {
-                                               throw new 
ResourceStreamNotFoundException();
-                                       }
-                               }
-
-                               @Override
-                               public void close() throws IOException {
-                                       if (con != null) {
-                                               con.disconnect();
-                                       }
-                               }
-                       }, "feed");
-                       
handler.setContentDisposition(ContentDisposition.ATTACHMENT);
-                       
getComponent().getRequestCycle().scheduleRequestHandlerAfterCurrent(handler);
-               }
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import static 
org.apache.openmeetings.core.rss.LoadAtomRssFeed.getFeedConnection;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
+import static org.apache.openmeetings.web.app.Application.getBean;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.wicket.behavior.AbstractAjaxBehavior;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.handler.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.request.resource.ContentDisposition;
+import org.apache.wicket.util.resource.AbstractResourceStream;
+import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class RssWidgetView extends WidgetView {
+       private static final long serialVersionUID = 1L;
+       private RSSFeedBehavior feed1; 
+       private RSSFeedBehavior feed2; 
+
+       public RssWidgetView(String id, Model<Widget> model) {
+               super(id, model);
+               ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
+               add(feed1 = new 
RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED1_KEY, String.class, "")));
+               add(feed2 = new 
RSSFeedBehavior(cfgDao.getConfValue(CONFIG_RSS_FEED2_KEY, String.class, "")));
+       }
+       
+       @Override
+       public void renderHead(IHeaderResponse response) {
+               super.renderHead(response);
+               response.render(OnDomReadyHeaderItem.forScript("loadRssTab('" + 
feed1.getCallbackUrl() + "',"
+                               + "'" + feed2.getCallbackUrl() + "');")) ;
+       }
+       
+       static class RSSFeedBehavior extends AbstractAjaxBehavior {
+               private static final long serialVersionUID = 1L;
+               private String url;
+
+               RSSFeedBehavior(String url) {
+                       this.url = url;
+               }
+               
+               @Override
+               public void onRequest() {
+                       ResourceStreamRequestHandler handler = new 
ResourceStreamRequestHandler(new AbstractResourceStream() {
+                               private static final long serialVersionUID = 1L;
+                               transient HttpURLConnection con;
+                               
+                               @Override
+                               public InputStream getInputStream() throws 
ResourceStreamNotFoundException {
+                                       try {
+                                               con = getFeedConnection(url);
+                                               con.connect();
+                                               return con.getInputStream();
+                                       } catch (IOException e) {
+                                               throw new 
ResourceStreamNotFoundException();
+                                       }
+                               }
+
+                               @Override
+                               public void close() throws IOException {
+                                       if (con != null) {
+                                               con.disconnect();
+                                       }
+                               }
+                       }, "feed");
+                       
handler.setContentDisposition(ContentDisposition.ATTACHMENT);
+                       
getComponent().getRequestCycle().scheduleRequestHandlerAfterCurrent(handler);
+               }
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
index 0591b78..df1d775 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
@@ -1,48 +1,48 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.WidgetLocation;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class StartWidget extends AbstractWidget {
-       private static final long serialVersionUID = 1L;
-
-       public StartWidget() {
-               super();
-               location = new WidgetLocation(1, 0);
-               init();
-       }
-       
-       @Override
-       public void init() {
-               super.init();
-               title = Application.getString(774L);
-               id = "StartWidget";
-       }
-       
-       @Override
-       public WidgetView createView(String viewId) {
-               return new StartWidgetView(viewId, new Model<Widget>(this));
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class StartWidget extends AbstractWidget {
+       private static final long serialVersionUID = 1L;
+
+       public StartWidget() {
+               super();
+               location = new WidgetLocation(1, 0);
+               init();
+       }
+       
+       @Override
+       public void init() {
+               super.init();
+               title = Application.getString(774L);
+               id = "StartWidget";
+       }
+       
+       @Override
+       public WidgetView createView(String viewId) {
+               return new StartWidgetView(viewId, new Model<Widget>(this));
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
index 1646202..42905b9 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class StartWidgetDescriptor implements WidgetDescriptor {
-       private static final long serialVersionUID = 1L;
-
-       @Override
-       public String getName() {
-               return Application.getString(774L);
-       }
-
-       @Override
-       public String getProvider() {
-               return "Apache Openmeetings";
-       }
-
-       @Override
-       public String getDescription() {
-               return Application.getString(804L);
-       }
-
-       @Override
-       public String getWidgetClassName() {
-               return StartWidget.class.getName();
-       }
-
-       @Override
-       public String getTypeName() {
-               return "om.widget.start";
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import org.apache.openmeetings.web.app.Application;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+
+public class StartWidgetDescriptor implements WidgetDescriptor {
+       private static final long serialVersionUID = 1L;
+
+       @Override
+       public String getName() {
+               return Application.getString(774L);
+       }
+
+       @Override
+       public String getProvider() {
+               return "Apache Openmeetings";
+       }
+
+       @Override
+       public String getDescription() {
+               return Application.getString(804L);
+       }
+
+       @Override
+       public String getWidgetClassName() {
+               return StartWidget.class.getName();
+       }
+
+       @Override
+       public String getTypeName() {
+               return "om.widget.start";
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
index 2438949..8bda8c8 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.html
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  
--->
-<html xmlns:wicket="http://wicket.apache.org";>
-       <wicket:panel>
-               <h3><wicket:message key="774"/></h3>
-               <div><div wicket:id="step1" class="clickable 
start_step1"><wicket:message key="768"/></div></div>
-               <div><div wicket:id="step2" class="clickable 
start_step2"><wicket:message key="771"/></div></div>
-               <div><div wicket:id="step3" class="clickable 
start_step3"><wicket:message key="772"/></div></div>
-               <div><div wicket:id="step4" class="clickable 
start_step4"><wicket:message key="773"/></div></div>
-               <table>
-                       <tr>
-                               <td><div wicket:id="123msg"></div></td>
-                               <td>
-                                       <button wicket:id="start" 
type="button"><wicket:message key="788"/></button><br/>
-                                       <button wicket:id="calendar" 
type="button"><wicket:message key="291"/></button>
-                               </td>
-                       </tr>
-               </table>
-       </wicket:panel>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+       <wicket:panel>
+               <h3><wicket:message key="774"/></h3>
+               <div><div wicket:id="step1" class="clickable 
start_step1"><wicket:message key="768"/></div></div>
+               <div><div wicket:id="step2" class="clickable 
start_step2"><wicket:message key="771"/></div></div>
+               <div><div wicket:id="step3" class="clickable 
start_step3"><wicket:message key="772"/></div></div>
+               <div><div wicket:id="step4" class="clickable 
start_step4"><wicket:message key="773"/></div></div>
+               <table>
+                       <tr>
+                               <td><div wicket:id="123msg"></div></td>
+                               <td>
+                                       <button wicket:id="start" 
type="button"><wicket:message key="788"/></button><br/>
+                                       <button wicket:id="calendar" 
type="button"><wicket:message key="291"/></button>
+                               </td>
+                       </tr>
+               </table>
+       </wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index 00d25b1..df523b1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -1,69 +1,69 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
-import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
-
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-import com.googlecode.wicket.jquery.ui.form.button.Button;
-
-public class StartWidgetView extends WidgetView {
-       private static final long serialVersionUID = 1L;
-
-       public StartWidgetView(String id, Model<Widget> model) {
-               super(id, model);
-               add(new WebMarkupContainer("step1").add(new 
PublicRoomsEventBehavior()));
-               add(new WebMarkupContainer("step2").add(new 
PublicRoomsEventBehavior()));
-               add(new WebMarkupContainer("step3").add(new 
PublicRoomsEventBehavior()));
-               add(new WebMarkupContainer("step4").add(new 
PublicRoomsEventBehavior()));
-               add(new Label("123msg", 
Application.getString(804)).setEscapeModelStrings(false));
-               add(new Button("start").add(new PublicRoomsEventBehavior()));
-               add(new Button("calendar").add(new AjaxEventBehavior("click") {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       protected void onEvent(AjaxRequestTarget target) {
-                               ((MainPage)getPage()).updateContents(CALENDAR, 
target);
-                       }
-               }));
-       }
-       
-       private class PublicRoomsEventBehavior extends AjaxEventBehavior {
-               private static final long serialVersionUID = 1L;
-
-               public PublicRoomsEventBehavior() {
-                       super("click");
-               }
-               
-               @Override
-               protected void onEvent(AjaxRequestTarget target) {
-                       ((MainPage)getPage()).updateContents(ROOMS_PUBLIC, 
target);
-               }
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
+import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+import com.googlecode.wicket.jquery.ui.form.button.Button;
+
+public class StartWidgetView extends WidgetView {
+       private static final long serialVersionUID = 1L;
+
+       public StartWidgetView(String id, Model<Widget> model) {
+               super(id, model);
+               add(new WebMarkupContainer("step1").add(new 
PublicRoomsEventBehavior()));
+               add(new WebMarkupContainer("step2").add(new 
PublicRoomsEventBehavior()));
+               add(new WebMarkupContainer("step3").add(new 
PublicRoomsEventBehavior()));
+               add(new WebMarkupContainer("step4").add(new 
PublicRoomsEventBehavior()));
+               add(new Label("123msg", 
Application.getString(804)).setEscapeModelStrings(false));
+               add(new Button("start").add(new PublicRoomsEventBehavior()));
+               add(new Button("calendar").add(new AjaxEventBehavior("click") {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       protected void onEvent(AjaxRequestTarget target) {
+                               ((MainPage)getPage()).updateContents(CALENDAR, 
target);
+                       }
+               }));
+       }
+       
+       private class PublicRoomsEventBehavior extends AjaxEventBehavior {
+               private static final long serialVersionUID = 1L;
+
+               public PublicRoomsEventBehavior() {
+                       super("click");
+               }
+               
+               @Override
+               protected void onEvent(AjaxRequestTarget target) {
+                       ((MainPage)getPage()).updateContents(ROOMS_PUBLIC, 
target);
+               }
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
index c28b4e9..b0b56be 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
@@ -1,48 +1,48 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.WidgetLocation;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class WelcomeWidget extends AbstractWidget {
-       private static final long serialVersionUID = 1L;
-
-       public WelcomeWidget() {
-               super();
-               location = new WidgetLocation(0, 0);
-               init();
-       }
-       
-       @Override
-       public void init() {
-               super.init();
-               title = Application.getString(1546L);
-               id = "WelcomeWidget";
-       }
-       
-       @Override
-       public WidgetView createView(String viewId) {
-               return new WelcomeWidgetView(viewId, new Model<Widget>(this));
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class WelcomeWidget extends AbstractWidget {
+       private static final long serialVersionUID = 1L;
+
+       public WelcomeWidget() {
+               super();
+               location = new WidgetLocation(0, 0);
+               init();
+       }
+       
+       @Override
+       public void init() {
+               super.init();
+               title = Application.getString(1546L);
+               id = "WelcomeWidget";
+       }
+       
+       @Override
+       public WidgetView createView(String viewId) {
+               return new WelcomeWidgetView(viewId, new Model<Widget>(this));
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
index 5d888e8..241ba59 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class WelcomeWidgetDescriptor implements WidgetDescriptor {
-       private static final long serialVersionUID = 1L;
-
-       @Override
-       public String getName() {
-               return Application.getString(1546L);
-       }
-
-       @Override
-       public String getProvider() {
-               return "Apache Openmeetings";
-       }
-
-       @Override
-       public String getDescription() {
-               return Application.getString(1547L);
-       }
-
-       @Override
-       public String getWidgetClassName() {
-               return WelcomeWidget.class.getName();
-       }
-
-       @Override
-       public String getTypeName() {
-               return "om.widget.welcome";
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import org.apache.openmeetings.web.app.Application;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+
+public class WelcomeWidgetDescriptor implements WidgetDescriptor {
+       private static final long serialVersionUID = 1L;
+
+       @Override
+       public String getName() {
+               return Application.getString(1546L);
+       }
+
+       @Override
+       public String getProvider() {
+               return "Apache Openmeetings";
+       }
+
+       @Override
+       public String getDescription() {
+               return Application.getString(1547L);
+       }
+
+       @Override
+       public String getWidgetClassName() {
+               return WelcomeWidget.class.getName();
+       }
+
+       @Override
+       public String getTypeName() {
+               return "om.widget.welcome";
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
index 5e39f51..4736e23 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  
--->
-<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
-       <table>
-               <tr>
-                       <td><div wicket:id="img"></div></td>
-                       <td>
-                               <h3><wicket:message key="376"/>&nbsp;<span 
wicket:id="firstname"></span>&nbsp;<span wicket:id="lastname"></span></h3>
-                               <wicket:message key="1143"/>&nbsp;<span 
wicket:id="tz"></span><br/>
-                               <wicket:message key="378"/>&nbsp;<a 
wicket:id="openUnread"><span wicket:id="unread"></span></a><br/>
-                               <a wicket:id="editProfile"><wicket:message 
key="377"/></a>
-                       </td>
-               </tr>
-               <tr>
-                       <td colspan="2" class="help support">
-                               <h3><wicket:message key="281"/></h3>
-                               <a wicket:message="href:282"><wicket:message 
key="286"/></a><br/>
-                               <a wicket:message="href:283"><wicket:message 
key="287"/></a><br/>
-                               <a wicket:id="netTest" 
target="_blank"><wicket:message key="1527"/></a><br/>
-                       </td>
-               </tr>
-       </table>
-</wicket:panel>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <table>
+               <tr>
+                       <td><div wicket:id="img"></div></td>
+                       <td>
+                               <h3><wicket:message key="376"/>&nbsp;<span 
wicket:id="firstname"></span>&nbsp;<span wicket:id="lastname"></span></h3>
+                               <wicket:message key="1143"/>&nbsp;<span 
wicket:id="tz"></span><br/>
+                               <wicket:message key="378"/>&nbsp;<a 
wicket:id="openUnread"><span wicket:id="unread"></span></a><br/>
+                               <a wicket:id="editProfile"><wicket:message 
key="377"/></a>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan="2" class="help support">
+                               <h3><wicket:message key="281"/></h3>
+                               <a wicket:message="href:282"><wicket:message 
key="286"/></a><br/>
+                               <a wicket:message="href:283"><wicket:message 
key="287"/></a><br/>
+                               <a wicket:id="netTest" 
target="_blank"><wicket:message key="1527"/></a><br/>
+                       </td>
+               </tr>
+       </table>
+</wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
index ba2664c..4c4543b 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
@@ -1,81 +1,81 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import static 
org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF;
-import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
-import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
-import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
-
-import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
-import org.apache.openmeetings.web.pages.HashPage;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class WelcomeWidgetView extends WidgetView {
-       private static final long serialVersionUID = 1L;
-
-       public WelcomeWidgetView(String id, Model<Widget> model) {
-               super(id, model);
-
-               User u = getBean(UserDao.class).get(getUserId());
-               add(new UploadableProfileImagePanel("img", getUserId()));
-                //FIXME this need to be aligned according to Locale
-               add(new Label("firstname", Model.of(u.getFirstname())));
-               add(new Label("lastname", Model.of(u.getLastname())));
-               add(new Label("tz", Model.of(u.getTimeZoneId())));
-               add(new AjaxLink<Void>("openUnread") {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       public void onClick(AjaxRequestTarget target) {
-                               
((MainPage)getPage()).updateContents(PROFILE_MESSAGES, target);
-                       }
-               }.add(new Label("unread", Model.of("" + 
getBean(PrivateMessageDao.class).count(getUserId(), INBOX_FOLDER_ID, null)))));
-               add(new AjaxLink<Void>("editProfile") {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       public void onClick(AjaxRequestTarget target) {
-                               
((MainPage)getPage()).updateContents(PROFILE_EDIT, target);
-                       }
-               });
-               add(new Link<Void>("netTest") {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       public void onClick() {
-                               setResponsePage(HashPage.class, new 
PageParameters().add(SWF, SWF_TYPE_NETWORK));
-                       }
-               });
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard;
+
+import static 
org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.openmeetings.web.room.SwfPanel.SWF;
+import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
+import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
+import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
+
+import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
+import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.openmeetings.web.pages.MainPage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class WelcomeWidgetView extends WidgetView {
+       private static final long serialVersionUID = 1L;
+
+       public WelcomeWidgetView(String id, Model<Widget> model) {
+               super(id, model);
+
+               User u = getBean(UserDao.class).get(getUserId());
+               add(new UploadableProfileImagePanel("img", getUserId()));
+                //FIXME this need to be aligned according to Locale
+               add(new Label("firstname", Model.of(u.getFirstname())));
+               add(new Label("lastname", Model.of(u.getLastname())));
+               add(new Label("tz", Model.of(u.getTimeZoneId())));
+               add(new AjaxLink<Void>("openUnread") {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       public void onClick(AjaxRequestTarget target) {
+                               
((MainPage)getPage()).updateContents(PROFILE_MESSAGES, target);
+                       }
+               }.add(new Label("unread", Model.of("" + 
getBean(PrivateMessageDao.class).count(getUserId(), INBOX_FOLDER_ID, null)))));
+               add(new AjaxLink<Void>("editProfile") {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       public void onClick(AjaxRequestTarget target) {
+                               
((MainPage)getPage()).updateContents(PROFILE_EDIT, target);
+                       }
+               });
+               add(new Link<Void>("netTest") {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       public void onClick() {
+                               setResponsePage(HashPage.class, new 
PageParameters().add(SWF, SWF_TYPE_NETWORK));
+                       }
+               });
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
index 4dbebe3..e9c1073 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard.admin;
-
-import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.WidgetLocation;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-public class AdminWidget extends AbstractWidget {
-       private static final long serialVersionUID = 1L;
-       public static final String WIDGET_ID_ADMIN = "AdminWidget";
-
-       public AdminWidget() {
-               super();
-               location = new WidgetLocation(0, 2);
-               init();
-       }
-       
-       @Override
-       public void init() {
-               super.init();
-               title = Application.getString("dashboard.widget.admin.title");
-               id = WIDGET_ID_ADMIN;
-       }
-       
-       @Override
-       public WidgetView createView(String viewId) {
-               return new AdminWidgetView(viewId, new Model<Widget>(this));
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard.admin;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+public class AdminWidget extends AbstractWidget {
+       private static final long serialVersionUID = 1L;
+       public static final String WIDGET_ID_ADMIN = "AdminWidget";
+
+       public AdminWidget() {
+               super();
+               location = new WidgetLocation(0, 2);
+               init();
+       }
+       
+       @Override
+       public void init() {
+               super.init();
+               title = Application.getString("dashboard.widget.admin.title");
+               id = WIDGET_ID_ADMIN;
+       }
+       
+       @Override
+       public WidgetView createView(String viewId) {
+               return new AdminWidgetView(viewId, new Model<Widget>(this));
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
index 3d418de..f57583e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
@@ -1,51 +1,51 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard.admin;
-
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class AdminWidgetDescriptor implements WidgetDescriptor {
-       private static final long serialVersionUID = 1L;
-
-       @Override
-       public String getName() {
-               return Application.getString("dashboard.widget.admin.title");
-       }
-
-       @Override
-       public String getProvider() {
-               return "Apache Openmeetings";
-       }
-
-       @Override
-       public String getDescription() {
-               return Application.getString("dashboard.widget.admin.desc");
-       }
-
-       @Override
-       public String getWidgetClassName() {
-               return AdminWidget.class.getName();
-       }
-
-       @Override
-       public String getTypeName() {
-               return "om.widget.admin";
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard.admin;
+
+import org.apache.openmeetings.web.app.Application;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+
+public class AdminWidgetDescriptor implements WidgetDescriptor {
+       private static final long serialVersionUID = 1L;
+
+       @Override
+       public String getName() {
+               return Application.getString("dashboard.widget.admin.title");
+       }
+
+       @Override
+       public String getProvider() {
+               return "Apache Openmeetings";
+       }
+
+       @Override
+       public String getDescription() {
+               return Application.getString("dashboard.widget.admin.desc");
+       }
+
+       @Override
+       public String getWidgetClassName() {
+               return AdminWidget.class.getName();
+       }
+
+       @Override
+       public String getTypeName() {
+               return "om.widget.admin";
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
index feb8a3d..1912617 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  
--->
-<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
-       <h3><wicket:message key="dashboard.widget.admin.title"/></h3>
-       <form wicket:id="form">
-               <button wicket:id="show-cleanup-dialog"><wicket:message 
key="dashboard.widget.admin.cleanup.show"/></button>
-               <div wicket:id="cleanup-dialog"></div>
-       </form>
-</wicket:panel>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <h3><wicket:message key="dashboard.widget.admin.title"/></h3>
+       <form wicket:id="form">
+               <button wicket:id="show-cleanup-dialog"><wicket:message 
key="dashboard.widget.admin.cleanup.show"/></button>
+               <div wicket:id="cleanup-dialog"></div>
+       </form>
+</wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
index 2efeeac..8d95d20 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
@@ -1,54 +1,54 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard.admin;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.Widget;
-import org.wicketstuff.dashboard.web.WidgetView;
-
-import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
-
-@AuthorizeInstantiation("Admin")
-public class AdminWidgetView extends WidgetView {
-       private static final long serialVersionUID = 1L;
-       private final AdminCleanupInfoDialog cleanupDialog;
-       final Form<Void> form = new Form<>("form");
-
-       public AdminWidgetView(String id, Model<Widget> model) {
-               super(id, model);
-               add(form);
-               form.add(cleanupDialog = new 
AdminCleanupInfoDialog("cleanup-dialog"));
-               form.add(new IndicatingAjaxButton("show-cleanup-dialog") {
-                       private static final long serialVersionUID = 1L;
-
-                       @Override
-                       protected boolean isDisabledOnClick() {
-                               return true;
-                       }
-
-                       @Override
-                       protected void onSubmit(AjaxRequestTarget target) {
-                               cleanupDialog.show(target);
-                       }
-               });
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.dashboard.admin;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
+
+import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
+
+@AuthorizeInstantiation("Admin")
+public class AdminWidgetView extends WidgetView {
+       private static final long serialVersionUID = 1L;
+       private final AdminCleanupInfoDialog cleanupDialog;
+       final Form<Void> form = new Form<>("form");
+
+       public AdminWidgetView(String id, Model<Widget> model) {
+               super(id, model);
+               add(form);
+               form.add(cleanupDialog = new 
AdminCleanupInfoDialog("cleanup-dialog"));
+               form.add(new IndicatingAjaxButton("show-cleanup-dialog") {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       protected boolean isDisabledOnClick() {
+                               return true;
+                       }
+
+                       @Override
+                       protected void onSubmit(AjaxRequestTarget target) {
+                               cleanupDialog.show(target);
+                       }
+               });
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
index c376953..7df1978 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  
--->
-<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
-       <div class="user info panel">
-               <table>
-                       <tr>
-                               <td><div wicket:id="img"></div></td>
-                               <td>
-                                       <table>
-                                               <tr>
-                                                       <td><wicket:message 
key="1164"/></td><td><span wicket:id="firstname"></span>&nbsp;<span 
wicket:id="lastname"></span></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><wicket:message 
key="1165"/></td><td><span wicket:id="timeZoneId"></span></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><wicket:message 
key="1296"/></td><td><span wicket:id="regdate"></span></td>
-                                               </tr>
-                                       </table>
-                               </td>
-                       </tr>
-               </table>
-               <div>
-                       <fieldset class="ui-widget-content">
-                               <legend 
class="ui-widget-header"><wicket:message key="1166"/></legend>
-                               <table>
-                                       <tr>
-                                               <td><wicket:message 
key="1162"/></td>
-                                               <td><textarea 
wicket:id="userOffers"></textarea></td>
-                                       </tr>
-                                       <tr>
-                                               <td><wicket:message 
key="1163"/></td>
-                                               <td><textarea 
wicket:id="userSearchs"></textarea></td>
-                                       </tr>
-                               </table>
-                       </fieldset> 
-               </div>
-               <div>
-                       <fieldset class="ui-widget-content">
-                               <legend 
class="ui-widget-header"><wicket:message key="1167"/></legend>
-                               <table wicket:id="address">
-                                       <tr>
-                                               <td><wicket:message key="607" 
/></td>
-                                               <td><span 
wicket:id="address.phone"></span></td>
-                                       </tr>
-                                       <tr>
-                                               <td><wicket:message key="139" 
/></td>
-                                               <td><span 
wicket:id="address.street"></span>&nbsp;<span 
wicket:id="address.additionalname"></span></td>
-                                       </tr>
-                                       <tr>
-                                               <td><wicket:message key="140" 
/></td>
-                                               <td><span 
wicket:id="address.zip"></span>&nbsp;<span wicket:id="address.town"></span></td>
-                                       </tr>
-                                       <tr>
-                                               <td><wicket:message key="141" 
/></td>
-                                               <td><span 
wicket:id="country"></span></td>
-                                       </tr>
-                                       <tr>
-                                               <td><wicket:message key="142" 
/></td>
-                                               <td><span 
wicket:id="address.comment"></span></td>
-                                       </tr>
-                               </table>
-                               <div wicket:id="addressDenied"></div>
-                       </fieldset> 
-               </div>
-       </div>
-</wicket:panel>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <div class="user info panel">
+               <table>
+                       <tr>
+                               <td><div wicket:id="img"></div></td>
+                               <td>
+                                       <table>
+                                               <tr>
+                                                       <td><wicket:message 
key="1164"/></td><td><span wicket:id="firstname"></span>&nbsp;<span 
wicket:id="lastname"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><wicket:message 
key="1165"/></td><td><span wicket:id="timeZoneId"></span></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><wicket:message 
key="1296"/></td><td><span wicket:id="regdate"></span></td>
+                                               </tr>
+                                       </table>
+                               </td>
+                       </tr>
+               </table>
+               <div>
+                       <fieldset class="ui-widget-content">
+                               <legend 
class="ui-widget-header"><wicket:message key="1166"/></legend>
+                               <table>
+                                       <tr>
+                                               <td><wicket:message 
key="1162"/></td>
+                                               <td><textarea 
wicket:id="userOffers"></textarea></td>
+                                       </tr>
+                                       <tr>
+                                               <td><wicket:message 
key="1163"/></td>
+                                               <td><textarea 
wicket:id="userSearchs"></textarea></td>
+                                       </tr>
+                               </table>
+                       </fieldset> 
+               </div>
+               <div>
+                       <fieldset class="ui-widget-content">
+                               <legend 
class="ui-widget-header"><wicket:message key="1167"/></legend>
+                               <table wicket:id="address">
+                                       <tr>
+                                               <td><wicket:message key="607" 
/></td>
+                                               <td><span 
wicket:id="address.phone"></span></td>
+                                       </tr>
+                                       <tr>
+                                               <td><wicket:message key="139" 
/></td>
+                                               <td><span 
wicket:id="address.street"></span>&nbsp;<span 
wicket:id="address.additionalname"></span></td>
+                                       </tr>
+                                       <tr>
+                                               <td><wicket:message key="140" 
/></td>
+                                               <td><span 
wicket:id="address.zip"></span>&nbsp;<span wicket:id="address.town"></span></td>
+                                       </tr>
+                                       <tr>
+                                               <td><wicket:message key="141" 
/></td>
+                                               <td><span 
wicket:id="country"></span></td>
+                                       </tr>
+                                       <tr>
+                                               <td><wicket:message key="142" 
/></td>
+                                               <td><span 
wicket:id="address.comment"></span></td>
+                                       </tr>
+                               </table>
+                               <div wicket:id="addressDenied"></div>
+                       </fieldset> 
+               </div>
+       </div>
+</wicket:panel>
+</html>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index 63dd237..56713fb 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -1,73 +1,73 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.profile;
-
-import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-
-import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.ProfileImagePanel;
-import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.CompoundPropertyModel;
-
-public class UserProfilePanel extends UserPanel {
-       private static final long serialVersionUID = 1L;
-       private final WebMarkupContainer address = new 
WebMarkupContainer("address");
-       private final Label addressDenied = new Label("addressDenied", "");
-
-       public UserProfilePanel(String id, long userId) {
-               this(id, new 
CompoundPropertyModel<>(getBean(UserDao.class).get(userId)));
-       }
-
-       public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
-               super(id, model);
-
-               add(new ProfileImagePanel("img", model.getObject().getId()));
-               add(new Label("firstname"));
-               add(new Label("lastname"));
-               add(new Label("timeZoneId"));
-               add(new Label("regdate"));
-               add(new TextArea<String>("userOffers").setEnabled(false));
-               add(new TextArea<String>("userSearchs").setEnabled(false));
-               if (getUserId().equals(model.getObject().getId()) || 
model.getObject().isShowContactData()
-                               || 
(model.getObject().isShowContactDataToContacts() && 
getBean(UserContactDao.class).isContact(model.getObject().getId(), 
getUserId())))
-               {
-                       addressDenied.setVisible(false);
-                       address.add(new Label("address.phone"));
-                       address.add(new Label("address.street"));
-                       address.add(new Label("address.additionalname"));
-                       address.add(new Label("address.zip"));
-                       address.add(new Label("address.town"));
-                       address.add(new Label("country", 
getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
-                       address.add(new Label("address.comment"));
-               } else {
-                       address.setVisible(false);
-                       
addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts()
 ? 1269 : 1268));
-               }
-               add(address.setDefaultModel(model));
-               add(addressDenied);
-       }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.user.profile;
+
+import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import org.apache.openmeetings.db.dao.user.UserContactDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.common.ProfileImagePanel;
+import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.CompoundPropertyModel;
+
+public class UserProfilePanel extends UserPanel {
+       private static final long serialVersionUID = 1L;
+       private final WebMarkupContainer address = new 
WebMarkupContainer("address");
+       private final Label addressDenied = new Label("addressDenied", "");
+
+       public UserProfilePanel(String id, long userId) {
+               this(id, new 
CompoundPropertyModel<>(getBean(UserDao.class).get(userId)));
+       }
+
+       public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
+               super(id, model);
+
+               add(new ProfileImagePanel("img", model.getObject().getId()));
+               add(new Label("firstname"));
+               add(new Label("lastname"));
+               add(new Label("timeZoneId"));
+               add(new Label("regdate"));
+               add(new TextArea<String>("userOffers").setEnabled(false));
+               add(new TextArea<String>("userSearchs").setEnabled(false));
+               if (getUserId().equals(model.getObject().getId()) || 
model.getObject().isShowContactData()
+                               || 
(model.getObject().isShowContactDataToContacts() && 
getBean(UserContactDao.class).isContact(model.getObject().getId(), 
getUserId())))
+               {
+                       addressDenied.setVisible(false);
+                       address.add(new Label("address.phone"));
+                       address.add(new Label("address.street"));
+                       address.add(new Label("address.additionalname"));
+                       address.add(new Label("address.zip"));
+                       address.add(new Label("address.town"));
+                       address.add(new Label("country", 
getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
+                       address.add(new Label("address.comment"));
+               } else {
+                       address.setVisible(false);
+                       
addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts()
 ? 1269 : 1268));
+               }
+               add(address.setDefaultModel(model));
+               add(addressDenied);
+       }
+}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8e63647c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index dc1cc3c..33b62b6 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  
--->
-<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
-       <!--  FIXME move styles into CSS -->
-       <table style="width: 100%; height: 100%;">
-               <tr>
-                       <td valign="top" style="width: 200px;">
-                               <form wicket:id="form">
-                                       <div><wicket:message key="1179"/></div>
-                                       <input type="text" 
wicket:id="text"/><br/>
-                                       <div><wicket:message key="1177"/></div>
-                                       <input type="text" 
wicket:id="offer"/><br/>
-                                       <div><wicket:message key="1178"/></div>
-                                       <input type="text" 
wicket:id="search"/><br/>
-                                       <br/>
-                                       <button wicket:id="submit" 
type="button"><wicket:message key="1176"/></button>
-                               </form>
-                       </td>
-                       <td valign="top">
-                               <div wicket:id="container" style="height: 100%; 
min-height: 400px;">
-                                       <div><strong><wicket:message 
key="1184"/></strong>&nbsp;&nbsp;&nbsp;<span wicket:id="navigator"></span></div>
-                                       <table id="searchUsersTable" 
style="width: 100%;">
-                                               <thead>
-                                                       <tr>
-                                                               
<th><wicket:message key="1180"/></th>
-                                                               
<th><wicket:message key="1181"/></th>
-                                                               
<th><wicket:message key="1182"/></th>
-                                                               
<th><wicket:message key="1183"/></th>
-                                                               
<th><wicket:message key="1185"/></th>
-                                                       </tr>
-                                               </thead>
-                                               <tbody>
-                                                       <tr wicket:id="users">
-                                                               <td><span 
class="om-icon" wicket:id="status"></span><span wicket:id="name"></span></td>
-                                                               <td 
wicket:id="tz"></td>
-                                                               <td 
wicket:id="offer"></td>
-                                                               <td 
wicket:id="search"></td>
-                                                               <td 
style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable" 
wicket:message="title:1186"
-                                                                       
></div><div wicket:id="message" class="new-email om-icon clickable" 
wicket:message="title:1253"
-                                                                       
></div><div wicket:id="view" class="user om-icon clickable" 
wicket:message="title:1236"
-                                                                       
></div><div wicket:id="invite" class="invite om-icon clickable" 
wicket:message="title:1131"></div></td>
-                                                       </tr>
-                                               </tbody>
-                                       </table>
-                               </div>
-                       </td>
-               </tr>
-       </table>
-</wicket:panel>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+      http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+       <!--  FIXME move styles into CSS -->
+       <table style="width: 100%; height: 100%;">
+               <tr>
+                       <td valign="top" style="width: 200px;">
+                               <form wicket:id="form">
+                                       <div><wicket:message key="1179"/></div>
+                                       <input type="text" 
wicket:id="text"/><br/>
+                                       <div><wicket:message key="1177"/></div>
+                                       <input type="text" 
wicket:id="offer"/><br/>
+                                       <div><wicket:message key="1178"/></div>
+                                       <input type="text" 
wicket:id="search"/><br/>
+                                       <br/>
+                                       <button wicket:id="submit" 
type="button"><wicket:message key="1176"/></button>
+                               </form>
+                       </td>
+                       <td valign="top">
+                               <div wicket:id="container" style="height: 100%; 
min-height: 400px;">
+                                       <div><strong><wicket:message 
key="1184"/></strong>&nbsp;&nbsp;&nbsp;<span wicket:id="navigator"></span></div>
+                                       <table id="searchUsersTable" 
style="width: 100%;">
+                                               <thead>
+                                                       <tr>
+                                                               
<th><wicket:message key="1180"/></th>
+                                                               
<th><wicket:message key="1181"/></th>
+                                                               
<th><wicket:message key="1182"/></th>
+                                                               
<th><wicket:message key="1183"/></th>
+                                                               
<th><wicket:message key="1185"/></th>
+                                                       </tr>
+                                               </thead>
+                                               <tbody>
+                                                       <tr wicket:id="users">
+                                                               <td><span 
class="om-icon" wicket:id="status"></span><span wicket:id="name"></span></td>
+                                                               <td 
wicket:id="tz"></td>
+                                                               <td 
wicket:id="offer"></td>
+                                                               <td 
wicket:id="search"></td>
+                                                               <td 
style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable" 
wicket:message="title:1186"
+                                                                       
></div><div wicket:id="message" class="new-email om-icon clickable" 
wicket:message="title:1253"
+                                                                       
></div><div wicket:id="view" class="user om-icon clickable" 
wicket:message="title:1236"
+                                                                       
></div><div wicket:id="invite" class="invite om-icon clickable" 
wicket:message="title:1131"></div></td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               </div>
+                       </td>
+               </tr>
+       </table>
+</wicket:panel>
 </html>
\ No newline at end of file

Reply via email to