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 2016/12/23 07:25:00 UTC
svn commit: r1775797 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/
branches/3.1.x/openmeetings-flas...
Author: solomax
Date: Fri Dec 23 07:25:00 2016
New Revision: 1775797
URL: http://svn.apache.org/viewvc?rev=1775797&view=rev
Log:
no jira: Code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Fri Dec 23 07:25:00 2016
@@ -47,7 +47,7 @@ public class PollDao {
p.setCreated(new Date());
em.persist(p);
} else {
- p = em.merge(p);
+ p = em.merge(p);
}
return p;
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Fri Dec 23 07:25:00 2016
@@ -48,7 +48,7 @@ import org.springframework.transaction.a
public class RoomDao implements IGroupAdminDataProviderDao<Room> {
private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, webAppRootKey);
public final static String[] searchFields = {"name"};
-
+
@PersistenceContext
private EntityManager em;
@Autowired
@@ -103,7 +103,7 @@ public class RoomDao implements IGroupAd
oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
}
}
-
+
public List<Room> get(List<Long> ids) {
return em.createNamedQuery("getRoomsByIds", Room.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Dec 23 07:25:00 2016
@@ -61,8 +61,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.type = :type"),
@NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId "
- + "AND c.type = :type AND c.deleted = false"),
-
+ + "AND c.type = :type AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
+ "where c.deleted = false AND c.name LIKE :search "),
@NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r "
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Dec 23 07:25:00 2016
@@ -116,12 +116,12 @@
<confmenucommand id="cmd_pollResults" tipLabelId="1484" actionCommand="pollResults" />
<confmenucommand id="cmd_checkPollVoted" tipLabelId="1485" actionCommand="checkPollVoted" />
<confmenucommand id="cmd_importFile" tipLabelId="1479" actionCommand="importFile" />
- <confmenucommand id="cmd_editCamMicSettings" actionCommand="editCamMicSettings" tipLabelId="1486" />
+ <confmenucommand id="cmd_editCamMicSettings" actionCommand="editCamMicSettings" tipLabelId="1486" />
<confmenucommand id="cmd_quit" actionCommand="quit" tipLabelId="1487" />
<confmenucommand id="cmd_showSipDialer" actionCommand="showSipDialer" tipLabelId="1488" />
- <confmenucommand id="cmd_invitation" actionCommand="invitation" tipLabelId="1489" />
- <confmenucommand id="cmd_editWhiteboardDefault" actionCommand="editWhiteboardDefault" tipLabelId="1490" />
+ <confmenucommand id="cmd_invitation" actionCommand="invitation" tipLabelId="1489" />
+ <confmenucommand id="cmd_editWhiteboardDefault" actionCommand="editWhiteboardDefault" tipLabelId="1490" />
<confmenucommand id="cmd_exportFilePNG" onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" tipLabelId="1489" />
<confmenucommand id="cmd_exportFileJPG" onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" tipLabelId="1489" />
@@ -130,7 +130,7 @@
<confmenucommand id="cmd_exportFilePDF" onselect="canvas.doWhiteboardActionmenu('exportFilePDF')" tipLabelId="1489" />
<confmenucommand id="cmd_exportFileTIF" onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" tipLabelId="1489" />
-->
-
+
<attribute name="colorArray" value="null" />
<attribute name="errorLoader" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx Fri Dec 23 07:25:00 2016
@@ -7,97 +7,87 @@
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="restrictedConferenceMenubar" extends="conferenceMenubar" viewType="restricted" />
-
<class name="interviewConferenceMenubar" extends="conferenceMenubar" viewType="interview"/>
-
- <class name="conferenceMenubar" extends="view" height="28" width="${ canvas.width }"
+
+ <class name="conferenceMenubar" extends="view" height="28" width="${ canvas.width }"
bgcolor="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" >
-
+
<attribute name="viewType" value="conference" type="string" />
-
- <attribute name="selected" value="null" />
-
+ <attribute name="selected" value="null" />
+
<method name="construct" args="parent, args">
super.construct(parent, args);
canvas._menubar = this;
</method>
-
- <method name="sendOpenMenu" args="menuref">
- if (this.selected != null) {
- this.selected.setAttribute("selected",false);
- }
- this.selected = menuref;
- this.selected.setAttribute("selected",true);
- </method>
-
+
+ <method name="sendOpenMenu" args="menuref">
+ if (this.selected != null) {
+ this.selected.setAttribute("selected",false);
+ }
+ this.selected = menuref;
+ this.selected.setAttribute("selected",true);
+ </method>
+
<view name="itemlist" layout="axis:x;spacing:0" >
-
- <conferenceExitButton name="_exitbtn"
- text_y_inset="4" text_fontsize="14" down_y_inset="8" height="28" />
-
- <baseMenuMeetingsItem text="$once{ canvas.getLabelName(245) }"
- text_y_inset="4" text_fontsize="14" down_y_inset="8"
- textToolTip="" height="28"
- visible="${ (canvas._menubar.viewType=='interview') ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
- >
+ <conferenceExitButton name="_exitbtn"
+ text_y_inset="4" text_fontsize="14" down_y_inset="8" height="28" />
+
+ <baseMenuMeetingsItem text="$once{ canvas.getLabelName(245) }"
+ text_y_inset="4" text_fontsize="14" down_y_inset="8" textToolTip="" height="28"
+ visible="${ canvas._menubar.viewType != 'interview' && (canvas.ismoderator || canvas.isAllowedToDraw) }"
+ >
<handler name="onclick">
- new lz.conferenceMenuFiles(canvas,{
- x:this.getAttributeRelative("x",canvas),
- y:this.getAttributeRelative("y",canvas)+this.height,
- btnRef:this,
- list:this.list
- });
- this.parent.parent.sendOpenMenu(this);
- </handler>
+ new lz.conferenceMenuFiles(canvas,{
+ x:this.getAttributeRelative("x", canvas),
+ y:this.getAttributeRelative("y", canvas) + this.height,
+ btnRef:this,
+ list:this.list
+ });
+ this.parent.parent.sendOpenMenu(this);
+ </handler>
</baseMenuMeetingsItem>
-
- <baseMenuMeetingsItem text="$once{ canvas.getLabelName(635) }"
- text_y_inset="4" text_fontsize="14" down_y_inset="8"
- textToolTip="" height="28"
- visible="${ canvas.currentRoomObj.hideActionsMenu ? false : ((canvas._menubar.viewType=='conference') ? true : (canvas.ismoderator ? true : (canvas.isAllowedToDraw ? true : false ))) }"
- >
+
+ <baseMenuMeetingsItem text="$once{ canvas.getLabelName(635) }"
+ text_y_inset="4" text_fontsize="14" down_y_inset="8" textToolTip="" height="28"
+ visible="${ !canvas.currentRoomObj.hideActionsMenu && (canvas._menubar.viewType == 'conference' || canvas.ismoderator || canvas.isAllowedToDraw) }"
+ >
<handler name="onclick">
- new lz.conferenceMenuActions(canvas,{
- x:this.getAttributeRelative("x",canvas),
- y:this.getAttributeRelative("y",canvas)+this.height,
- btnRef:this
- });
- this.parent.parent.sendOpenMenu(this);
- </handler>
+ new lz.conferenceMenuActions(canvas,{
+ x:this.getAttributeRelative("x", canvas),
+ y:this.getAttributeRelative("y", canvas) + this.height,
+ btnRef:this
+ });
+ this.parent.parent.sendOpenMenu(this);
+ </handler>
</baseMenuMeetingsItem>
-
</view>
-
- </class>
-
+ </class>
+
<class name="conferenceExitButton" extends="view" height="34" width="${ this._ctext.width+36 }" >
-
- <attribute name="text_y_inset" value="6" type="number" />
- <attribute name="text_fontsize" value="14" type="number" />
-
- <attribute name="down_y_inset" value="10" type="number" />
-
- <handler name="onmouseover">
- this.bgc.setAttribute('visibility','visible');
- </handler>
- <handler name="onmouseout">
- this.bgc.setAttribute('visibility','hidden');
- </handler>
-
+ <attribute name="text_y_inset" value="6" type="number" />
+ <attribute name="text_fontsize" value="14" type="number" />
+ <attribute name="down_y_inset" value="10" type="number" />
+
+ <handler name="onmouseover">
+ this.bgc.setAttribute('visibility','visible');
+ </handler>
+ <handler name="onmouseout">
+ this.bgc.setAttribute('visibility','hidden');
+ </handler>
+
<handler name="oninit"><![CDATA[
if (canvas.isRemoteUser()) {
if ($debug) Debug.write("this mbarcontent ",this);
@@ -107,31 +97,28 @@
}
]]></handler>
<handler name="onclick">
- canvas.commonVideoViewContent.exitRoom();
+ canvas.commonVideoViewContent.exitRoom();
</handler>
-
- <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
- visibility="hidden" name="bgc"/>
-
- <omImage src="$once{ canvas.getThemeImage( 'exit_btn_rsc' ) }" y="4" x="4" />
-
- <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
-
- <labelText labelid="789" name="_ctext" fontstyle="plain" fgcolor="0xFFFFFF"
- fontsize="$once{ parent.text_fontsize }" y="$once{ parent.text_y_inset }" x="30" />
-
- <labelTooltip name="_textToolTip" labelid="309" multiline="false" />
-
+
+ <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
+ visibility="hidden" name="bgc"/>
+
+ <omImage src="$once{ canvas.getThemeImage( 'exit_btn_rsc' ) }" y="4" x="4" />
+
+ <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
+
+ <labelText labelid="789" name="_ctext" fontstyle="plain" fgcolor="0xFFFFFF"
+ fontsize="$once{ parent.text_fontsize }" y="$once{ parent.text_y_inset }" x="30" />
+
+ <labelTooltip name="_textToolTip" labelid="309" multiline="false" />
</class>
-
-
-
+
<class name="conferencDropDownMenuItem" extends="view" height="36">
-
<attribute name="isSpacer" value="false" type="boolean" />
-
<attribute name="enabled" type="boolean" setter="this.setEnabled(enabled)" />
-
+ <attribute name="labelid" type="number" setter="this.setLabelId( labelid )" when="once" />
+ <attribute name="command" type="expression" setter="this.setCommand( command )" when="once" />
+
<method name="setEnabled" args="e">
this.enabled = e;
if (!this.isinited) {
@@ -148,82 +135,70 @@
this.command.enabled = this.enabled;
}
</method>
-
- <attribute name="labelid" type="number"
- setter="this.setLabelId( labelid )" when="once" />
-
+
<method name="setLabelId" args="id" >
- this.labelid = id;
- if ( this.labelid ) {
- this._ctext.setAttribute('text', canvas.getLabelName(this.labelid));
- }
- </method>
-
- <attribute name="command" type="expression"
- setter="this.setCommand( command )" when="once" />
-
+ this.labelid = id;
+ if ( this.labelid ) {
+ this._ctext.setAttribute('text', canvas.getLabelName(this.labelid));
+ }
+ </method>
+
<method name="setCommand" args="cmd" >
- this.command = cmd;
- if ( this.command ) {
- this._ctextTooltip.setAttribute('text',canvas.getLabelName(command.tipLabelId));
- }
- </method>
-
- <handler name="onclick">
- if (!this.enabled) {
- return;
- }
- this.command.execute(null);
- parent.parent.close();
- </handler>
-
- <handler name="onmouseover">
- this._bg.setAttribute("visible", true);
- </handler>
-
- <handler name="onmouseout">
- this._bg.setAttribute("visible", false);
- </handler>
-
- <view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0" x="1"
- bgcolor="0xFFFFFF" opacity="0.5" height="36" />
-
- <text name="_ctext" fontstyle="bold" fgcolor="0x666666"
- fontsize="14" y="2" x="10" />
-
- <text name="_ctextTooltip" fontstyle="plain" fgcolor="0x666666"
- fontsize="10" y="20" x="10" />
-
- </class>
-
+ this.command = cmd;
+ if ( this.command ) {
+ this._ctextTooltip.setAttribute('text',canvas.getLabelName(command.tipLabelId));
+ }
+ </method>
+
+ <handler name="onclick">
+ if (!this.enabled) {
+ return;
+ }
+ this.command.execute(null);
+ parent.parent.close();
+ </handler>
+
+ <handler name="onmouseover">
+ this._bg.setAttribute("visible", true);
+ </handler>
+
+ <handler name="onmouseout">
+ this._bg.setAttribute("visible", false);
+ </handler>
+
+ <view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0" x="1"
+ bgcolor="0xFFFFFF" opacity="0.5" height="36" />
+
+ <text name="_ctext" fontstyle="bold" fgcolor="0x666666" fontsize="14" y="2" x="10" />
+ <text name="_ctextTooltip" fontstyle="plain" fgcolor="0x666666" fontsize="10" y="20" x="10" />
+ </class>
+
<class name="conferenceMenuFiles" extends="baseDropDownMenuList"
height="${ this._content.height+2 }" width="${ this._content.width+2 }">
-
- <view name="_content" x="1" y="1"
- layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
-
+
+ <view name="_content" x="1" y="1"
+ layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
+
<conferencDropDownMenuItem labelid="15" command="cmd_importFile"
- enabled="${ canvas.ismoderator }" />
-
+ enabled="${ canvas.ismoderator }" />
</view>
-
</class>
-
+
<class name="conferenceMenuActions" extends="baseDropDownMenuList"
height="${ this._content.height+2 }" width="${ this._content.width+2 }">
-
+
<handler name="oninit">
- this.fixWidth();
+ this.fixWidth();
</handler>
-
- <view name="_content" x="1" y="1"
- layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
-
+
+ <view name="_content" x="1" y="1"
+ layout="axis:y;spacing:1" bgcolor="$once{ canvas.getThemeColor('menuBackgroundColor') }" >
+
<conferencDropDownMenuItem labelid="213" command="cmd_invitation"
- enabled="${ canvas.ismoderator && !hib.currentInvitation }" />
+ enabled="${ canvas.ismoderator && !hib.currentInvitation }" />
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="239" command="cmd_shareDesktop"
- enabled="${ canvas._menubar.viewType != 'interview' && canvas.ismoderator }" />
+ <conferencDropDownMenuItem labelid="239" command="cmd_shareDesktop"
+ enabled="${ canvas._menubar.viewType != 'interview' && canvas.ismoderator }" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="784" command="cmd_applyforMod" enabled="${ !canvas.ismoderator }" />
<horizontalDropDownSpacer />
@@ -239,19 +214,18 @@
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" enabled="${ canvas.userId != -1 }" />
<horizontalDropDownSpacer
- visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }" />
- <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer"
- visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }"
- enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }"/>
- <horizontalDropDownSpacer />
+ visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }" />
+ <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer"
+ visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }"
+ enabled="$once{ canvas.RED5_SIP_ENABLE == 'yes' && canvas.currentRoomObj.sipEnabled }"/>
+ <horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault" enabled="true"/>
<!-- Save Whiteboard as Image menues are commented for now
- <horizontalDropDownSpacer />
+ <horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="560" command="cmd_exportFileSVG" enabled="true"/>
<conferencDropDownMenuItem labelid="561" command="cmd_exportFilePNG" enabled="true"/>
<conferencDropDownMenuItem labelid="562" command="cmd_exportFileJPG" enabled="true"/>
-->
</view>
-
</class>
</library>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Fri Dec 23 07:25:00 2016
@@ -7,47 +7,46 @@
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="dtmfButton" extends="button" width="20" height="20" >
- <attribute name="dtmf" value="" type="string"/>
- <handler name="onclick">
- //callDTMFButton(this,this.text);
- </handler>
- <method name="doNextSipNumber">
- if ($debug) Debug.write("doNextSipNumber ",this.text);
- </method>
+ <attribute name="dtmf" value="" type="string"/>
+ <handler name="onclick">
+ //callDTMFButton(this,this.text);
+ </handler>
+ <method name="doNextSipNumber">
+ if ($debug) Debug.write("doNextSipNumber ",this.text);
+ </method>
</class>
-
+
<class name="debugPinCode" extends="labelExplorerBox" title="Enter PIN Code"
- docking="true" resizeable="false" closable="true" width="100" x="14" height="120">
-
-
- <view y="24">
- <dtmfButton text="1" x="20" dtmf="1"/>
- <dtmfButton text="2" x="40" dtmf="2"/>
- <dtmfButton text="3" x="60" dtmf="3"/>
-
- <dtmfButton text="4" x="20" y="20" dtmf="4"/>
- <dtmfButton text="5" x="40" y="20" dtmf="5"/>
- <dtmfButton text="6" x="60" y="20" dtmf="6"/>
-
- <dtmfButton text="7" x="20" y="40" dtmf="7"/>
- <dtmfButton text="8" x="40" y="40" dtmf="8"/>
- <dtmfButton text="9" x="60" y="40" dtmf="9"/>
- <dtmfButton text="10" x="20" y="60" dtmf="10"/>
- </view>
+ docking="true" resizeable="false" closable="true" width="100" x="14" height="120">
+
+ <view y="24">
+ <dtmfButton text="1" x="20" dtmf="1"/>
+ <dtmfButton text="2" x="40" dtmf="2"/>
+ <dtmfButton text="3" x="60" dtmf="3"/>
+
+ <dtmfButton text="4" x="20" y="20" dtmf="4"/>
+ <dtmfButton text="5" x="40" y="20" dtmf="5"/>
+ <dtmfButton text="6" x="60" y="20" dtmf="6"/>
+
+ <dtmfButton text="7" x="20" y="40" dtmf="7"/>
+ <dtmfButton text="8" x="40" y="40" dtmf="8"/>
+ <dtmfButton text="9" x="60" y="40" dtmf="9"/>
+ <dtmfButton text="10" x="20" y="60" dtmf="10"/>
+ </view>
</class>
<class name="baseConferenceRoom" extends="baseContentView" destroyByMethod="true" >
@@ -58,19 +57,19 @@
<![CDATA[
if ($debug) Debug.write("baseConferenceRoom:: oninit");
_mainScrollBar.setAttribute("visibility","hidden");
-
+
if ($debug) Debug.write("roomobj: ",this.roomobj);
-
+
var r = this.roomobj;
r.currentusers = ''; //this might be huge list
-
+
if (this.roomobj.closed) {
canvas.roomClosed();
}
if (this.roomobj.waitForRecording) {
new lz.labelerrorPopup(canvas, {labelid: 1316, errorlabelid: 1315});
}
-
+
if (this._chatPanelStrict) {
var chatHidden = this.roomobj.chatHidden;
this._chatPanelStrict.setAttribute('visible', !chatHidden);
@@ -78,14 +77,14 @@
this._chatPanelStrict.setAttribute('height', 28);
}
}
-
+
canvas.currentBaseConferenceRoom = this;
if (!this.roomobj.hideTopBar) {
canvas.main_content.setAttribute('y', 28);
canvas.currentBaseConferenceRoom.createMenu();
}
canvas._conferencemenu.setAttribute('visible', !this.roomobj.hideTopBar);
-
+
if ($debug) Debug.write("this.roomobj ",this.roomobj);
if (!!canvas._mymod) {
@@ -101,7 +100,7 @@
//if ($debug) Debug.write("GROUPS!!! ", this.roomobj.roomGroups);
if (!!this.roomobj.roomGroups && !!this.roomobj.roomGroups.length) {
var g = this.roomobj.roomGroups[0].group;
- m._group_logo.setAttribute('src', canvas.getUrl() + "group/" + g.id + "?anticache=" + new Date().getTime());
+ m._group_logo.setAttribute('src', canvas.getUrl() + "group/" + g.id + "?anticache=" + new Date().getTime());
m._group_logo.setAttribute("visible", true);
if (g.tag) {
m._group_tag.setAttribute("text", g.tag);
@@ -113,12 +112,12 @@
} else {
if ($debug) Debug.write("no appointed meeting");
}
-
+
if (this.roomobj.demoRoom && this.roomobj.demoTime != null) {
if ($debug) Debug.warn("THIS IS A DEMO ROOM THAT SHOULD CLOSE AFTER SEC: ",this.roomobj.demoTime);
this.meetingTimer = new lz.meetingTimer(canvas,{refObj:this, roomobj:this.roomobj});
}
-
+
if ($debug) Debug.write("canvas._videocontainer ", canvas._videocontainer);
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
]]>
@@ -147,28 +146,28 @@
]]>
</handler>
- <baseTabChatPanel name="_chatPanelStrict" labelid="616"
- height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0 : 28) }"
- width="${ canvas.width - parent._sidePanel.width }" isopen="${ !canvas.currentRoomObj.chatOpened }" />
- <!-- isopen need to be reverted, will be toggled -->
-
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0 : 28) }"
+ width="${ canvas.width - parent._sidePanel.width }" isopen="${ !canvas.currentRoomObj.chatOpened }" />
+ <!-- isopen need to be reverted, will be toggled -->
+
<handler name="ontabcontentleave">
if ($debug) Debug.write("################# ontabcontentleave:",this);
-
+
canvas.commonVideoViewContent.closeAllScreenSharings();
-
+
canvas.currentBaseConferenceRoom = null;
-
+
//reset the right to draw on WHiteboard as the RoomClient Object will be destroyed also
//on server-Side the canDraw status will be false again when you relogin the same room
canvas.isAllowedToDraw = true;
-
+
_mainScrollBar.setAttribute("visibility","visible");
-
+
//reset rights
canvas.isAllowedToGiveExclusiveAudio = false;
-
+
canvas.commonVideoViewContent.resetAllValues();
if (canvas._chatcontent!=null) {
canvas._chatcontent = null;
@@ -176,23 +175,23 @@
if (canvas._mymod!=null) {
canvas._mymod = null;
}
-
+
if (this.meetingTimer != null) {
this.meetingTimer.close();
}
-
+
if (canvas._drawarea.letterObjectIsActive) {
canvas._drawarea.currentletterObj.destroy();
}
-
+
if (canvas.currentFileExplorer != null) {
canvas.currentFileExplorer = null;
}
-
+
if (canvas.currentActivityList != null) {
canvas.currentActivityList = null;
}
-
+
//@deprecated we will not use old screen sharing implementation
//canvas._screens.clearAllSessions();
this.logicalRoomLeave.doCall();
@@ -204,7 +203,7 @@
if ($debug) Debug.write("############# logicalRoomLeave: ",value);
//this.parent.destroy();
canvas.thishib.reconnectedRoomInstance = this.parent;
-
+
// Reconnect User to default Scope
canvas.thishib.userScope = "hibernate";
var src = hib.getUrl();
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx Fri Dec 23 07:25:00 2016
@@ -9,7 +9,7 @@
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
@@ -29,7 +29,7 @@
<attribute name="currentrectanglestroke" value="0xFF6600" />
<attribute name="currentrectanglestrokeDis" value="1" type="number" />
<attribute name="currentrectanglestrokeFill" value="0xFFFF33" />
- <attribute name="currentrectanglestrokeFillDis" value="1" type="number" />
+ <attribute name="currentrectanglestrokeFillDis" value="1" type="number" />
<attribute name="currentrectangleineWidth" value="4" type="number" />
<attribute name="currentrectangleOpacity" value="1" type="number" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Fri Dec 23 07:25:00 2016
@@ -130,36 +130,36 @@
if (canvas._drawarea.drawmodus == 'paint'){
canvas._drawarea.currentlayerstroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentlayerlineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentlayerOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentlayerOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'line'){
canvas._drawarea.currentlinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentlinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentlineOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentlineOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'uline'){
canvas._drawarea.currentulinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentulinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentulineOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentulineOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'drawarrow'){
canvas._drawarea.currentdrawarrowlinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentdrawarrowlinestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentdrawarrowlinestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentdrawarrowlinestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentdrawarrowlinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentdrawarrowOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentdrawarrowOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'rectangle'){
canvas._drawarea.currentrectanglestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentrectanglestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentrectanglestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentrectanglestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentrectangleineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentrectangleOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentrectangleOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'ellipse'){
canvas._drawarea.currentellipsestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentellipsestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentellipsestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentellipsestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentellipselineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentellipseOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentellipseOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'letter'){
canvas._drawarea.setAttribute('currentlayerletter',this._content.lineColorChoose.selectedColor);
canvas._drawarea.setAttribute('currentlayersize',this._content.changeWidthSlider.initialNumber);
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Fri Dec 23 07:25:00 2016
@@ -40,7 +40,7 @@
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="status"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td>
</tr>
- </tbody>
+ </tbody>
</table>
</div>
</div>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Dec 23 07:25:00 2016
@@ -73,12 +73,9 @@ public class LdapForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId());
- LdapConfig ldapConfig = getBean(LdapConfigDao.class).get(getModelObject().getId());
- this.setModelObject(ldapConfig);
+ setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
- target.add(this);
- target.add(listContainer);
+ target.add(this, listContainer);
target.appendJavaScript("omLdapPanelInit();");
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Dec 23 07:25:00 2016
@@ -98,6 +98,5 @@ public class LdapsPanel extends AdminPan
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
-
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Fri Dec 23 07:25:00 2016
@@ -47,7 +47,7 @@ public class PollDao {
p.setCreated(new Date());
em.persist(p);
} else {
- p = em.merge(p);
+ p = em.merge(p);
}
return p;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Fri Dec 23 07:25:00 2016
@@ -48,7 +48,7 @@ import org.springframework.transaction.a
public class RoomDao implements IGroupAdminDataProviderDao<Room> {
private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, webAppRootKey);
public final static String[] searchFields = {"name"};
-
+
@PersistenceContext
private EntityManager em;
@Autowired
@@ -103,7 +103,7 @@ public class RoomDao implements IGroupAd
oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
}
}
-
+
public List<Room> get(List<Long> ids) {
return em.createNamedQuery("getRoomsByIds", Room.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Dec 23 07:25:00 2016
@@ -66,8 +66,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.type = :type"),
@NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId "
- + "AND c.type = :type AND c.deleted = false"),
-
+ + "AND c.type = :type AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
+ "where c.deleted = false AND c.name LIKE :search "),
@NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r "
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Fri Dec 23 07:25:00 2016
@@ -7,47 +7,46 @@
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="dtmfButton" extends="button" width="20" height="20" >
- <attribute name="dtmf" value="" type="string"/>
- <handler name="onclick">
- //callDTMFButton(this,this.text);
- </handler>
- <method name="doNextSipNumber">
- if ($debug) Debug.write("doNextSipNumber ",this.text);
- </method>
+ <attribute name="dtmf" value="" type="string"/>
+ <handler name="onclick">
+ //callDTMFButton(this,this.text);
+ </handler>
+ <method name="doNextSipNumber">
+ if ($debug) Debug.write("doNextSipNumber ",this.text);
+ </method>
</class>
-
+
<class name="debugPinCode" extends="labelExplorerBox" title="Enter PIN Code"
- docking="true" resizeable="false" closable="true" width="100" x="14" height="120">
-
-
- <view y="24">
- <dtmfButton text="1" x="20" dtmf="1"/>
- <dtmfButton text="2" x="40" dtmf="2"/>
- <dtmfButton text="3" x="60" dtmf="3"/>
-
- <dtmfButton text="4" x="20" y="20" dtmf="4"/>
- <dtmfButton text="5" x="40" y="20" dtmf="5"/>
- <dtmfButton text="6" x="60" y="20" dtmf="6"/>
-
- <dtmfButton text="7" x="20" y="40" dtmf="7"/>
- <dtmfButton text="8" x="40" y="40" dtmf="8"/>
- <dtmfButton text="9" x="60" y="40" dtmf="9"/>
- <dtmfButton text="10" x="20" y="60" dtmf="10"/>
- </view>
+ docking="true" resizeable="false" closable="true" width="100" x="14" height="120">
+
+ <view y="24">
+ <dtmfButton text="1" x="20" dtmf="1"/>
+ <dtmfButton text="2" x="40" dtmf="2"/>
+ <dtmfButton text="3" x="60" dtmf="3"/>
+
+ <dtmfButton text="4" x="20" y="20" dtmf="4"/>
+ <dtmfButton text="5" x="40" y="20" dtmf="5"/>
+ <dtmfButton text="6" x="60" y="20" dtmf="6"/>
+
+ <dtmfButton text="7" x="20" y="40" dtmf="7"/>
+ <dtmfButton text="8" x="40" y="40" dtmf="8"/>
+ <dtmfButton text="9" x="60" y="40" dtmf="9"/>
+ <dtmfButton text="10" x="20" y="60" dtmf="10"/>
+ </view>
</class>
<class name="baseConferenceRoom" extends="baseContentView" destroyByMethod="true" >
@@ -57,14 +56,14 @@
<![CDATA[
if ($debug) Debug.write("baseConferenceRoom:: oninit");
_mainScrollBar.setAttribute("visibility","hidden");
-
+
if ($debug) Debug.write("roomobj: ",this.roomobj);
-
+
var r = this.roomobj;
r.currentusers = ''; //this might be huge list
-
+
canvas.currentBaseConferenceRoom = this;
-
+
if ($debug) Debug.write("canvas._videocontainer ", canvas._videocontainer);
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
]]>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawRect.lzx Fri Dec 23 07:25:00 2016
@@ -9,7 +9,7 @@
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
@@ -29,7 +29,7 @@
<attribute name="currentrectanglestroke" value="0xFF6600" />
<attribute name="currentrectanglestrokeDis" value="1" type="number" />
<attribute name="currentrectanglestrokeFill" value="0xFFFF33" />
- <attribute name="currentrectanglestrokeFillDis" value="1" type="number" />
+ <attribute name="currentrectanglestrokeFillDis" value="1" type="number" />
<attribute name="currentrectangleineWidth" value="4" type="number" />
<attribute name="currentrectangleOpacity" value="1" type="number" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Fri Dec 23 07:25:00 2016
@@ -44,7 +44,7 @@
</method>
<method name="loadPanelByModus" args="drawArea">
- if ($debug) Debug.write("loadPanelByModus drawmodus: ",drawArea.drawmodus);
+ if ($debug) Debug.write("loadPanelByModus drawmodus: ", drawArea.drawmodus);
this.ignoreUpdates = true;
if (drawArea.drawmodus == 'paint') {
this._content.lineColorChoose.setSelectedColor(drawArea.currentlayerstroke);
@@ -130,36 +130,36 @@
if (canvas._drawarea.drawmodus == 'paint'){
canvas._drawarea.currentlayerstroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentlayerlineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentlayerOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentlayerOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'line'){
canvas._drawarea.currentlinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentlinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentlineOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentlineOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'uline'){
canvas._drawarea.currentulinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentulinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentulineOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentulineOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'drawarrow'){
canvas._drawarea.currentdrawarrowlinestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentdrawarrowlinestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentdrawarrowlinestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentdrawarrowlinestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentdrawarrowlinelineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentdrawarrowOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentdrawarrowOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'rectangle'){
canvas._drawarea.currentrectanglestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentrectanglestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentrectanglestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentrectanglestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentrectangleineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentrectangleOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentrectangleOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'ellipse'){
canvas._drawarea.currentellipsestroke = this._content.lineColorChoose.selectedColor;
canvas._drawarea.currentellipsestrokeDis = this._content.lineColorChoose.selectedColorDis;
canvas._drawarea.currentellipsestrokeFill = this._content.fillColorChoose.selectedColor;
canvas._drawarea.currentellipsestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
canvas._drawarea.currentellipselineWidth = this._content.changeWidthSlider.initialNumber;
- canvas._drawarea.currentellipseOpacity = this._content.changeOpacitySlider.initialNumber/100;
+ canvas._drawarea.currentellipseOpacity = this._content.changeOpacitySlider.initialNumber / 100;
} else if (canvas._drawarea.drawmodus == 'letter'){
canvas._drawarea.setAttribute('currentlayerletter',this._content.lineColorChoose.selectedColor);
canvas._drawarea.setAttribute('currentlayersize',this._content.changeWidthSlider.initialNumber);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Fri Dec 23 07:25:00 2016
@@ -40,7 +40,7 @@
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="status"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td>
</tr>
- </tbody>
+ </tbody>
</table>
</div>
</div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Dec 23 07:25:00 2016
@@ -73,12 +73,9 @@ public class LdapForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId());
- LdapConfig ldapConfig = getBean(LdapConfigDao.class).get(getModelObject().getId());
- this.setModelObject(ldapConfig);
+ setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
- target.add(this);
- target.add(listContainer);
+ target.add(this, listContainer);
target.appendJavaScript("omLdapPanelInit();");
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Dec 23 07:25:00 2016
@@ -98,6 +98,5 @@ public class LdapsPanel extends AdminPan
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
-
}
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Fri Dec 23 07:25:00 2016
@@ -47,7 +47,7 @@ public class PollDao {
p.setCreated(new Date());
em.persist(p);
} else {
- p = em.merge(p);
+ p = em.merge(p);
}
return p;
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Fri Dec 23 07:25:00 2016
@@ -48,7 +48,7 @@ import org.springframework.transaction.a
public class RoomDao implements IGroupAdminDataProviderDao<Room> {
private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, webAppRootKey);
public final static String[] searchFields = {"name"};
-
+
@PersistenceContext
private EntityManager em;
@Autowired
@@ -103,7 +103,7 @@ public class RoomDao implements IGroupAd
oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
}
}
-
+
public List<Room> get(List<Long> ids) {
return em.createNamedQuery("getRoomsByIds", Room.class).setParameter("ids", ids).getResultList();
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Fri Dec 23 07:25:00 2016
@@ -66,8 +66,7 @@ import org.simpleframework.xml.Root;
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE r.deleted = false"),
@NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE r.ispublic = true and r.deleted = false and r.type = :type"),
@NamedQuery(name = "getRoomByOwnerAndTypeId", query = "select c from Room as c where c.ownerId = :ownerId "
- + "AND c.type = :type AND c.deleted = false"),
-
+ + "AND c.type = :type AND c.deleted = false"),
@NamedQuery(name = "selectMaxFromRooms", query = "select count(c.id) from Room c "
+ "where c.deleted = false AND c.name LIKE :search "),
@NamedQuery(name = "getRoomByExternalId", query = "select r from Room as r "
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Fri Dec 23 07:25:00 2016
@@ -40,7 +40,7 @@
<td class="three_column_layout_column2"><div class="three_column_layout_divcolumn2"><span wicket:id="status"></span></div></td>
<td class="three_column_layout_column3"><div class="three_column_layout_divcolumn3"><span wicket:id="subject"></span></div></td>
</tr>
- </tbody>
+ </tbody>
</table>
</div>
</div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Dec 23 07:25:00 2016
@@ -73,12 +73,9 @@ public class LdapForm extends AdminBaseF
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId());
- LdapConfig ldapConfig = getBean(LdapConfigDao.class).get(getModelObject().getId());
- this.setModelObject(ldapConfig);
+ setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
- target.add(this);
- target.add(listContainer);
+ target.add(this, listContainer);
target.appendJavaScript("omLdapPanelInit();");
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1775797&r1=1775796&r2=1775797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Dec 23 07:25:00 2016
@@ -98,6 +98,5 @@ public class LdapsPanel extends AdminPan
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
-
}
}