Author: solomax
Date: Fri Jul 18 11:21:15 2014
New Revision: 1611594
URL: http://svn.apache.org/r1611594
Log:
[OPENMEETINGS-896] stubs for room name, recording status and screen sharing
button are added
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/monitor_go.png
(with props)
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1611594&r1=1611593&r2=1611594&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Fri Jul 18
11:21:15 2014
@@ -33,13 +33,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<server.dir>${project.build.directory}/red5-server</server.dir>
<languages.dir>${project.parent.basedir}/openmeetings-web/src/main/webapp/languages</languages.dir>
-
<dist.dir>${project.build.directory}/${project.build.finalName}</dist.dir>
+
<assembly.finalName>${project.build.finalName}</assembly.finalName>
+ <assembly.descriptor>server</assembly.descriptor>
+
<dist.dir>${project.build.directory}/${assembly.finalName}</dist.dir>
<dist.webapps>${dist.dir}/webapps</dist.webapps>
<dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir>
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/root</root.webapp>
-
<assembly.finalName>${project.build.finalName}</assembly.finalName>
- <assembly.descriptor>server</assembly.descriptor>
<red5-server.file.name>red5-server-1.0.2-RELEASE-server.zip</red5-server.file.name><!--
FIXME duplicate variable -->
</properties>
<scm>
@@ -82,7 +82,8 @@
<include>css/**</include>
<include>js/**</include>
<include>images/**</include>
-
<include>WEB-INF/**</include>
+
<include>WEB-INF/lib/openmeetings*</include>
+
<include>WEB-INF/classes/META-INF/*</include>
</includes>
</fileset>
<fileset>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml?rev=1611594&r1=1611593&r2=1611594&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
Fri Jul 18 11:21:15 2014
@@ -89,6 +89,13 @@
</includes>
</fileSet>
<fileSet>
+
<directory>${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}/WEB-INF/classes/META-INF</directory>
+
<outputDirectory>${om.webapp}/WEB-INF/classes/META-INF</outputDirectory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.parent.basedir}/openmeetings-webservice/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
<includes>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1611594&r1=1611593&r2=1611594&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
Fri Jul 18 11:21:15 2014
@@ -21,6 +21,11 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div wicket:id="roomMenu"></div>
+ <div class="room menu right">
+ <span class="share"></span>
+ <span class="room recording">Recording started</span>
+ <span class="room name">Room Name</span>
+ </div>
<div class="room sidebar left">
<div class="tabs">
<ul>
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/monitor_go.png
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/monitor_go.png?rev=1611594&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/monitor_go.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css?rev=1611594&r1=1611593&r2=1611594&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
Fri Jul 18 11:21:15 2014
@@ -25,6 +25,31 @@
background-repeat: no-repeat;
background-position: 5px 5px;
}
+.room.menu.right {
+ position: absolute;
+ top: 5px;
+ margin-right: 5px;
+ width: 100%;
+}
+.room.menu.right .room {
+ float: right;
+ padding-top: 5px;
+ padding-right: 5px;
+}
+.room.menu.right .room.name {
+ font-weight: bold;
+}
+.room.menu.right .room.recording {
+ color: red;
+}
+.room.menu.right .share {
+ background-image: url(images/monitor_go.png);
+ width: 30px;
+ height: 30px;
+ background-repeat: no-repeat;
+ background-position: 5px 5px;
+ float: right;
+}
.room.sidebar.left {
min-width: 200px;
width: 20%;
