From a0bfbeaae8ab211f09c58d9cfb244fe054de0cf2 Mon Sep 17 00:00:00 2001 From: moodler Date: Mon, 28 Aug 2006 06:49:19 +0000 Subject: [PATCH] Integrated topicsajax into "topics" --- .../ajaxcourse-topics.js | 4 +- .../{topicsajax => topics}/commands.php | 0 course/format/topics/format.php | 27 +- course/format/topicsajax/config.php | 14 - course/format/topicsajax/format.php | 291 ------------------ 5 files changed, 28 insertions(+), 308 deletions(-) rename course/format/{topicsajax => topics}/ajaxcourse-topics.js (97%) rename course/format/{topicsajax => topics}/commands.php (100%) delete mode 100644 course/format/topicsajax/config.php delete mode 100644 course/format/topicsajax/format.php diff --git a/course/format/topicsajax/ajaxcourse-topics.js b/course/format/topics/ajaxcourse-topics.js similarity index 97% rename from course/format/topicsajax/ajaxcourse-topics.js rename to course/format/topics/ajaxcourse-topics.js index 91f08501ee9..ac0acdc4570 100644 --- a/course/format/topicsajax/ajaxcourse-topics.js +++ b/course/format/topics/ajaxcourse-topics.js @@ -153,11 +153,11 @@ main_class.prototype.mk_button = function(tag,imgSrc,attributes,imgAttributes){ } main_class.prototype.connect = function(method,urlStub,callback,body){ - if(this.debug)YAHOO.log("Making "+method+" connection to /course/format/topicsajax/commands.php?courseId="+main.portal.id+"&"+urlStub); + if(this.debug)YAHOO.log("Making "+method+" connection to /course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub); if(callback == null){ callback = {} } - return YAHOO.util.Connect.asyncRequest(method,this.portal.wwwroot+"/course/format/topicsajax/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body); + return YAHOO.util.Connect.asyncRequest(method,this.portal.wwwroot+"/course/format/topics/commands.php?courseId="+main.portal.id+"&"+urlStub,callback,body); } diff --git a/course/format/topicsajax/commands.php b/course/format/topics/commands.php similarity index 100% rename from course/format/topicsajax/commands.php rename to course/format/topics/commands.php diff --git a/course/format/topics/format.php b/course/format/topics/format.php index 1d4c5f3af28..6280ba86a9d 100644 --- a/course/format/topics/format.php +++ b/course/format/topics/format.php @@ -5,11 +5,15 @@ // the dates aren't printed - it's just an aesthetic thing for // courses that aren't so rigidly defined by time. // Included from "view.php" + require_once($CFG->dirroot.'/mod/forum/lib.php'); - + require_once($CFG->libdir.'/ajax/ajaxlib.php'); + + $topic = optional_param('topic', -1, PARAM_INT); + // Bounds for block widths define('BLOCK_L_MIN_WIDTH', 100); define('BLOCK_L_MAX_WIDTH', 210); @@ -55,6 +59,22 @@ $strmarkedthistopic = get_string('markedthistopic'); $strmoveup = get_string('moveup'); $strmovedown = get_string('movedown'); + + if (!empty($USER->ajax)){ + + // If user doesnt want AJAX, then they wont get it, + // from here everything detects $COURSE->javascriptportal + + $COURSE->javascriptportal = new jsportal(); + + print_require_js(array('yui_yahoo','yui_dom','yui_event','yui_dragdrop', 'yui_connection', + 'ajaxcourse_blocks','ajaxcourse_sections','ajaxcourse_topic')); + + //javascript logging facilities + if ($CFG->debug > 7) { + print_require_js(Array('yui_logger')); + } + } } @@ -263,5 +283,10 @@ } echo ''; + + //create javascript portal code + if (!empty($COURSE->javascriptportal)) { + $COURSE->javascriptportal->print_javascript($course->id); + } ?> diff --git a/course/format/topicsajax/config.php b/course/format/topicsajax/config.php deleted file mode 100644 index f6f39d9e01a..00000000000 --- a/course/format/topicsajax/config.php +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/course/format/topicsajax/format.php b/course/format/topicsajax/format.php deleted file mode 100644 index 431763f544a..00000000000 --- a/course/format/topicsajax/format.php +++ /dev/null @@ -1,291 +0,0 @@ -dirroot.'/mod/forum/lib.php'); - require_once($CFG->libdir.'/ajax/ajaxlib.php'); - - - $topic = optional_param('topic', -1, PARAM_INT); - - - // Bounds for block widths - define('BLOCK_L_MIN_WIDTH', 100); - define('BLOCK_L_MAX_WIDTH', 210); - define('BLOCK_R_MIN_WIDTH', 100); - define('BLOCK_R_MAX_WIDTH', 210); - - $preferred_width_left = bounded_number(BLOCK_L_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), - BLOCK_L_MAX_WIDTH); - $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), - BLOCK_R_MAX_WIDTH); - - if ($topic != -1) { - $displaysection = course_set_display($course->id, $topic); - } else { - if (isset($USER->display[$course->id])) { // for admins, mostly - $displaysection = $USER->display[$course->id]; - } else { - $displaysection = course_set_display($course->id, 0); - } - } - - if (($marker >=0) && isteacher($course->id) && confirm_sesskey()) { - $course->marker = $marker; - if (! set_field("course", "marker", $marker, "id", $course->id)) { - error("Could not mark that topic for this course"); - } - } - - $streditsummary = get_string('editsummary'); - $stradd = get_string('add'); - $stractivities = get_string('activities'); - $strshowalltopics = get_string('showalltopics'); - $strtopic = get_string('topic'); - $strgroups = get_string('groups'); - $strgroupmy = get_string('groupmy'); - $editing = $PAGE->user_is_editing(); - - if ($editing) { - $strstudents = moodle_strtolower($course->students); - $strtopichide = get_string('topichide', '', $strstudents); - $strtopicshow = get_string('topicshow', '', $strstudents); - $strmarkthistopic = get_string('markthistopic'); - $strmarkedthistopic = get_string('markedthistopic'); - $strmoveup = get_string('moveup'); - $strmovedown = get_string('movedown'); - - if (!empty($USER->use_ajax)){ - /* - * if user doesnt want AJAX, than they wont get it, - * from here everything detects $COURSE->javascriptportal - */ - - $COURSE->javascriptportal = new jsportal(); - - print_require_js(Array("yui_yahoo","yui_dom","yui_event","yui_dragdrop","yui_connection","ajaxcourse_blocks","ajaxcourse_sections","ajaxcourse_topic")); - - //javascript logging facilities - if($CFG->debug)print_require_js(Array("yui_logger")); - } - - } - - -/// Layout the whole page as three big columns. - echo ''; - -/// The left column ... - - if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) { - echo ''; - } - -/// Start main column - echo ''; - - // The right column - if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) { - echo ''; - } - - echo '
'; - blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - echo ''; - - print_heading_block(get_string('topicoutline'), 'outline'); - - echo ''; - -/// If currently moving a file then show the current clipboard - if (ismoving($course->id)) { - $stractivityclipboard = strip_tags(get_string('activityclipboard', '', addslashes($USER->activitycopyname))); - $strcancel= get_string('cancel'); - echo ''; - echo ''; - echo ''; - } - -/// Print Section 0 - - $section = 0; - $thissection = $sections[$section]; - - if ($thissection->summary or $thissection->sequence or isediting($course->id)) { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - } - - -/// Now all the normal modules by topic -/// Everything below uses "section" terminology - each "section" is a topic. - - $timenow = time(); - $section = 1; - $sectionmenu = array(); - - while ($section <= $course->numsections) { - - if (!empty($sections[$section])) { - $thissection = $sections[$section]; - - } else { - unset($thissection); - $thissection->course = $course->id; // Create a new section structure - $thissection->section = $section; - $thissection->summary = ''; - $thissection->visible = 1; - if (!$thissection->id = insert_record('course_sections', $thissection)) { - notify('Error inserting new topic!'); - } - } - - $showsection = (isteacher($course->id) or $thissection->visible or !$course->hiddensections); - - if (!empty($displaysection) and $displaysection != $section) { - if ($showsection) { - $strsummary = strip_tags(format_string($thissection->summary,true)); - if (strlen($strsummary) < 57) { - $strsummary = ' - '.$strsummary; - } else { - $strsummary = ' - '.substr($strsummary, 0, 60).'...'; - } - $sectionmenu['topic='.$section] = s($section.$strsummary); - } - $section++; - continue; - } - - if ($showsection) { - - $currenttopic = ($course->marker == $section); - - if (!$thissection->visible) { - $sectionstyle = ' hidden'; - } else if ($currenttopic) { - $sectionstyle = ' current'; - } else { - $sectionstyle = ''; - } - - echo ''; - echo ''; - - echo ''; - - echo ''; - echo ''; - } - - $section++; - } - echo '
'; - echo $stractivityclipboard.'  ('.$strcancel.')'; - echo '
 '; - - echo '
