Added close notification button and fixed Info Pages.

Also added admin override for ads.
This commit is contained in:
Robbie Antenesse 2015-11-09 12:20:03 -07:00
parent 8356317d1d
commit 71defdd59b
3 changed files with 16 additions and 12 deletions

View File

@ -299,6 +299,7 @@ searchTerm {
border: 1px solid black; border: 1px solid black;
} }
#notificationCloseButton,
#settingsButton, #settingsScreenCloseButton, #settingsButton, #settingsScreenCloseButton,
#settingsSaveButtons button, #infoScreenCloseButton { #settingsSaveButtons button, #infoScreenCloseButton {
float: right; float: right;

View File

@ -10,12 +10,6 @@ $notificationMessage = get_include_contents('notification.php');
<title>Lexiconga Dictionary Builder</title> <title>Lexiconga Dictionary Builder</title>
<link href="css/styles.css" rel="stylesheet" /> <link href="css/styles.css" rel="stylesheet" />
<!-- Markdown Parser -->
<script src="js/markdown-js/markdown.min.js"></script>
<!-- JSON Search -->
<script src="js/defiant-js/defiant-latest.min.js"></script>
<link href="css/lexiconga.css" rel="stylesheet" /> <link href="css/lexiconga.css" rel="stylesheet" />
</head> </head>
<body> <body>
@ -30,6 +24,7 @@ $notificationMessage = get_include_contents('notification.php');
<contents> <contents>
<?php if ($notificationMessage) { ?> <?php if ($notificationMessage) { ?>
<div id="notificationArea"> <div id="notificationArea">
<span id="notificationCloseButton" class="clickable" onclick="document.getElementById('notificationArea').style.display='none';">Close</span>
<?php echo $notificationMessage; ?> <?php echo $notificationMessage; ?>
</div> </div>
<?php } ?> <?php } ?>
@ -95,7 +90,7 @@ $notificationMessage = get_include_contents('notification.php');
</div> </div>
<div id="rightColumn" class="googleads" style="float:right;width:20%;max-width:300px;min-width:200px;overflow:hidden;"> <div id="rightColumn" class="googleads" style="float:right;width:20%;max-width:300px;min-width:200px;overflow:hidden;">
<?php include_once("php/google/adsense.php"); ?> <?php if ($_GET['adminoverride'] != "noadsortracking") { include_once("php/google/adsense.php"); } ?>
</div> </div>
<div id="settingsScreen" style="display:none;"> <div id="settingsScreen" style="display:none;">
@ -176,7 +171,7 @@ $notificationMessage = get_include_contents('notification.php');
<!-- Main Script --> <!-- Main Script -->
<script src="js/dictionaryBuilder.js"></script> <script src="js/dictionaryBuilder.js"></script>
<script src="js/ui.js"></script> <script src="js/ui.js"></script>
<?php include_once("php/google/analytics.php"); ?> <?php if ($_GET['adminoverride'] != "noadsortracking") { include_once("php/google/analytics.php"); } ?>
</body> </body>
</html> </html>
<?php <?php

View File

@ -29,12 +29,20 @@ function ToggleDescription() {
} }
} }
function ShowAbout() { function ShowInfo(text) {
document.getElementById("aboutScreen").style.display = "block"; if (text == "terms") {
document.getElementById("infoText").innerHTML = termsText;
} else if (text == "privacy") {
document.getElementById("infoText").innerHTML = privacyText;
} else {
document.getElementById("infoText").innerHTML = aboutText;
}
document.getElementById("infoPage").scrollTop = 0;
document.getElementById("infoScreen").style.display = "block";
} }
function HideAbout() { function HideInfo() {
document.getElementById("aboutScreen").style.display = "none"; document.getElementById("infoScreen").style.display = "none";
} }
function ToggleCaseSensitiveOption() { function ToggleCaseSensitiveOption() {