Integrated topicsajax into "topics"

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 91f08501ee9a9bae68f9a87b1686dda6985d36d8..ac0acdc457038ec5a7f454923b814461245a04e0 100644 (file)
--- 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 1d4c5f3af28710ab6bba3b0e595b56a79e756b76..6280ba86a9deaf0da40025a27a9daca9f973f9e6 100644 (file)
--- 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 '</tr></table>';
+    
+    //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 (file)
index f6f39d9..0000000
--- a/course/format/topicsajax/config.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-//
-// Optional course format configuration file
-//
-// This file contains any specific configuration settings for the 
-// format.
-//
-// The default blocks layout for this course format:
-
-    $format['defaultblocks'] = 'participants,activity_modules,search_forums,'.
-                               'admin,course_list:news_items,calendar_upcoming,'.
-                               'recent_activity';
-//
-?>
\ No newline at end of file

diff --git a/course/format/topicsajax/format.php b/course/format/topicsajax/format.php
deleted file mode 100644 (file)
index 431763f..0000000
--- a/course/format/topicsajax/format.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php // $Id$
-      // Display the whole course as "topics" made of of modules
-      // In fact, this is very similar to the "weeks" format, in that
-      // each "topic" is actually a week.  The main difference is that
-      // 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);
-    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 '<table id="layout-table" cellspacing="0"><tr>';
-
-/// The left column ...
-
-    if (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $editing) {
-        echo '<td width="'.$preferred_width_left.'" id="left-column">';
-        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT);
-        echo '</td>';
-    }
-
-/// Start main column
-    echo '<td id="middle-column">';
-
-    print_heading_block(get_string('topicoutline'), 'outline');
-
-    echo '<table class="topics" width="100%">';
-
-/// 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 '<tr class="clipboard">';
-        echo '<td colspan="3">';
-        echo $stractivityclipboard.'&nbsp;&nbsp;(<a href="mod.php?cancelcopy=true&amp;sesskey='.$USER->sesskey.'">'.$strcancel.'</a>)';
-        echo '</td>';
-        echo '</tr>';
-    }
-
-/// Print Section 0
-
-    $section = 0;
-    $thissection = $sections[$section];
-
-    if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
-        echo '<tr id="section-0" class="section main">';
-        echo '<td class="left side">&nbsp;</td>';
-        echo '<td class="content">';
-        
-        echo '<div class="summary">';
-        $summaryformatoptions->noclean = true;
-        echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
-
-        //Accessibility: added Alt, filled empty Alt-link text.
-        if (isediting($course->id)) {
-            echo '<a title="'.$streditsummary.'" '.
-                 ' href="editsection.php?id='.$thissection->id.'"><img src="'.$CFG->pixpath.'/t/edit.gif" '.
-                 ' height="11" width="11" border="0" alt="'.$streditsummary.'" /></a><br /><br />';
-        }
-        echo '</div>';
-
-        print_section($course, $thissection, $mods, $modnamesused);
-
-        if (isediting($course->id)) {
-            print_section_add_menus($course, $section, $modnames);
-        }
-
-        echo '</td>';
-        echo '<td class="right side">&nbsp;</td>';
-        echo '</tr>';
-        echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
-    }
-
-
-/// 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 '<tr id="section-'.$section.'" class="section main'.$sectionstyle.'">';
-            echo '<td class="left side">'.$section.'</td>';
-
-            echo '<td class="content">';
-            if (!isteacher($course->id) and !$thissection->visible) {   // Hidden for students
-                echo get_string('notavailable');
-            } else {
-                echo '<div class="summary">';
-                $summaryformatoptions->noclean = true;
-                echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
-
-                if (isediting($course->id)) {
-                    echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/edit.gif" border="0" height="11" width="11" alt="'.$streditsummary.'" /></a><br /><br />';
-                }
-                echo '</div>';
-
-                print_section($course, $thissection, $mods, $modnamesused);
-
-                if (isediting($course->id)) {
-                    print_section_add_menus($course, $section, $modnames);
-                }
-            }
-            echo '</td>';
-
-            echo '<td class="right side">';
-            if ($displaysection == $section) {      // Show the zoom boxes
-                echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
-                     '<img src="'.$CFG->pixpath.'/i/all.gif" height="25" width="16" border="0" alt="'.$strshowalltopics.'" /></a><br />';
-            } else {
-                $strshowonlytopic = get_string('showonlytopic', '', $section);
-                echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
-                     '<img src="'.$CFG->pixpath.'/i/one.gif" height="16" width="16" border="0" alt="'.$strshowonlytopic.'" /></a><br />';
-            }
-
-            if (isediting($course->id)) {
-                if ($course->marker == $section) {  // Show the "light globe" on/off
-                    echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/marked.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkedthistopic.'" /></a><br />';
-                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strmarkthistopic.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/marker.gif" vspace="3" height="16" width="16" border="0" alt="'.$strmarkthistopic.'" /></a><br />';
-                }
-
-                if ($thissection->visible) {        // Show the hide/show eye
-                    echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopichide.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/hide.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopichide.'" /></a><br />';
-                } else {
-                    echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.$USER->sesskey.'#section-'.$section.'" title="'.$strtopicshow.'">'.
-                         '<img src="'.$CFG->pixpath.'/i/show.gif" vspace="3" height="16" width="16" border="0" alt="'.$strtopicshow.'" /></a><br />';
-                }
-
-                if ($section > 1) {                       // Add a arrow to move section up
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.$USER->sesskey.'#section-'.($section-1).'" title="'.$strmoveup.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/up.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a><br />';
-                }
-
-                if ($section < $course->numsections) {    // Add a arrow to move section down
-                    echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.$USER->sesskey.'#section-'.($section+1).'" title="'.$strmovedown.'">'.
-                         '<img src="'.$CFG->pixpath.'/t/down.gif" vspace="3" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a><br />';
-                }
-
-            }
-
-            echo '</td></tr>';
-            echo '<tr class="section separator"><td colspan="3" class="spacer"></td></tr>';
-        }
-
-        $section++;
-    }
-    echo '</table>';
-
-    if (!empty($sectionmenu)) {
-        echo '<div align="center" class="jumpmenu">';
-        echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;', $sectionmenu,
-                   'sectionmenu', '', get_string('jumpto'), '', '', true);
-        echo '</div>';
-    }
-
-
-    echo '</td>';
-
-    // The right column
-    if (blocks_have_content($pageblocks, BLOCK_POS_RIGHT) || $editing) {
-        echo '<td width="'.$preferred_width_right.'" id="right-column">';
-        blocks_print_group($PAGE, $pageblocks, BLOCK_POS_RIGHT);
-        echo '</td>';
-    }
-
-    echo '</tr></table>';
-    
-    //create javascript portal code
-    if (!empty($COURSE->javascriptportal)) {
-        $COURSE->javascriptportal->print_javascript($course->id);
-    }
-
-?>