Merge "This is a sub-patch to add the help icon on editing pages under portfolio/pages"

htdocs/collection/edit.php

@@ -121,6 +121,7 @@ if (!empty($groupid)) {
 else {
     $smarty->assign('PAGEHEADING', SUBTITLE);
 }
+$smarty->assign('PAGEHEADING', TITLE);
 $smarty->assign_by_ref('form', $form);
 $smarty->display('collection/edit.tpl');
 

htdocs/lang/en.utf8/help/pages/view/edit.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
-<h3>Page details</h3>
-<p>Here you may give your page a title and description to give people an idea of what your page is about.</p>
-<p>You may also tag your page to make it easier to find when you search your portfolio. If you tag a page with the word "profile", then it will appear in your sidebar, making it easy for you to reach from anywhere in the system.</p>
+<h3>Edit title and description</h3>
+<p>You should give your portfolio page a unique title so that you can find it again later on. The description helps you to see quickly on the overview page why you have created this page.</p>
+<p>Furthermore, the tags help you to search your portfolio for these keywords and find your content and portfolio pages.</p>

htdocs/lang/en.utf8/help/pages/view/layout.html

+<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
+<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
+<h3>Edit layout</h3>
+<p>The layout editor is very flexible and allows you to design your layout not only in columns but also in rows. You can decide how many columns each row shall have and also decide how each row shall differ.</p>

htdocs/lang/en.utf8/help/pages/view/skin.html

+<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
+<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
+<h3>Choose skin</h3>
+<p>you can choose a skin for the page from either skins you own, your chosen favourites, and site wide available skins</p>

htdocs/lib/web.php

@@ -1996,7 +1996,7 @@ function getoptions_country() {
 function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $section='') {
     global $THEME;
 
-    return ' <span class="help"><a href="" alt="' . get_string('Helpicon') . '" onclick="'.
+    return ' <span class="help"><a href="" title="' . get_string('Helpicon') . '" onclick="'.
         hsc(
             'contextualHelp(' . json_encode($form) . ',' .
             json_encode($element) . ',' . json_encode($plugintype) . ',' .

htdocs/skin/index.php

@@ -16,7 +16,6 @@ define('SECTION_PLUGINTYPE', 'core');
 define('SECTION_PLUGINNAME', 'skin');
 define('SECTION_PAGE', 'index');
 
-
 require(dirname(dirname(__FILE__)) . '/init.php');
 require_once('skin.php');
 require_once('pieforms/pieform.php');

htdocs/theme/raw/templates/view/blocks.tpl

@@ -2,7 +2,6 @@
   {include file="viewmicroheader.tpl"}
 {else}
   {include file="header.tpl"}
-  <h1>{$viewtitle}</h1>
 {/if}
 
 {include file="view/editviewtabs.tpl" selected='content' new=$new issiteview=$issiteview}

htdocs/theme/raw/templates/view/edit.tpl

@@ -2,7 +2,6 @@
   {include file="viewmicroheader.tpl"}
 {else}
   {include file="header.tpl"}
-  <h1>{$viewtitle}</h1>
 {/if}
 
 {include file="view/editviewtabs.tpl" selected='title' new=$new issiteview=$issiteview}

htdocs/theme/raw/templates/view/layout.tpl

@@ -2,7 +2,6 @@
   {include file="viewmicroheader.tpl"}
 {else}
   {include file="header.tpl"}
-  <h1>{$viewtitle}</h1>
 {/if}
 
 {include file="view/editviewtabs.tpl" selected='layout' new=$new issiteview=$issiteview}

htdocs/view/blocks.php

@@ -273,7 +273,6 @@ if (get_config('userscanchooseviewthemes') && $view->is_themeable() && $view->ge
 }
 
 $smarty->assign('viewid', $view->get('id'));
-$smarty->assign('viewtitle', $viewtitle);
 
 if ($blockid) {
     // Configuring a single block
@@ -290,5 +289,5 @@ $smarty->assign('issiteview', isset($institution) && ($institution == 'mahara'))
 if ($view->get('owner') == "0") {
     $smarty->assign('issitetemplate', true);
 }
-
+$smarty->assign('PAGEHEADING', TITLE);
 $smarty->display('view/blocks.tpl');

htdocs/view/edit.php

@@ -247,5 +247,5 @@ if (get_config('viewmicroheaders')) {
     $smarty->assign('microheadertitle', $view->display_title(true, false, false));
 }
 $smarty->assign('issiteview', isset($institution) && ($institution == 'mahara'));
-
+$smarty->assign('PAGEHEADING', TITLE);
 $smarty->display('view/edit.tpl');

htdocs/view/layout.php

@@ -17,12 +17,21 @@ require_once('pieforms/pieform.php');
 require_once('view.php');
 require_once(get_config('libroot') . 'group.php');
 require_once(get_config('libroot') . 'layoutpreviewimage.php');
-define('TITLE', get_string('changemyviewlayout', 'view'));
+define('SECTION_PLUGINTYPE', 'core');
+define('SECTION_PLUGINNAME', 'view');
+define('SECTION_PAGE', 'layout');
 
 $id = param_integer('id');
 $new = param_boolean('new');
 $view = new View($id);
 
+if ($new) {
+  define('TITLE', get_string('changemyviewlayout', 'view'));
+}
+else {
+  define('TITLE', $view->get('title') . ': ' . get_string('changemyviewlayout', 'view'));
+}
+
 if (!$USER->can_edit_view($view)) {
     throw new AccessDeniedException();
 }
@@ -183,6 +192,7 @@ $smarty->assign('issiteview', $view->get('institution') == 'mahara');
 if ($view->get('owner') == "0") {
     $smarty->assign('issitetemplate', true);
 }
+$smarty->assign('PAGEHEADING', TITLE);
 $smarty->display('view/layout.tpl');
 
 function viewlayout_validate(Pieform $form, $values) {

htdocs/view/skin.php

@@ -16,11 +16,19 @@ require_once('pieforms/pieform.php');
 require_once('skin.php');
 require_once('view.php');
 require_once(get_config('libroot') . 'group.php');
-define('TITLE', get_string('chooseviewskin', 'skin'));
+define('SECTION_PLUGINTYPE', 'core');
+define('SECTION_PLUGINNAME', 'view');
+define('SECTION_PAGE', 'skin');
 
 $id = param_integer('id');
 $new = param_boolean('new');
 $view = new View($id);
+if ($new) {
+    define('TITLE', get_string('chooseviewskin', 'skin'));
+}
+else {
+    define('TITLE', $view->get('title') . ': ' . get_string('chooseviewskin', 'skin'));
+}
 $issiteview = $view->get('institution') == 'mahara';
 
 if (!can_use_skins(null, false, $issiteview)) {
@@ -167,7 +175,7 @@ $smarty->assign('siteskins', $siteskins);
 $smarty->assign('form', $skinform);
 $smarty->assign('viewid', $view->get('id'));
 $smarty->assign('viewtype', $view->get('type'));
-$smarty->assign('viewtitle', $view->get('title'));
+$smarty->assign('PAGEHEADING', TITLE);
 $smarty->assign('edittitle', $view->can_edit_title());
 $smarty->assign('displaylink', $displaylink);
 $smarty->assign('new', $new);