diff --git a/js/controllers/MenuHandler.js b/js/controllers/MenuHandler.js
index bdbb2096038..48a944d310a 100644
--- a/js/controllers/MenuHandler.js
+++ b/js/controllers/MenuHandler.js
@@ -53,15 +53,6 @@
function(e) {
$(e.currentTarget).attr('aria-expanded', 'false');
});
-
- // Prevent first touch on top-level menu items from following the link
- this.getHtmlElement().find('[aria-haspopup="true"] > a').on(
- 'touchstart', function(e) {
- if ($(this).parent().attr('aria-expanded') != false) {
- $(this).focus();
- e.preventDefault();
- }
- });
};
$.pkp.classes.Helper.inherits(
$.pkp.controllers.MenuHandler, $.pkp.classes.Handler);
diff --git a/templates/common/header.tpl b/templates/common/header.tpl
index 28f88273916..10c8984d10e 100644
--- a/templates/common/header.tpl
+++ b/templates/common/header.tpl
@@ -73,7 +73,7 @@
{if array_intersect(array(ROLE_ID_MANAGER), (array)$userRoles)}
- {translate key="navigation.settings"}
+ {translate key="navigation.settings"}
- {translate key="navigation.access"}
+ {translate key="navigation.access"}
- {translate key="navigation.tools"}
+ {translate key="navigation.tools"}
- {translate key="navigation.tools.importExport"}
- {translate key="navigation.tools.statistics"}
diff --git a/templates/header/usernav.tpl b/templates/header/usernav.tpl
index 74cb49bab17..b342e695ec0 100644
--- a/templates/header/usernav.tpl
+++ b/templates/header/usernav.tpl
@@ -113,7 +113,7 @@
{/if}
{if $isUserLoggedIn}
-
-
+
{$loggedInUsername|escape}
diff --git a/tests/data/PKPCreateUsersTest.inc.php b/tests/data/PKPCreateUsersTest.inc.php
index 892e9de6a3e..3661e8c74b7 100644
--- a/tests/data/PKPCreateUsersTest.inc.php
+++ b/tests/data/PKPCreateUsersTest.inc.php
@@ -24,7 +24,7 @@ protected function createUsers($users) {
$this->open(self::$baseUrl);
$this->waitForElementPresent($selector='css=li.profile a:contains(\'Dashboard\')');
$this->clickAndWait($selector);
- $this->waitForElementPresent($selector='link=Users & Roles');
+ $this->waitForElementPresent($selector='link=Users');
$this->click($selector);
foreach ($users as $data) {