Index: lams_central/conf/flashxml/lams/defaultTheme.xml
===================================================================
diff -u -r12450cbea53946ad074ec52d10f5e94ae207e1f9 -re47890c32f932fde18be28fe3f8cedbd781a5219
--- lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision 12450cbea53946ad074ec52d10f5e94ae207e1f9)
+++ lams_central/conf/flashxml/lams/defaultTheme.xml (.../defaultTheme.xml) (revision e47890c32f932fde18be28fe3f8cedbd781a5219)
@@ -1 +1 @@
-0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaTAPanelSelected0x1B6BA7redLabel0xFF0000 12 VerdanaboldTAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000IndexBar0x1647BEIndexButtonTahoma12IndexTextFieldTahoma120x333333progressBar0xEAF9FF0x0033660xC4D6FF0x003366branchingDiagram0x0000000x0000000xCC0000BlueTextArea0xC2D5FELightBlueTextArea0x669BF2None
\ No newline at end of file
+0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaTAPanelSelected0x1B6BA7redLabel0xFF0000 12 VerdanaboldTAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000IndexBar0x1647BEIndexButtonTahoma12IndexTextFieldTahoma120x333333progressBar0xEAF9FF0x0033660xC4D6FF0x003366branchingDiagram0x0000000x0000000xCC0000BlueTextArea0xC2D5FELightBlueTextArea0x669BF2NoneToolTip0xF5EFC00x666666Verdana90x333333ToolTipShadowVerdana90xECE9D8
\ No newline at end of file
Index: lams_central/conf/flashxml/rams/defaultTheme.xml
===================================================================
diff -u -ra9a7abb38e9856ba77cfb56c8106d3a379a4bc70 -re47890c32f932fde18be28fe3f8cedbd781a5219
--- lams_central/conf/flashxml/rams/defaultTheme.xml (.../defaultTheme.xml) (revision a9a7abb38e9856ba77cfb56c8106d3a379a4bc70)
+++ lams_central/conf/flashxml/rams/defaultTheme.xml (.../defaultTheme.xml) (revision e47890c32f932fde18be28fe3f8cedbd781a5219)
@@ -1 +1 @@
-0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000IndexBar0xFFAA55IndexButtonTahoma12IndexTextFieldTahoma120x333333
\ No newline at end of file
+0x33364810Verdana0x669BF20x669BF20x669BF2insetdefaultbutton0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBF0x669BF2label0x33364812VerdanaPIlabel0x33364810VerdanaCALabel0x33364811VerdananoneEndGatelabel0x3336487VerdanaLFWindow0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFinsettreeview0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticdatagrid0x33364814Verdana0xBFFFBF0xBFFFBF0xBFFFBFElasticcombo0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFpicombo0x3336489Verdana0xBFFFBF0xBFFFBF0xBFFFBFLFMenuBar0x33364811Verdana0xBFFFBF0xBFFFBF0xBFFFBFBGPaneloutset0xC2D5FEFlowPanelnone0xC2D5FEWZPaneloutset0xDBE6FDMHPanelnone0xDBE6FDTAPaneloutset0xC2D5FE0x000000scrollpane0x669BF2textarea0x333648Verdana10CanvasPanel0xFCFCFCACTPanelNone0xC2D5FEACTPanel0None0xE1E7E7ACTPanel1None0xC2D5FEACTPanel2None0xFFFDBEACTPanel3None0xDDFCB1ACTPanel4None0xFFEEC8ACTPanel5None0xE9E2F5OptActContainerPanelinset0x25a56fOptActPanelnone0xd8ffefparallelHeadPaneloutset0x4684F7OptHeadPaneloutset0x4684F7ACTPanelNegativeNone0x000000smallLabel0x333648 10 VerdanaredLabel0xFF0000 12 VerdanaboldTAPanelSelected0x1B6BA7TAPanelRollover0xFFFFFFoutsetBGPanelShadow0xAFC8FFCAHighlightBorder0x266DEELTVLearnerText0x555555Verdana11bold0xE7EEFEsolidAboutDialogScpGeneralItem0x66666611VerdanaAboutDialogScpHeaderItem0x66666611VerdanaboldAboutDialogPanel0xFFFFFFnoneAlertDialog1000100010001000IndexBar0xFFAA55IndexButtonTahoma12IndexTextFieldTahoma120x333333ToolTip0xF5EFC00x666666Verdana90x333333ToolTipShadowVerdana90xECE9D8
\ No newline at end of file
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -re47890c32f932fde18be28fe3f8cedbd781a5219
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9 -re47890c32f932fde18be28fe3f8cedbd781a5219
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -re47890c32f932fde18be28fe3f8cedbd781a5219
--- lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision e47890c32f932fde18be28fe3f8cedbd781a5219)
@@ -57,7 +57,7 @@
public Long licenseID; // applicable for designs only
public String licenseText; // applicable for designs only
public Boolean readOnly; // applicable for designs only
-
+ public String author;
public FolderContentDTO(){
}
@@ -91,6 +91,7 @@
this.licenseText = design.getLicenseText();
this.versionDetails = null;
this.readOnly = design.getReadOnly();
+ this.author = design.getUser().getFullName();
}
public FolderContentDTO(WorkspaceFolder workspaceFolder, Integer permissionCode, User user){
this.name = workspaceFolder.getName();
@@ -211,6 +212,14 @@
this.readOnly = readOnly;
}
+ public String getAuthor() {
+ return this.author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
private String formatLastModifiedDateTime(TimeZone tz) {
if(this.lastModifiedDateTime != null) {
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r677c3d71981725a19d0a201f994cb9bc38440a20 -re47890c32f932fde18be28fe3f8cedbd781a5219
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36 -re47890c32f932fde18be28fe3f8cedbd781a5219
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rc5cee0ea97fcdbe30b44fc46b94bd34968e94a36 -re47890c32f932fde18be28fe3f8cedbd781a5219
Binary files differ