Author: eschwert
Date: Sun Jan 22 20:34:22 2012
New Revision: 1234597
URL: http://svn.apache.org/viewvc?rev=1234597&view=rev
Log:
hideTopBar layout correction
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1234597&r1=1234596&r2=1234597&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Sun Jan 22 20:34:22 2012
@@ -109,7 +109,7 @@
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${
parent._sidePanel.width }"
width="${canvas.width-parent._sidePanel.width}"
height="${canvas.height-(parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}"
clip="true"
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28) +
((canvas.currentRoomObj.hideTopBar) ? 28:0)}" clip="true"
visibility="${((canvas.currentRoomObj.hideWhiteboard) ?
'visible':'hidden')}">
<view name="_inn" width="${parent.width-10}">
<wrappinglayout axis="x" spacing="10"/>
@@ -119,14 +119,14 @@
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - 28 }"
+ y="${ canvas.height - (this.height) -
((canvas.currentRoomObj.hideTopBar) ? 0:28)}"
width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }" restricted="true"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visibility == 'hidden') ? 6:28)}" />
+ ((parent._chatPanelStrict.visibility == 'hidden') ? 6:28) +
((canvas.currentRoomObj.hideTopBar) ? 28:0)}" />
<!--
###############################
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1234597&r1=1234596&r2=1234597&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
Sun Jan 22 20:34:22 2012
@@ -122,7 +122,7 @@
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - 28 }"
+ y="${ canvas.height - (this.height) -
((canvas.currentRoomObj.hideTopBar) ? 0:28) }"
width="${ canvas.width - parent._sidePanel.width }" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx?rev=1234597&r1=1234596&r2=1234597&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
Sun Jan 22 20:34:22 2012
@@ -2,7 +2,7 @@
<library>
<class name="conferenceRoomSidebar" extends="view" width="280"
- height="${ canvas.height - 28 }" y="0" clip="true">
+ height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28)
}" y="0" clip="true">
<attribute name="selected" value="null" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx?rev=1234597&r1=1234596&r2=1234597&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/interviewRoomSidebar.lzx
Sun Jan 22 20:34:22 2012
@@ -2,7 +2,7 @@
<library>
<class name="interviewRoomSidebar" extends="view" width="280"
- height="${ canvas.height - 28 }" y="0" clip="true">
+ height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28)
}" y="0" clip="true">
<attribute name="selected" value="null" />
