Index: lams_central/conf/flashxml/lams/defaultTheme.xml
===================================================================
diff -u -r8b6f951bf758e2b25fcd27f25902fe7a6411fca7 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_central/conf/flashxml/lams/defaultTheme.xml	(.../defaultTheme.xml)	(revision 8b6f951bf758e2b25fcd27f25902fe7a6411fca7)
+++ lams_central/conf/flashxml/lams/defaultTheme.xml	(.../defaultTheme.xml)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -1 +1 @@
-<wddxPacket version="1.0"><header /><data><struct><var name="baseStyleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>10</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0x669BF2</number></var><var name="selectionColor"><number>0x669BF2</number></var><var name="rollOverColor"><number>0x669BF2</number></var><var name="borderStyle"><string>inset</string></var></struct></var><var name="name"><string>default</string></var><var name="visualElements"><array length="49"><struct><var name="name"><string>button</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>9</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="emphasizedStyleDeclaration"><number>0x669BF2</number></var></struct></var></struct><struct><var name="name"><string>label</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>12</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>PIlabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>10</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>CALabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="autoSize"><string>none</string></var></struct></var></struct><struct><var name="name"><string>EndGatelabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>7</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>LFWindow</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="borderStyle"><string>inset</string></var></struct></var></struct><struct><var name="name"><string>treeview</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="openEasing"><string>Elastic</string></var></struct></var></struct><struct><var name="name"><string>datagrid</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="openEasing"><string>Elastic</string></var></struct></var></struct><struct><var name="name"><string>combo</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>picombo</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>9</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>LFMenuBar</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>BGPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>FlowPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>WZPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xDBE6FD</number></var></struct></var></struct><struct><var name="name"><string>MHPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xDBE6FD</number></var></struct></var></struct><struct><var name="name"><string>TAPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var><var name="borderColor"><number>0x000000</number></var></struct></var></struct><struct><var name="name"><string>scrollpane</string></var><var name="styleObject"><struct><var name="themeColor"><number>0x669BF2</number></var></struct></var></struct><struct><var name="name"><string>textarea</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontSize"><number>10</number></var></struct></var></struct><struct><var name="name"><string>CanvasPanel</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFCFCFC</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel0</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xE1E7E7</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel1</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel2</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xFFFDBE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel3</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xDDFCB1</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel4</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xFFEEC8</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel5</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xE9E2F5</number></var></struct></var></struct><struct><var name="name"><string>OptActContainerPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>inset</string></var><var name="backgroundColor"><number>0x25a56f</number></var></struct></var></struct><struct><var name="name"><string>OptActPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xd8ffef</number></var></struct></var></struct><struct><var name="name"><string>parallelHeadPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0x4684F7</number></var></struct></var></struct><struct><var name="name"><string>OptHeadPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0x4684F7</number></var></struct></var></struct><struct><var name="name"><string>ACTPanelNegative</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0x000000</number></var></struct></var></struct><struct><var name="name"><string>smallLabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number> </var><var name="fontSize"><number>10</number> </var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>TAPanelSelected</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x1B6BA7</number></var></struct></var></struct><struct><var name="name"><string>redLabel</string></var><var name="styleObject"><struct><var name="color"><number>0xFF0000</number> </var><var name="fontSize"><number>12</number> </var><var name="fontFamily"><string>Verdana</string></var><var name="fontWeight"><string>bold</string></var></struct></var></struct><struct><var name="name"><string>TAPanelRollover</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFFFFFF</number></var><var name="borderStyle"><string>outset</string></var></struct></var></struct><struct><var name="name"><string>BGPanelShadow</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xAFC8FF</number></var></struct></var></struct><struct><var name="name"><string>CAHighlightBorder</string></var><var name="styleObject"><struct><var name="color"><number>0x266DEE</number></var></struct></var></struct><struct><var name="name"><string>LTVLearnerText</string></var><var name="styleObject"><struct><var name="color"><number>0x555555</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontSize"><number>11</number></var><var name="fontWeight"><string>bold</string></var><var name="backgroundColor"><number>0xE7EEFE</number></var><var name="borderStyle"><string>solid</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogScpGeneralItem</string></var><var name="styleObject"><struct><var name="color"><number>0x666666</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogScpHeaderItem</string></var><var name="styleObject"><struct><var name="color"><number>0x666666</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontWeight"><string>bold</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogPanel</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFFFFFF</number></var><var name="border"><string>none</string></var></struct></var></struct><struct><var name="name"><string>AlertDialog</string></var><var name="styleObject"><struct><var name="colorTransform"><struct><var name="ra"><number>100</number></var><var name="rb"><number>0</number></var><var name="ga"><number>100</number></var><var name="gb"><number>0</number></var><var name="ba"><number>100</number></var><var name="bb"><number>0</number></var><var name="aa"><number>100</number></var><var name="ab"><number>0</number></var></struct></var></struct></var></struct><struct><var name="name"><string>IndexBar</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x1647BE</number></var></struct></var></struct><struct><var name="name"><string>IndexButton</string></var><var name="styleObject"><struct><var name="fontFamily"><string>Tahoma</string></var><var name="fontSize"><number>12</number></var></struct></var></struct><struct><var name="name"><string>IndexTextField</string></var><var name="styleObject"><struct><var name="fontFamily"><string>Tahoma</string></var><var name="fontSize"><number>12</number></var><var name="color"><number>0x333333</number></var></struct></var></struct><struct><var name="name"><string>progressBar</string></var><var name="styleObject"><struct><var name="colors"><array length="2"><struct><var name="backgroundColor"><number>0xEAF9FF</number></var><var name="borderColor"><number>0x003366</number></var></struct><struct><var name="backgroundColor"><number>0xC4D6FF</number></var><var name="borderColor"><number>0x003366</number></var></struct></array></var></struct></var></struct><struct><var name="name"><string>branchingDiagram</string></var><var name="styleObject"><struct><var name="lineColor"><number>0x000000</number></var><var name="fillColor"><number>0x000000</number></var><var name="stopColor"><number>0xCC0000</number></var></struct></var></struct><struct><var name="name"><string>BlueTextArea</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xC2D5FE</number></var><var name="borderStyle"><string>None</string></var></struct></var></struct><struct><var name="name"><string>LightBlueTextArea</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x669BF2</number></var><var name="borderStyle"><string>None</string></var></struct></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
+<wddxPacket version="1.0"><header /><data><struct><var name="baseStyleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>10</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0x669BF2</number></var><var name="selectionColor"><number>0x669BF2</number></var><var name="rollOverColor"><number>0x669BF2</number></var><var name="borderStyle"><string>inset</string></var></struct></var><var name="name"><string>default</string></var><var name="visualElements"><array length="49"><struct><var name="name"><string>button</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>9</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="emphasizedStyleDeclaration"><number>0x669BF2</number></var></struct></var></struct><struct><var name="name"><string>label</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>12</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>PIlabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>10</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>CALabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="autoSize"><string>none</string></var></struct></var></struct><struct><var name="name"><string>EndGatelabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>7</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>LFWindow</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="borderStyle"><string>inset</string></var></struct></var></struct><struct><var name="name"><string>treeview</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="openEasing"><string>Elastic</string></var></struct></var></struct><struct><var name="name"><string>datagrid</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>14</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var><var name="openEasing"><string>Elastic</string></var></struct></var></struct><struct><var name="name"><string>combo</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>picombo</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>9</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>LFMenuBar</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="themeColor"><number>0xBFFFBF</number></var><var name="selectionColor"><number>0xBFFFBF</number></var><var name="rollOverColor"><number>0xBFFFBF</number></var></struct></var></struct><struct><var name="name"><string>BGPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>FlowPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>WZPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xDBE6FD</number></var></struct></var></struct><struct><var name="name"><string>MHPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xDBE6FD</number></var></struct></var></struct><struct><var name="name"><string>TAPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var><var name="borderColor"><number>0x000000</number></var></struct></var></struct><struct><var name="name"><string>scrollpane</string></var><var name="styleObject"><struct><var name="themeColor"><number>0x669BF2</number></var></struct></var></struct><struct><var name="name"><string>textarea</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontSize"><number>10</number></var></struct></var></struct><struct><var name="name"><string>CanvasPanel</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFCFCFC</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel0</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xE1E7E7</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel1</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel2</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xFFFDBE</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel3</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xDDFCB1</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel4</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xFFEEC8</number></var></struct></var></struct><struct><var name="name"><string>ACTPanel5</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0xE9E2F5</number></var></struct></var></struct><struct><var name="name"><string>OptActContainerPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>inset</string></var><var name="backgroundColor"><number>0x25a56f</number></var></struct></var></struct><struct><var name="name"><string>OptActPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>none</string></var><var name="backgroundColor"><number>0xd8ffef</number></var></struct></var></struct><struct><var name="name"><string>parallelHeadPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0x4684F7</number></var></struct></var></struct><struct><var name="name"><string>OptHeadPanel</string></var><var name="styleObject"><struct><var name="borderStyle"><string>outset</string></var><var name="backgroundColor"><number>0x4684F7</number></var></struct></var></struct><struct><var name="name"><string>ACTPanelNegative</string></var><var name="styleObject"><struct><var name="borderStyle"><string>None</string></var><var name="backgroundColor"><number>0x000000</number></var></struct></var></struct><struct><var name="name"><string>smallLabel</string></var><var name="styleObject"><struct><var name="color"><number>0x333648</number> </var><var name="fontSize"><number>10</number> </var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>TAPanelSelected</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x1B6BA7</number></var></struct></var></struct><struct><var name="name"><string>redLabel</string></var><var name="styleObject"><struct><var name="color"><number>0xFF0000</number> </var><var name="fontSize"><number>12</number> </var><var name="fontFamily"><string>Verdana</string></var><var name="fontWeight"><string>bold</string></var></struct></var></struct><struct><var name="name"><string>TAPanelRollover</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFFFFFF</number></var><var name="borderStyle"><string>outset</string></var></struct></var></struct><struct><var name="name"><string>BGPanelShadow</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xAFC8FF</number></var></struct></var></struct><struct><var name="name"><string>CAHighlightBorder</string></var><var name="styleObject"><struct><var name="color"><number>0x266DEE</number></var></struct></var></struct><struct><var name="name"><string>LTVLearnerText</string></var><var name="styleObject"><struct><var name="color"><number>0x555555</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontSize"><number>11</number></var><var name="fontWeight"><string>bold</string></var><var name="backgroundColor"><number>0xE7EEFE</number></var><var name="borderStyle"><string>solid</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogScpGeneralItem</string></var><var name="styleObject"><struct><var name="color"><number>0x666666</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogScpHeaderItem</string></var><var name="styleObject"><struct><var name="color"><number>0x666666</number></var><var name="fontSize"><number>11</number></var><var name="fontFamily"><string>Verdana</string></var><var name="fontWeight"><string>bold</string></var></struct></var></struct><struct><var name="name"><string>AboutDialogPanel</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xFFFFFF</number></var><var name="border"><string>none</string></var></struct></var></struct><struct><var name="name"><string>AlertDialog</string></var><var name="styleObject"><struct><var name="colorTransform"><struct><var name="ra"><number>100</number></var><var name="rb"><number>0</number></var><var name="ga"><number>100</number></var><var name="gb"><number>0</number></var><var name="ba"><number>100</number></var><var name="bb"><number>0</number></var><var name="aa"><number>100</number></var><var name="ab"><number>0</number></var></struct></var></struct></var></struct><struct><var name="name"><string>IndexBar</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x1647BE</number></var></struct></var></struct><struct><var name="name"><string>IndexButton</string></var><var name="styleObject"><struct><var name="fontFamily"><string>Tahoma</string></var><var name="fontSize"><number>12</number></var></struct></var></struct><struct><var name="name"><string>IndexTextField</string></var><var name="styleObject"><struct><var name="fontFamily"><string>Tahoma</string></var><var name="fontSize"><number>12</number></var><var name="color"><number>0x333333</number></var></struct></var></struct><struct><var name="name"><string>progressBar</string></var><var name="styleObject"><struct><var name="colors"><array length="2"><struct><var name="backgroundColor"><number>0xEAF9FF</number></var><var name="borderColor"><number>0x003366</number></var></struct><struct><var name="backgroundColor"><number>0xC4D6FF</number></var><var name="borderColor"><number>0x003366</number></var></struct></array></var></struct></var></struct><struct><var name="name"><string>branchingDiagram</string></var><var name="styleObject"><struct><var name="lineColor"><number>0x000000</number></var><var name="fillColor"><number>0x000000</number></var><var name="stopColor"><number>0xCC0000</number></var></struct></var></struct><struct><var name="name"><string>BlueTextArea</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0xC2D5FE</number></var></struct></var></struct><struct><var name="name"><string>LightBlueTextArea</string></var><var name="styleObject"><struct><var name="backgroundColor"><number>0x669BF2</number></var><var name="borderStyle"><string>None</string></var></struct></var></struct></array></var></struct></data></wddxPacket>
\ No newline at end of file
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -r573ecdb2e212ef1076090d1a0baffe4903f2f9d9 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 573ecdb2e212ef1076090d1a0baffe4903f2f9d9)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -69,6 +69,12 @@
 	margin-bottom:10px;
 	padding:0;
 	}
+	
+h5 {color:#47bc23; 
+	font-size:14px;
+	margin-right:40px;
+	margin-bottom:8px;
+	}
 
 /*defines when instructions are given and places a blue arrow before the text */
 p.instructions {
Index: lams_flash/src/central/flash/lam_addseq_wiz.fla
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_flash/src/central/flash/lams_learner.fla
===================================================================
diff -u -rdeab1a0aef578ae38f893dd99735fd61cbb85936 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_flash/src/central/flash/lams_monitoring_v1.fla
===================================================================
diff -u -r550a64d591c6d54d4849d09efc0ae6c714bd8b80 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as
===================================================================
diff -u -r2c52dcb8569ed13729cb6c3ec2adccb66686aa19 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as	(.../Presence.as)	(revision 2c52dcb8569ed13729cb6c3ec2adccb66686aa19)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as	(.../Presence.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -140,9 +140,10 @@
 		var myDate = new Date();
 		var h = myDate.getHours().toString(), m = myDate.getMinutes().toString(), s = myDate.getSeconds().toString();
 		var resource = "LAMSPRESENCE"+h+""+m+""+s;
-		
-		Debugger.log("PRESENCE: with arguements - " + String(_root.presenceServerUrl) + " " + String(_root.userID) + " " + String(_root.userID) + " " + String(resource) + " " + String(_root.lessonID) + " " + _root.firstName + _root.lastName + " " + "false" + " " + "true",Debugger.MED,'attemptConnection','Presence');
-		_root.proxy.call("doLogin", _root.presenceServerUrl, _root.userID, _root.userID, resource, _root.lessonID, _root.firstName + " " + _root.lastName, false, true);
+		var nickName:String = _root.firstName + " " + _root.lastName;
+		nickName = StringUtils.correctPresenceName(nickName);
+		Debugger.log("PRESENCE: with arguements - " + String(_root.presenceServerUrl) + " " + String(_root.userID) + " " + String(_root.userID) + " " + String(resource) + " " + String(_root.lessonID) + " " + nickName + " " + "false" + " " + "true",Debugger.MED,'attemptConnection','Presence');
+		_root.proxy.call("doLogin", _root.presenceServerUrl, _root.userID, _root.userID, resource, _root.lessonID, nickName, false, true);
 	}
 	
 	// Attempts to register to the Jabber server
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -r550a64d591c6d54d4849d09efc0ae6c714bd8b80 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 550a64d591c6d54d4849d09efc0ae6c714bd8b80)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -99,6 +99,8 @@
 	private var btnLabel:String;
 	private var learner_expp_cb:CheckBox;
 	private var learner_expp_cb_lbl:Label;
+	private var learner_epres_cb:CheckBox;
+	private var learner_epres_cb_lbl:Label;	
 	
 	//Text Items
 	private var LSTitle_lbl:Label;
@@ -255,7 +257,9 @@
 		schedule_btn.addEventListener("click", Delegate.create(this, scheduleLessonStart));
 		start_btn.addEventListener("click", _monitorController);
 		statusApply_btn.addEventListener("click", Proxy.create(this, changeStatus));
-		learner_expp_cb.addEventListener("click", Delegate.create(this, toogleExpPortfolio));
+		learner_expp_cb.addEventListener("click", Delegate.create(this, toggleExpPortfolio));
+		learner_epres_cb.addEventListener("click", Delegate.create(this, togglePresence));
+		
 		this.addEventListener("apply", Proxy.create(_monitorController, _monitorController.changeStatus));
 		
 		editClass_btn.onRollOver = Proxy.create(this,this['showToolTip'], editClass_btn, "ls_manage_editclass_btn_tooltip");
@@ -392,6 +396,8 @@
 		reqTasks_scp._y = reqTasks_scp._y - 30
 		learner_expp_cb._y = learner_expp_cb._y - 30
 		learner_expp_cb_lbl._y = learner_expp_cb_lbl._y - 30
+		learner_epres_cb._y = learner_epres_cb._y - 30
+		learner_epres_cb_lbl._y = learner_epres_cb_lbl._y - 30
 	}
 	
 	/**
@@ -413,6 +419,7 @@
 
 		class_txt.text = s.organisationName;
 		learner_expp_cb.selected = s.learnerExportAvailable;
+		learner_epres_cb.selected = s.learnerPresenceAvailable;
 	}
 	
 	private function populateStatusList(stateID:Number):Void{
@@ -780,6 +787,7 @@
 		manageDate_lbl.text = Dictionary.getValue('ls_manage_date_lbl');
 		manageTime_lbl.text = Dictionary.getValue('ls_manage_time_lbl');
 		learner_expp_cb_lbl.text = Dictionary.getValue('ls_manage_learnerExpp_lbl');
+		learner_epres_cb_lbl.text = Dictionary.getValue('ls_manage_presenceEnabled_lbl');
 		
 		//Button
 		viewLearners_btn.label = Dictionary.getValue('ls_manage_learners_btn');
@@ -812,31 +820,49 @@
 			
 	}
 	
-	
-	private function toogleExpPortfolio(evt:Object) {
-		Debugger.log("Toogle Staff Selection", Debugger.GEN, "toogleStaffSelection", "WizardView");
+	private function toggleExpPortfolio(evt:Object) {
+		Debugger.log("Toggle Staff Selection", Debugger.GEN, "toggleStaffSelection", "WizardView");
 		var target:CheckBox = CheckBox(evt.target);
 		
 		var callback:Function = Proxy.create(this,confirmOutput);
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=learnerExportPortfolioAvailable&lessonID='+_root.lessonID+'&learnerExportPortfolio='+target.selected, callback, false);
 	}
 	
+	private function togglePresence(evt:Object) {
+		Debugger.log("Toggle presence", Debugger.GEN, "togglePresence", "WizardView");
+		var target:CheckBox = CheckBox(evt.target);
+		
+		var callback:Function = Proxy.create(this,confirmOutput);
+		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=presenceAvailable&lessonID='+_root.lessonID+'&presenceAvailable='+target.selected, callback, false);
+	}
 	
 	public function confirmOutput(r):Void{
 		if(r instanceof LFError) {
 				r.showErrorAlert();
 		} else {
-			if (learner_expp_cb.selected){
-				var msg:String = Dictionary.getValue('ls_confirm_expp_enabled') ;
-				LFMessage.showMessageAlert(msg);
+			if (r == "learnerExportPortfolioAvailable") {
+				if (learner_expp_cb.selected){
+					var msg:String = Dictionary.getValue('ls_confirm_expp_enabled') ;
+					LFMessage.showMessageAlert(msg);
 
-			}else {
-				var msg:String = Dictionary.getValue('ls_confirm_expp_disabled') ;
-				LFMessage.showMessageAlert(msg);
+				}else {
+					var msg:String = Dictionary.getValue('ls_confirm_expp_disabled') ;
+					LFMessage.showMessageAlert(msg);
+				}
 			}
-			
+			else if (r == "presenceAvailable") {
+				if (learner_epres_cb.selected){
+					var msg:String = Dictionary.getValue('ls_confirm_presence_enabled') ;
+					LFMessage.showMessageAlert(msg);
+
+				}else {
+					var msg:String = Dictionary.getValue('ls_confirm_presence_disabled') ;
+					LFMessage.showMessageAlert(msg);
+				}
+			}
 		}
 	}
+	
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and apply them
 	 * directly to the instance
@@ -862,14 +888,13 @@
 		
 		// Check box label
 		learner_expp_cb_lbl.setStyle('styleName', styleObj);
+		learner_epres_cb_lbl.setStyle('styleName', styleObj);
 		
-		
 		//SMALL LABELS
 		styleObj = _tm.getStyleObject('PIlabel');
 		manageDate_lbl.setStyle('styleName',styleObj);
 		manageTime_lbl.setStyle('styleName',styleObj);
 		
-		
 		//BUTTONS
 		styleObj = _tm.getStyleObject('button');
 		viewLearners_btn.setStyle('styleName',styleObj);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as
===================================================================
diff -u -r6302ea176d59ceb6316c0e707dafd5d715303c8b -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision 6302ea176d59ceb6316c0e707dafd5d715303c8b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as	(.../Wizard.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -285,12 +285,11 @@
 	public function startLesson(isScheduled:Boolean, lessonID:Number, datetime:String){
 		var callback:Function = Proxy.create(this, onStartLesson);
 		
-		if (wizardModel.resultDTO.enablePresence) {
-			Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startLesson", "Wizard");
-			//var callback:Function = Proxy.create(this, onCreateXmppRoom);
-			var roomName:String = String(lessonID) + "@conference." + _root.presenceServerUrl;
-			Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
-		}
+		//if (wizardModel.resultDTO.enablePresence) {
+		Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startLesson", "Wizard");
+		//var callback:Function = Proxy.create(this, onCreateXmppRoom);
+		var roomName:String = String(lessonID) + "@conference." + _root.presenceServerUrl;
+		Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
 		
 		if (isScheduled) {
 			Debugger.log("calling start lesson scheduled", Debugger.MED, "startLesson", "Wizard");
@@ -342,12 +341,12 @@
 		var lessonIDs:Array = wizardModel.lessonIDs;
 		var startedLessonsCount:Number = wizardModel.startedLessonsCount;
 		
-		if (wizardModel.resultDTO.enablePresence) {
-			Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleLessons", "Wizard");
-			//var callback:Function = Proxy.create(this, onCreateXmppRoom);
-			var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl;
-			Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
-		}
+		//if (wizardModel.resultDTO.enablePresence) {
+		Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleLessons", "Wizard");
+		//var callback:Function = Proxy.create(this, onCreateXmppRoom);
+		var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl;
+		Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
+
 		
 		Debugger.log("calling start lesson non-scheduled", Debugger.MED, "startMultipleLessons", "Wizard");
 		Debugger.log("monitoring/monitoring.do?method=startLesson&lessonID=" + lessonIDs[startedLessonsCount] + '&userID=' + _root.userID, Debugger.MED, "startMultipleLessons", "Wizard");
@@ -375,12 +374,11 @@
 		var startedLessonsCount:Number = wizardModel.startedLessonsCount;
 		var scheduleDateTime:String = wizardModel.resultDTO.scheduleDateTime
 		
-		if (wizardModel.resultDTO.enablePresence) {
-			Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleScheduledLessons", "Wizard");
-			//var callback:Function = Proxy.create(this, onCreateXmppRoom);
-			var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl;
-			Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
-		}
+		//if (wizardModel.resultDTO.enablePresence) {
+		Debugger.log("presence enabled, creating xmpp room", Debugger.MED, "startMultipleScheduledLessons", "Wizard");
+		//var callback:Function = Proxy.create(this, onCreateXmppRoom);
+		var roomName:String = String(lessonIDs[startedLessonsCount]) + "@conference." + _root.presenceServerUrl;
+		Application.getInstance().getComms().getRequest('Presence.do?method=createXmppRoom&xmppRoomName=' + roomName, null, false);
 		
 		Debugger.log("calling start lesson scheduled", Debugger.MED, "startMultipleScheduledLessons", "Wizard");
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=startOnScheduleLesson&lessonStartDate=' + scheduleDateTime + '&lessonID=' + lessonIDs[startedLessonsCount] + '&userID=' + _root.userID, callback);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	(.../WizardLessonDetailsView.as)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	(.../WizardLessonDetailsView.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -120,6 +120,9 @@
 		title_lbl.setStyle('styleName',styleObj);
 		desc_lbl.setStyle('styleName',styleObj);
 		schedule_cb.setStyle('styleName', styleObj);
+		learner_eliveedit_cb.setStyle('styleName', styleObj);
+		learner_enpres_cb.setStyle('styleName', styleObj);
+		learner_enim_cb.setStyle('styleName', styleObj);
 		learner_expp_cb.setStyle('styleName', styleObj);
 		date_lbl.setStyle('styleName', styleObj);
 		time_lbl.setStyle('styleName', styleObj);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	(.../WizardOrganisationView.as)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	(.../WizardOrganisationView.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -109,6 +109,7 @@
 		learner_lbl.text = Dictionary.getValue('learner_lbl');
 		staff_selAll_cb.label = Dictionary.getValue('wizard_selAll_cb_lbl');
 		learner_selAll_cb.label = Dictionary.getValue('wizard_selAll_cb_lbl');
+		learner_split_cb.label = Dictionary.getValue('wizard_splitLearners_cb_lbl');
 		
 		intervalSetupSplitLabels = setInterval(Proxy.create(this, setupSplitLabels), DATA_LOAD_CHECK_INTERVAL);
 	}
@@ -165,12 +166,15 @@
 		staff_lbl.setStyle('styleName',styleObj);
 		learner_lbl.setStyle('styleName',styleObj);
 
+		learner_split_cb.setStyle('styleName', styleObj);
+		
 		styleObj = _tm.getStyleObject('scrollpane');
 		staff_scp.setStyle('styleName',styleObj);
 		learner_scp.setStyle('styleName', styleObj);
 		
 		styleObj = _tm.getStyleObject('LightBlueTextArea');
 		splitSummary_txa.setStyle('styleName', styleObj);
+		splitSummary_txa.border_mc.setStyle('_visible',false);
 	}
 	
 	public function show(v:Boolean):Void {
Index: lams_flash/src/central/flex/BranchManager/.project
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flex/BranchManager/.project	(.../.project)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_flash/src/central/flex/BranchManager/.project	(.../.project)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -21,5 +21,10 @@
 			<type>2</type>
 			<location>D:/LAMS_HEAD/lams_monitoring/web/branching</location>
 		</link>
+		<link>
+			<name>bin-release</name>
+			<type>2</type>
+			<location>D:/LAMS_HEAD/lams_monitoring/web/branching</location>
+		</link>
 	</linkedResources>
 </projectDescription>
Index: lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml
===================================================================
diff -u -r12ff0e150f8506d554c1405e0c4d14abda72ca4c -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml	(.../BranchManager.mxml)	(revision 12ff0e150f8506d554c1405e0c4d14abda72ca4c)
+++ lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml	(.../BranchManager.mxml)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="793" height="454" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="640" height="460" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
        
     <!-- httpservices -->
     <mx:HTTPService 
@@ -405,14 +405,14 @@
 		]]>
 	</mx:Script>
 
-	<mx:DataGrid id="mainDataGrid_dg" width="185" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
+	<mx:DataGrid id="mainDataGrid_dg" width="164" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
 		<mx:columns>
 			<mx:DataGridColumn id="mainDataGridCol1_col" dataField="displayName"/>
 		</mx:columns>
 	</mx:DataGrid>
-	<mx:Tile verticalScrollPolicy="auto" id="learnerBranches_tile" right="10" top="10" bottom="48" left="203">
+	<mx:Tile verticalScrollPolicy="auto" id="learnerBranches_tile" right="10" top="10" bottom="48" left="182">
 	</mx:Tile>
-	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="203">
+	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="182">
 		<mx:Spacer width="100%"/>
 		<mx:Button id="finish_btn"/>
 		<mx:SWFLoader visible="false">
Index: lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml
===================================================================
diff -u -r12ff0e150f8506d554c1405e0c4d14abda72ca4c -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(.../GroupManager.mxml)	(revision 12ff0e150f8506d554c1405e0c4d14abda72ca4c)
+++ lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(.../GroupManager.mxml)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="793" height="454" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="640" height="460" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
        
     <!-- httpservices -->
     <mx:HTTPService 
@@ -627,14 +627,14 @@
 		]]>
 	</mx:Script>
 
-	<mx:DataGrid id="mainDataGrid_dg" width="185" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
+	<mx:DataGrid id="mainDataGrid_dg" width="164" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
 		<mx:columns>
 			<mx:DataGridColumn id="mainDataGridCol1_col" dataField="displayName"/>
 		</mx:columns>
 	</mx:DataGrid>
-	<mx:Tile verticalScrollPolicy="auto" id="learnerGroups_tile" right="10" top="10" bottom="48" left="203">
+	<mx:Tile verticalScrollPolicy="auto" id="learnerGroups_tile" right="10" top="10" bottom="48" left="182">
 	</mx:Tile>
-	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="203">
+	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="182">
 		<mx:Label id="groupFunctions_lbl"/>
 		<mx:Button id="globalAddPanel_btn" />
 		<mx:Button id="globalRemovePanel_btn" />
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(.../StringUtils.as)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(.../StringUtils.as)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -365,4 +365,50 @@
 			return Boolean(string);
 		}
 	}
+	
+	public static function correctPresenceName(s:String):String {
+		var newNick:String = new String("");
+		for (var i:Number = 0; i < s.length; i++) {
+			Debugger.log("stringUtils isANumber char at " + i + ": " + s.charCodeAt(i), Debugger.MED, "isANumber", "StringUtils");
+			var char:Number = s.charCodeAt(i);
+			if (char >= 192 && char <= 197)
+				newNick += "A";
+			else if (char == 199)
+				newNick += "C";
+			else if (char >= 200 && char <= 203)
+				newNick += "E";
+			else if (char >= 204 && char <= 207)
+				newNick += "I";
+			else if (char == 209)
+				newNick += "N";
+			else if ((char >= 210 && char <= 214) || char == 216)
+				newNick += "O";
+			else if (char >= 217 && char <= 220)
+				newNick += "U";
+			else if (char == 221)
+				newNick += "Y";
+			else if (char >= 224 && char <= 229)
+				newNick += "a";
+			else if (char == 231)
+				newNick += "c";
+			else if (char >= 232 && char <= 235)
+				newNick += "e";
+			else if (char >= 236 && char <= 239)
+				newNick += "i";
+			else if (char == 241)
+				newNick += "n";
+			else if ((char >= 242 && char <= 246) || char == 240 || char == 248)
+				newNick += "o";
+			else if (char >= 249 && char <= 252)
+				newNick += "u";
+			else if (char == 253 || char == 255)
+				newNick += "y";
+			else
+				newNick += s.charAt(i);
+				
+		}
+
+		Debugger.log("correctPresenceName originalNick: " + s + " correctedNick: " + newNick, Debugger.MED, "isANumber", "StringUtils");
+		return newNick;
+	}
 }
\ No newline at end of file
Index: lams_learning/web/includes/presence.js
===================================================================
diff -u -rcc03b1b38612cfee8da89d05ac49461d943f6878 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_learning/web/includes/presence.js	(.../presence.js)	(revision cc03b1b38612cfee8da89d05ac49461d943f6878)
+++ lams_learning/web/includes/presence.js	(.../presence.js)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -31,6 +31,51 @@
 	return str;
 }
 
+function correctPresenceName(o){
+	var s = o.nick;
+	var newNick = new String("");
+	for (var i = 0; i < s.length; i++) {
+		var char = s.charCodeAt(i);
+		if (char >= 192 && char <= 197)
+			newNick += "A";
+		else if (char == 199)
+			newNick += "C";
+		else if (char >= 200 && char <= 203)
+			newNick += "E";
+		else if (char >= 204 && char <= 207)
+			newNick += "I";
+		else if (char == 209)
+			newNick += "N";
+		else if ((char >= 210 && char <= 214) || char == 216)
+			newNick += "O";
+		else if (char >= 217 && char <= 220)
+			newNick += "U";
+		else if (char == 221)
+			newNick += "Y";
+		else if (char >= 224 && char <= 229)
+			newNick += "a";
+		else if (char == 231)
+			newNick += "c";
+		else if (char >= 232 && char <= 235)
+			newNick += "e";
+		else if (char >= 236 && char <= 239)
+			newNick += "i";
+		else if (char == 241)
+			newNick += "n";
+		else if ((char >= 242 && char <= 246) || char == 240 || char == 248)
+			newNick += "o";
+		else if (char >= 249 && char <= 252)
+			newNick += "u";
+		else if (char == 253 || char == 255)
+			newNick += "y";
+		else
+			newNick += s.charAt(i);
+	}
+	
+	o.nick = newNick;
+	return o;
+}
+
 function createElem(name, attrs, style, text) {
 	var e = document.createElement(name);
 	if (attrs) {
@@ -88,24 +133,31 @@
 		var availableUsers = [];
 		for (var i = 0; i < this.users.length; i++) {
 			if (this.users[i].status != "unavailable") {
-				availableUsers[availableUsers.length] = this.users[i];
+				availableUsers[availableUsers.length] = correctPresenceName(this.users[i]);
 			}
 		}
 		flashProxy.call("sendUsersToFlash", availableUsers);
 	}
 	else {
 		// send roster to no flash version
 		var rosterDiv = document.getElementById("roster");
-		rosterDiv.innerHTML = "";
 		this.users.sort(sortFunction);
+		var availableCount = 0;
+		
+		// so sorry about this
 		for (var i = 0; i < this.users.length; i++) {
 			if (this.users[i].status != "unavailable") {
-				var className = "unselected";
-				if (i == this.currentIndex) {
-					className = "selected";
-				}
+				availableCount++;
+			}
+		}
+		
+		var presenceString = presenceLabel + " (" + availableCount + ")";
+		rosterDiv.innerHTML = "<h5>" + presenceString + "</h5>";
+		
+		for (var i = 0; i < this.users.length; i++) {
+			if (this.users[i].status != "unavailable") {
 				var nick = this.users[i].nick;
-				var userDiv = createElem("div", {attrId:"user-" + i, attrClass:className, onClick:"selectUser(this);"}, {width:"100%", color:"#0000FF"}, this.users[i].nick);
+				var userDiv = createElem("div", {attrId:"user-" + i}, {width:"100%", color:"#0000FF"}, this.users[i].nick);
 				rosterDiv.appendChild(userDiv);
 			}
 		}
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r527645365cd6683a33c5137b2aa28bff0decf4d4 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_learning/web/mainnoflash.jsp
===================================================================
diff -u -r52209141a1a1c17a7edffe34c91e2414066d44ec -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision 52209141a1a1c17a7edffe34c91e2414066d44ec)
+++ lams_learning/web/mainnoflash.jsp	(.../mainnoflash.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -49,6 +49,7 @@
       	<c:if test="${param.presenceEnabledPatch}"> 		 
         <script type="text/javascript">
      		var HTTPBASE = "<lams:LAMSURL/>JHB";
+     		var presenceLabel = "<fmt:message key='label.presence'/>";
      		
 	    	window.onload=function(){
 				// if presence is enabled, attempt to login once the window is loaded
@@ -91,7 +92,7 @@
 		<lams:help style="small" page="learner"/>
 		</div> 
 		
-		<div id="roster" style="position: absolute; right: 18px; bottom: 0;background: #ffffff; display: none; border: 1px #000000 solid;"></div>
+		<div id="roster" style="position: absolute; width: 150px; right: 18px; bottom: 0;background: #ffffff; display: none; padding: 5px; border: 1px #000000 solid;"></div>
 		
 		<iframe onload="javascript:resizeIframe()" id="contentFrame" name="contentFrame"  frameborder="no" scrolling="yes"  src="learner.do?method=joinLesson&lessonID=<c:out value="${param.lessonID}"/>" width="100%" ></iframe>
 		<script type="text/javascript">
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -253,6 +253,48 @@
     public Boolean setLearnerPortfolioAvailable(long lessonId, Integer userId, Boolean learnerExportAvailable);
 
     /**
+     * Set whether or not the learner presence button is available in monitor.
+     * Sets it to FALSE if learnerExportAvailable is null. Checks that the user
+     * is a staff member of this lesson before updating.
+     * 
+     * @param lessonId
+     * @param userId
+     * @param learnerPresenceAvailable
+     * @return new value for learnerPresenceAvailable. Normally will be same as
+     *         input parameter, will only be different if the value cannot be
+     *         updated for some reason.
+     */
+    public Boolean setPresenceAvailable(long lessonId, Integer userId, Boolean learnerPresenceAvailable);
+
+    /**
+     * Set whether or not the learner IM button is available in monitor.
+     * Sets it to FALSE if learnerExportAvailable is null. Checks that the user
+     * is a staff member of this lesson before updating.
+     * 
+     * @param lessonId
+     * @param userId
+     * @param learnerImPresenceAvailable
+     * @return new value for learnerPresenceImAvailable. Normally will be same as
+     *         input parameter, will only be different if the value cannot be
+     *         updated for some reason.
+     */
+    public Boolean setPresenceImAvailable(long lessonId, Integer userId, Boolean learnerPresenceImAvailable);
+
+    /**
+     * Set whether or not the live edit is available in monitor.
+     * Sets it to FALSE if learnerExportAvailable is null. Checks that the user
+     * is a staff member of this lesson before updating.
+     * 
+     * @param lessonId
+     * @param userId
+     * @param liveEditEnabled
+     * @return new value for liveEditEnabled. Normally will be same as
+     *         input parameter, will only be different if the value cannot be
+     *         updated for some reason.
+     */
+    public Boolean setLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled);
+    
+    /**
      * Force Complete works on an individual user. The teacher may complete it
      * up to a particular activity, or till the end of the sequence which
      * activity id is null indicating complete to end. Note, the give activity
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -1092,6 +1092,57 @@
     }
 
     /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#setPresenceAvailable(long,
+     *      java.lang.Integer, boolean)
+     */
+    public Boolean setPresenceAvailable(long lessonId, Integer userId, Boolean presenceAvailable) {
+	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
+	if (requestedLesson == null) {
+	    throw new MonitoringServiceException("Lesson for id=" + lessonId
+		    + " is missing. Unable to set learner presence available to " + presenceAvailable);
+	}
+	checkOwnerOrStaffMember(userId, requestedLesson, "set presence available");
+	requestedLesson.setLearnerPresenceAvailable(presenceAvailable != null ? presenceAvailable
+		: Boolean.FALSE);
+	lessonDAO.updateLesson(requestedLesson);
+	return requestedLesson.getLearnerPresenceAvailable();
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#setPresenceImAvailable(long,
+     *      java.lang.Integer, boolean)
+     */
+    public Boolean setPresenceImAvailable(long lessonId, Integer userId, Boolean presenceImAvailable) {
+	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
+	if (requestedLesson == null) {
+	    throw new MonitoringServiceException("Lesson for id=" + lessonId
+		    + " is missing. Unable to set learner im to " + presenceImAvailable);
+	}
+	checkOwnerOrStaffMember(userId, requestedLesson, "set presence available");
+	requestedLesson.setLearnerImAvailable(presenceImAvailable != null ? presenceImAvailable
+		: Boolean.FALSE);
+	lessonDAO.updateLesson(requestedLesson);
+	return requestedLesson.getLearnerImAvailable();
+    }    
+   
+    /**
+     * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#setLiveEditEnabled(long,
+     *      java.lang.Integer, boolean)
+     */
+    public Boolean setLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled) {
+	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
+	if (requestedLesson == null) {
+	    throw new MonitoringServiceException("Lesson for id=" + lessonId
+		    + " is missing. Unable to set live edit enabled to " + liveEditEnabled);
+	}
+	checkOwnerOrStaffMember(userId, requestedLesson, "set live edit available");
+	requestedLesson.setLiveEditEnabled(liveEditEnabled!= null ? liveEditEnabled
+		: Boolean.FALSE);
+	lessonDAO.updateLesson(requestedLesson);
+	return requestedLesson.getLiveEditEnabled();
+    }
+    
+    /**
      * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#openGate(org.lamsfoundation.lams.learningdesign.GateActivity)
      */
     public GateActivity openGate(Long gateId) {
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r68d2988cca350af15ba4087814f74e1527a71997 -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 68d2988cca350af15ba4087814f74e1527a71997)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -914,7 +914,7 @@
 	    	Boolean learnerExportPortfolioAvailable = WebUtil.readBooleanParam(request,"learnerExportPortfolio",false); 
     		monitoringService.setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable);
     		
