Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Cronlog-viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IML Open Source
Cronlog-viewer
Commits
9fda0f89
Commit
9fda0f89
authored
2 years ago
by
Hahn Axel (hahn)
Browse files
Options
Downloads
Plain Diff
Merge branch 'restyle-adminlte' into 'master'
fix: minify sidebar See merge request
!6
parents
0c48518b
a9b8df82
No related branches found
No related tags found
1 merge request
!6
fix: minify sidebar
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
classes/cronlog-renderer.class.php
+2
-1
2 additions, 1 deletion
classes/cronlog-renderer.class.php
config/page_replacements.php
+27
-7
27 additions, 7 deletions
config/page_replacements.php
index.php
+2
-0
2 additions, 0 deletions
index.php
main.css
+6
-3
6 additions, 3 deletions
main.css
with
37 additions
and
11 deletions
classes/cronlog-renderer.class.php
+
2
−
1
View file @
9fda0f89
...
@@ -244,7 +244,8 @@ class cronlogrenderer extends cronlog{
...
@@ -244,7 +244,8 @@ class cronlogrenderer extends cronlog{
}
}
$sReturn
=
''
;
$sReturn
=
''
;
$sServer
=
isset
(
$_SERVER
[
'SERVER_NAME'
])
?
$_SERVER
[
'SERVER_NAME'
]
:
false
;
$sServer
=
isset
(
$_SERVER
[
'SERVER_NAME'
])
?
$_SERVER
[
'SERVER_NAME'
]
:
false
;
$sReturn
.
=
'<li class="nav-item d-none d-sm-inline-block"><a href="#" class="nav-link">Instances:</a></li>'
;
$sReturn
.
=
'<li class="nav-item"><a class="nav-link nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a></li>'
.
'<li class="nav-item d-none d-sm-inline-block"><a href="#" class="nav-link">Instances:</a></li>'
;
foreach
(
$this
->
_aInstances
as
$sInstance
=>
$sUrl
){
foreach
(
$this
->
_aInstances
as
$sInstance
=>
$sUrl
){
$sHost
=
parse_url
(
$sUrl
,
PHP_URL_HOST
);
$sHost
=
parse_url
(
$sUrl
,
PHP_URL_HOST
);
...
...
This diff is collapsed.
Click to expand it.
config/page_replacements.php
+
27
−
7
View file @
9fda0f89
...
@@ -8,11 +8,22 @@ return [
...
@@ -8,11 +8,22 @@ return [
'{{PAGE_LAYOUT}}'
=>
'layout-navbar-fixed layout-fixed sidebar-mini'
,
'{{PAGE_LAYOUT}}'
=>
'layout-navbar-fixed layout-fixed sidebar-mini'
,
'{{NAVI_TOP}}'
=>
'<nav class="main-header navbar navbar-expand navbar-white navbar-light"><ul class="navbar-nav" id="instances"></ul></nav>'
,
'{{NAVI_TOP}}'
=>
'<nav class="main-header navbar navbar-expand navbar-white navbar-light"><ul class="navbar-nav" id="instances"></ul></nav>'
,
'{{BRAND}}'
=>
'<a href="/index.php" class="brand-link bg-red">
'{{BRAND}}'
=>
'<a href="/index.php" class="brand-link bg-red">
Cron
l
og viewer
Cron
L
og viewer
<span class="brand-text font-weight-light">v2
.0
</span>
<span class="brand-text font-weight-light">v2</span>
</a>'
,
</a>'
,
'{{NAVI_LEFT}}'
=>
'
'{{NAVI_LEFT}}'
=>
'
<br>
<br>
<!--
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<li class="nav-item">
<a href="#" class="nav-link">
<i class="far fa-hdd"></i>
<p>Server</p>
</a>
</li>
</ul>
-->
<div class="form-inline">
<div class="form-inline">
<div class="input-group">
<div class="input-group">
<input id="serverfiltertext" class="form-control form-control-sidebar" type="search" placeholder="Search"
<input id="serverfiltertext" class="form-control form-control-sidebar" type="search" placeholder="Search"
...
@@ -30,10 +41,19 @@ return [
...
@@ -30,10 +41,19 @@ return [
</div>
</div>
</div>
</div>
</div>
</div>
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<br>
<div class="form-inline">
<div id="selectserver" class="form-control-sidebar"></div>
</div>
<br>
<div class="sidebar-infobox bottom">
<i class="fas fa-info-circle"></i> CronLog viewer v'
.
APP_VERSION
.
'<br>
<i class="fab fa-php"></i> PHP '
.
PHP_VERSION
.
'<br>
</div>
'
,
<div id="selectserver" class="active"></div>
</div>'
,
'{{PAGE_HEADER_LEFT}}'
=>
'<h2 id="lblServername">Server wählen...</h2>
'{{PAGE_HEADER_LEFT}}'
=>
'<h2 id="lblServername">Server wählen...</h2>
<nav id="subnav" class="navbar navbar-expand navbar-light tabs">
<nav id="subnav" class="navbar navbar-expand navbar-light tabs">
<ul class="navbar-nav">
<ul class="navbar-nav">
...
@@ -52,7 +72,7 @@ return [
...
@@ -52,7 +72,7 @@ return [
'{{PAGE_BODY}}'
=>
'<div id="tabcontent">
'{{PAGE_BODY}}'
=>
'<div id="tabcontent">
<div id="cronlogs">
<div id="cronlogs">
<div class="card card-
primary
card-outline active">
<div class="card card-
info
card-outline active">
<div class="card-body" id="cronlogs-content"><br>Moment ...</div></div>
<div class="card-body" id="cronlogs-content"><br>Moment ...</div></div>
</div>
</div>
<div id="cronhistory">
<div id="cronhistory">
...
@@ -60,7 +80,7 @@ return [
...
@@ -60,7 +80,7 @@ return [
<div class="card-body" id="cronhistory-content"><br>Moment ...</div></div>
<div class="card-body" id="cronhistory-content"><br>Moment ...</div></div>
</div>
</div>
<div id="graph">
<div id="graph">
<div class="card card-
success
card-outline">
<div class="card card-
info
card-outline">
<div class="card-body" id="graph-content"><br>Moment ...</div></div>
<div class="card-body" id="graph-content"><br>Moment ...</div></div>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
index.php
+
2
−
0
View file @
9fda0f89
<?php
<?php
define
(
"APP_VERSION"
,
'2.0.1'
);
require_once
(
'classes/render-adminlte.class.php'
);
require_once
(
'classes/render-adminlte.class.php'
);
$renderAdminLTE
=
new
renderadminlte
();
$renderAdminLTE
=
new
renderadminlte
();
...
...
This diff is collapsed.
Click to expand it.
main.css
+
6
−
3
View file @
9fda0f89
/* ----- serverlist on the left side */
/* ----- serverlist on the left side */
#selectserver
{
min-height
:
20em
;
max-height
:
30em
;
}
#selectserver
{
background
:
none
!important
;
border
:
none
;
}
#selectserver
select
{
background
:
none
;
border
:
none
;
max-height
:
100%
;
color
:
#ddd
;}
#selectserver
select
{
background
:
none
!important
;
border
:
none
;
max-height
:
50vh
;
color
:
#ddd
;}
.sidebar-infobox
{
color
:
#888
;
text-align
:
center
;}
.bottom
{
bottom
:
0px
;
position
:
absolute
;}
/* ----- head area */
/* ----- head area */
...
@@ -22,7 +25,7 @@
...
@@ -22,7 +25,7 @@
#errorlog
{
background
:
#fcc
;
color
:
#800
;}
#errorlog
{
background
:
#fcc
;
color
:
#800
;}
p
.hint
{
margin-bottom
:
1em
;
background
:
#f
ed
;
padding
:
1em
;
}
p
.hint
{
margin-bottom
:
1em
;
background
:
#f
8f8f8
;
padding
:
1em
;
}
/* ----- override datatable defaults */
/* ----- override datatable defaults */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment