Reverting a bunch of changes
This commit is contained in:
parent
8854c47dd0
commit
afd8d0368a
|
@ -24,42 +24,42 @@
|
||||||
|
|
||||||
span[class^='bn-icon'], span[class*=' bn-icon'] { display: inline-block; }
|
span[class^='bn-icon'], span[class*=' bn-icon'] { display: inline-block; }
|
||||||
|
|
||||||
.better-navigator { position: fixed; z-index: 99999; max-height: 100%; overflow: auto; font-family: Helvetica, Arial, sans-serif; font-size: 12px; line-height: 16px; text-align: left; }
|
#BetterNavigator { position: fixed; z-index: 99999; max-height: 100%; overflow: auto; font-family: Helvetica, Arial, sans-serif; font-size: 12px; line-height: 16px; text-align: left; }
|
||||||
.better-navigator a { text-decoration: none; }
|
#BetterNavigator a { text-decoration: none; }
|
||||||
.better-navigator form { display: none; }
|
#BetterNavigator form { display: none; }
|
||||||
.better-navigator.collapsed { box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); }
|
#BetterNavigator.collapsed { box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5); }
|
||||||
.better-navigator.collapsed.translucent { opacity: 0.5; transition: opacity 250ms; }
|
#BetterNavigator.collapsed.translucent { opacity: 0.5; transition: opacity 250ms; }
|
||||||
.better-navigator.collapsed.translucent:hover { opacity: 1; }
|
#BetterNavigator.collapsed.translucent:hover { opacity: 1; }
|
||||||
.better-navigator.collapsed .better-navigator__status { border-width: 1px; }
|
#BetterNavigator.collapsed #BetterNavigatorStatus { border-width: 1px; }
|
||||||
.better-navigator.collapsed .better-navigator__status .bn-icon-close { display: none; }
|
#BetterNavigator.collapsed #BetterNavigatorStatus .bn-icon-close { display: none; }
|
||||||
.better-navigator.collapsed .better-navigator__status .bn-icon-cog { display: inline-block; }
|
#BetterNavigator.collapsed #BetterNavigatorStatus .bn-icon-cog { display: inline-block; }
|
||||||
.better-navigator.collapsed .better-navigator__content { display: none; }
|
#BetterNavigator.collapsed #BetterNavigatorContent { display: none; }
|
||||||
.better-navigator.right-top { right: 0; top: 0; }
|
#BetterNavigator.right-top { right: 0; top: 0; }
|
||||||
.better-navigator.right-top.collapsed { -moz-transform-origin: right top; -ms-transform-origin: right top; -webkit-transform-origin: right top; transform-origin: right top; -moz-transform: rotate(90deg) translate(100%, 0); -ms-transform: rotate(90deg) translate(100%, 0); -webkit-transform: rotate(90deg) translate(100%, 0); transform: rotate(90deg) translate(100%, 0); }
|
#BetterNavigator.right-top.collapsed { -moz-transform-origin: right top; -ms-transform-origin: right top; -webkit-transform-origin: right top; transform-origin: right top; -moz-transform: rotate(90deg) translate(100%, 0); -ms-transform: rotate(90deg) translate(100%, 0); -webkit-transform: rotate(90deg) translate(100%, 0); transform: rotate(90deg) translate(100%, 0); }
|
||||||
.better-navigator.right-bottom { right: 0; bottom: 0; }
|
#BetterNavigator.right-bottom { right: 0; bottom: 0; }
|
||||||
.better-navigator.right-bottom.collapsed { -moz-transform-origin: right bottom; -ms-transform-origin: right bottom; -webkit-transform-origin: right bottom; transform-origin: right bottom; -moz-transform: rotate(90deg) translate(0, 100%); -ms-transform: rotate(90deg) translate(0, 100%); -webkit-transform: rotate(90deg) translate(0, 100%); transform: rotate(90deg) translate(0, 100%); }
|
#BetterNavigator.right-bottom.collapsed { -moz-transform-origin: right bottom; -ms-transform-origin: right bottom; -webkit-transform-origin: right bottom; transform-origin: right bottom; -moz-transform: rotate(90deg) translate(0, 100%); -ms-transform: rotate(90deg) translate(0, 100%); -webkit-transform: rotate(90deg) translate(0, 100%); transform: rotate(90deg) translate(0, 100%); }
|
||||||
.better-navigator.left-bottom { left: 0; bottom: 0; }
|
#BetterNavigator.left-bottom { left: 0; bottom: 0; }
|
||||||
.better-navigator.left-bottom.collapsed { -moz-transform-origin: left bottom; -ms-transform-origin: left bottom; -webkit-transform-origin: left bottom; transform-origin: left bottom; -moz-transform: rotate(90deg) translate(-100%, 0); -ms-transform: rotate(90deg) translate(-100%, 0); -webkit-transform: rotate(90deg) translate(-100%, 0); transform: rotate(90deg) translate(-100%, 0); }
|
#BetterNavigator.left-bottom.collapsed { -moz-transform-origin: left bottom; -ms-transform-origin: left bottom; -webkit-transform-origin: left bottom; transform-origin: left bottom; -moz-transform: rotate(90deg) translate(-100%, 0); -ms-transform: rotate(90deg) translate(-100%, 0); -webkit-transform: rotate(90deg) translate(-100%, 0); transform: rotate(90deg) translate(-100%, 0); }
|
||||||
.better-navigator.left-top { left: 0; top: 0; }
|
#BetterNavigator.left-top { left: 0; top: 0; }
|
||||||
.better-navigator.left-top.collapsed { -moz-transform-origin: left top; -ms-transform-origin: left top; -webkit-transform-origin: left top; transform-origin: left top; -moz-transform: rotate(90deg) translate(0, -100%); -ms-transform: rotate(90deg) translate(0, -100%); -webkit-transform: rotate(90deg) translate(0, -100%); transform: rotate(90deg) translate(0, -100%); }
|
#BetterNavigator.left-top.collapsed { -moz-transform-origin: left top; -ms-transform-origin: left top; -webkit-transform-origin: left top; transform-origin: left top; -moz-transform: rotate(90deg) translate(0, -100%); -ms-transform: rotate(90deg) translate(0, -100%); -webkit-transform: rotate(90deg) translate(0, -100%); transform: rotate(90deg) translate(0, -100%); }
|
||||||
|
|
||||||
.better-navigator__status { color: #fff; background: #6f6f6f; border: 1px solid #646464; border-width: 0; text-transform: uppercase; cursor: pointer; padding: 10px 15px 8px; font-weight: bold; }
|
#BetterNavigatorStatus { color: #fff; background: #6f6f6f; border: 1px solid #646464; border-width: 0; text-transform: uppercase; cursor: pointer; padding: 10px 15px 8px; font-weight: bold; }
|
||||||
.better-navigator__status .bn-icon-cog { margin: -4px 8px -4px -4px; display: none; }
|
#BetterNavigatorStatus .bn-icon-cog { margin: -4px 8px -4px -4px; display: none; }
|
||||||
.better-navigator__status .bn-icon-close { float: right; margin: 1px 0 0 0; }
|
#BetterNavigatorStatus .bn-icon-close { float: right; margin: 1px 0 0 0; }
|
||||||
.better-navigator__status .bn-icon-cog, .better-navigator__status .bn-icon-close { opacity: .7; }
|
#BetterNavigatorStatus .bn-icon-cog, #BetterNavigatorStatus .bn-icon-close { opacity: .7; }
|
||||||
.better-navigator__status:hover { background: dimgray; }
|
#BetterNavigatorStatus:hover { background: dimgray; }
|
||||||
.better-navigator__status:hover .bn-icon-cog, .better-navigator__status:hover .bn-icon-close { opacity: 1; }
|
#BetterNavigatorStatus:hover .bn-icon-cog, #BetterNavigatorStatus:hover .bn-icon-close { opacity: 1; }
|
||||||
.live .better-navigator__status { background: #39b54a; border-color: #33a343; }
|
#BetterNavigatorStatus.Live { background: #39b54a; border-color: #33a343; }
|
||||||
.live .better-navigator__status:hover { background: #36ac46; }
|
#BetterNavigatorStatus.Live:hover { background: #36ac46; }
|
||||||
.draft .better-navigator__status { background: #f26c4f; border-color: #da6147; }
|
#BetterNavigatorStatus.Draft { background: #f26c4f; border-color: #da6147; }
|
||||||
.draft .better-navigator__status:hover { background: #e6674b; }
|
#BetterNavigatorStatus.Draft:hover { background: #e6674b; }
|
||||||
|
|
||||||
.better-navigator__content { padding: 6px; color: #71767a; background: #cfd8de; border: 1px solid #bac2c8; border-width: 0 0 1px 1px; }
|
#BetterNavigatorContent { padding: 6px; color: #71767a; background: #cfd8de; border: 1px solid #bac2c8; border-width: 0 0 1px 1px; }
|
||||||
.better-navigator__content .bn-heading { text-align: center; text-transform: uppercase; font-size: 11px; margin: 8px 0 4px 0; }
|
#BetterNavigatorContent .bn-heading { text-align: center; text-transform: uppercase; font-size: 11px; margin: 8px 0 4px 0; }
|
||||||
.better-navigator__content span[class^='bn-icon'], .better-navigator__content span[class*=' bn-icon'] { margin: -2px 5px -3px -2px; }
|
#BetterNavigatorContent span[class^='bn-icon'], #BetterNavigatorContent span[class*=' bn-icon'] { margin: -2px 5px -3px -2px; }
|
||||||
.better-navigator__content a, .better-navigator__content span.bn-disabled { display: block; background: #eceff2; color: #313639; font-family: Helvetica, Arial, sans-serif; font-size: 12px; border-radius: 5px; border-bottom: 1px solid #a3aaaf; margin: 0 0 4px 0; padding: 6px 10px 5px 10px; line-height: 16px; font-weight: bold; }
|
#BetterNavigatorContent a, #BetterNavigatorContent span.bn-disabled { display: block; background: #eceff2; color: #313639; font-family: Helvetica, Arial, sans-serif; font-size: 12px; border-radius: 5px; border-bottom: 1px solid #a3aaaf; margin: 0 0 4px 0; padding: 6px 10px 5px 10px; line-height: 16px; font-weight: bold; }
|
||||||
.better-navigator__content a .light, .better-navigator__content span.bn-disabled .light { font-weight: normal; }
|
#BetterNavigatorContent a .light, #BetterNavigatorContent span.bn-disabled .light { font-weight: normal; }
|
||||||
.better-navigator__content a:focus, .better-navigator__content a:hover, .better-navigator__content a:active { background: #fff; color: #000; }
|
#BetterNavigatorContent a:focus, #BetterNavigatorContent a:hover, #BetterNavigatorContent a:active { background: #fff; color: #000; }
|
||||||
.better-navigator__content span.bn-disabled { background: #afbac0; color: #51565a; cursor: default; }
|
#BetterNavigatorContent span.bn-disabled { background: #afbac0; color: #51565a; cursor: default; }
|
||||||
|
|
||||||
body > p.message { text-align: left; background: #fff; color: #222; padding: 10px 20px; margin: 0; border-bottom: 1px solid #ccc; border-left: 5px solid #1d8aff; }
|
body > p.message { text-align: left; background: #fff; color: #222; padding: 10px 20px; margin: 0; border-bottom: 1px solid #ccc; border-left: 5px solid #1d8aff; }
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
// For reading cookies
|
// For reading cookies
|
||||||
function getCookie(cname) {
|
function getCookie(cname) {
|
||||||
let name = cname + "=";
|
var name = cname + "=";
|
||||||
let ca = document.cookie.split(';');
|
var ca = document.cookie.split(';');
|
||||||
for (let i = 0; i < ca.length; i++) {
|
for (var i = 0; i < ca.length; i++) {
|
||||||
let c = ca[i];
|
var c = ca[i];
|
||||||
while (c.charAt(0) === ' ') {
|
while (c.charAt(0) === ' ') {
|
||||||
c = c.substring(1);
|
c = c.substring(1);
|
||||||
}
|
}
|
||||||
|
@ -16,35 +16,35 @@ function getCookie(cname) {
|
||||||
|
|
||||||
function initialiseBetterNavigator() {
|
function initialiseBetterNavigator() {
|
||||||
// Dom elements
|
// Dom elements
|
||||||
const betterNavigator = document.getElementById("BetterNavigator");
|
var BetterNavigator = document.getElementById("BetterNavigator");
|
||||||
const betterNavigatorStatus = document.getElementById("BetterNavigatorStatus");
|
var BetterNavigatorStatus = document.getElementById("BetterNavigatorStatus");
|
||||||
const betterNavigatorLogoutLink = document.getElementById("BetterNavigatorLogoutLink");
|
var BetterNavigatorLogoutLink = document.getElementById("BetterNavigatorLogoutLink");
|
||||||
const betterNavigatorLogoutForm = document.getElementById("LogoutForm_BetterNavigatorLogoutForm");
|
var BetterNavigatorLogoutForm = document.getElementById("LogoutForm_BetterNavigatorLogoutForm");
|
||||||
|
|
||||||
// Toggle visibility of menu by clicking status
|
// Toggle visibility of menu by clicking status
|
||||||
betterNavigatorStatus.onclick = function () {
|
BetterNavigatorStatus.onclick = function () {
|
||||||
if (betterNavigator.classList.contains('collapsed')) {
|
if (BetterNavigator.classList.contains('collapsed')) {
|
||||||
betterNavigator.classList.add('open');
|
BetterNavigator.classList.add('open');
|
||||||
betterNavigator.classList.remove('collapsed');
|
BetterNavigator.classList.remove('collapsed');
|
||||||
document.cookie = "BetterNavigator=open;path=/";
|
document.cookie = "BetterNavigator=open;path=/";
|
||||||
} else {
|
} else {
|
||||||
betterNavigator.classList.add('collapsed');
|
BetterNavigator.classList.add('collapsed');
|
||||||
betterNavigator.classList.remove('open');
|
BetterNavigator.classList.remove('open');
|
||||||
document.cookie = "BetterNavigator=collapsed;path=/";
|
document.cookie = "BetterNavigator=collapsed;path=/";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Restore menu state
|
// Restore menu state
|
||||||
if (getCookie('BetterNavigator') === 'open') {
|
if (getCookie('BetterNavigator') === 'open') {
|
||||||
betterNavigator.classList.add('open');
|
BetterNavigator.classList.add('open');
|
||||||
betterNavigator.classList.remove('collapsed');
|
BetterNavigator.classList.remove('collapsed');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (betterNavigatorLogoutForm) {
|
if (BetterNavigatorLogoutForm) {
|
||||||
// Upgrade logout link to directly log users out instead of redirecting to logout form
|
// Upgrade logout link to directly log users out instead of redirecting to logout form
|
||||||
betterNavigatorLogoutLink.onclick = function (e) {
|
BetterNavigatorLogoutLink.onclick = function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
betterNavigatorLogoutForm.submit();
|
BetterNavigatorLogoutForm.submit();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
|
||||||
|
|
||||||
//Container
|
//Container
|
||||||
|
|
||||||
.better-navigator {
|
#BetterNavigator {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 99999;
|
z-index: 99999;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
|
@ -43,7 +43,7 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.better-navigator__status {
|
#BetterNavigatorStatus {
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
|
|
||||||
.bn-icon-close {
|
.bn-icon-close {
|
||||||
|
@ -54,7 +54,7 @@ span[class^='bn-icon'],span[class*=' bn-icon']{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.better-navigator__content {
|
#BetterNavigatorContent {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ $liveColor: #39b54a;
|
||||||
$stageColor: #f26c4f;
|
$stageColor: #f26c4f;
|
||||||
$archiveColor: #6f6f6f;
|
$archiveColor: #6f6f6f;
|
||||||
|
|
||||||
.better-navigator__status {
|
#BetterNavigatorStatus {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: $archiveColor;
|
background: $archiveColor;
|
||||||
border: 1px solid shade($archiveColor, 10);
|
border: 1px solid shade($archiveColor, 10);
|
||||||
|
@ -140,7 +140,7 @@ $archiveColor: #6f6f6f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.live & {
|
&.Live {
|
||||||
background: $liveColor;
|
background: $liveColor;
|
||||||
border-color: shade($liveColor, 10);
|
border-color: shade($liveColor, 10);
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ $archiveColor: #6f6f6f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.draft & {
|
&.Draft {
|
||||||
background: $stageColor;
|
background: $stageColor;
|
||||||
border-color: shade($stageColor, 10);
|
border-color: shade($stageColor, 10);
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ $archiveColor: #6f6f6f;
|
||||||
|
|
||||||
//Content
|
//Content
|
||||||
|
|
||||||
.better-navigator__content {
|
#BetterNavigatorContent {
|
||||||
padding: 6px;
|
padding: 6px;
|
||||||
color: #71767a;
|
color: #71767a;
|
||||||
background: #cfd8de;
|
background: #cfd8de;
|
||||||
|
|
|
@ -130,7 +130,8 @@ class BetterNavigatorExtension extends DataExtension
|
||||||
$bNData = array_merge($nav, [
|
$bNData = array_merge($nav, [
|
||||||
'Member' => $member,
|
'Member' => $member,
|
||||||
'Stage' => Versioned::get_stage(),
|
'Stage' => Versioned::get_stage(),
|
||||||
'CssClass' => $this->cssClass($viewing),
|
'Viewing' => $viewing, // What we're viewing doesn't necessarily align with the active Stage
|
||||||
|
'CssClass' => $this->cssClass(),
|
||||||
'ViewingTitle' => $viewingTitle,
|
'ViewingTitle' => $viewingTitle,
|
||||||
'LoginLink' => Controller::join_links(Director::absoluteBaseURL(), Security::config()->login_url, $backURL),
|
'LoginLink' => Controller::join_links(Director::absoluteBaseURL(), Security::config()->login_url, $backURL),
|
||||||
'LogoutLink' => Controller::join_links(Director::absoluteBaseURL() . Security::config()->logout_url, $backURL),
|
'LogoutLink' => Controller::join_links(Director::absoluteBaseURL() . Security::config()->logout_url, $backURL),
|
||||||
|
@ -183,12 +184,10 @@ class BetterNavigatorExtension extends DataExtension
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $viewing
|
|
||||||
*
|
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private function cssClass($viewing) {
|
private function cssClass() {
|
||||||
$classes = strtolower($viewing);
|
$classes = '';
|
||||||
|
|
||||||
$position = Config::inst()->get('BetterNavigator', 'position');
|
$position = Config::inst()->get('BetterNavigator', 'position');
|
||||||
$translucent = Config::inst()->get('BetterNavigator', 'translucent');
|
$translucent = Config::inst()->get('BetterNavigator', 'translucent');
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
<div id="BetterNavigator" class="better-navigator collapsed $CssClass">
|
<div id="BetterNavigator" class="collapsed $CssClass">
|
||||||
|
|
||||||
<div id="BetterNavigatorStatus" class="better-navigator__status">
|
<div id="BetterNavigatorStatus" class="$Viewing">
|
||||||
<span class="bn-icon-cog"></span>
|
<span class="bn-icon-cog"></span>
|
||||||
$ViewingTitle
|
$ViewingTitle
|
||||||
<span class="bn-icon-close"></span>
|
<span class="bn-icon-close"></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="BetterNavigatorContent" class="better-navigator__content">
|
<div id="BetterNavigatorContent">
|
||||||
|
|
||||||
<div class="bn-links">
|
<div class="bn-links">
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
<% if $Member %>
|
<% if $Member %>
|
||||||
$LogoutForm
|
$LogoutForm
|
||||||
<a href="$LogoutLink" id="BetterNavigatorLogoutLink" class="better-navigator__logout-link"><span class="bn-icon-user"></span><%t JonoM\BetterNavigator.LOG_OUT_LABEL 'Log out' %><% if $Member.FirstName %><span class="light"> ($Member.FirstName)</span><% end_if %></a>
|
<a href="$LogoutLink" id="BetterNavigatorLogoutLink"><span class="bn-icon-user"></span><%t JonoM\BetterNavigator.LOG_OUT_LABEL 'Log out' %><% if $Member.FirstName %><span class="light"> ($Member.FirstName)</span><% end_if %></a>
|
||||||
<% else %>
|
<% else %>
|
||||||
<a href="$LoginLink"><span class="bn-icon-user"></span><%t JonoM\BetterNavigator.LOG_IN_LABEL 'Log in' %></a>
|
<a href="$LoginLink"><span class="bn-icon-user"></span><%t JonoM\BetterNavigator.LOG_IN_LABEL 'Log in' %></a>
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
|
|
Loading…
Reference in New Issue