(no commit message)

diff --git a/mods/atalker/README_ATUTOR_MODULE b/mods/atalker/README_ATUTOR_MODULE
index 7d6558b..c7b57a1 100644 (file)
--- a/mods/atalker/README_ATUTOR_MODULE
+++ b/mods/atalker/README_ATUTOR_MODULE
@@ -104,10 +104,10 @@ This version of ATalker (the second version) was developed on a Linux based syst
 
        3. Enabled the ATalker module after it has been installed.
 
-       ATalker should now be available as a TTS reader for students and instructors, as a speech generation tool for Instructors ans administrators. Read on if you want to add/create a speech enabled theme.
+       ATalker should now be available as a TTS reader for students and instructors, and as a speech generation tool for Instructors and administrators. Read on if you want to add/create a speech enabled theme.
 
-
-Creating an ATalker Theme
+       
+**3.Creating an ATalker Theme**
        Optionally you can create an ATalker enabled theme, or download and install the Default ATalker theme with each of the following features already available (see below). 
 
                A) Install the ATalker theme (the ATutor default theme with speech enabled), which includes mouseover/onfocus speech, and audio feadback and error messages. See atutor.ca for the most recent version of the ATalker theme.
@@ -118,19 +118,19 @@ Creating an ATalker Theme
 
                AND/OR
 
-               B) Create your own ATalaker enabled theme. .
+               B) Create your own ATalker enabled theme. .
 
                1. To create your  own ATalker enabled theme, copy the following  Javascript into the theme/theme_name/include/header.tmpl.php file near the Jump Menu to allow users to open ATalker into a new window and have it available while navigating through ATutor. 
                
                        <script type="text/javascript" language="javascript">
                                <!--
-                                       document.write(" <a onclick=\"window.open('<?php echo $this->base_path; ?>tools/atalker/index.php?popup=1','newWin1','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,copyhistory=0,width=640,height=400')\" style=\"cursor: pointer; text-decoration:underline;\" >Open ATalker</a> |");
+                                       document.write(" <a onclick=\"window.open('<?php echo $this->base_path; ?>mods/atalker/index.php?popup=1','newWin1','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,copyhistory=0,width=640,height=400')\" style=\"cursor: pointer; text-decoration:underline;\" >Open ATalker</a> |");
                                //-->
                        </script>
        
                Or. you can just insert a link somewhere in one of the other theme templates something like 
        
-                       <a href="<?php echo $this->base_path; ?>tools/atalker/index.php?popup=1" target = "newWin1">Open ATalker</a>
+                       <a href="<?php echo $this->base_path; ?>mods/atalker/index.php?popup=1" target = "newWin1">Open ATalker</a>
                
 
 
@@ -171,7 +171,7 @@ Creating an ATalker Theme
                You can create voice files using ATalker Administrator so ATutor interface feature will read outloud.  You may want to manually create a list of language to generate speech for, then use the ATalker Administrator to create a voice for ATutor. See the administrator section in Using ATalker below. 
 
        
-**3. Using ATalker**
+**4. Using ATalker**
        The ATalker addon provides speech output utilities for ATutor, for Students, Instructors, and Administrators:
        
 *Students* (and instructors and administrators):

diff --git a/mods/atalker/admin/admin_voice.php b/mods/atalker/admin/admin_voice.php
index 76b8a74..fc23a4f 100644 (file)
--- a/mods/atalker/admin/admin_voice.php
+++ b/mods/atalker/admin/admin_voice.php
@@ -240,7 +240,7 @@
 
 if($_GET['delete']){
        if(unlink(AT_SPEECH_TEMPLATE_DIR.$_GET['delete'])){
-               $feedback = VOICE_FILE_DELETED;
+               $feedback = FILE_DELETED;
                $msg->addFeedback($feedback);
        }else{
                $error = TTS_FILE_DELETE_FAILED;

diff --git a/mods/atalker/reader_controls.php b/mods/atalker/reader_controls.php
index 71990a6..3aad4b6 100644 (file)
--- a/mods/atalker/reader_controls.php
+++ b/mods/atalker/reader_controls.php
@@ -15,7 +15,7 @@
 // insert a require statement into a script to call this file into it to display ATalker controls
 // e.g    require(AT_INCLUDE_PATH."../mods/atalker/reader_controls.php");
        $_GET['atalker_on'] = intval($_GET['atalker_on']);
-               global $_base_href;
+               global $_base_href, $_rel_url;
 
        if($_GET['atalker_on'] == '1'){ 
        
@@ -32,6 +32,10 @@
        echo '<div style="text-align:right;">';
        //global $_rel_url;
        $_rel_url_new = ltrim($_rel_url, "/");
+       if($_REQUEST['cid']){
+
+
+       }
 
        if($_rel_url == "/index.php"){