Index: lams_bb_integration/lib/bb-cms-admin.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/lib/Attic/bb-cms-admin.jar,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_bb_integration/lib/bb-platform.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/lib/Attic/bb-platform.jar,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_bb_integration/lib/bb-taglibs.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/lib/Attic/bb-taglibs.jar,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_bb_integration/web/modules/create.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/create.jsp,v
diff -u -r1.13 -r1.14
--- lams_bb_integration/web/modules/create.jsp 18 Feb 2014 12:37:22 -0000 1.13
+++ lams_bb_integration/web/modules/create.jsp 18 Feb 2014 14:39:16 -0000 1.14
@@ -66,8 +66,8 @@
-
-
+
+
Index: lams_bb_integration/web/modules/learnermonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/learnermonitor.jsp,v
diff -u -r1.13 -r1.14
--- lams_bb_integration/web/modules/learnermonitor.jsp 16 Feb 2014 17:30:09 -0000 1.13
+++ lams_bb_integration/web/modules/learnermonitor.jsp 18 Feb 2014 14:39:16 -0000 1.14
@@ -101,7 +101,7 @@
ContentDbLoader courseDocumentLoader = (ContentDbLoader) bbPm.getLoader( ContentDbLoader.TYPE );
Content courseDoc = (Content)courseDocumentLoader.loadById( contentId );
title = courseDoc.getTitle();
- description = courseDoc.getBody().getText();
+ description = courseDoc.getBody().getFormattedText();
//get lineitemid from the storage (bbContentId -> lineitemid)
PortalExtraInfo pei = PortalUtil.loadPortalExtraInfo(null, null, "LamsLineitemStorage");
@@ -161,9 +161,9 @@
<% if((description != "") && (description != null)) { %>
-
+
<%=description%>
-
+
<% } %>
<% if(isDisplayDesignImage) { %>
Index: lams_bb_integration/web/modules/modify.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/modify.jsp,v
diff -u -r1.7 -r1.8
--- lams_bb_integration/web/modules/modify.jsp 16 Feb 2014 17:30:09 -0000 1.7
+++ lams_bb_integration/web/modules/modify.jsp 18 Feb 2014 14:39:16 -0000 1.8
@@ -52,8 +52,8 @@
// Get the Item Attributes
Calendar startDate = bbContent.getStartDate();
Calendar endDate = bbContent.getEndDate();
- FormattedText desc = bbContent.getBody();
- String description = desc.getText().replaceFirst(NOT_AVAILABLE, ""); //remove the NOT_AVAILABLE substring
+ FormattedText description = bbContent.getBody();
+ //String description = desc.getText().replaceFirst(NOT_AVAILABLE, ""); //remove the NOT_AVAILABLE substring
%>
@@ -80,8 +80,8 @@
-
-
+
+
Index: lams_bb_integration/web/modules/modify_proc.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/modify_proc.jsp,v
diff -u -r1.8 -r1.9
--- lams_bb_integration/web/modules/modify_proc.jsp 18 Feb 2014 12:37:22 -0000 1.8
+++ lams_bb_integration/web/modules/modify_proc.jsp 18 Feb 2014 14:39:16 -0000 1.9
@@ -60,7 +60,7 @@
// Get the form parameters and convert into correct data types
// TODO: Use bb text area instead
String strTitle = request.getParameter("title").trim();
- String strDescription = request.getParameter("description").trim();
+ String strDescription = request.getParameter("descriptiontext").trim();
FormattedText description = new FormattedText(strDescription, FormattedText.Type.HTML);
String strIsAvailable = request.getParameter("isAvailable");
Index: lams_bb_integration/web/modules/start_lesson_proc.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/Attic/start_lesson_proc.jsp,v
diff -u -r1.11 -r1.12
--- lams_bb_integration/web/modules/start_lesson_proc.jsp 16 Feb 2014 17:30:09 -0000 1.11
+++ lams_bb_integration/web/modules/start_lesson_proc.jsp 18 Feb 2014 14:39:16 -0000 1.12
@@ -76,7 +76,7 @@
// Get the form parameters and convert into correct data types
// TODO: Use bb text area instead
String strTitle = request.getParameter("title").trim();
- String strDescription = request.getParameter("description").trim();
+ String strDescription = request.getParameter("descriptiontext").trim();
FormattedText description = new FormattedText(strDescription, FormattedText.Type.HTML);
String strSequenceID = request.getParameter("sequence_id").trim();