1. fix the problem of exporting CC with remote URL defined for adapted content;

2. allow download of CC & CP on each content page for instructors

diff --git a/docs/home/classes/ContentUtility.class.php b/docs/home/classes/ContentUtility.class.php
index 2b8ac93..fdc3b0f 100644 (file)
--- a/docs/home/classes/ContentUtility.class.php
+++ b/docs/home/classes/ContentUtility.class.php
@@ -581,9 +581,13 @@ class ContentUtility {
                          || (isset($_current_user) && $_current_user->isAuthor($_course_id))) {\r
                \r
                        $tool_shortcuts[] = array(\r
-                                 'title' => _AT('export_content'), \r
-                                 'url' => $_base_href . 'home/imscc/ims_export.php?_cid='.$content_row['content_id'],\r
-                                 'icon' => $_base_href . 'images/download.png');\r
+                                 'title' => _AT('export_content_in_cp'), \r
+                                 'url' => $_base_href . 'home/ims/ims_export.php?_cid='.$content_row['content_id'],\r
+                                 'icon' => $_base_href . 'themes/'.$_SESSION['prefs']['PREF_THEME'].'/images/export.png');\r
+                       $tool_shortcuts[] = array(\r
+                                 'title' => _AT('export_content_in_cc'), \r
+                                 'url' => $_base_href . 'home/imscc/ims_export.php?_cid='.$content_row['content_id'].'&to_a4a=1',\r
+                                 'icon' => $_base_href . 'themes/'.$_SESSION['prefs']['PREF_THEME'].'/images/export_cc.png');\r
                }\r
                \r
                if (isset($_current_user) && $_current_user->isAuthor($_course_id)) {\r

diff --git a/docs/images/download.png b/docs/images/download.png
deleted file mode 100644 (file)
index 7e6636e..0000000
Binary files a/docs/images/download.png and /dev/null differ

diff --git a/docs/include/classes/A4a/A4aExport.class.php b/docs/include/classes/A4a/A4aExport.class.php
index f7c12a5..cd03074 100644 (file)
--- a/docs/include/classes/A4a/A4aExport.class.php
+++ b/docs/include/classes/A4a/A4aExport.class.php
@@ -138,7 +138,7 @@ class A4aExport extends A4a {
                                        foreach($resource['resource_type'][$uri] as $type_id){
                                                $orig_access_mode[] = $this->getResourceNameById($type_id);
                                                $savant->assign('orig_access_mode', $orig_access_mode);
-                                               $xml_array[$id.' to '.$uri] = $savant->fetch(TR_INCLUDE_PATH.'classes/A4a/A4a.tmpl.php');
+                                               $xml_array[$id.' to '.$uri][] = $savant->fetch(TR_INCLUDE_PATH.'classes/A4a/A4a.tmpl.php');
                                        }
                                }
                        } else {