From 85aa2a3fd9c0848e94280a3a2ceab32a87738dd8 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 24 Apr 2015 10:40:57 -0400
Subject: [PATCH] Refined refactoring.
---
.../templates/RecordDriver/SolrDefault/core.phtml | 8 ++++++++
themes/blueprint/templates/layout/layout.phtml | 8 +-------
.../templates/RecordDriver/SolrDefault/core.phtml | 8 ++++++++
themes/bootstrap3/templates/layout/layout.phtml | 8 +-------
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/themes/blueprint/templates/RecordDriver/SolrDefault/core.phtml b/themes/blueprint/templates/RecordDriver/SolrDefault/core.phtml
index 00fd354e5fc..84279ea2f51 100644
--- a/themes/blueprint/templates/RecordDriver/SolrDefault/core.phtml
+++ b/themes/blueprint/templates/RecordDriver/SolrDefault/core.phtml
@@ -1,3 +1,11 @@
+<?
+ if($loggedin = $this->auth()->isLoggedIn()) {
+ $user_id = $loggedin->id;
+ $loggedin = true;
+ } else {
+ $user_id = false;
+ }
+?>
<div class="span-13" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
<h1 property="name"><?=$this->escapeHtml($this->driver->getShortTitle() . ' ' . $this->driver->getSubtitle() . ' ' . $this->driver->getTitleSection())?></h1>
diff --git a/themes/blueprint/templates/layout/layout.phtml b/themes/blueprint/templates/layout/layout.phtml
index f96416f5e05..a1239082ba9 100644
--- a/themes/blueprint/templates/layout/layout.phtml
+++ b/themes/blueprint/templates/layout/layout.phtml
@@ -58,14 +58,8 @@
);
}
$this->headScript()->appendScript($this->jsTranslations()->getScript());
- if($loggedin = $this->auth()->isLoggedIn()) {
- $user_id = $loggedin->id;
- $loggedin = true;
- } else {
- $user_id = false;
- }
$this->headScript()->appendScript(
- 'var userIsLoggedIn = ' . ($loggedin ? 'true' : 'false') . ';'
+ 'var userIsLoggedIn = ' . ($this->auth()->isLoggedIn() ? 'true' : 'false') . ';'
);
}
if ($feedback) {
diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml
index 98b3841ca28..ea6a7b4f707 100644
--- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/core.phtml
@@ -1,3 +1,11 @@
+<?
+ if($loggedin = $this->auth()->isLoggedIn()) {
+ $user_id = $loggedin->id;
+ $loggedin = true;
+ } else {
+ $user_id = false;
+ }
+?>
<div class="row" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
<div class="col-sm-3">
<div class="text-center">
diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml
index f5633b7b0a0..d4db9be720d 100644
--- a/themes/bootstrap3/templates/layout/layout.phtml
+++ b/themes/bootstrap3/templates/layout/layout.phtml
@@ -63,14 +63,8 @@
);
}
$this->headScript()->appendScript($this->jsTranslations()->getScript());
- if($loggedin = $this->auth()->isLoggedIn()) {
- $user_id = $loggedin->id;
- $loggedin = true;
- } else {
- $user_id = false;
- }
$this->headScript()->appendScript(
- 'var userIsLoggedIn = ' . ($loggedin ? 'true' : 'false') . ';'
+ 'var userIsLoggedIn = ' . ($this->auth()->isLoggedIn() ? 'true' : 'false') . ';'
);
}
--
GitLab