You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/28 18:21:55 UTC
svn commit: r1518277 - in /openmeetings/trunk/singlewebapp/src/main:
java/org/apache/openmeetings/web/user/profile/
java/org/apache/openmeetings/web/user/record/ webapp/css/ webapp/css/images/
Author: solomax
Date: Wed Aug 28 16:21:55 2013
New Revision: 1518277
URL: http://svn.apache.org/r1518277
Log:
[OPENMEETINGS-183] basic online status implementation
Added:
openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_green.png (with props)
openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_red.png (with props)
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html Wed Aug 28 16:21:55 2013
@@ -93,11 +93,11 @@
</tr>
<tr wicket:id="users">
<td><div wicket:id="name" style="overflow-x: hidden;"></div></td>
- <td><div wicket:id="accept" class="tick-icon clickable" wicket:ommessage="title:1190"
- ></div><div wicket:id="decline" class="cross-icon clickable" wicket:ommessage="title:1191"
- ></div><div wicket:id="view" class="user-icon clickable" wicket:ommessage="title:1236"
- ></div><div wicket:id="message" class="new-email-icon clickable" wicket:ommessage="title:1253"
- ></div><div wicket:id="delete" class="cross-icon clickable" wicket:ommessage="title:1234"
+ <td><div wicket:id="accept" class="tick om-icon clickable" wicket:ommessage="title:1190"
+ ></div><div wicket:id="decline" class="cross om-icon clickable" wicket:ommessage="title:1191"
+ ></div><div wicket:id="view" class="user om-icon clickable" wicket:ommessage="title:1236"
+ ></div><div wicket:id="message" class="new-email om-icon clickable" wicket:ommessage="title:1253"
+ ></div><div wicket:id="delete" class="cross om-icon clickable" wicket:ommessage="title:1234"
></div></td>
</tr>
</table>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html Wed Aug 28 16:21:55 2013
@@ -50,13 +50,13 @@
</thead>
<tbody>
<tr wicket:id="users">
- <td wicket:id="name"></td>
+ <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-icon clickable" wicket:ommessage="title:1186"
- ></div><div wicket:id="message" class="new-email-icon clickable" wicket:ommessage="title:1253"
- ></div><div wicket:id="view" class="user-icon clickable" wicket:ommessage="title:1236"></div></td>
+ <td style="white-space: nowrap;"><div wicket:id="add" class="add om-icon clickable" wicket:ommessage="title:1186"
+ ></div><div wicket:id="message" class="new-email om-icon clickable" wicket:ommessage="title:1253"
+ ></div><div wicket:id="view" class="user om-icon clickable" wicket:ommessage="title:1236"></div></td>
</tr>
</tbody>
</table>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Wed Aug 28 16:21:55 2013
@@ -30,10 +30,12 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UserContactsDao;
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.session.SessionManager;
import org.apache.openmeetings.utils.TimezoneUtil;
import org.apache.openmeetings.web.common.PagingNavigatorPanel;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.util.ContactsHelper;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
@@ -128,6 +130,8 @@ public class UserSearchPanel extends Use
final UserContactsDao contactsDao = getBean(UserContactsDao.class);
User u = item.getModelObject();
final long userId = u.getUser_id();
+ item.add(new WebMarkupContainer("status").add(AttributeModifier.append("class"
+ , getBean(SessionManager.class).getClientByUserId(userId) == null ? "offline" : "online")));
item.add(new Label("name", getName(u)));
item.add(new Label("tz", getBean(TimezoneUtil.class).getTimezoneByUser(u).getID()));
item.add(new Label("offer", u.getUserOffers()));
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.html Wed Aug 28 16:21:55 2013
@@ -24,9 +24,9 @@
<tr>
<td valign="top" class="files">
<div class="icons clear">
- <span wicket:id="create" class="folder-create-icon align-left clickable"></span>
- <span wicket:id="refresh" class="refresh-icon align-left clickable"></span>
- <span wicket:id="trash" class="trash-icon align-right clickable" wicket:ommessage="title:705"></span>
+ <span wicket:id="create" class="folder-create om-icon align-left clickable"></span>
+ <span wicket:id="refresh" class="refresh om-icon align-left clickable"></span>
+ <span wicket:id="trash" class="trash om-icon align-right clickable" wicket:ommessage="title:705"></span>
<div class="clear"></div>
</div>
<div wicket:id="trees" class="trees">
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Wed Aug 28 16:21:55 2013
@@ -270,12 +270,12 @@ public class RecordingsPanel extends Use
protected String getOtherStyleClass(FlvRecording t) {
String style;
if (t.getFlvRecordingId() == -2) {
- style = "my-recordings-icon";
+ style = "my-recordings om-icon";
} else if (t.getFlvRecordingId() == -1) {
- style = "public-recordings-icon";
+ style = "public-recordings om-icon";
} else {
style = t.getIsFolder() ? super.getOtherStyleClass(t)
- : (getMp4Recording(t.getFileHash()).exists() ? "recording-icon" : "broken-recording-icon");
+ : (getMp4Recording(t.getFileHash()).exists() ? "recording om-icon" : "broken-recording om-icon");
}
if (isSelected()) {
style += " selected";
@@ -288,9 +288,9 @@ public class RecordingsPanel extends Use
String style;
FlvRecording r = getModelObject();
if (r.getFlvRecordingId() == -2) {
- style = "my-recordings-icon";
+ style = "my-recordings om-icon";
} else if (r.getFlvRecordingId() == -1) {
- style = "public-recordings-icon";
+ style = "public-recordings om-icon";
} else {
style = super.getOpenStyleClass();
}
@@ -302,9 +302,9 @@ public class RecordingsPanel extends Use
String style;
FlvRecording r = getModelObject();
if (r.getFlvRecordingId() == -2) {
- style = "my-recordings-icon";
+ style = "my-recordings om-icon";
} else if (r.getFlvRecordingId() == -1) {
- style = "public-recordings-icon";
+ style = "public-recordings om-icon";
} else {
style = super.getClosedStyleClass();
}
Added: openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_green.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_green.png?rev=1518277&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_green.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_red.png
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_red.png?rev=1518277&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/trunk/singlewebapp/src/main/webapp/css/images/bullet_red.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css?rev=1518277&r1=1518276&r2=1518277&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Wed Aug 28 16:21:55 2013
@@ -734,7 +734,7 @@ div.tableWrapperSmall {
.clear {
clear: both;
}
-.om-icon, .add-icon, .new-email-icon, .user-icon, .refresh-icon, .folder-create-icon, .tick-icon, .cross-icon, .trash-icon {
+.om-icon {
background-repeat: no-repeat;
width: 18px;
height: 18px;
@@ -743,50 +743,56 @@ div.tableWrapperSmall {
margin-top: 2px;
display: inline-block !important;
}
-.cross-icon {
+.cross.om-icon {
background-image: url(images/cross.png);
}
-.tick-icon {
+.tick.om-icon {
background-image: url(images/tick.png);
}
-.add-icon {
+.add.om-icon {
background-image: url(images/add.png);
}
-.new-email-icon {
+.new-email.om-icon {
background-image: url(images/email_add.png);
}
-.user-icon {
+.user.om-icon {
background: url(images/user.png) no-repeat;
}
-.refresh-icon {
+.refresh.om-icon {
background: url(images/refresh.gif) no-repeat;
}
-.trash-icon {
+.trash.om-icon {
background: url(images/trash.png) no-repeat;
}
-.folder-create-icon {
+.folder-create.om-icon {
background: url(images/folder_add.png) no-repeat;
}
-.recording-icon {
+.recording.om-icon {
padding-left: 18px;
background-image: url(images/film.png);
background-repeat: no-repeat;
}
-.broken-recording-icon {
+.broken-recording.om-icon {
padding-left: 18px;
background-image: url(images/film_error.png);
background-repeat: no-repeat;
}
-.my-recordings-icon {
+.my-recordings.om-icon {
padding-left: 18px;
background-image: url(images/house_link.png);
background-repeat: no-repeat;
}
-.public-recordings-icon {
+.public-recordings.om-icon {
padding-left: 18px;
background-image: url(images/world_link.png);
background-repeat: no-repeat;
}
+.online.om-icon {
+ background-image: url(images/bullet_green.png);
+}
+.offline.om-icon {
+ background-image: url(images/bullet_red.png);
+}
.error {
color: red;
}