Merge "Bug 1886727: Updating manual and github links"

htdocs/lib/manualhelp.php

@@ -151,6 +151,7 @@ $manual_link_map = array(
     "configextensions|cleanurls" => "administration/extensions.html#clean-urls",
     "configextensions|filters" => "administration/extensions.html#html-filters",
     "configextensions|frameworks" => "administration/smartevidence.html#smartevidence-admin",
+    "configextensions|frameworks|uploadmatrix" => "administration/smartevidence_import.html",
     "configextensions|frameworks|frameworkmanager" => "administration/smartevidence.html#smartevidence-admin", // Need to point to new place once created
     "configextensions|iframesites" => "administration/extensions.html#allowed-iframe-sources",
     "configextensions|pluginadmin|plugins" => "administration/extensions.html",

htdocs/module/framework/frameworks.php

@@ -63,10 +63,15 @@ function import_matrix_file_section() {
     define('SUBSECTIONHEADING', get_string('upload'));
     $active_tab = 'import';
     $form = upload_matrix_form();
+    $helplink = get_manual_help_link_array(array('configextensions','frameworks','uploadmatrix'));
+    $manuallink = $helplink['prefix'] .'/'.  $helplink['language'] . '/' . $helplink['version'] . '/' .  $helplink['suffix'];
+    $branchname = $helplink['version'] . "_STABLE";
     $smarty = smarty();
     setpageicon($smarty, 'icon-th');
     $smarty->assign('wwwroot', get_config('wwwroot'));
     $smarty->assign('SUBPAGENAV', PluginModuleFramework::submenu_items($active_tab));
+    $smarty->assign('branchname', $branchname);
+    $smarty->assign('manuallink', $manuallink);
     $smarty->assign('form', $form);
     $smarty->display('module:framework:uploadframework.tpl');
     exit;

htdocs/module/framework/lang/en.utf8/module.framework.php

@@ -50,7 +50,7 @@ $string['partialcomplete'] = 'Partially meets the standard';
 $string['completed'] = 'Meets the standard';
 $string['usedincollections'] = 'Used in collections';
 $string['selfassess'] = 'Self-assess';
-$string['uploadframeworkdesc1'] = 'Upload a JSON encoded .matrix file. See the <a href="https://git.mahara.org/mahara/mahara/blob/16.10_STABLE/test/behat/upload_files/example.matrix">Mahara git repository</a> for an example of the markup and the <a href="https://manual.mahara.org/en/16.10/administration/smartevidence.html#create-a-framework-file">Mahara manual</a> for an explanation of the individual components.';
+$string['uploadframeworkdesc2'] = 'Upload a JSON encoded .matrix file. See the <a href="https://git.mahara.org/mahara/mahara/-/blob/%s/test/behat/upload_files/example.matrix">Mahara git repository</a> for an example of the markup and the <a href="%s">Mahara manual</a> for an explanation of the individual components.';
 $string['savematrix'] = 'Upload matrix';
 $string['frameworkmissing'] = 'Framework not found';
 $string['activeframework'] = 'Active framework';

htdocs/theme/raw/plugintype/module/framework/templates/uploadframework.tpl

 {include file="header.tpl"}
 
-<p>{str tag="uploadframeworkdesc1" section="module.framework"}</p>
+<p>{str tag="uploadframeworkdesc2" section="module.framework" arg1 = $branchname arg2 = $manuallink}</p>
 
      {$form|safe}