Author: solomax
Date: Wed Apr 24 15:40:04 2013
New Revision: 1471488
URL: http://svn.apache.org/r1471488
Log:
[OPENMEETINGS-612] Widgets are updated look like original OM
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1471488&r1=1471487&r2=1471488&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Wed
Apr 24 15:40:04 2013
@@ -532,4 +532,25 @@ div.tableWrapper {
width: 480px;
bottom: 16px;
z-index:999;
-}
\ No newline at end of file
+}
+.start_step1, .start_step2, .start_step3, .start_step4 {
+ padding-left: 30px;
+ margin: 5px 0px 5px 0px;
+ background-size: contain;
+ background-repeat: no-repeat;
+}
+.start_step1 {
+ background-image:
url(../public/themes/basic-theme/dashboard/wizzard_button_1.png);
+}
+.start_step2 {
+ background-image:
url(../public/themes/basic-theme/dashboard/wizzard_button_2.png);
+ margin-left: 20px;
+}
+.start_step3 {
+ background-image:
url(../public/themes/basic-theme/dashboard/wizzard_button_3.png);
+ margin-left: 40px;
+}
+.start_step4 {
+ background-image:
url(../public/themes/basic-theme/dashboard/wizzard_button_4.png);
+ margin-left: 60px;
+}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html?rev=1471488&r1=1471487&r2=1471488&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetView.html
Wed Apr 24 15:40:04 2013
@@ -21,10 +21,10 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<h3><wicket:ommessage key="774"/></h3>
- <div><wicket:ommessage key="768"/></div>
- <div><wicket:ommessage key="771"/></div>
- <div><wicket:ommessage key="772"/></div>
- <div><wicket:ommessage key="773"/></div>
+ <div class="start_step1"><wicket:ommessage key="768"/></div>
+ <div class="start_step2"><wicket:ommessage key="771"/></div>
+ <div class="start_step3"><wicket:ommessage key="772"/></div>
+ <div class="start_step4"><wicket:ommessage key="773"/></div>
<table>
<tr>
<td><wicket:ommessage key="804"/></td>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html?rev=1471488&r1=1471487&r2=1471488&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.html
Wed Apr 24 15:40:04 2013
@@ -26,15 +26,15 @@
<td>
<h3><wicket:ommessage key="376"/> <span
wicket:id="firstname"></span> <span wicket:id="lastname"></span></h3>
<wicket:ommessage key="1143"/> <span
wicket:id="tz"></span><br/>
- <wicket:ommessage key="378"/> <span
wicket:id="unread"></span><br/>
+ <wicket:ommessage key="378"/> <a
wicket:id="openUnread"><span wicket:id="unread"></span></a><br/>
<a wicket:id="editProfile"><wicket:ommessage
key="377"/></a>
</td>
</tr>
<tr>
<td colspan="2">
<h3><wicket:ommessage key="281"/></h3>
- <wicket:ommessage key="286"/><br/>
- <wicket:ommessage key="287"/><br/>
+ <a
wicket:ommessage="href:282"><wicket:ommessage key="286"/></a><br/>
+ <a
wicket:ommessage="href:283"><wicket:ommessage key="287"/></a><br/>
<wicket:ommessage key="1527"/><br/>
</td>
</tr>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java?rev=1471488&r1=1471487&r2=1471488&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetView.java
Wed Apr 24 15:40:04 2013
@@ -18,10 +18,12 @@
*/
package org.apache.openmeetings.web.components.user.dashboard;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import org.apache.openmeetings.data.user.dao.PrivateMessagesDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.components.ProfileImagePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -37,13 +39,21 @@ public class WelcomeWidgetView extends W
public WelcomeWidgetView(String id, Model<Widget> model) {
super(id, model);
- User u =
Application.getBean(UsersDao.class).get(WebSession.getUserId());
- add(new ProfileImagePanel("img", WebSession.getUserId()));
+ User u = Application.getBean(UsersDao.class).get(getUserId());
+ add(new ProfileImagePanel("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.getOmTimeZone().getIcal())));
- add(new Label("unread", Model.of("0")));//FIXME need to have
valid number + link
+ add(new AjaxLink<Void>("openUnread") {
+ private static final long serialVersionUID =
-1847619557485964386L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ //FIXME should have action
+ }
+ }.add(new Label("unread", Model.of("" +
Application.getBean(PrivateMessagesDao.class)
+ .getNumberMessages(getUserId(), 0L, false)))));
add(new AjaxLink<Void>("editProfile") {
private static final long serialVersionUID =
-1847619557485964386L;
