Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v diff -u -r1.97.2.10 -r1.97.2.11 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 11 May 2016 07:08:00 -0000 1.97.2.10 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 28 Feb 2017 05:15:19 -0000 1.97.2.11 @@ -1032,7 +1032,6 @@ activity.setActivityUIID(activityUIID); activity.setDescription((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.DESCRIPTION)); activity.setTitle((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.ACTIVITY_TITLE)); - activity.setHelpText((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.HELP_TEXT)); activity.setXcoord(getCoord(activityDetails, AuthoringJsonTags.XCOORD)); activity.setYcoord(getCoord(activityDetails, AuthoringJsonTags.YCOORD)); Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml,v diff -u -r1.58.2.6 -r1.58.2.7 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 23 Nov 2015 11:49:54 -0000 1.58.2.6 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 28 Feb 2017 05:15:40 -0000 1.58.2.7 @@ -36,10 +36,6 @@ @hibernate.property column="title" length="255" - - - @hibernate.property column="help_text" length="65535" - @hibernate.property column="xcoord" length="11" Index: lams_common/db/sql/create_lams_11_tables.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/create_lams_11_tables.sql,v diff -u -r1.167.2.3 -r1.167.2.4 --- lams_common/db/sql/create_lams_11_tables.sql 27 Feb 2017 14:00:08 -0000 1.167.2.3 +++ lams_common/db/sql/create_lams_11_tables.sql 28 Feb 2017 05:15:40 -0000 1.167.2.4 @@ -419,7 +419,6 @@ , activity_ui_id INT(11) , description TEXT , title VARCHAR(255) - , help_TEXT TEXT , xcoord INT(11) , ycoord INT(11) , parent_activity_id BIGINT(20) Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Attic/patch3000001.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql 27 Feb 2017 14:00:09 -0000 1.1.2.1 +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch3000001.sql 28 Feb 2017 05:15:39 -0000 1.1.2.2 @@ -24,6 +24,7 @@ ALTER TABLE lams_learning_activity DROP COLUMN define_later_flag, DROP COLUMN run_offline_flag, + DROP COLUMN help_text, MODIFY COLUMN readonly TINYINT(1), MODIFY COLUMN initialised TINYINT(1), MODIFY COLUMN stop_after_activity TINYINT(1); Index: lams_tool_assessment/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/activity_insert.sql,v diff -u -r1.3.2.2 -r1.3.2.3 --- lams_tool_assessment/db/sql/activity_insert.sql 27 Feb 2017 14:00:21 -0000 1.3.2.2 +++ lams_tool_assessment/db/sql/activity_insert.sql 28 Feb 2017 05:15:41 -0000 1.3.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Assessment' , 'Assessment' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_bbb/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/activity_insert.sql,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_bbb/db/sql/activity_insert.sql 27 Feb 2017 14:00:22 -0000 1.4.2.3 +++ lams_tool_bbb/db/sql/activity_insert.sql 28 Feb 2017 05:15:31 -0000 1.4.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'A web conferencig tool using Big Blue Button.' , 'Web Conferencing' -, 'Web Conferencing help' , 1 , 2 , 0 Index: lams_tool_chat/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/db/sql/activity_insert.sql,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_tool_chat/db/sql/activity_insert.sql 27 Feb 2017 14:00:26 -0000 1.5.2.3 +++ lams_tool_chat/db/sql/activity_insert.sql 28 Feb 2017 05:15:27 -0000 1.5.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Chat Tool' , 'Chat Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_daco/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/db/sql/activity_insert.sql,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_daco/db/sql/activity_insert.sql 27 Feb 2017 14:00:11 -0000 1.5.2.2 +++ lams_tool_daco/db/sql/activity_insert.sql 28 Feb 2017 05:15:22 -0000 1.5.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Collecting data with custom structure.' , 'Data Collection' -, 'Asking questions with custom, limited answers.' , 1 , 2 , 0 Index: lams_tool_forum/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/activity_insert.sql,v diff -u -r1.13.2.3 -r1.13.2.4 --- lams_tool_forum/db/sql/activity_insert.sql 27 Feb 2017 14:00:12 -0000 1.13.2.3 +++ lams_tool_forum/db/sql/activity_insert.sql 28 Feb 2017 05:15:36 -0000 1.13.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Forum/Message Board' , 'Forum' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_gmap/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/db/sql/activity_insert.sql,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_gmap/db/sql/activity_insert.sql 27 Feb 2017 14:00:06 -0000 1.3.2.3 +++ lams_tool_gmap/db/sql/activity_insert.sql 28 Feb 2017 05:15:38 -0000 1.3.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Gmap Tool' , 'Gmap Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_images/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_images/db/sql/activity_insert.sql 27 Feb 2017 14:00:36 -0000 1.2.2.2 +++ lams_tool_images/db/sql/activity_insert.sql 28 Feb 2017 05:15:20 -0000 1.2.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'ImageGallery' , 'ImageGallery' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_imscc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_imscc/db/sql/activity_insert.sql 27 Feb 2017 14:00:32 -0000 1.2.2.2 +++ lams_tool_imscc/db/sql/activity_insert.sql 28 Feb 2017 05:15:31 -0000 1.2.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'CommonCartridge' , 'CommonCartridge' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_kaltura/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/db/sql/activity_insert.sql,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_kaltura/db/sql/activity_insert.sql 27 Feb 2017 14:00:19 -0000 1.3.2.3 +++ lams_tool_kaltura/db/sql/activity_insert.sql 28 Feb 2017 05:15:28 -0000 1.3.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Kaltura Tool' , 'Kaltura Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_lamc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/activity_insert.sql,v diff -u -r1.17.2.3 -r1.17.2.4 --- lams_tool_lamc/db/sql/activity_insert.sql 27 Feb 2017 14:00:18 -0000 1.17.2.3 +++ lams_tool_lamc/db/sql/activity_insert.sql 28 Feb 2017 05:15:41 -0000 1.17.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Allows creation and use of multiple choice questioning format' , 'Multiple Choice Questions' -, 'Help text' , 1 , 2 , 0 Index: lams_tool_laqa/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/activity_insert.sql,v diff -u -r1.20.2.3 -r1.20.2.4 --- lams_tool_laqa/db/sql/activity_insert.sql 27 Feb 2017 14:00:17 -0000 1.20.2.3 +++ lams_tool_laqa/db/sql/activity_insert.sql 28 Feb 2017 05:15:37 -0000 1.20.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Allows creation and use of question and answer format' , 'Question and Answer' -, 'Help text' , 1 , 2 , 0 Index: lams_tool_larsrc/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/db/sql/activity_insert.sql,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_larsrc/db/sql/activity_insert.sql 27 Feb 2017 14:00:02 -0000 1.5.2.2 +++ lams_tool_larsrc/db/sql/activity_insert.sql 28 Feb 2017 05:15:25 -0000 1.5.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Share Resources' , 'Share Resources' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_leader/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/db/sql/activity_insert.sql,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_leader/db/sql/activity_insert.sql 27 Feb 2017 14:00:03 -0000 1.2.2.3 +++ lams_tool_leader/db/sql/activity_insert.sql 28 Feb 2017 05:15:35 -0000 1.2.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Leaderselection Tool' , 'Leaderselection Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_mindmap/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/activity_insert.sql,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_mindmap/db/sql/activity_insert.sql 27 Feb 2017 14:00:35 -0000 1.2.2.3 +++ lams_tool_mindmap/db/sql/activity_insert.sql 28 Feb 2017 05:15:33 -0000 1.2.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Mindmap Tool' , 'Mindmap Tool' -, 'Mindmap Tool for creating mindmaps.' , 1 , 2 , 0 Index: lams_tool_nb/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/activity_insert.sql,v diff -u -r1.19.2.3 -r1.19.2.4 --- lams_tool_nb/db/sql/activity_insert.sql 27 Feb 2017 14:00:33 -0000 1.19.2.3 +++ lams_tool_nb/db/sql/activity_insert.sql 28 Feb 2017 05:15:24 -0000 1.19.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Displays a NoticeboardX' , 'NoticeboardX' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_notebook/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/activity_insert.sql,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_notebook/db/sql/activity_insert.sql 27 Feb 2017 14:00:37 -0000 1.4.2.3 +++ lams_tool_notebook/db/sql/activity_insert.sql 28 Feb 2017 05:15:44 -0000 1.4.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Notebook Tool' , 'Notebook Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_pixlr/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/db/sql/activity_insert.sql,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_pixlr/db/sql/activity_insert.sql 27 Feb 2017 14:00:28 -0000 1.3.2.3 +++ lams_tool_pixlr/db/sql/activity_insert.sql 28 Feb 2017 05:15:30 -0000 1.3.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Pixlr Tool' , 'Pixlr Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_preview/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/db/sql/activity_insert.sql,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_preview/db/sql/activity_insert.sql 27 Feb 2017 14:00:14 -0000 1.1.2.2 +++ lams_tool_preview/db/sql/activity_insert.sql 28 Feb 2017 05:15:32 -0000 1.1.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Peerreview' , 'Peerreview' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_sbmt/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/activity_insert.sql,v diff -u -r1.15.2.3 -r1.15.2.4 --- lams_tool_sbmt/db/sql/activity_insert.sql 27 Feb 2017 14:00:04 -0000 1.15.2.3 +++ lams_tool_sbmt/db/sql/activity_insert.sql 28 Feb 2017 05:15:42 -0000 1.15.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Uploading of files by learners, for review by teachers.' , 'Submit File' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_scratchie/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_scratchie/db/sql/activity_insert.sql 27 Feb 2017 14:00:15 -0000 1.2.2.2 +++ lams_tool_scratchie/db/sql/activity_insert.sql 28 Feb 2017 05:15:26 -0000 1.2.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Scratchie' , 'Scratchie' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_scribe/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/activity_insert.sql,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_scribe/db/sql/activity_insert.sql 27 Feb 2017 14:00:31 -0000 1.3.2.3 +++ lams_tool_scribe/db/sql/activity_insert.sql 28 Feb 2017 05:15:21 -0000 1.3.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Scribe Tool' , 'Scribe Tool' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_spreadsheet/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_spreadsheet/db/sql/activity_insert.sql 27 Feb 2017 14:00:38 -0000 1.2.2.2 +++ lams_tool_spreadsheet/db/sql/activity_insert.sql 28 Feb 2017 05:15:34 -0000 1.2.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Spreadsheet' , 'Spreadsheet' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_survey/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/activity_insert.sql,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_survey/db/sql/activity_insert.sql 27 Feb 2017 14:00:00 -0000 1.5.2.2 +++ lams_tool_survey/db/sql/activity_insert.sql 28 Feb 2017 05:15:43 -0000 1.5.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Survey' , 'Survey' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_task/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/activity_insert.sql,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_tool_task/db/sql/activity_insert.sql 27 Feb 2017 14:00:10 -0000 1.2.2.2 +++ lams_tool_task/db/sql/activity_insert.sql 28 Feb 2017 05:15:37 -0000 1.2.2.3 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'TaskList' , 'TaskList' -, 'Put some help text here.' , 1 , 2 , 0 Index: lams_tool_wiki/db/sql/activity_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/activity_insert.sql,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_wiki/db/sql/activity_insert.sql 27 Feb 2017 14:00:30 -0000 1.3.2.3 +++ lams_tool_wiki/db/sql/activity_insert.sql 28 Feb 2017 05:15:22 -0000 1.3.2.4 @@ -2,7 +2,6 @@ ( description , title -, help_text , learning_activity_type_id , grouping_support_type_id , apply_grouping_flag @@ -17,7 +16,6 @@ ( 'Wiki Tool' , 'Wiki Tool' -, 'Put some help text here.' , 1 , 2 , 0