From 0a12c7e382c507b6f7b6ca3cffc1f0fff58283fa Mon Sep 17 00:00:00 2001 From: Alec Smecher Date: Thu, 7 Feb 2013 15:37:40 -0800 Subject: [PATCH] *8094* Remove breadcrumb code --- classes/plugins/ImportExportPlugin.inc.php | 32 ------- classes/plugins/PubIdPlugin.inc.php | 24 ----- classes/plugins/ReportPlugin.inc.php | 32 ------- .../sectionEditor/SectionEditorAction.inc.php | 35 ------- pages/admin/AdminCategoriesHandler.inc.php | 22 +---- pages/author/AuthorHandler.inc.php | 15 +-- pages/comment/CommentHandler.inc.php | 25 ++--- pages/copyeditor/CopyeditorHandler.inc.php | 15 +-- pages/editor/EditorHandler.inc.php | 36 +------ pages/editor/IssueManagementHandler.inc.php | 39 +++----- pages/issue/IssueHandler.inc.php | 3 - .../layoutEditor/LayoutEditorHandler.inc.php | 24 ++--- pages/manager/FilesHandler.inc.php | 1 - pages/manager/ManagerHandler.inc.php | 9 +- pages/manager/ReviewFormHandler.inc.php | 27 ++---- pages/manager/SectionHandler.inc.php | 14 +-- pages/manager/SubscriptionHandler.inc.php | 21 ---- pages/proofreader/ProofreaderHandler.inc.php | 13 +-- pages/reviewer/ReviewerHandler.inc.php | 12 +-- pages/rtadmin/RTAdminHandler.inc.php | 27 +----- pages/search/SearchHandler.inc.php | 26 ++--- .../SectionEditorHandler.inc.php | 28 +----- .../SubmissionCommentsHandler.inc.php | 30 +++--- .../SubmissionEditHandler.inc.php | 96 +++++++++---------- .../SubscriptionManagerHandler.inc.php | 19 +--- pages/user/UserHandler.inc.php | 19 ++-- .../abnt/AbntCitationPlugin.inc.php | 26 ----- .../BooksForReviewPlugin.inc.php | 27 ------ .../pages/BooksForReviewAuthorHandler.inc.php | 19 +--- .../pages/BooksForReviewEditorHandler.inc.php | 38 +------- .../pages/BooksForReviewHandler.inc.php | 21 +--- plugins/generic/browse/BrowsePlugin.inc.php | 27 ------ .../browse/pages/BrowseHandler.inc.php | 17 ++-- .../generic/counter/CounterHandler.inc.php | 21 +--- .../CustomBlockManagerPlugin.inc.php | 17 ---- .../CustomBlockPlugin.inc.php | 9 -- .../customLocale/CustomLocaleHandler.inc.php | 19 ++-- .../externalFeed/ExternalFeedPlugin.inc.php | 31 ------ .../GoogleAnalyticsPlugin.inc.php | 28 ------ plugins/generic/lucene/LucenePlugin.inc.php | 26 ----- .../phpMyVisites/PhpMyVisitesPlugin.inc.php | 28 ------ plugins/generic/piwik/PiwikPlugin.inc.php | 28 ------ .../generic/referral/ReferralHandler.inc.php | 7 -- .../generic/referral/ReferralPlugin.inc.php | 28 ------ .../staticPages/StaticPagesPlugin.inc.php | 20 ---- .../sword/SwordImportExportPlugin.inc.php | 1 - plugins/generic/thesis/ThesisHandler.inc.php | 13 --- plugins/generic/thesis/ThesisPlugin.inc.php | 32 ------- .../timedView/TimedViewReportPlugin.inc.php | 27 ------ .../translator/TranslatorHandler.inc.php | 10 +- .../crossref/CrossRefExportPlugin.inc.php | 3 - .../datacite/DataciteExportPlugin.inc.php | 2 - .../datacite/classes/DOIExportPlugin.inc.php | 9 -- plugins/importexport/doaj/DOAJPlugin.inc.php | 1 - .../DuraCloudImportExportPlugin.inc.php | 4 - .../erudit/EruditExportPlugin.inc.php | 1 - .../mets/MetsExportPlugin.inc.php | 2 - .../native/NativeImportExportPlugin.inc.php | 3 - .../pubIds/PubIdImportExportPlugin.inc.php | 2 - .../pubmed/PubMedExportPlugin.inc.php | 3 - .../quickSubmit/QuickSubmitPlugin.inc.php | 1 - .../users/UserImportExportPlugin.inc.php | 1 - .../themes/custom/CustomThemePlugin.inc.php | 28 ------ templates/article/header.tpl | 6 -- templates/sectionEditor/submissionNotes.tpl | 1 - templates/sectionEditor/submissionRegrets.tpl | 1 - 66 files changed, 163 insertions(+), 1069 deletions(-) diff --git a/classes/plugins/ImportExportPlugin.inc.php b/classes/plugins/ImportExportPlugin.inc.php index 3510b7b56f7..ed72eb1d88c 100644 --- a/classes/plugins/ImportExportPlugin.inc.php +++ b/classes/plugins/ImportExportPlugin.inc.php @@ -46,38 +46,6 @@ function getDescription() { return 'This is the ImportExportPlugin base class. Its functions can be overridden by subclasses to provide import/export functionality for various formats.'; } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $crumbs Array ($url, $name, $isTranslated) - * @param $subclass boolean - */ - function setBreadcrumbs($crumbs = array(), $isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ), - array ( - $request->url(null, 'manager', 'importexport'), - 'manager.importExport' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'importexport', array('plugin', $this->getName())), - $this->getDisplayName(), - true - ); - - $templateMgr->assign('pageHierarchy', array_merge($pageCrumbs, $crumbs)); - } - /** * Display the import/export plugin UI. * @param $args array The array of arguments the user supplied. diff --git a/classes/plugins/PubIdPlugin.inc.php b/classes/plugins/PubIdPlugin.inc.php index c5ea55a50a5..33adb461f6a 100644 --- a/classes/plugins/PubIdPlugin.inc.php +++ b/classes/plugins/PubIdPlugin.inc.php @@ -113,7 +113,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $message = NOTIFICATION_TYPE_SUCCESS; return false; } else { - $this->_setBreadcrumbs(); $form->initData(); $pluginModalContent = $form->fetch($request); } @@ -453,29 +452,6 @@ function setEnabled($enabled) { function _getDAOs() { return array('IssueDAO', 'ArticleDAO', 'ArticleGalleyDAO', 'SuppFileDAO'); } - - /** - * Set the breadcrumbs, given the plugin's tree of items to append. - */ - function _setBreadcrumbs() { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ), - array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ) - ); - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } } ?> diff --git a/classes/plugins/ReportPlugin.inc.php b/classes/plugins/ReportPlugin.inc.php index 0155e52c9fa..1112cc2ce19 100644 --- a/classes/plugins/ReportPlugin.inc.php +++ b/classes/plugins/ReportPlugin.inc.php @@ -76,38 +76,6 @@ function getMetricFullName($metricType) { return null; } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $crumbs Array ($url, $name, $isTranslated) - * @param $subclass boolean - */ - function setBreadcrumbs($crumbs = array(), $isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ), - array ( - $request->url(null, 'manager', 'reports'), - 'manager.statistics.reports' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'reports', array('plugin', $this->getName())), - $this->getDisplayName(), - true - ); - - $templateMgr->assign('pageHierarchy', array_merge($pageCrumbs, $crumbs)); - } - /** * Display the import/export plugin UI. * @param $args Array The array of arguments the user supplied. diff --git a/classes/submission/sectionEditor/SectionEditorAction.inc.php b/classes/submission/sectionEditor/SectionEditorAction.inc.php index a2810582df5..3e64ce53bed 100644 --- a/classes/submission/sectionEditor/SectionEditorAction.inc.php +++ b/classes/submission/sectionEditor/SectionEditorAction.inc.php @@ -2410,41 +2410,6 @@ function uploadReviewForReviewer($reviewId, $article, $request) { ArticleLog::logEvent($request, $article, ARTICLE_LOG_REVIEW_FILE_BY_PROXY, 'log.review.reviewFileByProxy', array('reviewerName' => $reviewer->getFullName(), 'round' => $reviewAssignment->getRound(), 'userName' => $user->getFullName(), 'reviewId' => $reviewAssignment->getId())); } } - - /** - * Helper method for building submission breadcrumb - * @param $articleId - * @param $parentPage name of submission component - * @return array - */ - function submissionBreadcrumb($articleId, $parentPage, $section) { - $breadcrumb = array(); - if ($articleId) { - $breadcrumb[] = array(Request::url(null, $section, 'submission', $articleId), "#$articleId", true); - } - - if ($parentPage) { - switch($parentPage) { - case 'summary': - $parent = array(Request::url(null, $section, 'submission', $articleId), 'submission.summary'); - break; - case 'review': - $parent = array(Request::url(null, $section, 'submissionReview', $articleId), 'submission.review'); - break; - case 'editing': - $parent = array(Request::url(null, $section, 'submissionEditing', $articleId), 'submission.editing'); - break; - case 'history': - $parent = array(Request::url(null, $section, 'submissionHistory', $articleId), 'submission.history'); - break; - } - if ($section != 'editor' && $section != 'sectionEditor') { - $parent[0] = Request::url(null, $section, 'submission', $articleId); - } - $breadcrumb[] = $parent; - } - return $breadcrumb; - } } ?> diff --git a/pages/admin/AdminCategoriesHandler.inc.php b/pages/admin/AdminCategoriesHandler.inc.php index 0b60bb3f48c..9d57105a79b 100644 --- a/pages/admin/AdminCategoriesHandler.inc.php +++ b/pages/admin/AdminCategoriesHandler.inc.php @@ -133,7 +133,7 @@ function editCategory($args, &$request) { $this->validate($request, $categoryId); - $this->setupTemplate($request, $this->category, true); + $this->setupTemplate($request); import('classes.journal.categories.CategoryForm'); $templateMgr =& TemplateManager::getManager($request); @@ -177,7 +177,7 @@ function updateCategory($args, &$request) { $this->validate($request, $categoryId); $category =& $this->category; } - $this->setupTemplate($request, $category); + $this->setupTemplate($request); import('classes.journal.categories.CategoryForm'); @@ -192,7 +192,6 @@ function updateCategory($args, &$request) { } else { $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'admin', 'categories'), 'admin.categories')); $templateMgr->assign('pageTitle', $category? @@ -217,23 +216,6 @@ function setCategoriesEnabled($args, &$request) { $request->redirect(null, null, 'categories'); } - /** - * Set up the template. - * @param $request PKPRequest - * @param $category Category optional - * @param $subclass boolean optional - */ - function setupTemplate($request, $category = null, $subclass = false) { - parent::setupTemplate($request, true); - $templateMgr =& TemplateManager::getManager($request); - if ($subclass) { - $templateMgr->append('pageHierarchy', array($request->url(null, 'admin', 'categories'), 'admin.categories')); - } - if ($category) { - $templateMgr->append('pageHierarchy', array($request->url(null, 'admin', 'editCategory', $category->getId()), $category->getLocalizedName(), true)); - } - } - /** * Validate the request. If a category ID is supplied, the category object * will be fetched and validated against. If, diff --git a/pages/author/AuthorHandler.inc.php b/pages/author/AuthorHandler.inc.php index 7613936bdb3..856b20ad4df 100644 --- a/pages/author/AuthorHandler.inc.php +++ b/pages/author/AuthorHandler.inc.php @@ -149,22 +149,11 @@ function validate(&$request, $articleId = null, $reason = null) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy + * @param $request PKPRequest */ - function setupTemplate($request, $subclass = false, $articleId = 0, $parentPage = null) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR, LOCALE_COMPONENT_PKP_SUBMISSION); - $templateMgr =& TemplateManager::getManager($request); - - $pageHierarchy = $subclass ? array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'author'), 'user.role.author'), array($request->url(null, 'author'), 'article.submissions')) - : array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'author'), 'user.role.author')); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, 'author'); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } /** diff --git a/pages/comment/CommentHandler.inc.php b/pages/comment/CommentHandler.inc.php index 3421750188f..a671614dfd1 100644 --- a/pages/comment/CommentHandler.inc.php +++ b/pages/comment/CommentHandler.inc.php @@ -58,7 +58,7 @@ function view($args, &$request) { if (!$comment) $comments =& $commentDao->getRootCommentsBySubmissionId($articleId, 1); else $comments =& $comment->getChildren(); - $this->setupTemplate($request, $article, $galleyId, $comment); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); if ($request->getUserVar('refresh')) $templateMgr->setCacheability(CACHEABILITY_NO_CACHE); @@ -96,7 +96,7 @@ function add($args, $request) { } $this->validate($request, $articleId); - $this->setupTemplate($request, $publishedArticle, $galleyId, $parent); + $this->setupTemplate($request); // Bring in comment constants $enableComments = $journal->getSetting('enableComments'); @@ -225,28 +225,15 @@ function validate(&$request, $articleId) { * @param $galleyId int * @param $comment Comment */ - function setupTemplate(&$request, $article, $galleyId, $comment = null) { - parent::setupTemplate(); + function setupTemplate($request) { + parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_READER); - $templateMgr =& TemplateManager::getManager($request); - $journal =& $request->getJournal(); + $templateMgr = TemplateManager::getManager($request); + $journal = $request->getJournal(); if (!$journal || !$journal->getSetting('restrictSiteAccess')) { $templateMgr->setCacheability(CACHEABILITY_PUBLIC); } - - $pageHierarchy = array( - array( - $request->url(null, 'article', 'view', array( - $article->getBestArticleId($request->getJournal()), $galleyId - )), - String::stripUnsafeHtml($article->getLocalizedTitle()), - true - ) - ); - - if ($comment) $pageHierarchy[] = array($request->url(null, 'comment', 'view', array($article->getId(), $galleyId)), 'comments.readerComments'); - $templateMgr->assign('pageHierarchy', $pageHierarchy); } } diff --git a/pages/copyeditor/CopyeditorHandler.inc.php b/pages/copyeditor/CopyeditorHandler.inc.php index 15afe01833f..7f9f6fe34ec 100644 --- a/pages/copyeditor/CopyeditorHandler.inc.php +++ b/pages/copyeditor/CopyeditorHandler.inc.php @@ -111,23 +111,10 @@ function index($args, &$request) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - * @param $articleId int - * @param $parentPage string optional */ - function setupTemplate($request, $subclass = false, $articleId = 0, $parentPage = null) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION); - $templateMgr =& TemplateManager::getManager($request); - $pageHierarchy = $subclass ? array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'copyeditor'), 'user.role.copyeditor')) - : array(array('user', 'navigation.user'), array('copyeditor', 'user.role.copyeditor')); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, 'copyeditor'); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } /** diff --git a/pages/editor/EditorHandler.inc.php b/pages/editor/EditorHandler.inc.php index a2f5098c3d3..389d22bd187 100644 --- a/pages/editor/EditorHandler.inc.php +++ b/pages/editor/EditorHandler.inc.php @@ -40,7 +40,7 @@ function EditorHandler() { */ function index($args, $request) { $this->validate($request); - $this->setupTemplate($request, EDITOR_SECTION_HOME); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $journal =& $request->getJournal(); @@ -159,7 +159,7 @@ function index($args, $request) { */ function submissions($args, $request) { $this->validate($request); - $this->setupTemplate($request, EDITOR_SECTION_SUBMISSIONS); + $this->setupTemplate($request); $journal =& $request->getJournal(); $journalId = $journal->getId(); @@ -413,7 +413,7 @@ function assignEditor($args, $request) { // has been done, send the email and store the editor // selection. - $this->setupTemplate($request, EDITOR_SECTION_SUBMISSIONS, $articleId, 'summary'); + $this->setupTemplate($request); // FIXME: Prompt for due date. if (EditorAction::assignEditor($articleId, $editorId, $isEditor, $request->getUserVar('send'), $request)) { @@ -421,7 +421,7 @@ function assignEditor($args, $request) { } } else { // Allow the user to choose a section editor or editor. - $this->setupTemplate($request, EDITOR_SECTION_SUBMISSIONS, $articleId, 'summary'); + $this->setupTemplate($request); $searchType = null; $searchMatch = null; @@ -490,7 +490,7 @@ function deleteSubmission($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - parent::setupTemplate($request, true); + parent::setupTemplate($request); $journal =& $request->getJournal(); @@ -511,32 +511,6 @@ function deleteSubmission($args, $request) { $request->redirect(null, null, 'submissions', 'submissionsArchives'); } - - /** - * Setup common template variables. - * @param $level int set to 0 if caller is at the same level as this handler in the hierarchy; otherwise the number of levels below this handler - */ - function setupTemplate($request, $level = EDITOR_SECTION_HOME, $articleId = 0, $parentPage = null) { - parent::setupTemplate($request); - - // Layout Editors have access to some Issue Mgmt functions. Make sure we give them - // the appropriate breadcrumbs and sidebar. - $isLayoutEditor = $request->getRequestedPage() == 'layoutEditor'; - - $journal =& $request->getJournal(); - $templateMgr =& TemplateManager::getManager($request); - - if ($level==EDITOR_SECTION_HOME) $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user')); - else if ($level==EDITOR_SECTION_SUBMISSIONS) $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'editor'), 'user.role.editor'), array($request->url(null, 'editor', 'submissions'), 'article.submissions')); - else if ($level==EDITOR_SECTION_ISSUES) $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, $isLayoutEditor?'layoutEditor':'editor'), $isLayoutEditor?'user.role.layoutEditor':'user.role.editor'), array($request->url(null, $isLayoutEditor?'layoutEditor':'editor', 'futureIssues'), 'issue.issues')); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, 'editor'); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); - } } ?> diff --git a/pages/editor/IssueManagementHandler.inc.php b/pages/editor/IssueManagementHandler.inc.php index 88ba4d19051..c1b12806b15 100644 --- a/pages/editor/IssueManagementHandler.inc.php +++ b/pages/editor/IssueManagementHandler.inc.php @@ -32,7 +32,7 @@ function IssueManagementHandler() { */ function futureIssues($args, $request) { $this->validate($request, null, true); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $journal =& $request->getJournal(); $issueDao =& DAORegistry::getDAO('IssueDAO'); @@ -50,7 +50,7 @@ function futureIssues($args, $request) { */ function backIssues($args, $request) { $this->validate($request); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $journal =& $request->getJournal(); $issueDao =& DAORegistry::getDAO('IssueDAO'); @@ -137,7 +137,7 @@ function removeIssue($args, $request) { */ function createIssue($args, $request) { $this->validate($request); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); import('classes.issue.form.IssueForm'); @@ -164,7 +164,7 @@ function createIssue($args, $request) { */ function saveIssue($args, $request) { $this->validate($request); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); import('classes.issue.form.IssueForm'); $issueForm = new IssueForm('editor/issues/createIssue.tpl'); @@ -193,7 +193,7 @@ function issueData($args, $request) { $issueId = (int) array_shift($args); $this->validate($request, $issueId, true); $issue =& $this->issue; - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); import('classes.issue.IssueAction'); @@ -226,7 +226,7 @@ function editIssue($args, $request) { $issueId = (int) array_shift($args); $this->validate($request, $issueId, true); $issue =& $this->issue; - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('issueId', $issueId); @@ -316,7 +316,7 @@ function issueGalleys($args, $request) { $issueId = (int) array_shift($args); $this->validate($request, $issueId, true); $issue =& $this->issue; - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); import('classes.issue.IssueAction'); @@ -360,7 +360,7 @@ function editIssueGalley($args, $request) { $galleyId = (int) array_shift($args); $this->validate($request, $issueId, true); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); import('classes.issue.form.IssueGalleyForm'); $submitForm = new IssueGalleyForm($issueId, $galleyId); @@ -383,7 +383,7 @@ function saveIssueGalley($args, $request) { $galleyId = (int) array_shift($args); $this->validate($request, $issueId, true); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); import('classes.issue.form.IssueGalleyForm'); $submitForm = new IssueGalleyForm($issueId, $galleyId); @@ -456,7 +456,7 @@ function proofIssueGalley($args, $request) { $galleyId = (int) array_shift($args); $this->validate($request, $issueId, true); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('issueId', $issueId); @@ -474,7 +474,7 @@ function proofIssueGalleyTop($args, $request) { $galleyId = (int) array_shift($args); $this->validate($request, $issueId, true); - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('issueId', $issueId); @@ -533,7 +533,7 @@ function issueToc($args, $request) { $issueId = (int) array_shift($args); $this->validate($request, $issueId, true); $issue =& $this->issue; - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -994,7 +994,7 @@ function unpublishIssue($args, $request) { function notifyUsers($args, $request) { $this->validate($request, (int) $request->getUserVar('issue')); $issue =& $this->issue; - $this->setupTemplate($request, EDITOR_SECTION_ISSUES); + $this->setupTemplate($request); $userDao =& DAORegistry::getDAO('UserDAO'); $issueDao =& DAORegistry::getDAO('IssueDAO'); @@ -1148,15 +1148,6 @@ function validate($request, $issueId = null, $allowLayoutEditor = false) { $this->issue =& $issue; return true; } - - /** - * Setup common template variables. - * @param $level int set to one of EDITOR_SECTION_? defined in EditorHandler. - */ - function setupTemplate($request, $level) { - parent::setupTemplate($request, $level); - - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('isLayoutEditor', $request->getRequestedPage() == 'layoutEditor'); - } } + +?> diff --git a/pages/issue/IssueHandler.inc.php b/pages/issue/IssueHandler.inc.php index fd7ce2c07bf..3ca02467843 100644 --- a/pages/issue/IssueHandler.inc.php +++ b/pages/issue/IssueHandler.inc.php @@ -64,7 +64,6 @@ function current($args, $request) { // Display creative commons logo/licence if enabled $templateMgr->assign('displayCreativeCommons', $journal->getSetting('includeCreativeCommons')); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'issue', 'current'), 'current.current'))); $templateMgr->assign('helpTopicId', 'user.currentAndArchives'); // consider public identifiers $pubIdPlugins =& PluginRegistry::loadCategory('pubIds', true); @@ -91,7 +90,6 @@ function view($args, $request) { // Display creative commons logo/licence if enabled $templateMgr->assign('displayCreativeCommons', $journal->getSetting('includeCreativeCommons')); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'issue', 'archive'), 'archive.archives'))); $templateMgr->assign('helpTopicId', 'user.currentAndArchives'); // consider public identifiers $pubIdPlugins =& PluginRegistry::loadCategory('pubIds', true); @@ -162,7 +160,6 @@ function viewIssue($args, $request) { $templateMgr->assign('issueId', $issueId); $templateMgr->assign('galleyId', $galleyId); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'issue', 'view', $issueId), $issue->getIssueIdentification(false, true), true))); $templateMgr->assign('issueHeadingTitle', __('issue.viewIssue')); $templateMgr->assign('locale', AppLocale::getLocale()); diff --git a/pages/layoutEditor/LayoutEditorHandler.inc.php b/pages/layoutEditor/LayoutEditorHandler.inc.php index 9f4092bf360..54c699819c3 100644 --- a/pages/layoutEditor/LayoutEditorHandler.inc.php +++ b/pages/layoutEditor/LayoutEditorHandler.inc.php @@ -51,7 +51,7 @@ function index($args, &$request) { */ function submissions($args, &$request) { $this->validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); $user =& $request->getUser(); @@ -130,7 +130,7 @@ function submissions($args, &$request) { */ function futureIssues($args, &$request) { $this->validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); $issueDao =& DAORegistry::getDAO('IssueDAO'); @@ -148,7 +148,7 @@ function futureIssues($args, &$request) { */ function backIssues($args, &$request) { $this->validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); $issueDao =& DAORegistry::getDAO('IssueDAO'); @@ -189,7 +189,7 @@ function completeProofreader($args, &$request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // set the date notified for this signoff so proofreading can no longer be initiated. $signoffDao =& DAORegistry::getDAO('SignoffDAO'); @@ -204,23 +204,11 @@ function completeProofreader($args, &$request) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - * @param $articleId int optional - * @param $parentPage string optional + * @param $request PKPRequest */ - function setupTemplate($request, $subclass = false, $articleId = 0, $parentPage = null) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_EDITOR); - $templateMgr =& TemplateManager::getManager($request); - $pageHierarchy = $subclass ? array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'layoutEditor'), 'user.role.layoutEditor')) - : array(array($request->url(null, 'user'), 'navigation.user')); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, 'layoutEditor'); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } /** diff --git a/pages/manager/FilesHandler.inc.php b/pages/manager/FilesHandler.inc.php index a8165e75e27..1b2a894c010 100644 --- a/pages/manager/FilesHandler.inc.php +++ b/pages/manager/FilesHandler.inc.php @@ -35,7 +35,6 @@ function files($args, &$request) { $fileManager = new FileManager(); $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'manager'), 'manager.journalManagement'))); $this->_parseDirArg($args, $currentDir, $parentDir); $currentPath = $this->_getRealFilesDir($request, $currentDir); diff --git a/pages/manager/ManagerHandler.inc.php b/pages/manager/ManagerHandler.inc.php index f639c853e32..aed307dda50 100644 --- a/pages/manager/ManagerHandler.inc.php +++ b/pages/manager/ManagerHandler.inc.php @@ -65,16 +65,11 @@ function index($args, &$request) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy + * @param $request PKPRequest */ - function setupTemplate($request, $subclass = false) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_MANAGER, LOCALE_COMPONENT_APP_MANAGER, LOCALE_COMPONENT_PKP_ADMIN); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('pageHierarchy', - $subclass ? array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'manager'), 'manager.journalManagement')) - : array(array($request->url(null, 'user'), 'navigation.user')) - ); } /** diff --git a/pages/manager/ReviewFormHandler.inc.php b/pages/manager/ReviewFormHandler.inc.php index 8bed6cf4a0d..02a33273e32 100644 --- a/pages/manager/ReviewFormHandler.inc.php +++ b/pages/manager/ReviewFormHandler.inc.php @@ -74,7 +74,7 @@ function editReviewForm($args, $request) { if ($reviewFormId != null && (!isset($reviewForm) || $completeCounts[$reviewFormId] != 0 || $incompleteCounts[$reviewFormId] != 0)) { $request->redirect(null, null, 'reviewForms'); } else { - $this->setupTemplate($request, true, $reviewForm); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); if ($reviewFormId == null) { @@ -111,7 +111,7 @@ function updateReviewForm($args, &$request) { if ($reviewFormId != null && (!isset($reviewForm) || $completeCounts[$reviewFormId] != 0 || $incompleteCounts[$reviewFormId] != 0)) { $request->redirect(null, null, 'reviewForms'); } - $this->setupTemplate($request, true, $reviewForm); + $this->setupTemplate($request); import('classes.manager.form.ReviewFormForm'); $reviewFormForm = new ReviewFormForm($reviewFormId); @@ -155,11 +155,7 @@ function previewReviewForm($args, &$request) { $completeCounts = $reviewFormDao->getUseCounts(ASSOC_TYPE_JOURNAL, $journal->getId(), true); $incompleteCounts = $reviewFormDao->getUseCounts(ASSOC_TYPE_JOURNAL, $journal->getId(), false); - if ($completeCounts[$reviewFormId] != 0 || $incompleteCounts[$reviewFormId] != 0) { - $this->setupTemplate($request, true); - } else { - $this->setupTemplate($request, true, $reviewForm); - } + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -344,7 +340,7 @@ function reviewFormElements($args, $request) { $unusedReviewFormTitles =& $reviewFormDao->getTitlesByAssocId(ASSOC_TYPE_JOURNAL, $journal->getId(), 0); - $this->setupTemplate($request, true, $reviewForm); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->addJavaScript('lib/pkp/js/lib/jquery/plugins/jquery.tablednd.js'); @@ -387,7 +383,7 @@ function editReviewFormElement($args, $request) { $request->redirect(null, null, 'reviewFormElements', array($reviewFormId)); } - $this->setupTemplate($request, true, $reviewForm); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); if ($reviewFormElementId == null) { @@ -421,7 +417,7 @@ function updateReviewFormElement($args, $request) { $reviewFormElementDao =& DAORegistry::getDAO('ReviewFormElementDAO'); $reviewForm =& $reviewFormDao->getReviewForm($reviewFormId, ASSOC_TYPE_JOURNAL, $journal->getId()); - $this->setupTemplate($request, true, $reviewForm); + $this->setupTemplate($request); if (!$reviewFormDao->unusedReviewFormExists($reviewFormId, ASSOC_TYPE_JOURNAL, $journal->getId()) || ($reviewFormElementId != null && !$reviewFormElementDao->reviewFormElementExists($reviewFormElementId, $reviewFormId))) { $request->redirect(null, null, 'reviewFormElements', array($reviewFormId)); @@ -572,17 +568,6 @@ function copyReviewFormElement($args, $request) { $request->redirect(null, null, 'reviewFormElements', array($targetReviewFormId)); } - - function setupTemplate($request, $subclass = false, $reviewForm = null) { - parent::setupTemplate($request, true); - if ($subclass) { - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'reviewForms'), 'manager.reviewForms')); - } - if ($reviewForm) { - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'editReviewForm', $reviewForm->getId()), $reviewForm->getLocalizedTitle(), true)); - } - } } ?> diff --git a/pages/manager/SectionHandler.inc.php b/pages/manager/SectionHandler.inc.php index d4aac0b0b6d..d4d868c020a 100644 --- a/pages/manager/SectionHandler.inc.php +++ b/pages/manager/SectionHandler.inc.php @@ -39,7 +39,6 @@ function sections($args, &$request) { $templateMgr =& TemplateManager::getManager($request); $templateMgr->addJavaScript('lib/pkp/js/lib/jquery/plugins/jquery.tablednd.js'); $templateMgr->addJavaScript('lib/pkp/js/functions/tablednd.js'); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'manager'), 'manager.journalManagement'))); $templateMgr->assign_by_ref('sections', $sections); $templateMgr->assign('emptySectionIds', $emptySectionIds); $templateMgr->assign('helpTopicId','journal.managementPages.sections'); @@ -62,7 +61,7 @@ function createSection($args, &$request) { */ function editSection($args, &$request) { $this->validate(); - $this->setupTemplate($request, true); + $this->setupTemplate($request); import('classes.manager.form.SectionForm'); @@ -82,7 +81,7 @@ function editSection($args, &$request) { */ function updateSection($args, &$request) { $this->validate(); - $this->setupTemplate($request, true); + $this->setupTemplate($request); import('classes.manager.form.SectionForm'); $sectionForm = new SectionForm(!isset($args) || empty($args) ? null : ((int) $args[0])); @@ -173,15 +172,10 @@ function moveSection($args, &$request) { /** * Configure the template. * @param $request PKPRequest - * @param $subclass boolean True iff this page is a second level deep in the breadcrumb heirarchy. */ - function setupTemplate($request, $subclass = false) { + function setupTemplate($request) { AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_PKP_READER); - parent::setupTemplate($request, true); - if ($subclass) { - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'sections'), 'section.sections')); - } + parent::setupTemplate($request); } } diff --git a/pages/manager/SubscriptionHandler.inc.php b/pages/manager/SubscriptionHandler.inc.php index 88a7f31959d..7b6b6458f18 100644 --- a/pages/manager/SubscriptionHandler.inc.php +++ b/pages/manager/SubscriptionHandler.inc.php @@ -219,9 +219,6 @@ function editSubscriptionType($args, $request) { $this->validate(); $this->setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'subscriptionTypes'), 'manager.subscriptionTypes')); - import('classes.subscription.SubscriptionAction'); $editSuccess = SubscriptionAction::editSubscriptionType($args, $request); @@ -244,9 +241,6 @@ function updateSubscriptionType($args, $request) { $this->validate(); $this->setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'subscriptionTypes'), 'manager.subscriptionTypes')); - import('classes.subscription.SubscriptionAction'); $updateSuccess = SubscriptionAction::updateSubscriptionType($request); @@ -282,21 +276,6 @@ function saveSubscriptionPolicies($args, $request) { import('classes.subscription.SubscriptionAction'); SubscriptionAction::saveSubscriptionPolicies($args, $request); } - - /** - * Setup common template variables. - */ - function setupTemplate($request, $subclass = false, $institutional = false) { - parent::setupTemplate($request, true); - if ($subclass) { - $templateMgr =& TemplateManager::getManager($request); - if ($institutional) { - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'subscriptions', 'institutional'), 'manager.institutionalSubscriptions')); - } else { - $templateMgr->append('pageHierarchy', array($request->url(null, 'manager', 'subscriptions', 'individual'), 'manager.individualSubscriptions')); - } - } - } } ?> diff --git a/pages/proofreader/ProofreaderHandler.inc.php b/pages/proofreader/ProofreaderHandler.inc.php index eaf24faef48..de7f6515dda 100644 --- a/pages/proofreader/ProofreaderHandler.inc.php +++ b/pages/proofreader/ProofreaderHandler.inc.php @@ -111,21 +111,10 @@ function index($args, &$request) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate($request, $subclass = false, $articleId = 0, $parentPage = null, $showSidebar = true) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_EDITOR); - $templateMgr =& TemplateManager::getManager($request); - $pageHierarchy = $subclass ? array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'proofreader'), 'user.role.proofreader')) - : array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'proofreader'), 'user.role.proofreader')); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, 'proofreader'); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } /** diff --git a/pages/reviewer/ReviewerHandler.inc.php b/pages/reviewer/ReviewerHandler.inc.php index 848fe781982..97afb93cca7 100644 --- a/pages/reviewer/ReviewerHandler.inc.php +++ b/pages/reviewer/ReviewerHandler.inc.php @@ -143,19 +143,11 @@ function &validateAccessKey($request, $userId, $reviewId, $newKey = null) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy + * @param $request PKPRequest */ - function setupTemplate($request, $subclass = false, $articleId = 0, $reviewId = 0) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_EDITOR); - $templateMgr =& TemplateManager::getManager($request); - $pageHierarchy = $subclass ? array(array(Request::url(null, 'user'), 'navigation.user'), array(Request::url(null, 'reviewer'), 'user.role.reviewer')) - : array(array(Request::url(null, 'user'), 'navigation.user'), array(Request::url(null, 'reviewer'), 'user.role.reviewer')); - - if ($articleId && $reviewId) { - $pageHierarchy[] = array(Request::url(null, 'reviewer', 'submission', $reviewId), "#$articleId", true); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } // diff --git a/pages/rtadmin/RTAdminHandler.inc.php b/pages/rtadmin/RTAdminHandler.inc.php index 1545690f152..fc402f3171a 100644 --- a/pages/rtadmin/RTAdminHandler.inc.php +++ b/pages/rtadmin/RTAdminHandler.inc.php @@ -103,7 +103,7 @@ function validateUrls($args, $request) { $versions = $rtDao->getVersions($journalId); } - $this->setupTemplate($request, true, $version); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->register_modifier('validate_url', 'smarty_rtadmin_validate_url'); $templateMgr->assign_by_ref('versions', $versions); @@ -114,33 +114,10 @@ function validateUrls($args, $request) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - * @param $version object The current version, if applicable - * @param $context object The current context, if applicable - * @param $search object The current search, if applicable */ - function setupTemplate($request, $subclass = false, $version = null, $context = null, $search = null) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_READER, LOCALE_COMPONENT_APP_MANAGER); - $templateMgr =& TemplateManager::getManager($request); - - $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'manager'), 'manager.journalManagement')); - - if ($subclass) $pageHierarchy[] = array($request->url(null, 'rtadmin'), 'rt.readingTools'); - - if ($version) { - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'versions'), 'rt.versions'); - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'editVersion', $version->getVersionId()), $version->getTitle(), true); - if ($context) { - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'contexts', $version->getVersionId()), 'rt.contexts'); - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'editContext', array($version->getVersionId(), $context->getContextId())), $context->getAbbrev(), true); - if ($search) { - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'searches', array($version->getVersionId(), $context->getContextId())), 'rt.searches'); - $pageHierarchy[] = array($request->url(null, 'rtadmin', 'editSearch', array($version->getVersionId(), $context->getContextId(), $search->getSearchId())), $search->getTitle(), true); - } - } - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } } diff --git a/pages/search/SearchHandler.inc.php b/pages/search/SearchHandler.inc.php index fcf61ae3794..35864f1f447 100644 --- a/pages/search/SearchHandler.inc.php +++ b/pages/search/SearchHandler.inc.php @@ -162,7 +162,7 @@ function search($args, &$request) { */ function authors($args, &$request) { $this->validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); @@ -255,7 +255,7 @@ function authors($args, &$request) { */ function titles($args, &$request) { $this->validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); @@ -310,7 +310,7 @@ function category($args, &$request) { $categoryId = (int) array_shift($args); $this->validate($request); - $this->setupTemplate($request, true, 'categories'); + $this->setupTemplate($request); $site =& $request->getSite(); $journal =& $request->getJournal(); @@ -338,25 +338,11 @@ function category($args, &$request) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - * @param $op string Current operation (for breadcrumb construction) */ - function setupTemplate($request, $subclass = false, $op = 'index') { + function setupTemplate($request) { parent::setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('helpTopicId', 'user.searchAndBrowse'); - - $opMap = array( - 'index' => 'navigation.search', - 'categories' => 'navigation.categories' - ); - - $templateMgr->assign('pageHierarchy', - $subclass ? array(array($request->url(null, 'search', $op), $opMap[$op])) - : array() - ); - - $journal =& $request->getJournal(); + $templateMgr = TemplateManager::getManager($request); + $journal = $request->getJournal(); if (!$journal || !$journal->getSetting('restrictSiteAccess')) { $templateMgr->setCacheability(CACHEABILITY_PUBLIC); } diff --git a/pages/sectionEditor/SectionEditorHandler.inc.php b/pages/sectionEditor/SectionEditorHandler.inc.php index 0ee51839c50..214b31d2926 100644 --- a/pages/sectionEditor/SectionEditorHandler.inc.php +++ b/pages/sectionEditor/SectionEditorHandler.inc.php @@ -169,35 +169,11 @@ function index($args, &$request) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - * @param $articleId int optional - * @param $parentPage string optional - * @param $showSidebar boolean optional + * @param $request PKPRequest */ - function setupTemplate($request, $subclass = false, $articleId = 0, $parentPage = null, $showSidebar = true) { + function setupTemplate($request) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION, LOCALE_COMPONENT_APP_EDITOR, LOCALE_COMPONENT_PKP_MANAGER, LOCALE_COMPONENT_APP_AUTHOR, LOCALE_COMPONENT_APP_MANAGER); - $templateMgr =& TemplateManager::getManager($request); - $isEditor = Validation::isEditor(); - - if (Request::getRequestedPage() == 'editor') { - $templateMgr->assign('helpTopicId', 'editorial.editorsRole'); - - } else { - $templateMgr->assign('helpTopicId', 'editorial.sectionEditorsRole'); - } - - $roleSymbolic = $isEditor ? 'editor' : 'sectionEditor'; - $roleKey = $isEditor ? 'user.role.editor' : 'user.role.sectionEditor'; - $pageHierarchy = $subclass ? array(array(Request::url(null, 'user'), 'navigation.user'), array(Request::url(null, $roleSymbolic), $roleKey), array(Request::url(null, $roleSymbolic), 'article.submissions')) - : array(array(Request::url(null, 'user'), 'navigation.user'), array(Request::url(null, $roleSymbolic), $roleKey)); - - import('classes.submission.sectionEditor.SectionEditorAction'); - $submissionCrumb = SectionEditorAction::submissionBreadcrumb($articleId, $parentPage, $roleSymbolic); - if (isset($submissionCrumb)) { - $pageHierarchy = array_merge($pageHierarchy, $submissionCrumb); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); } /** diff --git a/pages/sectionEditor/SubmissionCommentsHandler.inc.php b/pages/sectionEditor/SubmissionCommentsHandler.inc.php index b6b53fa29f4..d2fe7f58457 100644 --- a/pages/sectionEditor/SubmissionCommentsHandler.inc.php +++ b/pages/sectionEditor/SubmissionCommentsHandler.inc.php @@ -35,7 +35,7 @@ function viewPeerReviewComments($args, $request) { $reviewId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::viewPeerReviewComments($this->submission, $reviewId); } @@ -50,7 +50,7 @@ function postPeerReviewComment($args, $request) { $reviewId = (int) $request->getUserVar('reviewId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // If the user pressed the "Save and email" button, then email the comment. $emailComment = $request->getUserVar('saveAndEmail') != null ? true : false; @@ -69,7 +69,7 @@ function viewEditorDecisionComments($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::viewEditorDecisionComments($this->submission); } @@ -83,7 +83,7 @@ function postEditorDecisionComment($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // If the user pressed the "Save and email" button, then email the comment. $emailComment = $request->getUserVar('saveAndEmail') != null ? true : false; @@ -102,7 +102,7 @@ function viewCopyeditComments($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::viewCopyeditComments($this->submission); } @@ -116,7 +116,7 @@ function postCopyeditComment($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // If the user pressed the "Save and email" button, then email the comment. $emailComment = $request->getUserVar('saveAndEmail') != null ? true : false; @@ -135,7 +135,7 @@ function viewLayoutComments($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::viewLayoutComments($this->submission, $request); } @@ -149,7 +149,7 @@ function postLayoutComment($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // If the user pressed the "Save and email" button, then email the comment. $emailComment = $request->getUserVar('saveAndEmail') != null ? true : false; @@ -168,7 +168,7 @@ function viewProofreadComments($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::viewProofreadComments($this->submission); } @@ -182,7 +182,7 @@ function postProofreadComment($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); // If the user pressed the "Save and email" button, then email the comment. $emailComment = $request->getUserVar('saveAndEmail') != null ? true : false; @@ -201,7 +201,7 @@ function emailEditorDecisionComment($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); if (SectionEditorAction::emailEditorDecisionComment($this->submission, $request->getUserVar('send'), $request)) { if ($request->getUserVar('blindCcReviewers')) { $request->redirect(null, null, 'bccEditorDecisionCommentToReviewers', null, array('articleId' => $articleId)); @@ -220,7 +220,7 @@ function bccEditorDecisionCommentToReviewers($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true); + $this->setupTemplate($request); if (SectionEditorAction::bccEditorDecisionCommentToReviewers($this->submission, $request->getUserVar('send'), $request)) { $request->redirect(null, null, 'submissionReview', array($articleId)); } @@ -239,7 +239,7 @@ function editComment($args, $request) { $this->validate($request, $articleId); $comment =& $this->comment; - $this->setupTemplate($request, true); + $this->setupTemplate($request); if ($comment->getCommentType() == COMMENT_TYPE_EDITOR_DECISION) { // Cannot edit an editor decision comment. @@ -265,7 +265,7 @@ function saveComment($args, $request) { $this->validate($request, $articleId); $comment =& $this->comment; - $this->setupTemplate($request, true); + $this->setupTemplate($request); if ($comment->getCommentType() == COMMENT_TYPE_EDITOR_DECISION) { // Cannot edit an editor decision comment. @@ -305,7 +305,7 @@ function deleteComment($args, $request) { $this->validate($request, $articleId); $comment =& $this->comment; - $this->setupTemplate($request, true); + $this->setupTemplate($request); SectionEditorAction::deleteComment($commentId); diff --git a/pages/sectionEditor/SubmissionEditHandler.inc.php b/pages/sectionEditor/SubmissionEditHandler.inc.php index f3f44163673..519ebff084c 100644 --- a/pages/sectionEditor/SubmissionEditHandler.inc.php +++ b/pages/sectionEditor/SubmissionEditHandler.inc.php @@ -54,7 +54,7 @@ function submission($args, $request) { // author.submit.selectPrincipalContact under Metadata AppLocale::requireComponents(LOCALE_COMPONENT_PKP_READER, LOCALE_COMPONENT_APP_AUTHOR); - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); $user =& $request->getUser(); @@ -137,7 +137,7 @@ function submissionRegrets($args, $request) { $this->validate($request, $articleId); $journal =& $request->getJournal(); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); $reviewAssignmentDao =& DAORegistry::getDAO('ReviewAssignmentDAO'); $cancelsAndRegrets = $reviewAssignmentDao->getCancelsAndRegrets($articleId); @@ -185,7 +185,7 @@ function submissionReview($args, $request) { $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_REVIEW); $journal =& Request::getJournal(); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_APP_MANAGER); @@ -287,7 +287,7 @@ function submissionEditing($args, $request) { $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $journal =& $request->getJournal(); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); $useCopyeditors = $journal->getSetting('useCopyeditors'); $useLayoutEditors = $journal->getSetting('useLayoutEditors'); @@ -349,7 +349,7 @@ function submissionEditing($args, $request) { function submissionHistory($args, $request) { $articleId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $submission =& $this->submission; @@ -389,7 +389,7 @@ function submissionCitations($args, $request) { $this->validate($request, $articleId); // Prepare the view. - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); // Insert the citation editing assistant into the view. SectionEditorAction::editCitations($request, $this->submission); @@ -471,7 +471,7 @@ function selectReviewer($args, $request) { // FIXME: Prompt for due date. } else { - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); $sectionEditorSubmissionDao =& DAORegistry::getDAO('SectionEditorSubmissionDAO'); @@ -537,7 +537,7 @@ function createReviewer($args, $request) { import('classes.sectionEditor.form.CreateReviewerForm'); $createReviewerForm = new CreateReviewerForm($articleId); - $this->setupTemplate($request, true, $articleId); + $this->setupTemplate($request); if (isset($args[1]) && $args[1] === 'create') { $createReviewerForm->readInputData(); @@ -592,7 +592,7 @@ function enrollSearch($args, $request) { $rangeInfo = $this->getRangeInfo($request, 'users'); $templateMgr =& TemplateManager::getManager($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $searchType = null; $searchMatch = null; @@ -676,7 +676,7 @@ function notifyReviewer($args, $request) { $reviewId = (int) $request->getUserVar('reviewId'); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); if (SectionEditorAction::notifyReviewer($submission, $reviewId, $send, $request)) { $request->redirect(null, null, 'submissionReview', $articleId); @@ -712,7 +712,7 @@ function cancelReview($args, $request) { $reviewId = (int) $request->getUserVar('reviewId'); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); if (SectionEditorAction::cancelReview($submission, $reviewId, $send, $request)) { $request->redirect(null, null, 'submissionReview', $articleId); @@ -730,7 +730,7 @@ function remindReviewer($args, $request) { $submission =& $this->submission; $reviewId = (int) $request->getUserVar('reviewId'); - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); if (SectionEditorAction::remindReviewer($submission, $reviewId, $request->getUserVar('send'), $request)) { $request->redirect(null, null, 'submissionReview', $articleId); @@ -778,7 +778,7 @@ function thankReviewer($args, $request) { $reviewId = (int) $request->getUserVar('reviewId'); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); if (SectionEditorAction::thankReviewer($submission, $reviewId, $send, $request)) { $request->redirect(null, null, 'submissionReview', $articleId); @@ -796,7 +796,7 @@ function rateReviewer($args, $request) { $quality = (int) $request->getUserVar('quality'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_REVIEW); - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); SectionEditorAction::rateReviewer($articleId, $reviewId, $quality, $request); @@ -875,7 +875,7 @@ function setDueDate($args, $request) { SectionEditorAction::setDueDate($articleId, $reviewId, $dueDate, $numWeeks, false, $request); $request->redirect(null, null, 'submissionReview', $articleId); } else { - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); $journal =& $request->getJournal(); $reviewAssignmentDao =& DAORegistry::getDAO('ReviewAssignmentDAO'); @@ -920,7 +920,7 @@ function enterReviewerRecommendation($args, $request) { SectionEditorAction::setReviewerRecommendation($this->submission, $reviewId, $recommendation, SUBMISSION_REVIEWER_RECOMMENDATION_ACCEPT, $request); $request->redirect(null, null, 'submissionReview', $articleId); } else { - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -941,7 +941,7 @@ function enterReviewerRecommendation($args, $request) { */ function userProfile($args, $request) { parent::validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('currentUrl', $request->url(null, $request->getRequestedPage())); @@ -994,7 +994,7 @@ function viewMetadata($args, $request) { $this->validate($request, $articleId); AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); SectionEditorAction::viewMetadata($submission, $journal); } @@ -1009,7 +1009,7 @@ function saveMetadata($args, $request) { $this->validate($request, $articleId); AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); if (SectionEditorAction::saveMetadata($submission, $request)) { $request->redirect(null, null, 'submission', $articleId); @@ -1047,7 +1047,7 @@ function removeArticleCoverPage($args, $request) { */ function previewReviewForm($args, $request) { parent::validate($request); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $reviewId = (int) array_shift($args); $reviewFormId = (int) array_shift($args); @@ -1110,7 +1110,7 @@ function selectReviewForm($args, $request) { $reviewAssignmentDao =& DAORegistry::getDAO('ReviewAssignmentDAO'); $reviewAssignment =& $reviewAssignmentDao->getById($reviewId); - $this->setupTemplate($request, true, $articleId, 'review'); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('articleId', $articleId); @@ -1132,7 +1132,7 @@ function viewReviewFormResponse($args, $request) { $reviewId = (int) array_shift($args); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_REVIEW); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); SectionEditorAction::viewReviewFormResponse($this->submission, $reviewId); } @@ -1208,7 +1208,7 @@ function selectCopyeditor($args, $request) { SectionEditorAction::selectCopyeditor($submission, $userId, $request); $request->redirect(null, null, 'submissionEditing', $articleId); } else { - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); $sectionEditorSubmissionDao =& DAORegistry::getDAO('SectionEditorSubmissionDAO'); @@ -1267,7 +1267,7 @@ function notifyCopyeditor($args, $request) { $submission =& $this->submission; $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::notifyCopyeditor($submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1296,7 +1296,7 @@ function thankCopyeditor($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::thankCopyeditor($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1312,7 +1312,7 @@ function notifyAuthorCopyedit($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::notifyAuthorCopyedit($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1328,7 +1328,7 @@ function thankAuthorCopyedit($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::thankAuthorCopyedit($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1344,7 +1344,7 @@ function notifyFinalCopyedit($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::notifyFinalCopyedit($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1384,7 +1384,7 @@ function thankFinalCopyedit($args, $request) { $articleId = $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::thankFinalCopyedit($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1428,7 +1428,7 @@ function addSuppFile($args, $request) { $this->validate($request, $articleId); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); import('classes.submission.form.SuppFileForm'); @@ -1461,7 +1461,7 @@ function editSuppFile($args, $request) { $request->redirect(null, null, 'submissionEditing', $articleId); } - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); import('classes.submission.form.SuppFileForm'); $submitForm = new SuppFileForm($submission, $journal, $suppFileId); @@ -1502,7 +1502,7 @@ function setSuppFileVisibility($args, $request) { function saveSuppFile($args, $request) { $articleId = $request->getUserVar('articleId'); $this->validate($request, $articleId); - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); $submission =& $this->submission; $suppFileId = (int) array_shift($args); @@ -1597,7 +1597,7 @@ function unsuitableSubmission($args, $request) { $articleId = $request->getUserVar('articleId'); $this->validate($request, $articleId); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'summary'); + $this->setupTemplate($request); if (SectionEditorAction::unsuitableSubmission($this->submission, $send, $request)) { $request->redirect(null, null, 'submission', $articleId); @@ -1716,7 +1716,7 @@ function assignLayoutEditor($args, $request) { $sectionEditorSubmissionDao =& DAORegistry::getDAO('SectionEditorSubmissionDAO'); $layoutEditorStatistics = $sectionEditorSubmissionDao->getLayoutEditorStatistics($journal->getId()); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -1758,7 +1758,7 @@ function notifyLayoutEditor($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::notifyLayoutEditor($this->submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); } @@ -1775,7 +1775,7 @@ function thankLayoutEditor($args, $request) { $submission =& $this->submission; $send = $request->getUserVar('send')?true:false; - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); if (SectionEditorAction::thankLayoutEditor($submission, $send, $request)) { $request->redirect(null, null, 'submissionEditing', $articleId); @@ -1814,7 +1814,7 @@ function editGalley($args, $request) { $request->redirect(null, null, 'submissionEditing', $articleId); } - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.form.ArticleGalleyForm'); $submitForm = new ArticleGalleyForm($articleId, $galleyId); @@ -1835,7 +1835,7 @@ function saveGalley($args, $request) { $articleId = (int) array_shift($args); $galleyId = (int) array_shift($args); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); $submission =& $this->submission; import('classes.submission.form.ArticleGalleyForm'); @@ -2013,7 +2013,7 @@ function submissionEventLog($args, $request) { $logId = (int) array_shift($args); $this->validate($request, $articleId); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'history'); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -2067,7 +2067,7 @@ function submissionEmailLog($args, $request) { $this->validate($request, $articleId); $submission =& $this->submission; - $this->setupTemplate($request, true, $articleId, 'history'); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); @@ -2182,7 +2182,7 @@ function submissionNotes($args, $request) { $noteId = (int) array_shift($args); $this->validate($request, $articleId); - $this->setupTemplate($request, true, $articleId, 'history'); + $this->setupTemplate($request); $submission =& $this->submission; $rangeInfo = $this->getRangeInfo($request, 'submissionNotes'); @@ -2275,7 +2275,7 @@ function selectProofreader($args, $request) { ProofreaderAction::selectProofreader($userId, $submission, $request); $request->redirect(null, null, 'submissionEditing', $articleId); } else { - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); $searchType = null; $searchMatch = null; @@ -2335,7 +2335,7 @@ function notifyAuthorProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.proofreader.ProofreaderAction'); if (ProofreaderAction::proofreadEmail($articleId, 'PROOFREAD_AUTHOR_REQUEST', $request, $send?'':$request->url(null, null, 'notifyAuthorProofreader'))) { @@ -2352,7 +2352,7 @@ function thankAuthorProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.proofreader.ProofreaderAction'); if (ProofreaderAction::proofreadEmail($articleId, 'PROOFREAD_AUTHOR_ACK', $request, $send?'':$request->url(null, null, 'thankAuthorProofreader'))) { @@ -2405,7 +2405,7 @@ function notifyProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.proofreader.ProofreaderAction'); if (ProofreaderAction::proofreadEmail($articleId, 'PROOFREAD_REQUEST', $request, $send?'':$request->url(null, null, 'notifyProofreader'))) { @@ -2422,7 +2422,7 @@ function thankProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.proofreader.ProofreaderAction'); if (ProofreaderAction::proofreadEmail($articleId, 'PROOFREAD_ACK', $request, $send?'':$request->url(null, null, 'thankProofreader'))) { @@ -2480,7 +2480,7 @@ function notifyLayoutEditorProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); $signoffDao =& DAORegistry::getDAO('SignoffDAO'); $signoff = $signoffDao->build('SIGNOFF_PROOFREADING_LAYOUT', ASSOC_TYPE_ARTICLE, $articleId); @@ -2505,7 +2505,7 @@ function thankLayoutEditorProofreader($args, $request) { $articleId = (int) $request->getUserVar('articleId'); $send = $request->getUserVar('send'); $this->validate($request, $articleId, SECTION_EDITOR_ACCESS_EDIT); - $this->setupTemplate($request, true, $articleId, 'editing'); + $this->setupTemplate($request); import('classes.submission.proofreader.ProofreaderAction'); if (ProofreaderAction::proofreadEmail($articleId, 'PROOFREAD_LAYOUT_ACK', $request, $send?'':$request->url(null, null, 'thankLayoutEditorProofreader'))) { diff --git a/pages/subscriptionManager/SubscriptionManagerHandler.inc.php b/pages/subscriptionManager/SubscriptionManagerHandler.inc.php index 454a93eefaa..5de076010ec 100644 --- a/pages/subscriptionManager/SubscriptionManagerHandler.inc.php +++ b/pages/subscriptionManager/SubscriptionManagerHandler.inc.php @@ -225,9 +225,6 @@ function editSubscriptionType($args, $request) { $this->validate(); $this->setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'subscriptionManager', 'subscriptionTypes'), 'subscriptionManager.subscriptionTypes')); - import('classes.subscription.SubscriptionAction'); $editSuccess = SubscriptionAction::editSubscriptionType($args, $request); @@ -250,9 +247,6 @@ function updateSubscriptionType($args, $request) { $this->validate(); $this->setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'subscriptionManager', 'subscriptionTypes'), 'subscriptionManager.subscriptionTypes')); - import('classes.subscription.SubscriptionAction'); $updateSuccess = SubscriptionAction::updateSubscriptionType($request); @@ -460,18 +454,9 @@ function suggestUsername($args, $request) { /** * Setup common template variables. */ - function setupTemplate($request, $subclass = false, $institutional = false) { - parent::setupTemplate($request, true); + function setupTemplate($request) { + parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_MANAGER, LOCALE_COMPONENT_APP_MANAGER); - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'subscriptionManager'), 'subscriptionManager.subscriptionManagement'))); - if ($subclass) { - if ($institutional) { - $templateMgr->append('pageHierarchy', array($request->url(null, 'subscriptionManager', 'subscriptions', 'institutional'), 'subscriptionManager.institutionalSubscriptions')); - } else { - $templateMgr->append('pageHierarchy', array($request->url(null, 'subscriptionManager', 'subscriptions', 'individual'), 'subscriptionManager.individualSubscriptions')); - } - } } } diff --git a/pages/user/UserHandler.inc.php b/pages/user/UserHandler.inc.php index cecdbc98ad1..062e41e2c06 100644 --- a/pages/user/UserHandler.inc.php +++ b/pages/user/UserHandler.inc.php @@ -145,7 +145,7 @@ function gifts($args, $request) { $userId ); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('journalTitle', $journal->getLocalizedName()); @@ -265,7 +265,7 @@ function subscriptions($args, $request) { $paymentManager = new OJSPaymentManager($request); $acceptSubscriptionPayments = $paymentManager->acceptSubscriptionPayments(); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('subscriptionName', $subscriptionName); @@ -407,15 +407,10 @@ function validate($loginCheck = true) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate($request = null, $subclass = false) { + function setupTemplate($request = null) { parent::setupTemplate($request); AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR, LOCALE_COMPONENT_APP_EDITOR, LOCALE_COMPONENT_APP_MANAGER); - $templateMgr =& TemplateManager::getManager($request); - if ($subclass) { - $templateMgr->assign('pageHierarchy', array(array($request->url(null, 'user'), 'navigation.user'))); - } } /** @@ -471,7 +466,7 @@ function purchaseSubscription($args, $request) { $acceptSubscriptionPayments = $paymentManager->acceptSubscriptionPayments(); if (!$acceptSubscriptionPayments) $request->redirect(null, 'user'); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $user =& $request->getUser(); $userId = $user->getId(); $journalId = $journal->getId(); @@ -550,7 +545,7 @@ function payPurchaseSubscription($args, $request) { $acceptSubscriptionPayments = $paymentManager->acceptSubscriptionPayments(); if (!$acceptSubscriptionPayments) $request->redirect(null, 'user'); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $user =& $request->getUser(); $userId = $user->getId(); $journalId = $journal->getId(); @@ -654,7 +649,7 @@ function completePurchaseSubscription($args, $request) { $acceptSubscriptionPayments = $paymentManager->acceptSubscriptionPayments(); if (!$acceptSubscriptionPayments) $request->redirect(null, 'user'); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $user =& $request->getUser(); $userId = $user->getId(); $journalId = $journal->getId(); @@ -705,7 +700,7 @@ function payRenewSubscription($args, $request) { $acceptSubscriptionPayments = $paymentManager->acceptSubscriptionPayments(); if (!$acceptSubscriptionPayments) $request->redirect(null, 'user'); - $this->setupTemplate($request, true); + $this->setupTemplate($request); $user =& $request->getUser(); $userId = $user->getId(); $journalId = $journal->getId(); diff --git a/plugins/citationFormats/abnt/AbntCitationPlugin.inc.php b/plugins/citationFormats/abnt/AbntCitationPlugin.inc.php index 06a65cfe9cf..3dbd77016e1 100644 --- a/plugins/citationFormats/abnt/AbntCitationPlugin.inc.php +++ b/plugins/citationFormats/abnt/AbntCitationPlugin.inc.php @@ -119,11 +119,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugin'); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); if ($form->isLocaleResubmit()) { $form->readInputData(); } else { @@ -138,30 +136,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = } } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) { - $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - } - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Extend the {url ...} smarty to support this plugin. */ diff --git a/plugins/generic/booksForReview/BooksForReviewPlugin.inc.php b/plugins/generic/booksForReview/BooksForReviewPlugin.inc.php index 24a3cb4bce3..9dc0debc3a5 100644 --- a/plugins/generic/booksForReview/BooksForReviewPlugin.inc.php +++ b/plugins/generic/booksForReview/BooksForReviewPlugin.inc.php @@ -145,33 +145,6 @@ function getStyleSheet() { return $this->getPluginPath() . '/styles/booksForReview.css'; } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugin', array('generic', $this->getName(), 'booksForReview')), - $this->getDisplayName(), - true - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Allow author to specify book for review during article submission. */ diff --git a/plugins/generic/booksForReview/pages/BooksForReviewAuthorHandler.inc.php b/plugins/generic/booksForReview/pages/BooksForReviewAuthorHandler.inc.php index c286fc8c3bb..016d1b76cb3 100644 --- a/plugins/generic/booksForReview/pages/BooksForReviewAuthorHandler.inc.php +++ b/plugins/generic/booksForReview/pages/BooksForReviewAuthorHandler.inc.php @@ -165,23 +165,10 @@ function authorize(&$request, &$args, $roleAssignments) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate($request, $subclass = false) { - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'author'), - 'user.role.author' - ) - ); - $templateMgr->assign('pageHierarchy', $pageCrumbs); - - $bfrPlugin =& PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); + function setupTemplate($request) { + $templateMgr = TemplateManager::getManager($request); + $bfrPlugin = PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); $templateMgr->addStyleSheet($request->getBaseUrl() . '/' . $bfrPlugin->getStyleSheet()); } } diff --git a/plugins/generic/booksForReview/pages/BooksForReviewEditorHandler.inc.php b/plugins/generic/booksForReview/pages/BooksForReviewEditorHandler.inc.php index 33a796bf3a5..39ccfbdf8d1 100644 --- a/plugins/generic/booksForReview/pages/BooksForReviewEditorHandler.inc.php +++ b/plugins/generic/booksForReview/pages/BooksForReviewEditorHandler.inc.php @@ -979,41 +979,11 @@ function authorize(&$request, &$args, $roleAssignments) { /** * Setup common template variables. * @param $request PKPRequest - * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate($request, $subclass = false) { - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - Request::url(null, 'user'), - 'navigation.user' - ), - array( - Request::url(null, 'editor'), - 'user.role.editor' - ) - ); - - if ($subclass) { - $returnPage = Request::getUserVar('returnPage'); - - if ($returnPage != null) { - $validPages =& $this->getValidReturnPages(); - if (!in_array($returnPage, $validPages)) { - $returnPage = null; - } - } - - $pageCrumbs[] = array( - Request::url(null, 'editor', 'booksForReview', $returnPage), - AppLocale::Translate('plugins.generic.booksForReview.displayName'), - true - ); - } - $templateMgr->assign('pageHierarchy', $pageCrumbs); - - $bfrPlugin =& PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); - $templateMgr->addStyleSheet(Request::getBaseUrl() . '/' . $bfrPlugin->getStyleSheet()); + function setupTemplate($request) { + $templateMgr = TemplateManager::getManager($request); + $bfrPlugin = PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); + $templateMgr->addStyleSheet($request->getBaseUrl() . '/' . $bfrPlugin->getStyleSheet()); } } diff --git a/plugins/generic/booksForReview/pages/BooksForReviewHandler.inc.php b/plugins/generic/booksForReview/pages/BooksForReviewHandler.inc.php index 63153677a4a..5dd97b1626d 100644 --- a/plugins/generic/booksForReview/pages/BooksForReviewHandler.inc.php +++ b/plugins/generic/booksForReview/pages/BooksForReviewHandler.inc.php @@ -78,7 +78,7 @@ function index($args, &$request) { * Public view book for review details. */ function viewBookForReview($args = array(), &$request) { - $this->setupTemplate($request, true); + $this->setupTemplate($request); $journal =& $request->getJournal(); $journalId = $journal->getId(); @@ -132,23 +132,10 @@ function authorize(&$request, &$args, $roleAssignments) { /** * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate($request, $subclass = false) { - $templateMgr =& TemplateManager::getManager($request); - - if ($subclass) { - $templateMgr->append( - 'pageHierarchy', - array( - $request->url(null, 'booksForReview'), - AppLocale::Translate('plugins.generic.booksForReview.displayName'), - true - ) - ); - } - - $bfrPlugin =& PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); + function setupTemplate($request) { + $templateMgr = TemplateManager::getManager($request); + $bfrPlugin = PluginRegistry::getPlugin('generic', BOOKS_FOR_REVIEW_PLUGIN_NAME); $templateMgr->addStyleSheet($request->getBaseUrl() . '/' . $bfrPlugin->getStyleSheet()); } } diff --git a/plugins/generic/browse/BrowsePlugin.inc.php b/plugins/generic/browse/BrowsePlugin.inc.php index 533487ad779..d63944f14c3 100644 --- a/plugins/generic/browse/BrowsePlugin.inc.php +++ b/plugins/generic/browse/BrowsePlugin.inc.php @@ -111,31 +111,6 @@ function setupBrowseHandler($hookName, $params) { } } - /** - * Set the breadcrumbs, given the plugin's tree of items to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Display verbs for the management interface. */ @@ -170,11 +145,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugins'); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } diff --git a/plugins/generic/browse/pages/BrowseHandler.inc.php b/plugins/generic/browse/pages/BrowseHandler.inc.php index 44ee50a4666..98a3ae44380 100644 --- a/plugins/generic/browse/pages/BrowseHandler.inc.php +++ b/plugins/generic/browse/pages/BrowseHandler.inc.php @@ -21,7 +21,7 @@ class BrowseHandler extends Handler { * Show list of journal sections. */ function sections($args, &$request) { - $this->setupTemplate($request, true); + $this->setupTemplate($request); $router =& $request->getRouter(); $journal =& $router->getContext($request); @@ -78,7 +78,7 @@ function sections($args, &$request) { * Show list of journal sections identify types. */ function identifyTypes($args = array(), &$request) { - $this->setupTemplate($request, true); + $this->setupTemplate($request); $router =& $request->getRouter(); $journal =& $router->getContext($request); @@ -157,8 +157,8 @@ function authorize(&$request, &$args, $roleAssignments) { * Setup common template variables. * @param $subclass boolean set to true if caller is below this handler in the hierarchy */ - function setupTemplate(&$request, $subclass = false, $op = 'index') { - $templateMgr =& TemplateManager::getManager($request); + function setupTemplate($request, $op = 'index') { + $templateMgr = TemplateManager::getManager($request); $templateMgr->assign('helpTopicId', 'user.searchAndBrowse'); $opMap = array( @@ -166,13 +166,8 @@ function setupTemplate(&$request, $subclass = false, $op = 'index') { 'categories' => 'navigation.categories' ); - $templateMgr->assign('pageHierarchy', - $subclass ? array(array($request->url(null, 'search', $op), $opMap[$op])) - : array() - ); - - $router =& $request->getRouter(); - $journal =& $router->getContext($request); + $router = $request->getRouter(); + $journal = $router->getContext($request); if (!$journal || !$journal->getSetting('restrictSiteAccess')) { $templateMgr->setCacheability(CACHEABILITY_PUBLIC); } diff --git a/plugins/generic/counter/CounterHandler.inc.php b/plugins/generic/counter/CounterHandler.inc.php index f3b1b27b631..8c2488648d0 100644 --- a/plugins/generic/counter/CounterHandler.inc.php +++ b/plugins/generic/counter/CounterHandler.inc.php @@ -112,7 +112,7 @@ function _assignTemplateCounterXML($templateManager, $begin, $end='') { function reportXML($args, &$request) { $this->validate(); $plugin =& $this->plugin; - $this->setupTemplate(true); + $this->setupTemplate(); $templateManager =& TemplateManager::getManager($request); @@ -133,7 +133,7 @@ function reportXML($args, &$request) { function sushiXML($args, &$request) { $this->validate(); $plugin =& $this->plugin; - $this->setupTemplate(true); + $this->setupTemplate(); $templateManager =& TemplateManager::getManager($request); @@ -243,7 +243,7 @@ function _formColumns(&$cols, $entries) { function report($args, &$request) { $this->validate(); $plugin =& $this->plugin; - $this->setupTemplate(true); + $this->setupTemplate(); $journal =& $request->getJournal(); $year = $request->getUserVar('year'); @@ -331,21 +331,6 @@ function validate($canRedirect = true) { $this->plugin =& $plugin; return true; } - - /** - * Set up common template variables. - * @param $subclass boolean set to true if caller is below this handler in the heirarchy - */ - function setupTemplate($subclass = false) { - parent::setupTemplate(); - $templateMgr =& TemplateManager::getManager(); - - $pageHierarchy = array(array(Request::url(null, 'user'), 'navigation.user')); - - if ($subclass) $pageHierarchy[] = array(Request::url(null, 'counter'), 'plugins.generic.counter'); - - $templateMgr->assign_by_ref('pageHierarchy', $pageHierarchy); - } } ?> diff --git a/plugins/generic/customBlockManager/CustomBlockManagerPlugin.inc.php b/plugins/generic/customBlockManager/CustomBlockManagerPlugin.inc.php index b78e4228c79..dc3c6f5d17e 100644 --- a/plugins/generic/customBlockManager/CustomBlockManagerPlugin.inc.php +++ b/plugins/generic/customBlockManager/CustomBlockManagerPlugin.inc.php @@ -101,23 +101,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $templateMgr =& TemplateManager::getManager($request); $templateMgr->register_function('plugin_url', array(&$this, 'smartyPluginUrl')); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ), - array( - $request->url(null, 'manager', 'plugins'), - __('manager.plugins'), - true - ) - ); - $templateMgr->assign('pageHierarchy', $pageCrumbs); - $this->import('SettingsForm'); $form = new SettingsForm($this, $journal->getId()); $form->readInputData(); diff --git a/plugins/generic/customBlockManager/CustomBlockPlugin.inc.php b/plugins/generic/customBlockManager/CustomBlockPlugin.inc.php index eb32c76f593..746939cf240 100644 --- a/plugins/generic/customBlockManager/CustomBlockPlugin.inc.php +++ b/plugins/generic/customBlockManager/CustomBlockPlugin.inc.php @@ -126,13 +126,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $this->setEnabled(false); return false; case 'edit': - $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - __('manager.plugins'), - true - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); $form->initData(); $form->display(); exit; @@ -141,11 +134,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $form->readInputData(); if ($form->validate()) { $form->save(); - $pageCrumbs[] = array($request->url(null, 'manager', 'plugins'), 'manager.plugins'); $templateMgr->assign(array( 'currentUrl' => $request->url(null, null, null, array($this->getCategory(), $this->getName(), 'edit')), 'pageTitleTranslated' => $this->getDisplayName(), - 'pageHierarchy' => $pageCrumbs, 'message' => 'plugins.generic.customBlock.saved', 'backLink' => $request->url(null, 'manager', 'plugins'), 'backLinkLabel' => 'common.continue' diff --git a/plugins/generic/customLocale/CustomLocaleHandler.inc.php b/plugins/generic/customLocale/CustomLocaleHandler.inc.php index 8d866b5ce41..da0fc5a20f2 100644 --- a/plugins/generic/customLocale/CustomLocaleHandler.inc.php +++ b/plugins/generic/customLocale/CustomLocaleHandler.inc.php @@ -36,7 +36,7 @@ function CustomLocaleHandler($parentPluginName) { function index($args, &$request) { $this->validate(null, $request); $plugin =& $this->plugin; - $this->setupTemplate($request, $plugin, false); + $this->setupTemplate($request, $plugin); $journal = $request->getJournal(); $rangeInfo = $this->getRangeInfo($request, 'locales'); @@ -52,7 +52,7 @@ function index($args, &$request) { function edit($args, $request) { $this->validate(null, $request); $plugin =& $this->plugin; - $this->setupTemplate($request, $plugin, true); + $this->setupTemplate($request, $plugin); $locale = array_shift($args); $file = array_shift($args); @@ -79,7 +79,7 @@ function edit($args, $request) { function editLocaleFile($args, $request) { $this->validate(null, $request); $plugin =& $this->plugin; - $this->setupTemplate($request, $plugin, true); + $this->setupTemplate($request, $plugin); $locale = array_shift($args); if (!AppLocale::isLocaleValid($locale)) { @@ -144,7 +144,7 @@ function editLocaleFile($args, $request) { function saveLocaleFile($args, $request) { $this->validate(null, $request); $plugin =& $this->plugin; - $this->setupTemplate($request, $plugin, true); + $this->setupTemplate($request, $plugin); $locale = array_shift($args); if (!AppLocale::isLocaleValid($locale)) { @@ -205,17 +205,10 @@ function correctCr($value) { return str_replace("\r\n", "\n", $value); } - function setupTemplate($request, &$plugin, $subclass = true) { + function setupTemplate($request, $plugin) { parent::setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); + $templateMgr = TemplateManager::getManager($request); $templateMgr->register_function('plugin_url', array($plugin, 'smartyPluginUrl')); - $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'manager'), 'user.role.manager')); - if ($subclass) { - $path = array($plugin->getCategory(), $plugin->getName(), 'index'); - $pageHierarchy[] = array($request->url(null, null, null, $path), 'plugins.generic.customLocale.name'); - } - $templateMgr->assign('pageHierarchy', $pageHierarchy); - $templateMgr->assign('helpTopicId', 'plugins.generic.CustomLocalePlugin'); } } diff --git a/plugins/generic/externalFeed/ExternalFeedPlugin.inc.php b/plugins/generic/externalFeed/ExternalFeedPlugin.inc.php index 9332145dc95..8eac9494df5 100644 --- a/plugins/generic/externalFeed/ExternalFeedPlugin.inc.php +++ b/plugins/generic/externalFeed/ExternalFeedPlugin.inc.php @@ -106,33 +106,6 @@ function smartyPluginUrl($params, &$smarty) { return $smarty->smartyUrl($params, $smarty); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugin', array('generic', $this->getName(), 'feeds')), - $this->getDisplayName(), - true - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Register as a block plugin, even though this is a generic plugin. * This will allow the plugin to behave as a block plugin, i.e. to @@ -332,7 +305,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = } else { $externalFeedForm->initData(); } - $this->setBreadCrumbs(true); $templateMgr->assign('journalSettings', $journalSettings); $externalFeedForm->display(); } else { @@ -367,7 +339,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $journalSettingsDao =& DAORegistry::getDAO('JournalSettingsDAO'); $journalSettings =& $journalSettingsDao->getSettings($journalId); - $this->setBreadCrumbs(true); $templateMgr->assign('journalSettings', $journalSettings); $externalFeedForm->display(); } @@ -385,7 +356,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = } elseif ($this->getRequest()->getUserVar('deleteStyleSheet')) { $form->deleteStyleSheet(); } - $this->setBreadCrumbs(true); $form->initData(); $form->display(); return true; @@ -396,7 +366,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $externalFeedDao =& DAORegistry::getDAO('ExternalFeedDAO'); $feeds =& $externalFeedDao->getExternalFeedsByJournalId($journalId, $rangeInfo); $templateMgr->assign('feeds', $feeds); - $this->setBreadCrumbs(); $templateMgr->display($this->getTemplatePath() . 'externalFeeds.tpl'); return true; diff --git a/plugins/generic/googleAnalytics/GoogleAnalyticsPlugin.inc.php b/plugins/generic/googleAnalytics/GoogleAnalyticsPlugin.inc.php index e9d7331736f..12f32c224ed 100644 --- a/plugins/generic/googleAnalytics/GoogleAnalyticsPlugin.inc.php +++ b/plugins/generic/googleAnalytics/GoogleAnalyticsPlugin.inc.php @@ -89,32 +89,6 @@ function smartyPluginUrl($params, &$smarty) { return $smarty->smartyUrl($params, $smarty); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $request->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Display verbs for the management interface. */ @@ -224,11 +198,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugin'); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } diff --git a/plugins/generic/lucene/LucenePlugin.inc.php b/plugins/generic/lucene/LucenePlugin.inc.php index c6cb95b4178..52e380055ef 100644 --- a/plugins/generic/lucene/LucenePlugin.inc.php +++ b/plugins/generic/lucene/LucenePlugin.inc.php @@ -259,7 +259,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugins', 'generic'); return false; } else { - $this->_setBreadCrumbs(); $form->display($request); } @@ -268,7 +267,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = // Re-init data. It should be visible to users // that whatever data they may have entered into // the form was not saved. - $this->_setBreadCrumbs(); $form->initData(); // Index rebuild. @@ -873,30 +871,6 @@ function callbackTemplateSectionFormAdditionalMetadata($hookName, $params) { // // Private helper methods // - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - */ - function _setBreadcrumbs() { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url('index', 'admin'), - 'user.role.siteAdmin' - ), - array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ) - ); - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Return the available options for result * set ordering. diff --git a/plugins/generic/phpMyVisites/PhpMyVisitesPlugin.inc.php b/plugins/generic/phpMyVisites/PhpMyVisitesPlugin.inc.php index 16a9f36a72d..f2dc03ab531 100644 --- a/plugins/generic/phpMyVisites/PhpMyVisitesPlugin.inc.php +++ b/plugins/generic/phpMyVisites/PhpMyVisitesPlugin.inc.php @@ -74,32 +74,6 @@ function smartyPluginUrl($params, &$smarty) { return $smarty->smartyUrl($params, $smarty); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Display verbs for the management interface. */ @@ -160,11 +134,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugin'); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } diff --git a/plugins/generic/piwik/PiwikPlugin.inc.php b/plugins/generic/piwik/PiwikPlugin.inc.php index 9a9477ceaed..e303fbcb11a 100755 --- a/plugins/generic/piwik/PiwikPlugin.inc.php +++ b/plugins/generic/piwik/PiwikPlugin.inc.php @@ -87,32 +87,6 @@ function smartyPluginUrl($params, &$smarty) { return $smarty->smartyUrl($params, $smarty); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Display verbs for the management interface. */ @@ -222,11 +196,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $form->execute(); $request->redirect(null, 'manager', 'plugin'); } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } diff --git a/plugins/generic/referral/ReferralHandler.inc.php b/plugins/generic/referral/ReferralHandler.inc.php index 3c92fc15386..7a5282f7b67 100644 --- a/plugins/generic/referral/ReferralHandler.inc.php +++ b/plugins/generic/referral/ReferralHandler.inc.php @@ -22,13 +22,6 @@ function ReferralHandler() { parent::Handler(); } - function setupTemplate($request) { - parent::setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); - $pageHierarchy = array(array($request->url(null, 'referral', 'index'), 'plugins.generic.referral.referrals')); - $templateMgr->assign('pageHierarchy', $pageHierarchy); - } - function editReferral($args, $request) { $referralId = (int) array_shift($args); if ($referralId === 0) $referralId = null; diff --git a/plugins/generic/referral/ReferralPlugin.inc.php b/plugins/generic/referral/ReferralPlugin.inc.php index d9cf4faa1aa..888d1052efa 100644 --- a/plugins/generic/referral/ReferralPlugin.inc.php +++ b/plugins/generic/referral/ReferralPlugin.inc.php @@ -70,11 +70,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugin'); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } @@ -85,32 +83,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = } } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $templateMgr =& TemplateManager::getManager(); - $request =& $this->getRequest(); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Intercept the load handler hook to present the user-facing * referrals list if necessary. diff --git a/plugins/generic/staticPages/StaticPagesPlugin.inc.php b/plugins/generic/staticPages/StaticPagesPlugin.inc.php index 849b985cdbb..29a2f942ae0 100644 --- a/plugins/generic/staticPages/StaticPagesPlugin.inc.php +++ b/plugins/generic/staticPages/StaticPagesPlugin.inc.php @@ -97,17 +97,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $templateMgr->register_function('plugin_url', array(&$this, 'smartyPluginUrl')); $templateMgr->assign('pagesPath', $request->url(null, 'pages', 'view', 'REPLACEME')); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - switch ($verb) { case 'settings': $journal =& $request->getJournal(); @@ -115,7 +104,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $this->import('StaticPagesSettingsForm'); $form = new StaticPagesSettingsForm($this, $journal->getId()); - $templateMgr->assign('pageHierarchy', $pageCrumbs); $form->initData($request); $form->display(); return true; @@ -135,12 +123,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $form->initData(); } - $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugin', array('generic', $this->getName(), 'settings')), - $this->getDisplayName(), - true - ); - $templateMgr->assign('pageHierarchy', $pageCrumbs); $form->display(); return true; case 'save': @@ -158,7 +140,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $templateMgr->assign(array( 'currentUrl' => $request->url(null, null, null, array($this->getCategory(), $this->getName(), 'settings')), 'pageTitle' => 'plugins.generic.staticPages.displayName', - 'pageHierarchy' => $pageCrumbs, 'message' => 'plugins.generic.staticPages.pageSaved', 'backLink' => $request->url(null, null, null, array($this->getCategory(), $this->getName(), 'settings')), 'backLinkLabel' => 'common.continue' @@ -187,7 +168,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = 'backLinkLabel' => 'common.continue' )); - $templateMgr->assign('pageHierarchy', $pageCrumbs); $templateMgr->display('common/message.tpl'); return true; default: diff --git a/plugins/generic/sword/SwordImportExportPlugin.inc.php b/plugins/generic/sword/SwordImportExportPlugin.inc.php index f4cf16ade5a..69cccc88a8d 100644 --- a/plugins/generic/sword/SwordImportExportPlugin.inc.php +++ b/plugins/generic/sword/SwordImportExportPlugin.inc.php @@ -96,7 +96,6 @@ function display(&$args) { $request =& $this->getRequest(); $templateMgr =& TemplateManager::getManager($request); parent::display($args, $request); - $this->setBreadcrumbs(); $journal =& $request->getJournal(); $plugin =& $this->getSwordPlugin(); diff --git a/plugins/generic/thesis/ThesisHandler.inc.php b/plugins/generic/thesis/ThesisHandler.inc.php index 054eadc11f4..89608c75ba6 100644 --- a/plugins/generic/thesis/ThesisHandler.inc.php +++ b/plugins/generic/thesis/ThesisHandler.inc.php @@ -110,7 +110,6 @@ function submit($args, $request) { $journalSettings =& $journalSettingsDao->getSettings($journalId); $templateMgr =& TemplateManager::getManager($request); - $templateMgr->append('pageHierarchy', array($request->url(null, 'thesis'), 'plugins.generic.thesis.theses')); $templateMgr->assign('journalSettings', $journalSettings); $thesisDao =& DAORegistry::getDAO('ThesisDAO'); @@ -155,7 +154,6 @@ function view($args, $request) { $templateMgr =& TemplateManager::getManager($request); $templateMgr->assign('journal', $journal); $templateMgr->assign('thesis', $thesis); - $templateMgr->append('pageHierarchy', array($request->url(null, 'thesis'), 'plugins.generic.thesis.theses')); $thesisMetaCustomHeaders = $templateMgr->fetch($thesisPlugin->getTemplatePath() . 'metadata.tpl'); $metaCustomHeaders = $templateMgr->get_template_vars('metaCustomHeaders'); $templateMgr->assign('metaCustomHeaders', $metaCustomHeaders . "\n" . $thesisMetaCustomHeaders); @@ -211,17 +209,6 @@ function save($args, $request) { $request->redirect(null, 'index'); } } - - /** - * Setup common template variables. - * @param $subclass boolean set to true if caller is below this handler in the hierarchy - */ - function setupTemplate($request, $subclass = false) { - parent::setupTemplate($request); - - $templateMgr =& TemplateManager::getManager($request); - $templateMgr->assign('pageHierachy', array(array($request->url(null, 'theses'), 'plugins.generic.thesis.theses'))); - } } ?> diff --git a/plugins/generic/thesis/ThesisPlugin.inc.php b/plugins/generic/thesis/ThesisPlugin.inc.php index 4001b4a8a4c..4332bdeeb5f 100644 --- a/plugins/generic/thesis/ThesisPlugin.inc.php +++ b/plugins/generic/thesis/ThesisPlugin.inc.php @@ -86,33 +86,6 @@ function smartyPluginUrl($params, &$smarty) { return $smarty->smartyUrl($params, $smarty); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugin', array('generic', $this->getName(), 'theses')), - $this->getDisplayName(), - true - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Display verbs for the management interface. */ @@ -191,11 +164,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $request->redirect(null, 'manager', 'plugin', array('generic', $this->getName(), 'theses')); return false; } else { - $this->setBreadCrumbs(true); $form->display(); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display(); } @@ -232,7 +203,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $thesisForm = new ThesisForm($this->getName(), $thesisId); $thesisForm->initData(); - $this->setBreadCrumbs(true); $templateMgr->assign('journalSettings', $journalSettings); $thesisForm->display(); } else { @@ -267,7 +237,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $journalSettingsDao =& DAORegistry::getDAO('JournalSettingsDAO'); $journalSettings =& $journalSettingsDao->getSettings($journal->getId()); - $this->setBreadCrumbs(true); $templateMgr->assign('journalSettings', $journalSettings); $thesisForm->display(); } @@ -295,7 +264,6 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $theses =& $thesisDao->getThesesByJournalId($journal->getId(), $searchField, $search, $searchMatch, $dateFrom, $dateTo, null, $rangeInfo); $templateMgr->assign('theses', $theses); - $this->setBreadCrumbs(); // Set search parameters $duplicateParameters = array( diff --git a/plugins/generic/timedView/TimedViewReportPlugin.inc.php b/plugins/generic/timedView/TimedViewReportPlugin.inc.php index 6a6d474690f..7771c24711a 100755 --- a/plugins/generic/timedView/TimedViewReportPlugin.inc.php +++ b/plugins/generic/timedView/TimedViewReportPlugin.inc.php @@ -50,35 +50,8 @@ function getDescription() { return __('plugins.generic.timedView.description'); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs() { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ), - array( - $request->url(null, 'manager', 'statistics'), - 'manager.statistics' - ) - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - function display(&$args, $request) { parent::display($args); - $this->setBreadcrumbs(); $form = new TimedViewReportForm($this); diff --git a/plugins/generic/translator/TranslatorHandler.inc.php b/plugins/generic/translator/TranslatorHandler.inc.php index 146c575c479..d697afe2771 100644 --- a/plugins/generic/translator/TranslatorHandler.inc.php +++ b/plugins/generic/translator/TranslatorHandler.inc.php @@ -36,7 +36,7 @@ function getEmailTemplateFilename($locale) { function index($args, &$request) { $this->validate(); $plugin =& $this->plugin; - $this->setupTemplate($request, false); + $this->setupTemplate($request); $rangeInfo = $this->getRangeInfo($request, 'locales'); @@ -52,14 +52,10 @@ function index($args, &$request) { $templateMgr->display($plugin->getTemplatePath() . 'index.tpl'); } - function setupTemplate($request, $subclass = true) { + function setupTemplate($request) { parent::setupTemplate($request); - $templateMgr =& TemplateManager::getManager($request); + $templateMgr = TemplateManager::getManager($request); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_ADMIN, LOCALE_COMPONENT_PKP_MANAGER); - $pageHierarchy = array(array($request->url(null, 'user'), 'navigation.user'), array($request->url(null, 'admin'), 'admin.siteAdmin')); - if ($subclass) $pageHierarchy[] = array($request->url(null, 'translate'), 'plugins.generic.translator.name'); - $templateMgr->assign('pageHierarchy', $pageHierarchy); - $templateMgr->assign('helpTopicId', 'plugins.generic.TranslatorPlugin'); } function edit($args, $request) { diff --git a/plugins/importexport/crossref/CrossRefExportPlugin.inc.php b/plugins/importexport/crossref/CrossRefExportPlugin.inc.php index 601368da364..1d031f8f7e5 100644 --- a/plugins/importexport/crossref/CrossRefExportPlugin.inc.php +++ b/plugins/importexport/crossref/CrossRefExportPlugin.inc.php @@ -84,7 +84,6 @@ function display(&$args, $request) { break; case 'issues': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getPublishedIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -94,7 +93,6 @@ function display(&$args, $request) { break; case 'articles': // Display a list of articles for export - $this->setBreadcrumbs(array(), true); $publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO'); $rangeInfo = Handler::getRangeInfo($this->getRequest, 'articles'); $articleIds = $publishedArticleDao->getPublishedArticleIdsByJournal($journal->getId(), false); @@ -106,7 +104,6 @@ function display(&$args, $request) { $templateMgr->display($this->getTemplatePath() . 'articles.tpl'); break; default: - $this->setBreadcrumbs(); $doiPrefix = null; $pubIdPlugins = PluginRegistry::loadCategory('pubIds', true); if (isset($pubIdPlugins['DOIPubIdPlugin'])) { diff --git a/plugins/importexport/datacite/DataciteExportPlugin.inc.php b/plugins/importexport/datacite/DataciteExportPlugin.inc.php index 0cb8460af7b..299fee6f83f 100644 --- a/plugins/importexport/datacite/DataciteExportPlugin.inc.php +++ b/plugins/importexport/datacite/DataciteExportPlugin.inc.php @@ -109,8 +109,6 @@ function getObjectName($exportType) { * @see DOIExportPlugin::displaySuppFileList() */ function displaySuppFileList(&$templateMgr, &$journal) { - $this->setBreadcrumbs(array(), true); - // Retrieve all published articles. $allArticles = $this->getAllPublishedArticles($journal); diff --git a/plugins/importexport/datacite/classes/DOIExportPlugin.inc.php b/plugins/importexport/datacite/classes/DOIExportPlugin.inc.php index 68754cf8371..de779e48088 100644 --- a/plugins/importexport/datacite/classes/DOIExportPlugin.inc.php +++ b/plugins/importexport/datacite/classes/DOIExportPlugin.inc.php @@ -452,7 +452,6 @@ function getAllObjectTypes() { * @param $journal Journal */ function displayAllUnregisteredObjects(&$templateMgr, &$journal) { - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(array(LOCALE_COMPONENT_PKP_SUBMISSION)); // Prepare and display the template. @@ -932,8 +931,6 @@ function getObjectNotFoundErrorKey($exportType) { * @param $journal Journal */ function _displayPluginHomePage(&$templateMgr, &$journal) { - $this->setBreadcrumbs(); - // Check for configuration errors: $configurationErrors = array(); @@ -972,8 +969,6 @@ function _displayPluginHomePage(&$templateMgr, &$journal) { * @param $journal Journal */ function _displayIssueList(&$templateMgr, &$journal) { - $this->setBreadcrumbs(array(), true); - // Retrieve all published issues. AppLocale::requireComponents(array(LOCALE_COMPONENT_APP_EDITOR)); $issueDao =& DAORegistry::getDAO('IssueDAO'); /* @var $issueDao IssueDAO */ @@ -1006,8 +1001,6 @@ function _displayIssueList(&$templateMgr, &$journal) { * @param $journal Journal */ function _displayArticleList(&$templateMgr, &$journal) { - $this->setBreadcrumbs(array(), true); - // Retrieve all published articles. $this->registerDaoHook('PublishedArticleDAO'); $allArticles = $this->getAllPublishedArticles($journal); @@ -1056,8 +1049,6 @@ function _displayArticleList(&$templateMgr, &$journal) { * @param $journal Journal */ function _displayGalleyList(&$templateMgr, &$journal) { - $this->setBreadcrumbs(array(), true); - // Retrieve all published articles. $allArticles = $this->getAllPublishedArticles($journal); diff --git a/plugins/importexport/doaj/DOAJPlugin.inc.php b/plugins/importexport/doaj/DOAJPlugin.inc.php index f1e76dd60f8..1c4dece1fea 100644 --- a/plugins/importexport/doaj/DOAJPlugin.inc.php +++ b/plugins/importexport/doaj/DOAJPlugin.inc.php @@ -75,7 +75,6 @@ function display(&$args, $request) { $this->contact($journal); break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'index.tpl'); } } diff --git a/plugins/importexport/duracloud/DuraCloudImportExportPlugin.inc.php b/plugins/importexport/duracloud/DuraCloudImportExportPlugin.inc.php index fe1642fe847..daff154cf4c 100644 --- a/plugins/importexport/duracloud/DuraCloudImportExportPlugin.inc.php +++ b/plugins/importexport/duracloud/DuraCloudImportExportPlugin.inc.php @@ -99,7 +99,6 @@ function display(&$args, $request) { return; case 'exportableIssues': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -109,13 +108,11 @@ function display(&$args, $request) { return; case 'importableIssues': // Display a list of issues for import - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $templateMgr->assign('issues', $this->getImportableIssues()); $templateMgr->display($this->getTemplatePath() . 'importableIssues.tpl'); return; case 'signIn': - $this->setBreadcrumbs(); $this->import('DuraCloudLoginForm'); $duraCloudLoginForm = new DuraCloudLoginForm($this); $duraCloudLoginForm->readInputData(); @@ -133,7 +130,6 @@ function display(&$args, $request) { } // If we fall through: display the form. - $this->setBreadcrumbs(); $this->import('DuraCloudLoginForm'); $duraCloudLoginForm = new DuraCloudLoginForm($this); $duraCloudLoginForm->display($this); diff --git a/plugins/importexport/erudit/EruditExportPlugin.inc.php b/plugins/importexport/erudit/EruditExportPlugin.inc.php index f9f9a4822cf..7d1bd315595 100644 --- a/plugins/importexport/erudit/EruditExportPlugin.inc.php +++ b/plugins/importexport/erudit/EruditExportPlugin.inc.php @@ -68,7 +68,6 @@ function display(&$args, $request) { } default: // Display a list of articles for export - $this->setBreadcrumbs(); AppLocale::requireComponents(LOCALE_COMPONENT_PKP_SUBMISSION); $publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO'); $rangeInfo = Handler::getRangeInfo($this->getRequest(), $this->getRequest(), $this->getRequest(), $this->getRequest(), 'articles'); diff --git a/plugins/importexport/mets/MetsExportPlugin.inc.php b/plugins/importexport/mets/MetsExportPlugin.inc.php index c365d5de316..412915fec5a 100644 --- a/plugins/importexport/mets/MetsExportPlugin.inc.php +++ b/plugins/importexport/mets/MetsExportPlugin.inc.php @@ -70,7 +70,6 @@ function display(&$args, $request) { break; case 'issues': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -84,7 +83,6 @@ function display(&$args, $request) { $templateMgr->display($this->getTemplatePath() . 'issues.tpl'); break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'index.tpl'); } } diff --git a/plugins/importexport/native/NativeImportExportPlugin.inc.php b/plugins/importexport/native/NativeImportExportPlugin.inc.php index c236a747409..fe86272e3dc 100644 --- a/plugins/importexport/native/NativeImportExportPlugin.inc.php +++ b/plugins/importexport/native/NativeImportExportPlugin.inc.php @@ -89,7 +89,6 @@ function display(&$args, $request) { break; case 'issues': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -99,7 +98,6 @@ function display(&$args, $request) { break; case 'articles': // Display a list of articles for export - $this->setBreadcrumbs(array(), true); $publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO'); $rangeInfo = Handler::getRangeInfo($this->getRequest(), 'articles'); $articleIds = $publishedArticleDao->getPublishedArticleIdsAlphabetizedByJournal($journal->getId(), false); @@ -170,7 +168,6 @@ function display(&$args, $request) { } break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'index.tpl'); } } diff --git a/plugins/importexport/pubIds/PubIdImportExportPlugin.inc.php b/plugins/importexport/pubIds/PubIdImportExportPlugin.inc.php index ec9497594dc..7abb3179280 100644 --- a/plugins/importexport/pubIds/PubIdImportExportPlugin.inc.php +++ b/plugins/importexport/pubIds/PubIdImportExportPlugin.inc.php @@ -94,7 +94,6 @@ function display(&$args, $request) { break; case 'selectIssue': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(array(LOCALE_COMPONENT_APP_EDITOR)); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -127,7 +126,6 @@ function display(&$args, $request) { return $templateMgr->display($this->getTemplatePath() . 'importResults.tpl'); break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'importExportIndex.tpl'); } } diff --git a/plugins/importexport/pubmed/PubMedExportPlugin.inc.php b/plugins/importexport/pubmed/PubMedExportPlugin.inc.php index 551b4f57eca..2ac43c3eed1 100644 --- a/plugins/importexport/pubmed/PubMedExportPlugin.inc.php +++ b/plugins/importexport/pubmed/PubMedExportPlugin.inc.php @@ -84,7 +84,6 @@ function display(&$args, $request) { break; case 'issues': // Display a list of issues for export - $this->setBreadcrumbs(array(), true); AppLocale::requireComponents(LOCALE_COMPONENT_APP_EDITOR); $issueDao =& DAORegistry::getDAO('IssueDAO'); $issues =& $issueDao->getIssues($journal->getId(), Handler::getRangeInfo($this->getRequest(), 'issues')); @@ -94,7 +93,6 @@ function display(&$args, $request) { break; case 'articles': // Display a list of articles for export - $this->setBreadcrumbs(array(), true); $publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO'); $rangeInfo = Handler::getRangeInfo($this->getRequest(), 'articles'); $articleIds = $publishedArticleDao->getPublishedArticleIdsByJournal($journal->getId(), false); @@ -106,7 +104,6 @@ function display(&$args, $request) { $templateMgr->display($this->getTemplatePath() . 'articles.tpl'); break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'index.tpl'); } } diff --git a/plugins/importexport/quickSubmit/QuickSubmitPlugin.inc.php b/plugins/importexport/quickSubmit/QuickSubmitPlugin.inc.php index 423de9fa610..f3490ff3b35 100644 --- a/plugins/importexport/quickSubmit/QuickSubmitPlugin.inc.php +++ b/plugins/importexport/quickSubmit/QuickSubmitPlugin.inc.php @@ -50,7 +50,6 @@ function display(&$args, $request) { $templateMgr =& TemplateManager::getManager($request); $templateMgr->register_function('plugin_url', array(&$this, 'smartyPluginUrl')); AppLocale::requireComponents(LOCALE_COMPONENT_APP_AUTHOR, LOCALE_COMPONENT_APP_EDITOR, LOCALE_COMPONENT_PKP_SUBMISSION); - $this->setBreadcrumbs(); if (array_shift($args) == 'saveSubmit') { $this->saveSubmit($args, $request); diff --git a/plugins/importexport/users/UserImportExportPlugin.inc.php b/plugins/importexport/users/UserImportExportPlugin.inc.php index ce07f315648..945005f2f2f 100644 --- a/plugins/importexport/users/UserImportExportPlugin.inc.php +++ b/plugins/importexport/users/UserImportExportPlugin.inc.php @@ -198,7 +198,6 @@ function display(&$args, $request) { echo XMLCustomWriter::getXML($doc); break; default: - $this->setBreadcrumbs(); $templateMgr->display($this->getTemplatePath() . 'index.tpl'); } } diff --git a/plugins/themes/custom/CustomThemePlugin.inc.php b/plugins/themes/custom/CustomThemePlugin.inc.php index 40ca08f08d4..a03c676c583 100644 --- a/plugins/themes/custom/CustomThemePlugin.inc.php +++ b/plugins/themes/custom/CustomThemePlugin.inc.php @@ -66,32 +66,6 @@ function getManagementVerbs() { return array(array('settings', __('plugins.theme.custom.settings'))); } - /** - * Set the page's breadcrumbs, given the plugin's tree of items - * to append. - * @param $subclass boolean - */ - function setBreadcrumbs($isSubclass = false) { - $request =& $this->getRequest(); - $templateMgr =& TemplateManager::getManager($request); - $pageCrumbs = array( - array( - $request->url(null, 'user'), - 'navigation.user' - ), - array( - $request->url(null, 'manager'), - 'user.role.manager' - ) - ); - if ($isSubclass) $pageCrumbs[] = array( - $request->url(null, 'manager', 'plugins'), - 'manager.plugins' - ); - - $templateMgr->assign('pageHierarchy', $pageCrumbs); - } - /** * Extend the {url ...} smarty to support this plugin. */ @@ -133,11 +107,9 @@ function manage($verb, $args, &$message, &$messageParams, &$pluginModalContent = $form->execute(); $request->redirect(null, 'manager', 'plugin', array('themes', 'CustomThemePlugin', 'settings')); } else { - $this->setBreadCrumbs(true); $form->display($request); } } else { - $this->setBreadCrumbs(true); $form->initData(); $form->display($request); } diff --git a/templates/article/header.tpl b/templates/article/header.tpl index 66b7a370dd9..e992b3b7e95 100644 --- a/templates/article/header.tpl +++ b/templates/article/header.tpl @@ -116,11 +116,5 @@ {include file="common/navbar.tpl"} - -
diff --git a/templates/sectionEditor/submissionNotes.tpl b/templates/sectionEditor/submissionNotes.tpl index e93adc1b237..e8f9277f0a7 100644 --- a/templates/sectionEditor/submissionNotes.tpl +++ b/templates/sectionEditor/submissionNotes.tpl @@ -10,7 +10,6 @@ *} {strip} {assign var="pageTitle" value="submission.notes"} -{assign var="pageCrumbTitle" value="submission.notes.breadcrumb"} {include file="common/header.tpl"} {/strip} diff --git a/templates/sectionEditor/submissionRegrets.tpl b/templates/sectionEditor/submissionRegrets.tpl index acc39e0f4bf..fa60fa84dce 100644 --- a/templates/sectionEditor/submissionRegrets.tpl +++ b/templates/sectionEditor/submissionRegrets.tpl @@ -11,7 +11,6 @@ {strip} {translate|assign:"pageTitleTranslated" key="sectionEditor.regrets.title" articleId=$submission->getId()} {assign var=pageTitleTranslated value=$pageTitleTranslated|escape} -{assign var="pageCrumbTitle" value="sectionEditor.regrets.breadcrumb"} {include file="common/header.tpl"} {/strip}