-    		flashMessage = new FlashMessage("learnerExportPortfolioAvailable",Boolean.TRUE);
+    		flashMessage = new FlashMessage("learnerExportPortfolioAvailable", "learnerExportPortfolioAvailable");
        	} catch (Exception e) {
 			flashMessage = handleException(e, "renameLesson", monitoringService);
 		}
@@ -923,4 +923,91 @@
         writer.println(wddxPacket);
         return null;
     }
+    
+	/**
+     * Set whether or not the presence available button is available in learner. Expects parameters lessonID
+     * and presenceAvailable.
+     */
+    public ActionForward presenceAvailable(ActionMapping mapping,
+                                     ActionForm form,
+                                     HttpServletRequest request,
+                                     HttpServletResponse response) throws IOException,
+                                                                          ServletException
+    {
+
+    	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+        FlashMessage flashMessage = null;
+    	try {
+      		Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID"));
+	    	Integer userID = getUserId();
+	    	Boolean presenceAvailable = WebUtil.readBooleanParam(request,"presenceAvailable",false); 
+    		monitoringService.setPresenceAvailable(lessonID, userID, presenceAvailable);
+
+    		flashMessage = new FlashMessage("presenceAvailable", "presenceAvailable");
+       	} catch (Exception e) {
+			flashMessage = handleException(e, "presenceAvailable", monitoringService);
+		}
+       	String wddxPacket = flashMessage.serializeMessage();
+        PrintWriter writer = response.getWriter();
+        writer.println(wddxPacket);
+        return null;
+    }
+
+	/**
+     * Set whether or not the presence available button is available in learner. Expects parameters lessonID
+     * and presenceImAvailable.
+     */
+    public ActionForward presenceImAvailable(ActionMapping mapping,
+                                     ActionForm form,
+                                     HttpServletRequest request,
+                                     HttpServletResponse response) throws IOException,
+                                                                          ServletException
+    {
+
+    	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+        FlashMessage flashMessage = null;
+    	try {
+      		Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID"));
+	    	Integer userID = getUserId();
+	    	Boolean presenceImAvailable = WebUtil.readBooleanParam(request,"presenceImAvailable",false); 
+    		monitoringService.setPresenceImAvailable(lessonID, userID, presenceImAvailable);
+    
+    		flashMessage = new FlashMessage("presenceImAvailable", "presenceImAvailable");
+       	} catch (Exception e) {
+			flashMessage = handleException(e, "presenceImAvailable", monitoringService);
+		}
+       	String wddxPacket = flashMessage.serializeMessage();
+        PrintWriter writer = response.getWriter();
+        writer.println(wddxPacket);
+        return null;
+    }
+    
+	/**
+     * Set whether or not the presence available button is available in learner. Expects parameters lessonID
+     * and presenceAvailable.
+     */
+    public ActionForward liveEditAvailable(ActionMapping mapping,
+                                     ActionForm form,
+                                     HttpServletRequest request,
+                                     HttpServletResponse response) throws IOException,
+                                                                          ServletException
+    {
+
+    	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+        FlashMessage flashMessage = null;
+    	try {
+      		Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID"));
+	    	Integer userID = getUserId();
+	    	Boolean liveEditAvailable = WebUtil.readBooleanParam(request,"liveEditAvailable",false); 
+    		monitoringService.setLiveEditEnabled(lessonID, userID, liveEditAvailable);
+    		
+    		flashMessage = new FlashMessage("liveEditAvailable", "liveEditAvailable");
+       	} catch (Exception e) {
+			flashMessage = handleException(e, "liveEditAvailable", monitoringService);
+		}
+       	String wddxPacket = flashMessage.serializeMessage();
+        PrintWriter writer = response.getWriter();
+        writer.println(wddxPacket);
+        return null;
+    }  
 }
