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/10/01 19:09:39 UTC
svn commit: r1528150 - in /openmeetings: branches/2.x/WebContent/swf10/video/
trunk/singlewebapp/WebContent/swf10/video/
trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/
trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/...
Author: solomax
Date: Tue Oct 1 17:09:39 2013
New Revision: 1528150
URL: http://svn.apache.org/r1528150
Log:
[OPENMEETINGS-810] video resolution is static in interview room;
code clean up;
style fixes;
Modified:
openmeetings/branches/2.x/WebContent/swf10/video/editRecordStreamSWF10.lzx
openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
Modified: openmeetings/branches/2.x/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1528150&r1=1528149&r2=1528150&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/branches/2.x/WebContent/swf10/video/editRecordStreamSWF10.lzx Tue Oct 1 17:09:39 2013
@@ -33,7 +33,7 @@
-->
<class name="editRecordStreamSWF10" extends="labelExplorerBox" labelid="51"
- width="600" height="500" x="14" y="-540" >
+ width="680" height="540" x="14" y="-540" >
<switch>
<when property="$as3">
@@ -65,8 +65,8 @@
<attribute name="doDefaultAnimation" value="true" type="boolean" />
- <attribute name="cam_default_width" value="240" type="number" />
- <attribute name="cam_default_height" value="180" type="number" />
+ <attribute name="cam_default_width" value="320" type="number" />
+ <attribute name="cam_default_height" value="260" type="number" />
<attribute name="interviewPodId" value="0" type="number" />
@@ -123,8 +123,8 @@
if(sharedData != null) {
this.chosenCam = sharedData["cam"];
this.chosenMic = sharedData["mic"];
- this.cam_default_width = sharedData["width"];
- this.cam_default_height = sharedData["height"];
+ this.cam_default_width = canvas.isInterview ? 320 : sharedData["width"];
+ this.cam_default_height = canvas.isInterview ? 260 : sharedData["height"];
this.chosenSetting = sharedData["avstored"];
this.remoteMessage = new Array();
this.remoteMessage[0] = 'avsettings';
@@ -686,29 +686,31 @@
<attribute name="counter" value="0" />
<handler name="onselect" args="item">
<![CDATA[
- if ($debug) Debug.write("onselect w ", item.cam_width);
- if ($debug) Debug.write("onselect h ", item.cam_height);
- parent.setAttribute("cam_default_width",item.cam_width);
- parent.setAttribute("cam_default_height",item.cam_height);
-
- if (item.cam_width > 240) {
- var newWidth = 600 + item.cam_width - 240;
- if (newWidth+parent.x+10 > canvas.width) {
- newWidth = canvas.width - 10 - this.x;
+ if (!canvas.isInterview) {
+ if ($debug) Debug.write("onselect w ", item.cam_width);
+ if ($debug) Debug.write("onselect h ", item.cam_height);
+ parent.setAttribute("cam_default_width",item.cam_width);
+ parent.setAttribute("cam_default_height",item.cam_height);
+
+ if (item.cam_width > 240) {
+ var newWidth = 600 + item.cam_width - 240;
+ if (newWidth+parent.x+10 > canvas.width) {
+ newWidth = canvas.width - 10 - this.x;
+ }
+ parent.setAttribute("width",newWidth);
+ } else {
+ parent.setAttribute("width",600);
}
- parent.setAttribute("width",newWidth);
- } else {
- parent.setAttribute("width",600);
- }
-
- if (item.cam_height > 180) {
- var newHeight = 500 + item.cam_height - 180;
- if (newHeight+parent.y+10 > canvas.height) {
- newHeight = canvas.height - 10 - parent.y;
+
+ if (item.cam_height > 180) {
+ var newHeight = 500 + item.cam_height - 180;
+ if (newHeight+parent.y+10 > canvas.height) {
+ newHeight = canvas.height - 10 - parent.y;
+ }
+ parent.setAttribute("height",newHeight);
+ } else {
+ parent.setAttribute("height",500);
}
- parent.setAttribute("height",newHeight);
- } else {
- parent.setAttribute("height",500);
}
parent.attachCamera();
]]>
Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1528150&r1=1528149&r2=1528150&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Tue Oct 1 17:09:39 2013
@@ -33,7 +33,7 @@
-->
<class name="editRecordStreamSWF10" extends="labelExplorerBox" labelid="51"
- width="600" height="500" x="14" y="-540" >
+ width="680" height="540" x="14" y="-540" >
<switch>
<when property="$as3">
@@ -65,8 +65,8 @@
<attribute name="doDefaultAnimation" value="true" type="boolean" />
- <attribute name="cam_default_width" value="240" type="number" />
- <attribute name="cam_default_height" value="180" type="number" />
+ <attribute name="cam_default_width" value="320" type="number" />
+ <attribute name="cam_default_height" value="260" type="number" />
<attribute name="interviewPodId" value="0" type="number" />
@@ -123,8 +123,8 @@
if(sharedData != null) {
this.chosenCam = sharedData["cam"];
this.chosenMic = sharedData["mic"];
- this.cam_default_width = sharedData["width"];
- this.cam_default_height = sharedData["height"];
+ this.cam_default_width = canvas.isInterview ? 320 : sharedData["width"];
+ this.cam_default_height = canvas.isInterview ? 260 : sharedData["height"];
this.chosenSetting = sharedData["avstored"];
this.remoteMessage = new Array();
this.remoteMessage[0] = 'avsettings';
@@ -686,29 +686,31 @@
<attribute name="counter" value="0" />
<handler name="onselect" args="item">
<![CDATA[
- if ($debug) Debug.write("onselect w ", item.cam_width);
- if ($debug) Debug.write("onselect h ", item.cam_height);
- parent.setAttribute("cam_default_width",item.cam_width);
- parent.setAttribute("cam_default_height",item.cam_height);
-
- if (item.cam_width > 240) {
- var newWidth = 600 + item.cam_width - 240;
- if (newWidth+parent.x+10 > canvas.width) {
- newWidth = canvas.width - 10 - this.x;
+ if (!canvas.isInterview) {
+ if ($debug) Debug.write("onselect w ", item.cam_width);
+ if ($debug) Debug.write("onselect h ", item.cam_height);
+ parent.setAttribute("cam_default_width",item.cam_width);
+ parent.setAttribute("cam_default_height",item.cam_height);
+
+ if (item.cam_width > 240) {
+ var newWidth = 600 + item.cam_width - 240;
+ if (newWidth+parent.x+10 > canvas.width) {
+ newWidth = canvas.width - 10 - this.x;
+ }
+ parent.setAttribute("width",newWidth);
+ } else {
+ parent.setAttribute("width",600);
}
- parent.setAttribute("width",newWidth);
- } else {
- parent.setAttribute("width",600);
- }
-
- if (item.cam_height > 180) {
- var newHeight = 500 + item.cam_height - 180;
- if (newHeight+parent.y+10 > canvas.height) {
- newHeight = canvas.height - 10 - parent.y;
+
+ if (item.cam_height > 180) {
+ var newHeight = 500 + item.cam_height - 180;
+ if (newHeight+parent.y+10 > canvas.height) {
+ newHeight = canvas.height - 10 - parent.y;
+ }
+ parent.setAttribute("height",newHeight);
+ } else {
+ parent.setAttribute("height",500);
}
- parent.setAttribute("height",newHeight);
- } else {
- parent.setAttribute("height",500);
}
parent.attachCamera();
]]>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1528150&r1=1528149&r2=1528150&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Tue Oct 1 17:09:39 2013
@@ -71,7 +71,7 @@ public class RoomDao implements IDataPro
}
public List<Room> get(String search, int start, int count, String sort) {
- TypedQuery<Room> q = em.createQuery(DaoHelper.getSearchQuery("Rooms", "r", search, true, false, sort, searchFields), Room.class);
+ TypedQuery<Room> q = em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, false, sort, searchFields), Room.class);
q.setFirstResult(start);
q.setMaxResults(count);
return q.getResultList();
@@ -83,7 +83,7 @@ public class RoomDao implements IDataPro
}
public long count(String search) {
- TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("Rooms", "r", search, true, true, null, searchFields), Long.class);
+ TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery("Room", "r", search, true, true, null, searchFields), Long.class);
return q.getSingleResult();
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1528150&r1=1528149&r2=1528150&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Tue Oct 1 17:09:39 2013
@@ -57,7 +57,7 @@ public class RoomsPanel extends AdminPan
final Room room = item.getModelObject();
item.add(new Label("rooms_id", "" + room.getRooms_id()));
item.add(new Label("name", "" + room.getName()));
- item.add(new Label("ispublic", ""+room.getIspublic()));
+ item.add(new Label("ispublic", "" + room.getIspublic()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
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=1528150&r1=1528149&r2=1528150&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Tue Oct 1 17:09:39 2013
@@ -414,6 +414,12 @@ div.tableWrapperSmall {
margin-top: 2px;
display: inline-block !important;
}
+.trees a.om-icon {
+ width: auto;
+}
+.trees a.om-icon span {
+ white-space: nowrap;
+}
.cross.om-icon {
background-image: url(images/cross.png);
}