Commit ca177073 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells

BUG: fix menu names

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I528c9d0ae2aaa488702aa7bd1559f090835cfd2b
parent 696dee22
......@@ -191,6 +191,7 @@ $smarty->assign('paginatorData', $activitylist['pagination_js']);
// Adding the links to out- and inbox
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('labelinbox', 'artefact.multirecipientnotification'));
// show urls and titles
define('NOTIFICATION_SUBPAGE', 'inbox');
......
......@@ -140,6 +140,8 @@ $smarty->assign('INLINEJAVASCRIPT', null);
// Adding the links to out- and inbox
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('labeloutbox1', 'artefact.multirecipientnotification'));
// show urls and titles
define('NOTIFICATION_SUBPAGE', 'outbox');
......
......@@ -17,6 +17,7 @@ define('SECTION_PAGE', 'index');
define('RESUME_SUBPAGE', 'achievements');
require_once(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('resume', 'artefact.resume'));
require_once('pieforms/pieform.php');
safe_require('artefact', 'resume');
......@@ -37,5 +38,6 @@ $smarty = smarty(array('tablerenderer', 'expandable'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('achievements', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:achievements.tpl');
......@@ -115,5 +115,6 @@ $smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('compositeform', $compositeform);
$smarty->assign('composite', $type);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('achievements', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:editcomposite.tpl');
......@@ -144,6 +144,7 @@ $smarty = smarty(array(), array(), array(), array(
$smarty->assign('INLINEJAVASCRIPT', $javascript);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->assign('subsectionheading', get_string('goalsandskills', 'artefact.resume'));
$smarty->assign_by_ref('artefactform', $form);
$smarty->assign('artefacttype', $type);
$smarty->display('artefact:resume:editgoalsandskills.tpl');
......
......@@ -32,5 +32,6 @@ $smarty = smarty(array('tablerenderer', 'expandable'));
$smarty->assign('compositeforms', $compositeforms);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('educationandemployment', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:employment.tpl');
......@@ -43,5 +43,6 @@ $smarty->assign_by_ref('goals', $goals);
$smarty->assign_by_ref('skills', $skills);
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('goalsandskills', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:goalsandskills.tpl');
......@@ -123,6 +123,7 @@ $smarty->assign('coverletterform', $coverletterform);
$smarty->assign('personalinformationform',$personalinformationform);
$smarty->assign('INLINEJAVASCRIPT', '$j(simple_resumefield_init);');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('introduction', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:index.tpl');
......
......@@ -39,5 +39,6 @@ $smarty = smarty(array('artefact/resume/js/simpleresumefield.js'));
$smarty->assign('interestsform', $form);
$smarty->assign('INLINEJAVASCRIPT', '$j(simple_resumefield_init);');
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('interests', 'artefact.resume'));
$smarty->assign('SUBPAGENAV', PluginArtefactResume::submenu_items());
$smarty->display('artefact:resume:interests.tpl');
......@@ -102,7 +102,7 @@
</span>
{/if}
<span class="section-heading">
{$PAGEHEADING}
{if $subsectionheading}| {/if}{$PAGEHEADING}
</span>
{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}
{if $publicgroup && $rsswithtitle}
......
......@@ -75,6 +75,7 @@ $smarty->assign('form', $form);
$smarty->assign('opened', param_alphanumext('open', ''));
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('PAGEHEADING', $heading);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
......@@ -507,9 +508,9 @@ function service_fg_edit_form() {
return $pieform->build(false) . '<div class="function_add">' .
pieform(array(
'name' => 'webservices_function_groups_add',
'renderer' => 'oneline',
'renderer' => 'div',
'successcallback' => 'webservices_function_groups_submit',
'class' => 'oneline inline',
'class' => 'inline',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/index.php',
'elements' => array(
......@@ -540,7 +541,7 @@ function service_tokens_edit_form() {
'name' => 'webservices_tokens',
'elementclasses' => false,
'successcallback' => 'webservices_tokens_submit',
'renderer' => 'multicolumntable',
'renderer' => 'div',
'elements' => array(
'token' => array(
'title' => ' ',
......@@ -718,7 +719,7 @@ function service_tokens_edit_form() {
return $pieform->build(false) . '<div class="function_add">' .
pieform(array(
'name' => 'webservices_token_generate',
'renderer' => 'oneline',
'renderer' => 'div',
'successcallback' => 'webservices_token_submit',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/index.php',
......@@ -930,7 +931,7 @@ function service_users_edit_form() {
return $pieform->build(false) . '<div id="user_add">' .
pieform(array(
'name' => 'webservices_user_generate',
'renderer' => 'oneline',
'renderer' => 'div',
'successcallback' => 'webservices_user_submit',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/index.php',
......
......@@ -14,7 +14,10 @@ define('ADMIN', 1);
define('MENUITEM', 'configextensions/webservices/oauthconfig');
define('SECTION_PAGE', 'oauth');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('oauthv1sregister', 'auth.webservice'));
define('TITLE', get_string('webservices_title', 'auth.webservice'));
require_once('pieforms/pieform.php');
require_once(get_config('docroot') . 'webservice/libs/oauth-php/OAuthServer.php');
require_once(get_config('docroot') . 'webservice/libs/oauth-php/OAuthStore.php');
......@@ -138,6 +141,8 @@ safe_require('auth', 'webservice');
PluginAuthWebservice::menu_items($smarty, 'webservice/oauthconfig');
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('oauthv1sregister', 'auth.webservice'));
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
......@@ -435,7 +440,7 @@ function webservice_server_list_form($sopts, $iopts) {
'renderer' => 'div',
'validatecallback' => 'webservices_add_application_validate',
'successcallback' => 'webservices_add_application_submit',
'class' => 'oneline inline',
'class' => 'inline',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/oauthv1sregister.php',
'elements' => array(
......
......@@ -15,7 +15,7 @@ define('MENUITEM', 'configextensions/webservices/logs');
define('SECTION_PAGE', 'webservicelogs');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
require_once('webservicessearchlib.php');
define('TITLE', get_string('webservicelogs', 'auth.webservice'));
define('TITLE', get_string('webservices_title', 'auth.webservice'));
require_once('pieforms/pieform.php');
$userquery = param_variable('userquery', null);
......@@ -149,6 +149,8 @@ $smarty->assign('sortby', $searchurl['sortby']);
$smarty->assign('sortdir', $searchurl['sortdir']);
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('webservicelogs', 'auth.webservice'));
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
......
......@@ -27,7 +27,7 @@ define('ADMIN', 1);
require(dirname(dirname(__FILE__)) . '/init.php');
require_once(dirname(__FILE__) . '/lib.php');
define('TITLE', get_string('apptokens', 'auth.webservice'));
define('TITLE', get_string('webservices_title', 'auth.webservice'));
require_once('pieforms/pieform.php');
/*
......@@ -184,7 +184,7 @@ if (!empty($dbservices)) {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'title' => get_string('deletespecific', 'mahara', $service->id),
'value' => get_string('deletespecific', 'mahara', $service->id),
'elementtitle' => get_string('delete'),
),
),
......@@ -314,7 +314,7 @@ if (!empty($dbtokens)) {
'renderer' => 'div',
'elementclasses' => false,
'successcallback' => 'webservices_oauth_token_submit',
'class' => 'oneline inline',
'class' => 'div inline',
'jsform' => false,
'elements' => array(
'token' => array('type' => 'hidden', 'value' => $token->id),
......@@ -430,6 +430,8 @@ safe_require('auth', 'webservice');
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', get_string('apptokens', 'auth.webservice'));
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
$webservice_menu = PluginAuthWebservice::admin_menu_items();
......
......@@ -17,7 +17,8 @@ define('SECTION_PAGE', 'wstestclient');
require(dirname(dirname(__FILE__)) . '/init.php');
require_once(get_config('docroot') . 'webservice/lib.php');
define('TITLE', get_string('pluginadmin', 'admin'));
define('TITLE', get_string('webservices_title', 'auth.webservice'));
require_once('pieforms/pieform.php');
$protocol = param_alpha('protocol', '');
......@@ -176,7 +177,10 @@ safe_require('auth', 'webservice');
$smarty->assign('form', $form);
$heading = get_string('testclient', 'auth.webservice');
$smarty->assign('PAGEHEADING', $heading);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('subsectionheading', $heading);
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment