Author: sebawagner
Date: Fri Apr 20 17:05:22 2012
New Revision: 1328450
URL: http://svn.apache.org/viewvc?rev=1328450&view=rev
Log:
OPENMEETINGS-188 Inserting room, horizontal bar does not appear
+ Remove some invalid strings in Java source files
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/simpleTurnOverList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/simpleTurnOverList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/simpleTurnOverList.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/simpleTurnOverList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/simpleTurnOverList.lzx
Fri Apr 20 17:05:22 2012
@@ -69,7 +69,7 @@
</method>
<!-- ========= BgArea area =========-->
- <view width="$once{ parent.width }" bgcolor="0x000000"
+ <view width="$once{ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }"
height="$once{ parent.height-20 }" x="0" y="20">
<view width="$once{ parent.width-2 }" bgcolor="$once{
parent.parent.mainBgColor }"
height="$once{ parent.height-2 }" x="1" y="1"></view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverList.lzx
Fri Apr 20 17:05:22 2012
@@ -256,9 +256,9 @@
<!-- ========= BgArea area =========-->
<view width="$once{ parent.width }" bgcolor="$once{
canvas.getThemeColor('mainBorderColor') }"
- height="$once{ parent.height-20 }" x="0" y="20">
+ height="${ parent.height-20 }" x="0" y="20">
<view width="$once{ parent.width-2 }" bgcolor="$once{
parent.parent.mainBgColor }"
- height="$once{ parent.height-2 }" x="1" y="1"></view>
+ height="${ parent.height-2 }" x="1" y="1"></view>
</view>
<!-- ========= List Header area =========-->
@@ -269,7 +269,7 @@
</view>
<!-- ========= List Contents area =========-->
- <view name="_innerlist" height="$once{ parent.height-43 }" x="1"
width="$once{ parent.width-2 }"
+ <view name="_innerlist" height="${ parent.height-43 }" x="1"
width="$once{ parent.width-2 }"
y="42" clip="true" bgcolor="$once{ parent.mainBgColor }">
<view name="_inn" >
<innerList name="_inn" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Fri Apr 20 17:05:22 2012
@@ -249,12 +249,16 @@
<animator name="_hide" attribute="opacity" to="0" from="1"
duration="1000" start="false">
<handler name="onstop">
- parent._show.doStart();
+ if (parent["_show"]) {
+ parent._show.doStart();
+ }
</handler>
</animator>
<animator name="_show" attribute="opacity" to="1" from="0"
duration="1000" start="false">
<handler name="onstop">
- parent._show.doStart();
+ if (parent["_show"]) {
+ parent._show.doStart();
+ }
</handler>
</animator>
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Fri Apr
20 17:05:22 2012
@@ -85,7 +85,7 @@
]]>
</method>
</view>
-
+ <om_hscrollbar name="_scrollbarH" id="_mainScrollHBar" visibility="hidden"
/>
<om_vscrollbar name="_scrollbar" id="_mainScrollBar" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Fri
Apr 20 17:05:22 2012
@@ -85,6 +85,7 @@
]]>
</method>
</view>
+ <om_hscrollbar name="_scrollbarH" id="_mainScrollHBar" visibility="hidden"
/>
<om_vscrollbar name="_scrollbar" id="_mainScrollBar" />
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
Fri Apr 20 17:05:22 2012
@@ -23,7 +23,9 @@
<!--- Configuration module for ADMIN -->
<class name="confAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="410" height="${ canvas.height -
canvas.naviHeight }" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="410"
+ height="${ canvas.height - canvas.naviHeight }" x="2"
+ y="${ 0 - parent.parent.parent.y }"
orderby="configuration_id" step="50" asc="true">
<handler name="oninit">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
Fri Apr 20 17:05:22 2012
@@ -30,8 +30,9 @@
_mainScrollBar.setAttribute("visibility","visible");
</handler>
- <turnOverList name="_turnoverlist" width="780" height="${ canvas.height
- canvas.naviHeight }"
- x="2" y="0" orderby="room_id" step="50" asc="true">
+ <turnOverList name="_turnoverlist" width="780"
+ height="${ canvas.height - canvas.naviHeight }"
+ x="2" y="0" orderby="room_id" step="50" asc="true">
<handler name="oninit">
this.addHeaderItem(599,80);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
Fri Apr 20 17:05:22 2012
@@ -36,7 +36,9 @@
<!--- Organization administration module for ADMIN.-->
<class name="ldapAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="420" height="${ canvas.height
- canvas.naviHeight }" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="420"
+ height="${ canvas.height - canvas.naviHeight }" x="2"
+ y="${ 0 - parent.parent.parent.y }"
orderby="ldapConfigId" step="50" asc="true">
<handler name="oninit">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx
Fri Apr 20 17:05:22 2012
@@ -22,18 +22,26 @@
<!--- Admin module to configure the Conference or Audience room.-->
<class name="roomAdmin" extends="baseContentView">
+
+ <handler name="oninit">
+ _mainScrollHBar.setAttribute("visibility","visible");
+ </handler>
+
+ <handler name="ontabcontentleave" args="tRef">
+ _mainScrollHBar.setAttribute("visibility","hidden");
+ </handler>
- <labelText x="2" y="8" labelid="714" />
+ <labelText x="2" y="${ 8 - parent.parent.parent.y }" labelid="714" />
- <customEdittext name="_search" y="4" x="120" width="200" height="24"/>
+ <customEdittext name="_search" y="${ 4 - parent.parent.parent.y }"
x="120" width="200" height="24"/>
- <simpleLabelButton labelid="715" x="330" width="70" height="24" y="4">
+ <simpleLabelButton labelid="715" x="330" width="70" height="24" y="${ 4 -
parent.parent.parent.y }">
<handler name="onclick">
parent._turnoverlist.getRooms.doCall();
</handler>
</simpleLabelButton>
- <turnOverList name="_turnoverlist" width="400" height="${ canvas.height
- canvas.naviHeight - 30 }" x="2" y="30"
+ <turnOverList name="_turnoverlist" width="400" height="${ canvas.height
- canvas.naviHeight - 40 }" x="2" y="${ 30 - parent.parent.parent.y }"
orderby="c.rooms_id" step="50" asc="true">
<handler name="oninit">
@@ -80,7 +88,7 @@
}
if (parent._roomvalueform.rooms_id == 0) {
if (records.length > 0) {
-
parent._roomModerateValueForm.initValueFieldsByObject(records[0]);
+ parent._roomvalueform.initValueFieldsByObject(records[0]);
}
}
this.sendInitialWidthUpdate();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
Fri Apr 20 17:05:22 2012
@@ -417,8 +417,10 @@
<labelText labelid="191" width="200" y="390" resize="false" x="2"/>
<!-- 172:add organisation -->
- <baseChooseIcon resourceN="edit_add_rsc" labelid="172" y="390" x="370"
width="20" height="20"
- onclick="this.parent.addOrganisationToUser()" />
+ <blueButton width="20" height="20" resourceItem="edit_add_rsc"
+ x_insetResource="2" y_insetResource="2" y="390"
x="370"
+ width_insetResource="16"
height_insetResource="16"
+ onclick="this.parent.addOrganisationToUser()"
/>
<method name="addOrganisationToUser">
new
lz.chooseOrganisationWindow(canvas.main_content._content.inner,{refObj:this,item_id:this.rooms_id});
</method>
@@ -620,8 +622,10 @@
<labelText labelid="816" width="300" y="380" resize="false" x="400"/>
<!-- 172:add default moderator -->
- <baseChooseIcon resourceN="edit_add_rsc" labelid="821" y="380" x="680"
- onclick="this.parent.addModeratorToRoom()" width="20" height="20" />
+ <blueButton width="20" height="20" resourceItem="edit_add_rsc"
+ x_insetResource="2" y_insetResource="2" y="380"
x="680"
+ width_insetResource="16"
height_insetResource="16"
+ onclick="this.parent.addModeratorToRoom()" />
<method name="addModeratorToRoom">
new lz.addAttendee(canvas.main_content._content.inner,{
isSuperModerator:true,
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx
Fri Apr 20 17:05:22 2012
@@ -23,17 +23,17 @@
<!--- User administration module for ADMIN.-->
<class name="userAdmin" extends="baseContentView">
- <labelText x="2" y="8" labelid="714" />
+ <labelText x="2" y="${ 8 - parent.parent.parent.y }" labelid="714" />
- <customEdittext name="_search" y="4" x="120" width="200" height="24"/>
+ <customEdittext name="_search" y="${ 4 - parent.parent.parent.y }"
x="120" width="200" height="24"/>
- <simpleLabelButton labelid="715" x="330" width="112" height="24" y="4">
+ <simpleLabelButton labelid="715" x="330" width="112" height="24" y="${ 4 -
parent.parent.parent.y }">
<handler name="onclick">
parent._turnoverlist.getUserListWithSearch.doCall();
</handler>
</simpleLabelButton>
- <turnOverList name="_turnoverlist" width="440" height="${ canvas.height
- canvas.naviHeight - 30 }" x="2" y="30"
+ <turnOverList name="_turnoverlist" width="440" height="${ canvas.height
- canvas.naviHeight - 30 }" x="2" y="${ 30 - parent.parent.parent.y }"
orderby="user_id" step="50" asc="true">
<handler name="oninit">
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
Fri Apr 20 17:05:22 2012
@@ -31,7 +31,6 @@ import org.openmeetings.app.conference.s
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
-import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.ldap.config.ConfigReader;
@@ -65,8 +64,6 @@ public class LdapLoginManagement {
@Autowired
private Statemanagement statemanagement;
@Autowired
- private Organisationmanagement organisationmanagement;
- @Autowired
private LdapConfigDaoImpl ldapConfigDao;
// External User Types
@@ -420,7 +417,7 @@ public class LdapLoginManagement {
}
}
- // Pr�fen, ob user bereits vorhanden ist
+ // check if user already exists
Users u = null;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/FileWebService.java
Fri Apr 20 17:05:22 2012
@@ -1090,9 +1090,11 @@ public class FileWebService {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if
(authLevelManagement.checkWebServiceLevel(user_level)) {
+ if (authLevelManagement.checkUserLevel(user_level)) {
+
+ // A test is required that checks if the user
is allowed to move the file
- log.debug("deleteFileOrFolder " +
fileExplorerItemId);
+ log.debug("moveFileSelf " + fileExplorerItemId);
fileExplorerItemDao
.moveFile(fileExplorerItemId,
@@ -1121,37 +1123,4 @@ public class FileWebService {
return null;
}
- public TestObject getTestObject() {
- TestObject textO = new TestObject();
- textO.setList1(new LinkedList<String>());
- textO.setList2(new LinkedList<String>());
- return new TestObject();
- }
-
- public OMElement echo(OMElement element) throws XMLStreamException {
- // Praparing the OMElement so that it can be attached to
another OM
- // Tree.
- // First the OMElement should be completely build in case it is
not
- // fully built and still
- // some of the xml is in the stream.
- element.build();
- // Secondly the OMElement should be detached from the current
OMTree so
- // that it can be attached
- // some other OM Tree. Once detached the OmTree will remove its
- // connections to this OMElement.
- element.detach();
- return element;
- }
-
- public void ping(OMElement element) throws XMLStreamException {
- // Do some processing
- System.out.println("PING PING 1");
- Long ch = sessionManagement.checkSession("12312312");
- System.out.println("PING PING 1 ch: " + ch);
- }
-
- public void pingF(OMElement element) throws AxisFault {
- throw new AxisFault("Fault being thrown");
- }
-
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java?rev=1328450&r1=1328449&r2=1328450&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
Fri Apr 20 17:05:22 2012
@@ -865,7 +865,7 @@ public class CoreScreenShare {
// logger.debug("IS WINDOWS");
- // dr�ckt STRG+C == copy
+ // pressing STRG+C == copy
instance.keyPress(KeyEvent.VK_CONTROL);
Thread.sleep(200);
instance.keyPress(KeyEvent.VK_C);
@@ -914,7 +914,7 @@ public class CoreScreenShare {
// logger.debug("IS WINDOWS");
- // dr�ckt STRG+V == einf�gen
+ // pressing STRG+V == insert-mode
instance.keyPress(KeyEvent.VK_CONTROL);
Thread.sleep(100);
instance.keyPress(KeyEvent.VK_V);