Index: lams_monitoring/web/branching/BranchManager.swf
===================================================================
diff -u -r12ff0e150f8506d554c1405e0c4d14abda72ca4c -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_monitoring/web/branching/chosenSelection.jsp
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -84,10 +84,10 @@
 		    var MMdoctitle = document.title;
 		
 			AC_FL_RunContent(
-				"src", "playerProductInstall",
+				"src", "<lams:LAMSURL/>/monitoring/branching/playerProductInstall",
 				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-				"width", "793",
-				"height", "454",
+				"width", "640",
+				"height", "460",
 				"align", "middle",
 				"id", "BranchManager",
 				"quality", "high",
@@ -101,10 +101,10 @@
 			// if we've detected an acceptable version
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
-					"src", "BranchManager",
+					"src", "<lams:LAMSURL/>/monitoring/branching/BranchManager",
 					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-					"width", "793",
-					"height", "454",
+					"width", "640",
+					"height", "460",
 					"align", "middle",
 					"id", "BranchManager",
 					"quality", "high",
@@ -124,14 +124,14 @@
 		</script>
 		<noscript>
 		  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-					id="BranchManager" width="793" height="454"
+					id="BranchManager" width="640" height="460"
 					codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-					<param name="movie" value="BranchManager.swf" />
+					<param name="movie" value="<lams:LAMSURL/>/monitoring/branching/BranchManager.swf" />
 					<param name="quality" value="high" />
 					<param name="bgcolor" value="#869ca7" />
 					<param name="allowScriptAccess" value="sameDomain" />
-					<embed src="BranchManager.swf" quality="high" bgcolor="#869ca7"
-						width="793" height="454" name="BranchManager" align="middle"
+					<embed src="<lams:LAMSURL/>/monitoring/branching/BranchManager.swf" quality="high" bgcolor="#869ca7"
+						width="640" height="460" name="BranchManager" align="middle"
 						play="true"
 						loop="false"
 						quality="high"
Index: lams_monitoring/web/branching/viewBranches.jsp
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/web/branching/viewBranches.jsp	(.../viewBranches.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_monitoring/web/branching/viewBranches.jsp	(.../viewBranches.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -65,10 +65,10 @@
 		    var MMdoctitle = document.title;
 		
 			AC_FL_RunContent(
-				"src", "playerProductInstall",
+				"src", "<lams:LAMSURL/>/monitoring/branching/playerProductInstall",
 				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-				"width", "793",
-				"height", "454",
+				"width", "640",
+				"height", "460",
 				"align", "middle",
 				"id", "BranchManager",
 				"quality", "high",
@@ -82,10 +82,10 @@
 			// if we've detected an acceptable version
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
-					"src", "BranchManager",
+					"src", "<lams:LAMSURL/>/monitoring/branching/BranchManager",
 					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-					"width", "793",
-					"height", "454",
+					"width", "640",
+					"height", "460",
 					"align", "middle",
 					"id", "BranchManager",
 					"quality", "high",
@@ -105,14 +105,14 @@
 		</script>
 		<noscript>
 		  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-					id="BranchManager" width="793" height="454"
+					id="BranchManager" width="640" height="460"
 					codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-					<param name="movie" value="BranchManager.swf" />
+					<param name="movie" value="<lams:LAMSURL/>/monitoring/branching/BranchManager.swf" />
 					<param name="quality" value="high" />
 					<param name="bgcolor" value="#869ca7" />
 					<param name="allowScriptAccess" value="sameDomain" />
-					<embed src="BranchManager.swf" quality="high" bgcolor="#869ca7"
-						width="793" height="454" name="BranchManager" align="middle"
+					<embed src="<lams:LAMSURL/>/monitoring/branching/BranchManager.swf" quality="high" bgcolor="#869ca7"
+						width="640" height="460" name="BranchManager" align="middle"
 						play="true"
 						loop="false"
 						quality="high"
Index: lams_monitoring/web/grouping/GroupManager.swf
===================================================================
diff -u -r12ff0e150f8506d554c1405e0c4d14abda72ca4c -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -62,12 +62,6 @@
 		<p><c:out value="${description}"/></p>
 	</c:if>
 	
-	<p>&nbsp;
-		<c:if test="${not usedForBranching and maxNumberOfGroups > 0}">
-			<STRONG><fmt:message key="label.grouping.max.num.in.group.heading"/></STRONG> <c:out value="${maxNumberOfGroups}"/> 
-		</c:if>
-		<span id="message" align="right"></span></p>
-
 	<P><STRONG><fmt:message key="label.grouping.general.instructions.heading"/></STRONG> <fmt:message key="label.grouping.general.instructions.line1"/></P>
 
 	<p><fmt:message key="label.grouping.general.instructions.line2"/></p>
@@ -93,10 +87,10 @@
 		    var MMdoctitle = document.title;
 		
 			AC_FL_RunContent(
-				"src", "playerProductInstall",
+				"src", "<lams:LAMSURL/>/monitoring/grouping/playerProductInstall",
 				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-				"width", "827",
-				"height", "502",
+				"width", "640",
+				"height", "460",
 				"align", "middle",
 				"id", "LamsLessonGroupManager",
 				"quality", "high",
@@ -110,10 +104,10 @@
 			// if we've detected an acceptable version
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
-					"src", "GroupManager",
+					"src", "<lams:LAMSURL/>/monitoring/grouping/GroupManager",
 					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-					"width", "827",
-					"height", "502",
+					"width", "640",
+					"height", "460",
 					"align", "middle",
 					"id", "GroupManager",
 					"quality", "high",
@@ -132,14 +126,14 @@
 	</script>
 	<noscript>
 	  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-				id="LamsLessonGroupManager" width="827" height="502"
+				id="GroupManager" width="640" height="460"
 				codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-				<param name="movie" value="LamsLessonGroupManager.swf" />
+				<param name="movie" value="<lams:LAMSURL/>/monitoring/grouping/GroupManager.swf" />
 				<param name="quality" value="high" />
 				<param name="bgcolor" value="#ffffff" />
 				<param name="allowScriptAccess" value="sameDomain" />
-				<embed src="LamsLessonGroupManager.swf" quality="high" bgcolor="#869ca7"
-					width="827" height="502" name="LamsLessonGroupManager" align="middle"
+				<embed src="<lams:LAMSURL/>/monitoring/branching/GroupManager.swf" quality="high" bgcolor="#869ca7"
+					width="640" height="460" name="LamsLessonGroupManager" align="middle"
 					play="true"
 					loop="false"
 					quality="high"
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -redba2c28d900fba6e7bb761fb0a828aad979629e -r12450cbea53946ad074ec52d10f5e94ae207e1f9
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
@@ -64,10 +64,10 @@
 		    var MMdoctitle = document.title;
 		
 			AC_FL_RunContent(
-				"src", "playerProductInstall",
+				"src", "<lams:LAMSURL/>/monitoring/grouping/playerProductInstall",
 				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-				"width", "827",
-				"height", "502",
+				"width", "640",
+				"height", "460",
 				"align", "middle",
 				"id", "LamsLessonGroupManager",
 				"quality", "high",
@@ -81,10 +81,10 @@
 			// if we've detected an acceptable version
 			// embed the Flash Content SWF when all tests are passed
 			AC_FL_RunContent(
-					"src", "GroupManager",
+					"src", "<lams:LAMSURL/>/monitoring/grouping/GroupManager",
 					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
-					"width", "827",
-					"height", "502",
+					"width", "640",
+					"height", "460",
 					"align", "middle",
 					"id", "GroupManager",
 					"quality", "high",
@@ -103,14 +103,14 @@
 	</script>
 	<noscript>
 	  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-				id="LamsLessonGroupManager" width="827" height="502"
+				id="GroupManager" width="640" height="460"
 				codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
-				<param name="movie" value="LamsLessonGroupManager.swf" />
+				<param name="movie" value="<lams:LAMSURL/>/monitoring/grouping/GroupManager.swf" />
 				<param name="quality" value="high" />
 				<param name="bgcolor" value="#ffffff" />
 				<param name="allowScriptAccess" value="sameDomain" />
-				<embed src="LamsLessonGroupManager.swf" quality="high" bgcolor="#869ca7"
-					width="827" height="502" name="LamsLessonGroupManager" align="middle"
+				<embed src="<lams:LAMSURL/>/monitoring/branching/GroupManager.swf" quality="high" bgcolor="#869ca7"
+					width="640" height="460" name="LamsLessonGroupManager" align="middle"
 					play="true"
 					loop="false"
 					quality="high"
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rcbfac9ce613068af91c96c8d61215902e39d8abf -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rcbfac9ce613068af91c96c8d61215902e39d8abf -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_monitoring/web/lams_wizard.swf
===================================================================
diff -u -r6302ea176d59ceb6316c0e707dafd5d715303c8b -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ
Index: lams_monitoring/web/lams_wizard_library.swf
===================================================================
diff -u -r6302ea176d59ceb6316c0e707dafd5d715303c8b -r12450cbea53946ad074ec52d10f5e94ae207e1f9
Binary files differ