Revision: 2541
Author: seba.wagner
Date: Tue Oct 27 03:25:21 2009
Log: Fix: Dashboard only one button, back to rooms leads to new Conference
Room Overview
http://code.google.com/p/openmeetings/source/detail?r=2541
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/monthview/monthView.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/dashboard/infosPanel.lzx
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Mon
Oct 26 09:21:03 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Tue
Oct 27 03:25:21 2009
@@ -267,24 +267,8 @@
} else if (stringSub=='editBoardSettings') {
new
lz.editWhiteboardDefault(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
- if($debug)
Debug.write(canvas.thishib.modus,canvas.thishib.roomtype);
- if (canvas.thishib.modus=='audience' &&
canvas.thishib.roomtype=='public'){
- var t = new Array();
- t.action = 'eventModuleRoomList';
- } else if (canvas.thishib.modus=='audience' &&
canvas.thishib.roomtype=='private'){
- var t = new Array();
- t.action = 'eventModuleRoomList';
- } else if (canvas.thishib.modus=='conference' &&
canvas.thishib.roomtype=='public'){
- var t = new Array();
- t.action = 'conferenceModuleRoomList';
- } else if (canvas.thishib.modus=='conference'
&&
canvas.thishib.roomtype=='private'){
- var t = new Array();
- t.action = 'conferenceModuleRoomList';
- }
-
- if($debug) Debug.write( 'conferenceMenubar:
doActionMenu(): ' , t);
-
- loadContent(t);
+
+ quicklink('meetings')
} else if( stringSub == "browser_open" ){
var browserPanelWidth =
canvas.browserPanelWidth;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/monthview/monthView.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/monthview/monthView.lzx
Tue Oct 27 03:25:21 2009
@@ -156,7 +156,7 @@
}
var datecount = new Date(firstdayDate.getTime()
+86400000*i);
- if ($debug) Debug.write("datecount ",datecount);
+ //if ($debug) Debug.write("datecount ",datecount);
//this["week"+ j].subviews[t].setAttribute('daydate',
this.weekdaynames[datecount.getDay()]+" "
//+datecount.getDate().toString()+". "+this.monthnames[datecount.getMonth()]
);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/dashboard/infosPanel.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/dashboard/infosPanel.lzx
Tue Oct 27 03:25:21 2009
@@ -47,23 +47,14 @@
<simpleLabelButton labelid="769" width="196" x="$once{
parent.width-200 }"
- y="$once{ parent.height-80 }" height="38"
+ y="$once{ parent.height-80 }" height="78"
onclick="this.parent.storeSettings();">
- <view resource="test_setup_start_conference_rsc" x="2" y="9" />
+ <view resource="test_setup_start_conference_rsc" x="2"
valign="middle" />
<handler name="onclick">
quicklink('meetings');
</handler>
</simpleLabelButton>
- <simpleLabelButton labelid="770" width="196" x="$once{
parent.width-200 }"
- y="$once{ parent.height-40 }" height="38"
- onclick="this.parent.storeSettings();">
- <view resource="test_setup_start_conference_rsc" x="2" y="9" />
- <handler name="onclick">
- quicklink('events');
- </handler>
- </simpleLabelButton>
-
<!--
<view resource="icon_btn_dashboard_1" y="30" x="10" />
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