'; - $summaryformatoptions->noclean = true; - echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); - - //Accessibility: added Alt, filled empty Alt-link text. - if (isediting($course->id)) { - echo ''.$streditsummary.'

'; - } - echo '
'; - - print_section($course, $thissection, $mods, $modnamesused); - - if (isediting($course->id)) { - print_section_add_menus($course, $section, $modnames); - } - - echo '		 
'.$section.''; - if (!isteacher($course->id) and !$thissection->visible) { // Hidden for students - echo get_string('notavailable'); - } else { - echo '
'; - $summaryformatoptions->noclean = true; - echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions); - - if (isediting($course->id)) { - echo ' '. - ''.$streditsummary.'

'; - } - echo '
'; - - print_section($course, $thissection, $mods, $modnamesused); - - if (isediting($course->id)) { - print_section_add_menus($course, $section, $modnames); - } - } - echo '		'; - if ($displaysection == $section) { // Show the zoom boxes - echo ''. - ''.$strshowalltopics.'
'; - } else { - $strshowonlytopic = get_string('showonlytopic', '', $section); - echo ''. - ''.$strshowonlytopic.'
'; - } - - if (isediting($course->id)) { - if ($course->marker == $section) { // Show the "light globe" on/off - echo ''. - ''.$strmarkedthistopic.'
'; - } else { - echo ''. - ''.$strmarkthistopic.'
'; - } - - if ($thissection->visible) { // Show the hide/show eye - echo ''. - ''.$strtopichide.'
'; - } else { - echo ''. - ''.$strtopicshow.'
'; - } - - if ($section > 1) { // Add a arrow to move section up - echo ''. - ''.$strmoveup.'
'; - } - - if ($section < $course->numsections) { // Add a arrow to move section down - echo ''. - ''.$strmovedown.'
'; - } - - } - - echo '
'; - - if (!empty($sectionmenu)) { - echo '
'; - echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&', $sectionmenu, - 'sectionmenu', '', get_string('jumpto'), '', '', true); - echo '
'; - } - - - echo '		'; - blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT); - echo '
'; - - //create javascript portal code - if (!empty($COURSE->javascriptportal)) { - $COURSE->javascriptportal->print_javascript($course->id); - } - -?>