Move page help icons to appear next to page titles

htdocs/account/activity/index.php

@@ -163,5 +163,6 @@ $smarty->assign('markdel', 'markread(document.notificationlist, \'del\'); return
 $smarty->assign('typechange', 'activitylist.doupdate({\'type\':this.options[this.selectedIndex].value});');
 $smarty->assign('types', $types);
 $smarty->assign('INLINEJAVASCRIPT', $javascript);
+$smarty->assign('heading', get_string('notifications'));
 $smarty->display('account/activity/index.tpl');
 ?>

htdocs/account/activity/preferences/index.php

@@ -97,6 +97,7 @@ $prefsform = array(
 $smarty = smarty();
 $smarty->assign('prefsdescr', get_string('prefsdescr', 'activity'));
 $smarty->assign('form', pieform($prefsform));
+$smarty->assign('heading', get_string('activityprefs'));
 $smarty->display('account/activity/preferences/index.tpl');
 
 function activityprefs_submit(Pieform $form, $values) {

htdocs/account/index.php

@@ -417,6 +417,7 @@ function clearPasswords(form, data) {
         $('accountprefs_password2').value = '';
     }
 }");
+$smarty->assign('heading', get_string('preferences'));
 $smarty->display('account/index.tpl');
 
 

htdocs/admin/extensions/pluginconfig.php

@@ -83,6 +83,11 @@ $smarty->assign('form', pieform($form));
 $smarty->assign('plugintype', $plugintype);
 $smarty->assign('pluginname', $pluginname);
 $smarty->assign('type', $type);
+$heading = get_string('pluginadmin', 'admin') . ': ' . $plugintype . ': ' . $pluginname;
+if ($type) {
+    $heading .= ': ' . $type;
+}
+$smarty->assign('heading', $heading);
 $smarty->display('admin/extensions/pluginconfig.tpl');
 
 

htdocs/admin/extensions/plugins.php

@@ -188,6 +188,7 @@ $smarty = smarty();
 $smarty->assign('INLINEJAVASCRIPT', $javascript);
 $smarty->assign('plugins', $plugins);
 $smarty->assign('installlink', 'installplugin');
+$smarty->assign('heading', get_string('pluginadmin', 'admin'));
 $smarty->display('admin/extensions/plugins.tpl');
 
 ?>

htdocs/admin/site/files.php

@@ -52,6 +52,7 @@ $smarty = smarty(array('tablerenderer',
                        'artefact/file/js/file.js'));
 $smarty->assign('INLINEJAVASCRIPT', $javascript);
 $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
+$smarty->assign('heading', get_string('adminfiles', 'admin'));
 $smarty->display('admin/site/files.tpl');
 
 ?>

htdocs/admin/site/menu.php

@@ -277,6 +277,7 @@ $smarty = smarty(array(), array($style));
 $smarty->assign('INLINEJAVASCRIPT', $ijs);
 $smarty->assign('MENUS', $menulist);
 $smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/files.php">', '</a>'));
+$smarty->assign('heading', get_string('linksandresourcesmenu', 'admin'));
 $smarty->display('admin/site/menu.tpl');
 
 ?>

htdocs/admin/site/pages.php

@@ -91,6 +91,7 @@ function editsitepage_submit(Pieform $form, $values) {
 
 $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('discardpageedits')));
 $smarty->assign('pageeditform', $form);
+$smarty->assign('heading', get_string('editsitepages', 'admin'));
 $smarty->display('admin/site/pages.tpl');
 
 ?>

htdocs/admin/users/admins.php

@@ -79,6 +79,7 @@ function adminusers_submit(Pieform $form, $values) {
 }
 
 $smarty->assign('adminusersform', pieform($form));
+$smarty->assign('heading', get_string('adminusers', 'admin'));
 $smarty->display('admin/users/admin.tpl');
 
 ?>

htdocs/admin/users/institutions.php

@@ -401,6 +401,7 @@ function institution_cancel_submit() {
     redirect('/admin/users/institutions.php');
 }
 
+$smarty->assign('heading', get_string('admininstitutions', 'admin'));			
 $smarty->display('admin/users/institutions.tpl');
 
 ?>

htdocs/admin/users/notifications.php

@@ -87,6 +87,7 @@ if ($userinstitutions) {
 $smarty = smarty();
 $smarty->assign('users', $users);
 $smarty->assign('types', $types);
+$smarty->assign('heading', get_string('adminnotifications', 'admin'));
 $smarty->display('admin/users/notifications.tpl');
 
 

htdocs/admin/users/search.php

@@ -58,6 +58,7 @@ $smarty->assign('search', $search);
 $smarty->assign('alphabet', explode(',', get_string('alphabet')));
 $smarty->assign('institutions', $institutions);
 $smarty->assign('results', build_admin_user_search_results($search, $offset, $limit, $sortby, $sortdir));
+$smarty->assign('heading', get_string('usersearch', 'admin'));
 $smarty->display('admin/users/search.tpl');
 
 ?>

htdocs/admin/users/staff.php

@@ -76,6 +76,7 @@ function staffusers_submit(Pieform $form, $values) {
 }
 
 $smarty->assign('staffusersform', pieform($form));
+$smarty->assign('heading', get_string('staffusers', 'admin'));
 $smarty->display('admin/users/staff.tpl');
 
 ?>

htdocs/admin/users/suspended.php

@@ -83,7 +83,7 @@ $form = new Pieform(array(
 ));
 $smarty->assign('buttonformopen', $form->get_form_tag());
 $smarty->assign('buttonform', $form->build(false));
-
+$smarty->assign('heading', get_string('suspendedusers', 'admin'));
 $smarty->display('admin/users/suspended.tpl');
 
 function buttons_submit_unsuspend(Pieform $form, $values) {

htdocs/artefact/blog/index.php

@@ -87,6 +87,7 @@ EOF;
 $smarty = smarty(array('tablerenderer'));
 $smarty->assign_by_ref('INLINEJAVASCRIPT', $js);
 $smarty->assign_by_ref('blogs', $blogs);
+$smarty->assign('heading', get_string("myblogs", "artefact.blog"));
 $smarty->display('artefact:blog:list.tpl');
 
 ?>

htdocs/artefact/blog/theme/default/list.tpl

@@ -11,7 +11,6 @@
 
 {include file="columnleftstart.tpl"}
 		<div id="myblogs">
-            <h2>{str section="artefact.blog" tag="myblogs"}</h2>
             <div class="addiconcontainer">
               <span class="addicon">
                 <a href="{$WWWROOT}artefact/blog/new/">{str section="artefact.blog" tag="addblog"}</a>

htdocs/artefact/blog/theme/default/view.tpl

@@ -9,8 +9,6 @@
 {include file="sidebar.tpl"}
 
 {include file="columnleftstart.tpl"}
-			<h2>{str section="artefact.blog" tag="viewblog"} - {$blog->get('title')|escape}</h2>
-			
 			<div id="myblogs">
                 <div class="blogsettingscontainer">
                     <div class="addiconcontainer">

htdocs/artefact/blog/view/index.php

@@ -47,6 +47,7 @@ $smarty = smarty(array('tablerenderer'), array(), array(), $images);
 $smarty->assign_by_ref('blog', $blog);
 $smarty->assign_by_ref('editform', $form);
 $smarty->assign_by_ref('INLINEJAVASCRIPT', $js);
+$smarty->assign('heading', get_string('viewblog', 'artefact.blog') . ' - ' . $blog->get('title'));
 $smarty->display('artefact:blog:view.tpl');
 
 ?>

htdocs/artefact/file/index.php

@@ -90,6 +90,7 @@ $smarty = smarty(
     )
 );
 $smarty->assign('INLINEJAVASCRIPT', $javascript);
+$smarty->assign('heading', get_string('myfiles', 'artefact.file'));
 $smarty->display('artefact:file:index.tpl');
 
 ?>

htdocs/artefact/file/theme/default/index.tpl

@@ -2,7 +2,6 @@
 {include file="sidebar.tpl"}
 
 {include file="columnleftstart.tpl"}
-			<h2>{str section="artefact.file" tag="myfiles"}</h2>
 			{str tag='fileinstructions' section='artefact.file'}
 			<div id="myfiles">
 				<div id="uploader"></div>