Alamantus
/
Lexiconga
mirror of https://github.com/Alamantus/Lexiconga.git
1
0
Fork 0
Code Issues Releases Activity

Separated announcements from notifications so the announcement doesn't come back every time you add a new word.

This commit is contained in:
Robbie Antenesse 2015-12-21 13:36:25 -07:00
parent 14f9942647
commit ddc301d78f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/lexiconga.css
View File

@ -85,6 +85,10 @@ input, textarea, select, option, button {
background: #efdfc0; background: #efdfc0;
} }
#announcementArea {
background:#a0c066;
}
#notificationArea { #notificationArea {
background:#c0c088; background:#c0c088;
} }

4
css/styles.css
View File

@ -149,7 +149,7 @@ input[type=checkbox] {
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
#notificationArea { #announcementArea, #notificationArea {
text-align:center; text-align:center;
padding:10px; padding:10px;
border-radius:5px; border-radius:5px;
@ -341,7 +341,7 @@ searchTerm {
border: 1px solid black; border: 1px solid black;
} }
#notificationCloseButton, #announcementCloseButton, #notificationCloseButton,
#settingsButton, #settingsScreenCloseButton, #settingsButton, #settingsScreenCloseButton,
#settingsSaveButtons button, #infoScreenCloseButton { #settingsSaveButtons button, #infoScreenCloseButton {
float: right; float: right;

7
index.php
View File

@ -48,10 +48,13 @@ require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
</div> </div>
</header> </header>
<contents> <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> <span id="notificationCloseButton" class="clickable" onclick="document.getElementById('notificationArea').style.display='none';">Close</span>
<div id="notificationMessage"><?php echo $notificationMessage; ?></div> <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>
<div id="leftColumn"> <div id="leftColumn">
<form id="wordEntryForm"> <form id="wordEntryForm">