Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address some issues brought up by #1001 #1005

Merged
merged 5 commits into from
Nov 15, 2024
Merged

Address some issues brought up by #1001 #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca3d839
Add back pid and start work on adding styling for update checks
tsadpbb Nov 5, 2024
09a5c95
improve styling and layout
tsadpbb Nov 6, 2024
ec014f6
remove this styling, its not needed
tsadpbb Nov 6, 2024
1991653
add changelog
tsadpbb Nov 6, 2024
395ea4a
Merge branch 'master' into 1001-add-back-pid
dylan-at-nagios Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Nagios Core 4 Change Log

4.5.8 - 2024-XX-XX
------------------
* Improve new exfoliation theme and add back in PID information (Dylan Anderson)
* Fix issues with downtimes that are both flexible and triggered and improve downtime additions in general (#595) (Dylan Anderson)

4.5.7 - 2024-10-24
Expand Down
45 changes: 31 additions & 14 deletions contrib/exfoliation/stylesheets/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@ not important: blue aaccff 777777
--border: #28303E;
--input: #0D1014;
--radius: 0.3rem;

--info-msg-text: #89BDF1;
--info-msg-border: #1866B6;
--info-msg-bg: #041220;

--success-msg-text: #40DE7A;
--success-msg-border: #147538;
--success-msg-bg: #04160A;

--warning-msg-text: #FFF948;
--warning-msg-border: #706C00;
--warning-msg-bg: #191900;

--error-msg-text: #F9B4B5;
--error-msg-border: #710B09;
--error-msg-bg: #1C0202;
}

#side {
Expand Down Expand Up @@ -161,7 +177,6 @@ a:hover {
gap: 4px;
padding: 16px;
margin: 0;
border-right: 1px var(--border) solid;
}

.navbarlogo {
Expand Down Expand Up @@ -261,12 +276,6 @@ ul.navsectionlinks li ul li a:hover {
text-align: center;
}

#mainbrandsplash {
font-size: 12pt;
font-weight: bold;
margin: 0 0 35px 0;
}

#maincopy {
margin: 0 0 15px 0;
}
Expand Down Expand Up @@ -305,7 +314,7 @@ ul.navsectionlinks li ul li a:hover {
}

#updateversioninfo {
margin: 15px auto 35px auto;
margin: 15px auto 0 auto;
width: 400px;
}

Expand All @@ -314,8 +323,10 @@ ul.navsectionlinks li ul li a:hover {
}

.updatechecksdisabled {
background-color: #FF9F9F;
border: 1px solid red;
background-color: var(--error-msg-bg);
border: 1px solid var(--error-msg-border);
color: var(--error-msg-text);
border-radius: var(--radius);
padding: 10px;
}

Expand All @@ -324,8 +335,10 @@ ul.navsectionlinks li ul li a:hover {
}

.updateavailable {
background-color: #9FD4FF;
border: 1px solid blue;
background-color: var(--info-msg-bg);
border: 1px solid var(--info-msg-border);
color: var(--info-msg-text);
border-radius: var(--radius);
padding: 10px;
}

Expand All @@ -334,8 +347,12 @@ ul.navsectionlinks li ul li a:hover {
font-weight: bold;
}

#mainbrandsplash {
display: none;
.dot-enabled {
color: #00EE5F;
}

.dot-disabled {
color: red;
}

#mainsplash {
Expand Down
2 changes: 2 additions & 0 deletions html/index.php.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ $this_year = '2024';
height: 100vh;
width: 200px;
border: none;
/* I don't like doing this but not sure of a better way */
border-right: 1px solid #28303E;
}

iframe[name="main"] {
Expand Down
13 changes: 3 additions & 10 deletions html/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function getCoreStatus() {
}

function setCoreStatusHTML(image, text) {
$('#core-status').html('<img src="images/' + image + '.gif" /> ' + text);
$('#core-status').html(`<span class='dot-${image}'>●</span>&nbsp&nbsp${text}`);
}
</script>

Expand All @@ -65,17 +65,12 @@ function setCoreStatusHTML(image, text) {

<body id="splashpage">


<div id="mainbrandsplash">
<div><span id="core-status"></span></div>
</div>


<div id="currentversioninfo">
<div>
<div class="version">Version <b><?php echo $this_version; ?></b></div>
<div class="releasedate">October 24, 2024</div>
</div>
<div><span id="core-status"></span></div>
<a class="checkforupdates" href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a>
</div>

Expand All @@ -90,9 +85,7 @@ function setCoreStatusHTML(image, text) {
<div class="submessage">Disabling update checks presents a possible security risk. Visit <a href="https://www.nagios.org/" target="_blank">nagios.org</a> to check for updates manually or enable update checks in your Nagios config file.</a></div>
</div>
<?php
} else if (
$updateinfo['update_available'] && $this_version < $updateinfo['update_version']
) {
} else if ($updateinfo['update_available'] && $this_version < $updateinfo['update_version']) {
?>
<div class="updateavailable">
<div class="updatemessage">A new version of Nagios Core is available!</div>
Expand Down
48 changes: 22 additions & 26 deletions html/stylesheets/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,40 +190,36 @@ div.navsectionheader ul li ul li {
text-align: center;
}

#mainbrandsplash{
font-size: 12pt;
font-weight: bold;
margin: 0 0 35px 0;
}

#maincopy{
margin: 0 0 15px 0;
}

#currentversioninfo{
font-size: 12pt;
}
#currentversioninfo .product{
font-size: 14pt;
font-weight: bold;
}
#currentversioninfo .version{
#currentversioninfo {
font-size: 14pt;
font-weight: bold;
display: flex;
flex-direction: column;
gap: 2rem;
}
#currentversioninfo .version b{
font-size: 14pt;
font-weight: bold;
}
#currentversioninfo .releasedate{
font-size: 11pt;
margin: 5px 0 0 0;
}
#currentversioninfo .checkforupdates{
font-size: 11pt;
font-weight: bold;

#currentversioninfo *{
font-size: 12pt;
}

#currentversioninfo > div {
display: flex;
flex-direction: column;
align-items: center;
gap: 2rem;
}

.dot-enabled {
color: #33FF00;
}

.dot-disabled {
color: red;
}

#updateversioninfo{
margin: 15px auto 35px auto;
width: 400px;
Expand Down