Author: sebawagner
Date: Thu Mar 1 15:32:37 2012
New Revision: 1295620
URL: http://svn.apache.org/viewvc?rev=1295620&view=rev
Log:
OPENMEETINGS-75 Remove roomtype audience
Remove test and duplicated whiteboards
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/audio_and_video.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/audio_and_video_no.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/audio_and_video_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/background_small.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small_no.fla
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/background_small_no.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/background_small_no.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/background_small_no.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/bullet_ball_glass_green.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/bullet_ball_glass_green.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/bullet_ball_glass_red.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/bullet_ball_glass_red.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/bullet_ball_glass_yellow.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/bullet_ball_glass_yellow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/cancel_icon.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/cancel_icon.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mic.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/mic.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control.fla
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/mouse_remote_control.fla
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/mouse_remote_control.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/resources/mouse_remote_control_no.png
- copied unchanged from r1295606,
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/eventuserlist/resources/mouse_remote_control_no.png
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/audienceView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/resources/reload.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/multiWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/newWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/test_whiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/whiteBoard.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx?rev=1295620&r1=1295619&r2=1295620&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/library.lzx
Thu Mar 1 15:32:37 2012
@@ -22,14 +22,9 @@
<resource name="go_jump_rsc" src="resources/go-jump.png" />
<resource name="messagebox_info_big_rsc"
src="resources/messagebox_info.png" />
- <!--
- <resource name="reload_rsc" src="resources/reload.png" />
- -->
<resource name="exit_btn_rsc" src="resources/exit.png" />
- <include href="conferenceView.lzx" />
<include href="roomListItem.lzx" />
- <include href="audienceView.lzx" />
<include href="roomListDetails.lzx" />
<include href="conferenceMenubar.lzx" />
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx?rev=1295620&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/innerlistViewEventUserListTable.lzx
Thu Mar 1 15:32:37 2012
@@ -0,0 +1,27 @@
+<?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.
+
+-->
+<library>
+
+<class name="innerlistViewEventUserListTable" extends="view" width="258" >
+ <wrappinglayout name="_layout" axis="x" spacing="4"/>
+</class>
+
+</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1295620&r1=1295619&r2=1295620&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
Thu Mar 1 15:32:37 2012
@@ -19,16 +19,34 @@
-->
<library>
+
+ <resource name="userstatus_multiframe_rsc">
+ <frame src="resources/bullet_ball_glass_green.png"/> <!-- user
-->
+ <frame src="resources/bullet_ball_glass_yellow.png"/> <!-- mod
-->
+ <frame src="resources/bullet_ball_glass_red.png"/> <!--
whiteboard allow -->
+ </resource>
<resource name="users_tab_btn" src="resources/kdmconfig.png" />
<resource name="files_tab_btn" src="resources/folder_yellow.png" />
<resource name="chat_message_incoming_rsc"
src="resources/ledlightgreen.png" />
+ <resource name="screen_allow_rsc" src="resources/background_small.png"
/>
+ <resource name="screen_deny_rsc" src="resources/background_small_no.png" />
+
+ <resource name="remote_allow_rsc" src="resources/mouse_remote_control.png"
/>
+ <resource name="remote_deny_rsc"
src="resources/mouse_remote_control_no.png" />
+
+ <resource name="mic_rsc" src="resources/mic.png" />
+ <resource name="av_allow_rsc" src="resources/audio_and_video.png" />
+ <resource name="av_deny_rsc" src="resources/audio_and_video_no.png" />
+ <resource name="kick_user_rsc" src="resources/cancel_icon.png" />
+
<resource name="sidebar_tab_btn">
<frame src="resources/sidebar_close.png" />
<frame src="resources/sidebar_open.png" />
</resource>
+ <include href="innerlistViewEventUserListTable.lzx" />
<include href="moderationMiniIconsEventUserList.lzx" />
<include href="activitylist/" />
<include href="roomSidebar/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx?rev=1295620&r1=1295619&r2=1295620&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/library.lzx
Thu Mar 1 15:32:37 2012
@@ -53,7 +53,9 @@
<include href="popups/" />
<include href="moderation/" />
<include href="polls/" />
+
<include href="conference/" />
+
<!-- throws an Exception
<include href="browser/"/>
-->
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx?rev=1295620&r1=1295619&r2=1295620&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
Thu Mar 1 15:32:37 2012
@@ -88,11 +88,11 @@
<include href="toolbar/" />
<include href="panels/" />
+
+<!--
<include href="newWhiteBoard.lzx" />
<include href="fixedWhiteBoard.lzx" />
-
-<!--
-<include href="multiWhiteBoard.lzx" />
-->
-
+
+
</library>
