Commit 629a64e6 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

NEW submenu for tertiary navigation

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I7196464441c27c657820742b2d310de4fb409b2d
parent 63a997cd
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -9,26 +9,12 @@
{if $SIDEBARS && $SIDEBLOCKS.right}
<div class="col-md-3 sidebar">
{if $SUBPAGENAV }
<div class="panel panel-secondary">
<div class="panel-heading">
{include file="inpagenav.tpl"}
</div>
</div>
{/if}
{include file="sidebar.tpl" blocks=$SIDEBLOCKS.right}
</div>
{/if}
{if $SIDEBARS && $SIDEBLOCKS.left}
<div class="col-md-3 col-md-pull-9 sidebar">
{if !$SIDEBLOCKS.right && $SUBPAGENAV }
<div class="panel panel-secondary">
<div class="panel-heading">
{include file="inpagenav.tpl"}
</div>
</div>
{/if}
{include file="sidebar.tpl" blocks=$SIDEBLOCKS.left}
</div>
{/if}
......@@ -58,7 +44,7 @@
<a href="{$item.url}">{$item.title}</a>
</li>
{/foreach}
</ul>
</ul>
<!-- there is a div id="performance-info" wrapping this -->
{mahara_performance_info}
<div id="version">{mahara_version}</div>
......
......@@ -10,8 +10,8 @@
</span>
{/if}
</h4>
<div class="groupsdetails">
<div class="groupsdetails text-small">
<div class="mtm mbm">
{$group->description|str_shorten_html:100:true|safe}
......@@ -28,7 +28,7 @@
<em>
<a href="{profile_url($user)}" class="inner-link"> {$user|display_name}</a>
</em>
{if !$.foreach.admins.last},
{if !$.foreach.admins.last},
{/if}{/foreach}
</div>
{if $group->membercount}
......
......@@ -64,18 +64,31 @@
</span>
<div id="loading-box" class="loading-box" style='display:none'></div>
{include file="header/topright.tpl"}
</div>
</header>
{include file="header/navigation.tpl"}
<div class="container {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}{else}ptl{/if}">
<div class="row">
<div id="main" class="{if $SIDEBARS}{if $SIDEBLOCKS.right}col-md-9 {else}col-md-9 col-md-push-3{/if}{else}col-md-12{/if} main">
<div id="content" class="main-column{if $selected == 'content'} editcontent{/if}">
<div id="main-column-container">
{if $SUBPAGENAV}
<div class="arrow-bar">
<span class="arrow hidden-xs">
<span class="text">
{if isset($PAGEHEADING)}{$PAGEHEADING}{/if}
</span>
</span>
<span class="right-text">
{include file="inpagenav.tpl"}
</span>
</div>
{/if}
{dynamic}{insert_messages}{/dynamic}
{if isset($PAGEHEADING)}
......@@ -83,8 +96,21 @@
{if isset($PAGEICON)}
<span class="{$PAGEICON}"></span>
{/if}
{$PAGEHEADING}
{if $subsectionheading}
<span class="subsection-heading">
{$subsectionheading}
</span>
{/if}
<span class="section-heading">
{$PAGEHEADING}
</span>
{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}
{if $publicgroup && $rsswithtitle}
<a href="{$feedlink}" class="text-orange text-small pull-right ">
<span class="fa-rss fa fa-lg"></span>
</a>
{/if}
</h1>
{/if}
......@@ -93,10 +119,5 @@
{/if}
{if $SUBPAGENAV}
{if !$SIDEBARS}
<div class="pull-left fullwidth at-top">
{include file="inpagenav.tpl"}
</div>
{/if}
<div class="subpage mtl">
{/if}
......@@ -52,5 +52,6 @@
<link rel="image_src" href="{$sitelogo}">
{if $ADDITIONALHTMLHEAD}{$ADDITIONALHTMLHEAD|safe}{/if}
{if $COOKIECONSENTCODE}{$COOKIECONSENTCODE|safe}{/if}
</head>
{dynamic}{flush}{/dynamic}
......@@ -103,30 +103,12 @@
<li{if $item.selected} class="active"{/if}>
<a href="{$WWWROOT}{$item.url}"{if $item.accesskey} accesskey="{$item.accesskey}"{/if}>{$item.title}</a>
</li>
{if $item.submenu && $item.selected}
{assign var=tertiarymenu value=$item.submenu}
{/if}
{/foreach}
{/strip}
</ul>
</div>
</div>
{/if}
{if $tertiarymenu}
<div class="navbar navbar-secondary minor-nav">
<div class="container">
<ul class="nav navbar-nav">
{strip}
{foreach from=$tertiarymenu item=tertiaryitem}
<li{if $tertiaryitem.selected} class="active"{/if}>
<a href="{$WWWROOT}{$tertiaryitem.url}"{if $tertiaryitem.accesskey} accesskey="{$tertiaryitem.accesskey}"{/if}>{$tertiaryitem.title}</a>
</li>
{/foreach}
{/strip}
</ul>
</div>
</div>
{/if}
{/if}
{/if}
{* nav and beginning of page container for group info pages *}
<ul class="nav nav-pills nav-inpage {if $SIDEBARS}nav-stacked{/if}">
<ul class="nav nav-pills nav-inpage">
{foreach from=$SUBPAGENAV item=item}
<li class="{if $item.class}{$item.class} {/if}{if $item.selected} current-tab active{/if}">
<a {if $item.tooltip}title="{$item.tooltip}"{/if} class="{if $item.selected} current-tab{/if}" href="{$WWWROOT}{$item.url}">
......@@ -10,4 +10,4 @@
</a>
</li>
{/foreach}
</ul>
\ No newline at end of file
</ul>
......@@ -13,13 +13,13 @@
{/if}
</form>
</div>
{if $GROUP}
<h2>{str tag=groupviews section=view}</h2>
{/if}
<div class="mtxl ptxl">
{if $institution}
{$institutionselector|safe}
{/if}
<div class="ptxl">
<div class="mtxl">
{if $institution}
{$institutionselector|safe}
{/if}
</div>
</div>
<div class="grouppageswrap">
<div class="panel panel-default pll">
......@@ -41,7 +41,7 @@
<h3 class="title list-group-item-heading">
{$view.displaytitle}
</h3>
{if $view.submittedto}
<div class="detail submitted-viewitem">{$view.submittedto|clean_html|safe}</div>
{elseif $view.type == 'profile'}
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--[if IE 8 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}" class="ie ie8"><![endif]-->
<!--[if IE 9 ]><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}" class="ie ie9"><![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--><html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}"><!--<![endif]-->
{include file="header/head.tpl"}
<body class="no-js">
{if $ADDITIONALHTMLTOPOFBODY}{$ADDITIONALHTMLTOPOFBODY|safe}{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}<div class="sitemessages">{/if}
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_image_url filename='failure'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>{/if}
{if !$PRODUCTIONMODE}<div class="sitemessage center">{str tag=notproductionsite section=error}</div>{/if}
{if $SITECLOSED}<div class="sitemessage center">{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>{/if}
{if $SITETOP}<div id="switchwrap">{$SITETOP|safe}</div>{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}</div>{/if}
<div id="container">
<div class="center"><a class="skiplink" href="#mainmiddle">{str tag=skipmenu}</a></div>
<div id="loading-box"></div>
<div id="top-wrapper">
<div id="header"><h1 id="site-logo"><a href="{$WWWROOT}"><img src="{$sitelogo}" alt="{$sitename}"></a></h1>
{include file="header/topright.tpl"}
</div>
{include file="header/navigation.tpl"}
<div class="cb"></div>
</div>
<div id="mainmiddlewrap">
<div id="mainmiddle">
<div id="{if $SIDEBARS}{if $SIDEBLOCKS.right}main-wrapper-narrow-right{else}main-wrapper-narrow-left{/if}{else}main-wrapper{/if}">
<div id="main-column" class="main-column{if $SIDEBARS} main-column-narrow{/if}{if $selected == 'content'} editcontent{/if}">
<div id="main-column-container">
{dynamic}{insert_messages}{/dynamic}
{if isset($PAGEHEADING)} <h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h1>
{/if}
{if $SUBPAGENAV}
{if $SUBPAGETOP}{include file=$SUBPAGETOP}{/if}
{* Tabs and beginning of page container for group info pages *}
<div class="tabswrap">
<h3 class="rd-tab-title"><a href="#">{str tag=tabs}<span class="rd-tab"></span></a></h3>
<ul class="in-page-tabs">
{foreach from=$SUBPAGENAV item=item}
<li {if $item.selected}class="current-tab"{/if}><a {if $item.tooltip}title="{$item.tooltip}" {/if}{if $item.selected}class="current-tab" {/if}href="{$WWWROOT}{$item.url}">{$item.title}<span class="accessible-hidden">({str tag=tab}{if $item.selected} {str tag=selected}{/if})</span></a></li>
{/foreach}
</ul>
</div>
<div class="subpage">
{/if}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--[if IE 8 ]> <html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}" class="ie ie8"> <![endif]-->
<!--[if IE 9 ]> <html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}" class="ie ie9"> <![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--> <html{if $LANGDIRECTION == 'rtl'} dir="rtl"{/if} lang="{$LANGUAGE}"><!--<![endif]-->
{include file="header/head.tpl"}
<body id="micro" class="no-js">
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}<div class="sitemessages">{/if}
{if $USERMASQUERADING}<div class="sitemessage"><img src="{theme_image_url filename='failure'}" alt="">{$masqueradedetails} {$becomeyouagain|safe}</div>{/if}
{if !$PRODUCTIONMODE}<div class="sitemessage center">{str tag=notproductionsite section=error}</div>{/if}
{if $SITECLOSED}<div class="sitemessage center">{if $SITECLOSED == 'logindisabled'}{str tag=siteclosedlogindisabled section=mahara arg1="`$WWWROOT`admin/upgrade.php"}{else}{str tag=siteclosed}{/if}</div>{/if}
{if $SITETOP}<div id="switchwrap">{$SITETOP|safe}</div>{/if}
{if $USERMASQUERADING || !$PRODUCTIONMODE || $SITECLOSED || $SITETOP}</div>{/if}
<div id="container">
<div class="center"><a class="skiplink" href="#mainmiddle">{str tag=skipmenu}</a></div>
<div id="loading-box"></div>
<div id="top-wrapper"><div id="header">
<h1 class="hidden"><a href="{$WWWROOT}">{$hiddenheading|default:"Mahara"|escape}</a></h1>
</div></div>
<div id="mainmiddlewrap">
<div id="mainmiddle">
<div id="main-wrapper">
<div id="main-column" class="main-column">
<div id="main-column-container">
{dynamic}{insert_messages}{/dynamic}
{if isset($PAGEHEADING)} <h1>{$PAGEHEADING}{if $PAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h1>
{/if}
......@@ -104,6 +104,8 @@ $smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('views', $data->data);
$smarty->assign('headingclass', 'page-header');
$smarty->assign('pagination', $pagination['html']);
$smarty->assign('subsectionheading', get_string('Views', 'view'));
if (!$can_edit) {
$smarty->display('view/groupviews.tpl');
}
......
......@@ -378,7 +378,6 @@ if (get_config('viewmicroheaders')) {
else {
$microheaderlinks[] = array(
'name' => get_string('edit', 'mahara'),
'image' => $THEME->get_image_url('btn_edit'),
'url' => get_config('wwwroot') . 'view/blocks.php?id=' . $viewid,
);
}
......@@ -386,7 +385,6 @@ if (get_config('viewmicroheaders')) {
if ($can_copy) {
$microheaderlinks[] = array(
'name' => get_string('copy', 'mahara'),
'image' => $THEME->get_image_url('btn_edit'),
'url' => get_config('wwwroot') . 'view/copy.php?id=' . $viewid . (!empty($collection) ? '&collection=' . $collection->get('id') : ''),
'class' => 'copyview',
);
......
......@@ -23,9 +23,10 @@ require_once('pieforms/pieform.php');
safe_require('auth', 'webservice');
$heading = get_string('webservices_title', 'auth.webservice');
$webservice_menu = PluginAuthWebservice::menu_items(MENUITEM);
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$form = get_config_options_extended();
$inlinejs = <<<JS
jQuery(function ($) {
......@@ -69,10 +70,10 @@ $inlinejs = <<<JS
});
JS;
$smarty = smarty(array(), array('<link rel="stylesheet" type="text/css" href="' . $THEME->get_url('style/webservice.css', false, 'auth/webservice') . '">'));
$smarty = smarty(array(), array());
$smarty->assign('form', $form);
$smarty->assign('opened', param_alphanumext('open', ''));
$smarty->assign('TERTIARYMENU', $webservice_menu);
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('PAGEHEADING', $heading);
$smarty->assign('INLINEJAVASCRIPT', $inlinejs);
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
......@@ -354,6 +355,9 @@ function webservices_protocol_switch_form() {
function service_fg_edit_form() {
global $THEME;
$editicon = 'fa fa-pencil prm';
$deleteicon = 'fa fa-trash prm text-danger';
$form = array(
'name' => 'webservices_function_groups',
'elementclasses' => false,
......@@ -455,7 +459,7 @@ function service_fg_edit_form() {
'value' => pieform(array(
'name' => 'webservices_function_groups_edit_' . $service->id,
'renderer' => 'div',
'elementclasses' => false,
'class' => 'form-as-button',
'successcallback' => 'webservices_function_groups_submit',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/index.php',
......@@ -463,9 +467,10 @@ function service_fg_edit_form() {
'service' => array('type' => 'hidden', 'value' => $service->id),
'action' => array('type' => 'hidden', 'value' => 'edit'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_edit'),
'alt' => get_string('editspecific', 'mahara', $service->id),
'type' => 'button',
'class' => 'btn btn-default btn-sm',
'usebuttontag' => true,
'value' => '<span class="'.$editicon.'"></span>' . get_string('editspecific', 'mahara', $service->id),
'elementtitle' => get_string('edit'),
),
),
......@@ -474,7 +479,7 @@ function service_fg_edit_form() {
pieform(array(
'name' => 'webservices_function_groups_delete_' . $service->id,
'renderer' => 'div',
'elementclasses' => false,
'class' => 'form-as-button',
'successcallback' => 'webservices_function_groups_submit',
'jsform' => false,
'action' => get_config('wwwroot') . 'webservice/admin/index.php',
......@@ -482,9 +487,10 @@ function service_fg_edit_form() {
'service' => array('type' => 'hidden', 'value' => $service->id),
'action' => array('type' => 'hidden', 'value' => 'delete'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_deleteremove'),
'alt' => get_string('deletespecific', 'mahara', $service->id),
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'value' => '<span class="'.$deleteicon.'"></span>' . get_string('deletespecific', 'mahara', $service->id),
'elementtitle' => get_string('delete'),
),
),
......@@ -492,7 +498,7 @@ function service_fg_edit_form() {
,
'type' => 'html',
'key' => $service->name,
'class' => 'webserviceconfigcontrols btns2 right',
'class' => 'webserviceconfigcontrols text-right btn-top-right btn-group btn-group-top',
);
}
}
......@@ -527,6 +533,9 @@ function service_fg_edit_form() {
function service_tokens_edit_form() {
global $THEME, $USER;
$editicon = 'fa fa-pencil prm';
$deleteicon = 'fa fa-trash prm text-danger';
$form = array(
'name' => 'webservices_tokens',
'elementclasses' => false,
......@@ -649,15 +658,16 @@ function service_tokens_edit_form() {
'renderer' => 'div',
'elementclasses' => false,
'successcallback' => 'webservices_token_submit',
'class' => 'oneline inline',
'class' => 'form-as-button',
'jsform' => false,
'elements' => array(
'token' => array('type' => 'hidden', 'value' => $token->tokenid),
'action' => array('type' => 'hidden', 'value' => 'edit'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_edit'),
'alt' => get_string('editspecific', 'mahara', $token->tokenid),
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'value' => '<span class="'.$editicon.'"></span>' . get_string('editspecific', 'mahara', $token->tokenid),
'elementtitle' => get_string('edit'),
),
),
......@@ -668,15 +678,16 @@ function service_tokens_edit_form() {
'renderer' => 'div',
'elementclasses' => false,
'successcallback' => 'webservices_token_submit',
'class' => 'oneline inline',
'class' => 'form-as-button',
'jsform' => false,
'elements' => array(
'token' => array('type' => 'hidden', 'value' => $token->tokenid),
'action' => array('type' => 'hidden', 'value' => 'delete'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_deleteremove'),
'alt' => get_string('deletespecific', 'mahara', $token->tokenid),
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'value' => '<span class="'.$deleteicon.'"></span>' . get_string('deletespecific', 'mahara', $token->tokenid),
'elementtitle' => get_string('delete'),
),
),
......@@ -684,7 +695,7 @@ function service_tokens_edit_form() {
,
'type' => 'html',
'key' => $token->token,
'class' => 'webserviceconfigcontrols btns2 right',
'class' => 'webserviceconfigcontrols text-right btn-top-right btn-group btn-group-top',
);
}
}
......@@ -744,6 +755,9 @@ function service_tokens_edit_form() {
function service_users_edit_form() {
global $THEME, $USER;
$editicon = 'fa fa-pencil prm';
$deleteicon = 'fa fa-trash prm text-danger';
$form = array(
'name' => 'webservices_users',
'elementclasses' => false,
......@@ -855,15 +869,16 @@ function service_users_edit_form() {
'renderer' => 'div',
'elementclasses' => false,
'successcallback' => 'webservices_user_submit',
'class' => 'oneline inline',
'class' => 'form-as-button',
'jsform' => false,
'elements' => array(
'suid' => array('type' => 'hidden', 'value' => $user->id),
'action' => array('type' => 'hidden', 'value' => 'edit'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_edit'),
'alt' => get_string('editspecific', 'mahara', $user->username),
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'value' => get_string('editspecific', 'mahara', $user->username),
'elementtitle' => get_string('edit'),
),
),
......@@ -874,15 +889,16 @@ function service_users_edit_form() {
'renderer' => 'div',
'elementclasses' => false,
'successcallback' => 'webservices_user_submit',
'class' => 'oneline inline',
'class' => 'form-as-button',
'jsform' => false,
'elements' => array(
'suid' => array('type' => 'hidden', 'value' => $user->id),
'action' => array('type' => 'hidden', 'value' => 'delete'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_deleteremove'),
'alt' => get_string('deletespecific', 'mahara', $user->username),
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'value' => '<span class="'.$deleteicon.'"></span>' . get_string('deletespecific', 'mahara', $user->username),
'elementtitle' => get_string('delete'),
),
),
......@@ -909,7 +925,7 @@ function service_users_edit_form() {
else {
$username = param_alphanum('username', '');
}
$searchicon = $THEME->get_image_url('btn-search', 'auth/webservice');
$pieform = new pieform($form);
return $pieform->build(false) . '<div id="user_add">' .
pieform(array(
......
......@@ -138,6 +138,8 @@ safe_require('auth', 'webservice');
PluginAuthWebservice::menu_items($smarty, 'webservice/oauthconfig');
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', TITLE);
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('PAGEICON', 'fa fa-puzzle-piece');
$smarty->display('form.tpl');
......@@ -392,9 +394,9 @@ function webservice_server_list_form($sopts, $iopts) {
'token' => array('type' => 'hidden', 'value' => $consumer->id),
'action' => array('type' => 'hidden', 'value' => 'edit'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_edit'),
'alt' => get_string('editspecific', 'mahara', $consumer->id),
'type' => 'button',
'usebuttontag' => true,
'value' => get_string('editspecific', 'mahara', $consumer->id),
'elementtitle' => get_string('edit'),
),
),
......@@ -410,8 +412,8 @@ function webservice_server_list_form($sopts, $iopts) {
'token' => array('type' => 'hidden', 'value' => $consumer->id),
'action' => array('type' => 'hidden', 'value' => 'delete'),
'submit' => array(
'type' => 'image',
'src' => $THEME->get_image_url('btn_deleteremove'),
'type' => 'button',
'usebuttontag' => true,
'alt' => get_string('deletespecific', 'mahara', $consumer->id),
'elementtitle' => get_string('delete'),
),
......
......@@ -182,8 +182,8 @@ EOF;
$headers[] = $inlinejs;
$smarty = smarty(array(), $headers, array('Close' => 'mahara', 'wsdoc' => 'auth.webservice'));
safe_require('auth', 'webservice');
$webservice_menu = PluginAuthWebservice::menu_items(MENUITEM);
$smarty->assign('TERTIARYMENU', $webservice_menu);
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('form', $form);
$smarty->assign('PAGEHEADING', $heading);
$smarty->display('form.tpl');
......
......@@ -66,7 +66,6 @@ $token_details['elements']['institution'] = array(
'defaultvalue' => trim($dbtoken->institution),
);
$searchicon = $THEME->get_image_url('btn-search', 'auth/webservice');
if ($USER->is_admin_for_user($dbuser->id)) {
$user_url = get_config('wwwroot') . 'admin/users/edit.php?id=' . $dbuser->id;
......@@ -179,8 +178,8 @@ $form = pieform($form);
$smarty = smarty(array(), array('<link rel="stylesheet" type="text/css" href="' . $THEME->get_url('style/webservice.css', false, 'auth/webservice') . '">',));
safe_require('auth', 'webservice');
$webservice_menu = PluginAuthWebservice::menu_items(MENUITEM);
$smarty->assign('TERTIARYMENU', $webservice_menu);
$webservice_menu = PluginAuthWebservice::admin_menu_items();
$smarty->assign('SUBPAGENAV', $webservice_menu);
$smarty->assign('token', $dbtoken->token);
$smarty->assign('form', $form);
$heading = get_string('tokens', 'auth.webservice');
......
......@@ -77,8 +77,6 @@ $serviceuser_details['elements']['institution'] = array(