Separated announcements from notifications so the announcement doesn't come back every time you add a new word.
This commit is contained in:
parent
14f9942647
commit
ddc301d78f
|
@ -85,6 +85,10 @@ input, textarea, select, option, button {
|
|||
background: #efdfc0;
|
||||
}
|
||||
|
||||
#announcementArea {
|
||||
background:#a0c066;
|
||||
}
|
||||
|
||||
#notificationArea {
|
||||
background:#c0c088;
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ input[type=checkbox] {
|
|||
margin: 0 10px 0 0;
|
||||
}
|
||||
|
||||
#notificationArea {
|
||||
#announcementArea, #notificationArea {
|
||||
text-align:center;
|
||||
padding:10px;
|
||||
border-radius:5px;
|
||||
|
@ -341,7 +341,7 @@ searchTerm {
|
|||
border: 1px solid black;
|
||||
}
|
||||
|
||||
#notificationCloseButton,
|
||||
#announcementCloseButton, #notificationCloseButton,
|
||||
#settingsButton, #settingsScreenCloseButton,
|
||||
#settingsSaveButtons button, #infoScreenCloseButton {
|
||||
float: right;
|
||||
|
|
|
@ -48,10 +48,13 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
|
|||
</div>
|
||||
</header>
|
||||
<contents>
|
||||
<div id="notificationArea" style="display:<?php echo (($announcement || $notificationMessage) ? "block" : "none"); ?>;">
|
||||
<div id="announcementArea" style="display:<?php echo (($announcement) ? "block" : "none"); ?>;margin-bottom:10px;">
|
||||
<span id="announcementCloseButton" class="clickable" onclick="document.getElementById('announcementArea').style.display='none';">Close</span>
|
||||
<div id="announcement"><?php echo $announcement; ?></div>
|
||||
</div>
|
||||
<div id="notificationArea" style="display:<?php echo (($notificationMessage) ? "block" : "none"); ?>;">
|
||||
<span id="notificationCloseButton" class="clickable" onclick="document.getElementById('notificationArea').style.display='none';">Close</span>
|
||||
<div id="notificationMessage"><?php echo $notificationMessage; ?></div>
|
||||
<div id="announcement" style="margin-top:<?php echo (($announcement && $notificationMessage) ? "15px" : "0"); ?>;"><?php echo $announcement; ?></div>
|
||||
</div>
|
||||
<div id="leftColumn">
|
||||
<form id="wordEntryForm">
|
||||
|
|
Loading…
Reference in New Issue