diff --git a/classes/cronlog-renderer.class.php b/classes/cronlog-renderer.class.php index b49548023628bfa707d0d92b143e4236772ada05..6e8c353e6ef4fa12156feac902d817ecbc2fcbbf 100644 --- a/classes/cronlog-renderer.class.php +++ b/classes/cronlog-renderer.class.php @@ -244,7 +244,8 @@ class cronlogrenderer extends cronlog{ } $sReturn=''; $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){ $sHost=parse_url($sUrl, PHP_URL_HOST); diff --git a/config/page_replacements.php b/config/page_replacements.php index b2cb42a0384f8f569a930e0067a27ff6561250b7..ad50fc4a2f560f561d85a5016d9663e09bb8aacd 100644 --- a/config/page_replacements.php +++ b/config/page_replacements.php @@ -8,11 +8,22 @@ return [ '{{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>', '{{BRAND}}' =>'<a href="/index.php" class="brand-link bg-red"> - Cronlog viewer - <span class="brand-text font-weight-light">v2.0</span> + CronLog viewer + <span class="brand-text font-weight-light">v2</span> </a>', '{{NAVI_LEFT}}' =>' <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="input-group"> <input id="serverfiltertext" class="form-control form-control-sidebar" type="search" placeholder="Search" @@ -30,10 +41,19 @@ return [ </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> <nav id="subnav" class="navbar navbar-expand navbar-light tabs"> <ul class="navbar-nav"> @@ -52,7 +72,7 @@ return [ '{{PAGE_BODY}}'=>'<div id="tabcontent"> <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> <div id="cronhistory"> @@ -60,7 +80,7 @@ return [ <div class="card-body" id="cronhistory-content"><br>Moment ...</div></div> </div> <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> </div> diff --git a/index.php b/index.php index 64a0288bd10fe97cc05a032e5207c18301e67028..a6fdd28009daf74af83cee80e2cfef6caedfbcc7 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,7 @@ <?php +define("APP_VERSION", '2.0.1'); + require_once('classes/render-adminlte.class.php'); $renderAdminLTE=new renderadminlte(); diff --git a/main.css b/main.css index c4666231840eaf95710ae6abdc8b575d1be24267..dff21044ecf9a3575c72b6710f1d4e326710844b 100644 --- a/main.css +++ b/main.css @@ -1,8 +1,11 @@ /* ----- serverlist on the left side */ -#selectserver{min-height: 20em;max-height: 30em; } -#selectserver select{background: none; border: none; max-height: 100%; color: #ddd;} +#selectserver{background: none !important; border: none; } +#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 */ @@ -22,7 +25,7 @@ #errorlog {background:#fcc; color:#800;} -p.hint{margin-bottom: 1em; background:#fed; padding: 1em; } +p.hint{margin-bottom: 1em; background:#f8f8f8; padding: 1em; } /* ----- override datatable defaults */