Commit e82c0fcb authored by Robert Lyon's avatar Robert Lyon

Bug 1539262: Removing unnecessary $smarty PAGEHEADING lines

As they are set to TITLE we can just assign TITLE to PAGEHEADING in
the smarty function call.

We can later override the PAGEHRADING with
$smarty->assign('PAGEHEADING', string); if we need to.

Have also updated a few files where TITLE was not defined.

behatnotneeded - everything should work as before

Change-Id: I3ea592cd37344e68c6e90a3c64947cf99db59471
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 0280a4ce
......@@ -152,7 +152,6 @@ $smarty = smarty(array('paginator'));
$smarty->assign('options', $options);
$smarty->assign('type', $type);
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('deleteall', $deleteall);
$smarty->assign('activitylist', $activitylist);
$smarty->display('account/activity/index.tpl');
......@@ -320,5 +320,4 @@ function clearPasswords(form, data) {
}
}
");
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/index.tpl');
......@@ -235,5 +235,4 @@ $smarty->assign('memberform', $memberform);
$smarty->assign('requestedform', $requestedform);
$smarty->assign('invitedform', $invitedform);
$smarty->assign('joinform', $joinform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('account/institutions.tpl');
......@@ -47,7 +47,6 @@ setpageicon($smarty, 'icon-puzzle-piece');
$smarty->assign('cleanurls', get_config('cleanurls'));
$smarty->assign('cleanurlconfig', $cleanurlconfig);
$smarty->assign('regenerateform', $regenerateform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/cleanurls.tpl');
// Regenerates urlids for users, groups, and portfolio pages.
......
......@@ -53,5 +53,4 @@ setpageicon($smarty, 'icon-puzzle-piece');
$smarty->assign('reloadform', $reloadform);
$smarty->assign('newfiltersdescription', get_string('newfiltersdescription', 'admin', get_config('libroot') . 'htmlpurifiercustom'));
$smarty->assign('filters', $filters);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/filters.tpl');
......@@ -263,7 +263,6 @@ EOF;
$smarty = smarty();
setpageicon($smarty, 'icon-puzzle-piece');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('editurls', $editurls);
$smarty->assign('newform', $newform);
......
......@@ -192,5 +192,4 @@ setpageicon($smarty, 'icon-puzzle-piece');
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('plugins', $plugins);
$smarty->assign('installlink', 'installplugin');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/extensions/plugins.tpl');
......@@ -68,5 +68,4 @@ $smarty->assign('searchurl', $search['url']);
$smarty->assign('sortby', $search['sortby']);
$smarty->assign('sortdir', $search['sortdir']);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/groups/archives.tpl');
......@@ -78,7 +78,6 @@ EOF;
$smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-users');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('searchform', $searchform);
$smarty->assign('results', $data);
......
......@@ -129,7 +129,6 @@ function groupadminsform_submit(Pieform $form, $values) {
$smarty = smarty();
setpageicon($smarty, 'icon-users');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('quotasform', $quotasform);
$smarty->assign('groupname', $group->name);
$smarty->assign('managegroupform', $groupadminsform);
......
......@@ -381,5 +381,4 @@ $smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-users');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/groups/uploadcsv.tpl');
......@@ -243,5 +243,4 @@ setpageicon($smarty, 'icon-users');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/groups/uploadcsv.tpl');
......@@ -210,5 +210,4 @@ $smarty->assign('introtext4', get_string('cookieconsentintro4', 'cookieconsent')
$smarty->assign('introtext5', get_string('cookieconsentintro51', 'cookieconsent', '<a href="http://sitebeam.net/cookieconsent/" target="_blank">', '</a>'));
// Official EU languages
$smarty->assign('languages', array('BG','CS','DA','DE','EL','EN','ES','ET','FI','FR','HU','IT','LT','LV','MT','NL','PL','PT','RO','SK','SL','SV'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/cookieconsent.tpl');
......@@ -198,5 +198,4 @@ $data = array(
$smarty = smarty();
$smarty->assign('modifications', get_string('additionalmodifications','cookieconsent'));
$smarty->assign('data', $data);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/cookieconsent2.tpl');
......@@ -114,8 +114,6 @@ function license_submit(Pieform $form, $values) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $form);
$smarty->assign('enabled', get_config('licensemetadata'));
$smarty->display('admin/site/license-edit.tpl');
......@@ -44,7 +44,6 @@ $extralicenses = get_column_sql("
$smarty = smarty();
setpageicon($smarty, 'icon-legal');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('licenses', $licenses);
$smarty->assign('extralicenses', $extralicenses);
$smarty->assign('allowextralicenses', get_config('licenseallowcustom'));
......
......@@ -333,6 +333,5 @@ setpageicon($smarty, 'icon-bars');
$smarty->assign('INLINEJAVASCRIPT', $ijs);
$smarty->assign('MENUS', $menulist);
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'artefact/file/sitefiles.php">', '</a>'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('footerform', $footerform);
$smarty->display('admin/site/menu.tpl');
......@@ -30,7 +30,6 @@ if (!$opensslext || !$curlext || !$xmlrpcext) {
$smarty = smarty();
setpageicon($smarty, 'icon-exchange');
$smarty->assign('PAGEHEADING', TITLE);
$missingextensions = array();
!$opensslext && $missingextensions[] = 'openssl';
!$curlext && $missingextensions[] = 'curl';
......@@ -172,5 +171,4 @@ function networkingform_submit(Pieform $form, $values) {
$smarty = smarty();
setpageicon($smarty, 'icon-exchange');
$smarty->assign('networkingform', $networkingform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/networking.tpl');
......@@ -977,6 +977,5 @@ $thispage = json_encode(get_config('wwwroot') . 'admin/site/options.php');
$smarty = smarty(array('adminsiteoptions'));
setpageicon($smarty, 'icon-cogs');
$smarty->assign('siteoptionform', $siteoptionform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('admin/site/options.tpl');
......@@ -93,5 +93,4 @@ $smarty = smarty(array('adminsitepages'), array(), array('admin' => array('disca
setpageicon($smarty, 'icon-pencil');
$smarty->assign('pageeditform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl');
......@@ -21,7 +21,5 @@ $accesslists = View::get_accesslists(null, null, 'mahara');
$smarty = smarty();
setpageicon($smarty, 'icon-key');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('accesslists', $accesslists);
$smarty->display('view/share.tpl');
......@@ -43,5 +43,4 @@ $smarty = smarty();
$smarty->assign('skins', $data->data);
$smarty->assign('siteskins', true);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('skin/index.tpl');
......@@ -60,7 +60,6 @@ $createviewform = pieform(create_view_form(null, 'mahara'));
$smarty = smarty(array('paginator'));
setpageicon($smarty, 'icon-file-text');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('views', $views);
$smarty->assign('institution', 'mahara');
......
......@@ -73,7 +73,6 @@ EOF;
$smarty = smarty(array('paginator','js/chartjs/Chart.min.js'));
setpageicon($smarty, 'icon-area-chart');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('sitedata', $sitedata);
......
......@@ -77,7 +77,6 @@ $form = pieform(array(
));
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('message', $message);
$smarty->assign('form', $form);
$smarty->display('admin/users/actionregistration.tpl');
......
......@@ -368,6 +368,5 @@ function adduser_submit(Pieform $form, $values) {
$smarty = smarty(array('adminadduser'));
setpageicon($smarty, 'icon-user-plus');
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('headingclass', 'page-header');
$smarty->display('admin/users/add.tpl');
......@@ -11,7 +11,6 @@
define('INTERNAL', 1);
define('ADMIN', 1);
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('institutions', 'admin'));
require_once(get_config('docroot') . '/lib/htmloutput.php');
// CHECK FOR CANCEL BEFORE THE 'REQUIRED' PARAMS:
......@@ -29,6 +28,8 @@ $edit = param_boolean('edit');
$json = param_boolean('j');
$instanceid = param_variable('id', 0);
define('TITLE', get_string($plugin . 'config', 'admin'));
// IF WE'RE EDITING OR CREATING AN AUTHORITY:
if ($institution && $plugin) {
$classname = 'PluginAuth' . ucfirst(strtolower($plugin));
......@@ -178,5 +179,7 @@ addLoadEvent(
);
EOF;
$institution = get_record('institution', 'name', $institution);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('SUBSECTIONHEADING', $institution->displayname);
$smarty->display('admin/users/addauthority.tpl');
......@@ -73,5 +73,4 @@ $smarty = smarty();
setpageicon($smarty, 'icon-user');
$smarty->assign('adminusersform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/admin.tpl');
......@@ -190,7 +190,6 @@ $deleteform = pieform(array(
));
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('users', $users);
$smarty->assign('changeauthform', $changeauthform);
$smarty->assign('suspendform', $suspendform);
......
......@@ -228,5 +228,4 @@ $form = pieform($form);
$smarty = smarty();
$smarty->assign('bulkexportform', $form);
$smarty->assign('bulkexportdescription', get_string('bulkexportdescription', 'admin'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkexport.tpl');
......@@ -323,5 +323,4 @@ $form = pieform($form);
$smarty = smarty();
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/bulkimport.tpl');
......@@ -31,7 +31,8 @@ if (!$USER->is_admin_for_user($user)) {
if ($user->deleted) {
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE . ': ' . display_name($user));
$smarty->assign('PAGEHEADING', display_name($user));
$smarty->assign('SUBSECTIONHEADING', TITLE);
$smarty->assign('message', get_string('thisuserdeleted', 'admin'));
$smarty->display('message.tpl');
exit;
......@@ -925,7 +926,8 @@ $smarty->assign('institutions', count($allinstitutions) > 1);
$smarty->assign('institutionform', $institutionform);
$smarty->assign('loginas', $id != $USER->get('id') && is_null($USER->get('parentuser')));
$smarty->assign('PAGEHEADING', TITLE . ': ' . display_name($user));
$smarty->assign('PAGEHEADING', display_name($user));
$smarty->assign('SUBSECTIONHEADING', TITLE);
# Only allow deletion and suspension of a user if the viewed user is not
# the current user; or if they are the current user, they're not the only
......
......@@ -172,5 +172,4 @@ $smarty->assign('searchurl', $search['url']);
$smarty->assign('sortby', $search['sortby']);
$smarty->assign('sortdir', $search['sortdir']);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/exportqueue.tpl');
......@@ -98,5 +98,4 @@ addLoadEvent(function() {
formchangemanager.unbindForm(\'adminusers\');
});');
$smarty->assign('adminusersform', pieform($form));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionadmins.tpl');
......@@ -51,7 +51,6 @@ else if (empty($institutionelement['options'])) {
$smarty = smarty();
$smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false));
$smarty->assign('noinstitutions', get_string('noinstitutionstaticpages', 'admin'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl');
exit;
}
......@@ -156,5 +155,4 @@ setpageicon($smarty, 'icon-university');
$smarty->assign('noinstitutionsadmin', (($USER->admin) ? get_string('noinstitutionstaticpagesadmin', 'admin', get_config('wwwroot') . 'admin/site/pages.php') : false));
$smarty->assign('pageeditform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/site/pages.tpl');
......@@ -97,5 +97,4 @@ addLoadEvent(function() {
formchangemanager.unbindForm(\'staffusers\');
});');
$smarty->assign('staffusersform', pieform($form));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionstaff.tpl');
......@@ -307,6 +307,5 @@ $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '1', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle']));
$smarty->assign('institutionusersform', $userlistform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('institutionselector', $institutionselector);
$smarty->display('admin/users/institutionusers.tpl');
......@@ -74,5 +74,4 @@ setpageicon($smarty, 'icon-university');
$smarty->assign('users', $users);
$smarty->assign('types', $types);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/notifications.tpl');
......@@ -77,7 +77,6 @@ EOF;
$smarty = smarty();
setpageicon($smarty, 'icon-university');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('data', $data);
$smarty->assign('institutionselector', $institutionselector);
......
......@@ -241,5 +241,4 @@ $smarty->assign('institution', $institution);
$smarty->assign('institutionselector', $institutionselector);
$smarty->assign('enabled', get_config('showprogressbar'));
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/progressbar.tpl');
......@@ -191,7 +191,6 @@ else if ($selected == 'loginaslog') {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('sectiontabs', $tabs);
$smarty->assign('users', $users);
$smarty->assign('userlisthtml', $userlisthtml);
......
......@@ -104,5 +104,4 @@ $smarty->assign('searchurl', $search['url']);
$smarty->assign('sortby', $search['sortby']);
$smarty->assign('sortdir', $search['sortdir']);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/search.tpl');
......@@ -70,5 +70,4 @@ $smarty = smarty();
setpageicon($smarty, 'icon-user');
$smarty->assign('staffusersform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/staff.tpl');
......@@ -103,7 +103,6 @@ EOF;
$smarty = smarty(array('paginator','js/chartjs/Chart.min.js'));
setpageicon($smarty, 'icon-university');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('institutiondata', $institutiondata);
......
......@@ -205,7 +205,6 @@ $smarty->assign('suspendhtml', $html);
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('buttonformopen', $form->get_form_tag());
$smarty->assign('buttonform', $form->build(false));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/suspended.tpl');
function buttons_submit_unsuspend(Pieform $form, $values) {
......
......@@ -635,5 +635,4 @@ $smarty = smarty(array('adminuploadcsv'));
setpageicon($smarty, 'icon-user');
$smarty->assign('uploadcsvpagedescription', $uploadcsvpagedescription);
$smarty->assign('uploadcsvform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/uploadcsv.tpl');
......@@ -221,7 +221,6 @@ function edit_annotation_feedback_notify($view, $author, $owner) {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('strdescription', get_string('editannotationfeedbackdescription', 'artefact.annotation', $maxage));
$smarty->assign('form', $form);
$smarty->display('artefact:annotation:edit.tpl');
......@@ -94,7 +94,6 @@ $smarty = smarty(array('paginator'));
$smarty->assign_by_ref('blogs', $blogs);
$smarty->assign('institutionname', $institutionname);
$smarty->assign('group', $groupid);
$smarty->assign('PAGEHEADING', TITLE);
$js = '';
if ($blogs->pagination_js) {
$js .= 'addLoadEvent(function() {' . $blogs->pagination_js . '});';
......
......@@ -108,7 +108,6 @@ $form = pieform($form);
$smarty =& smarty();
$smarty->assign_by_ref('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('form.tpl');
exit;
......
......@@ -219,7 +219,6 @@ $smarty = smarty(array(), array(), array(), array(
));
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign_by_ref('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:blog:editpost.tpl');
......
......@@ -113,7 +113,6 @@ if (!$institutionname && !$groupid) {
$smarty->assign_by_ref('editform', $form);
$smarty->assign_by_ref('blog', $blog);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:blog:settings.tpl');
exit;
......
......@@ -183,7 +183,6 @@ function edit_comment_notify($view, $author, $owner) {
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('strdescription', get_string('editcommentdescription', 'artefact.comment', $maxage));
$smarty->assign('form', $form);
$smarty->display('artefact:comment:edit.tpl');
......@@ -115,7 +115,6 @@ $smarty->assign('zipinfo', $zipinfo);
$smarty->assign('message', $message);
$smarty->assign('quotaerror', $quotaerror);
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:extract.tpl');
function files_page($file) {
......
......@@ -37,7 +37,6 @@ $smarty = smarty(
)
);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->display('artefact:file:files.tpl');
......@@ -49,5 +49,4 @@ $smarty->assign('institution', $institution);
$smarty->assign('institutionselector', $s['institutionselector']);
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $s['institutionselectorjs'] . $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:files.tpl');
......@@ -366,5 +366,4 @@ $smarty->assign('uploadform', $uploadform);
// the buttons need to be inside the tablerenderer.
$smarty->assign('settingsformtag', $settingsform->get_form_tag());
$smarty->assign('imagemaxdimensions', array(get_config('imagemaxwidth'), get_config('imagemaxheight')));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:file:profileicons.tpl');
......@@ -27,7 +27,6 @@ $smarty = smarty();
setpageicon($smarty, 'icon-file-image-o');
$smarty->assign('descriptionstrargs', array('<a href="' . get_config('wwwroot') . 'admin/site/menu.php">', '</a>'));
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('institution', 'mahara');
$smarty->assign('form', $form);
$smarty->assign('INLINEJAVASCRIPT', $js);
......
......@@ -458,7 +458,6 @@ $smarty = smarty(array(), array(), array(
));
$smarty->assign('profileform', $profileform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('artefact:internal:index.tpl');
......
......@@ -139,7 +139,6 @@ else {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('navtabs', PluginArtefactInternal::submenu_items());
$smarty->assign('subheading', $subheading);
$smarty->assign('form', $form);
......
......@@ -85,6 +85,5 @@ else {
}
$smarty = smarty();
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('message', $message);
$smarty->display('artefact:internal:validate.tpl');
......@@ -37,6 +37,5 @@ $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:achievements.tpl');
......@@ -113,6 +113,5 @@ EOF;
$smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('compositeform', $compositeform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:editcomposite.tpl');
......@@ -139,7 +139,6 @@ $smarty = smarty(array(), array(), array(), array(
),
));
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->assign_by_ref('artefactform', $form);
$smarty->assign('artefacttype', $type);
......
......@@ -32,6 +32,5 @@ $compositeforms = ArtefactTypeResumeComposite::get_forms($compositetypes);
$smarty = smarty(array('tablerenderer'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:employment.tpl');
......@@ -43,6 +43,5 @@ $smarty = smarty(array('tablerenderer'));
$smarty->assign_by_ref('goals', $goals);
$smarty->assign_by_ref('skills', $skills);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:goalsandskills.tpl');
......@@ -18,6 +18,7 @@ define('RESUME_SUBPAGE', 'index');
require_once(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('resume', 'artefact.resume'));
define('SUBSECTIONHEADING', get_string('introduction', 'artefact.resume'));
require_once('pieforms/pieform/elements/calendar.php');
safe_require('artefact', 'resume');
......@@ -120,9 +121,6 @@ $personalinformationform = pieform(array(
$smarty = smarty(array('artefact/resume/js/simpleresumefield.js'));
$smarty->assign('coverletterform', $coverletterform);
$smarty->assign('personalinformationform',$personalinformationform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('introduction', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:index.tpl');
......
......@@ -38,6 +38,5 @@ $form = pieform(simple_resumefield_form($defaults, 'artefact/resume/interests.ph
$smarty = smarty(array('artefact/resume/js/simpleresumefield.js'));
$smarty->assign('interestsform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:interests.tpl');
......@@ -18,6 +18,7 @@ define('RESUME_SUBPAGE', 'license');
require_once(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('resume', 'artefact.resume'));
define('SUBSECTIONHEADING', get_string('license', 'artefact.resume'));
require_once('license.php');
safe_require('artefact', 'resume');
......@@ -78,7 +79,5 @@ function resumelicense_submit(Pieform $form, $values) {
$smarty = smarty(array('artefact/resume/js/simpleresumefield.js'));
$smarty->assign('licensesform', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty