diff options
author | Felipe Figueroa <amenadiel@gmail.com> | 2021-01-07 03:36:07 +0300 |
---|---|---|
committer | Felipe Figueroa <amenadiel@gmail.com> | 2021-01-07 03:36:07 +0300 |
commit | cddb7ffb796a64512c484d4e0365aea1d69a3217 (patch) | |
tree | a1ae45d05d474da393eb3245ae2bfe368ed9d72b | |
parent | 85efcca29d07b0e1dcda13c2bcc3fb7554408c0c (diff) |
RC 6.3.0
-rw-r--r-- | assets/themes/global.css | 54 | ||||
-rw-r--r-- | assets/themes/global.less | 10 | ||||
-rw-r--r-- | src/classes/ContainerUtils.php | 7 | ||||
-rw-r--r-- | src/controllers/LoginController.php | 2 | ||||
-rw-r--r-- | src/controllers/TreeController.php | 1 | ||||
-rw-r--r-- | src/router.php | 6 |
6 files changed, 59 insertions, 21 deletions
diff --git a/assets/themes/global.css b/assets/themes/global.css index d4b0e9a5..f3851fb5 100644 --- a/assets/themes/global.css +++ b/assets/themes/global.css @@ -70,26 +70,40 @@ html body #detail.detail_container table, html body.detailbody table { min-width: calc(100vw - 370px); } -html body #detail.detail_container table#data td, -html body.detailbody table#data td { +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td, +html body #detail.detail_container table.searchpath html body.detailbody table#data td, +html body.detailbody table.searchpath html body #detail.detail_container table#data td, +html body.detailbody table.searchpath html body.detailbody table#data td { white-space: nowrap; } -html body #detail.detail_container table#data td.opbutton1, -html body.detailbody table#data td.opbutton1, -html body #detail.detail_container table#data td.opbutton2, -html body.detailbody table#data td.opbutton2, -html body #detail.detail_container table#data td.opbutton3, -html body.detailbody table#data td.opbutton3 { +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton1, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton1, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton1, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton1, +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton2, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton2, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton2, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton2, +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton3, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton3, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton3, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton3 { border: 0 none; padding-left: 1px; padding-right: 1px; } -html body #detail.detail_container table#data td.opbutton1 a, -html body.detailbody table#data td.opbutton1 a, -html body #detail.detail_container table#data td.opbutton2 a, -html body.detailbody table#data td.opbutton2 a, -html body #detail.detail_container table#data td.opbutton3 a, -html body.detailbody table#data td.opbutton3 a { +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton1 a, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton1 a, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton1 a, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton1 a, +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton2 a, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton2 a, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton2 a, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton2 a, +html body #detail.detail_container table.searchpath html body #detail.detail_container table#data td.opbutton3 a, +html body #detail.detail_container table.searchpath html body.detailbody table#data td.opbutton3 a, +html body.detailbody table.searchpath html body #detail.detail_container table#data td.opbutton3 a, +html body.detailbody table.searchpath html body.detailbody table#data td.opbutton3 a { margin-left: 2px; margin-right: 2px; } @@ -176,8 +190,18 @@ html body #detail.detail_container .topbar .toplink { margin-right: 110px; } html body #detail.detail_container .trail { + height: 24px; position: fixed; } +html body #detail.detail_container .trail .trail_table { + min-width: unset; +} +html body #detail.detail_container .trail .searchpath { + min-width: unset; + right: 0; + position: fixed; + top: 25px; +} html body .navlink li a { -webkit-background-clip: border-box; -webkit-background-origin: padding-box; @@ -501,6 +525,8 @@ html body form.sqlform .sqledit_bottom_inputs p label #paginate { html body .searchpath { padding: 5px; clear: both; + min-width: unset; + float: left; } html body .CodeMirror { border: 1px solid #aaa; diff --git a/assets/themes/global.less b/assets/themes/global.less index 129446db..2c038072 100644 --- a/assets/themes/global.less +++ b/assets/themes/global.less @@ -174,7 +174,17 @@ html { } } .trail { + height:24px; position: fixed; + .trail_table { + min-width:unset; + } + .searchpath { + min-width:unset; +right:0; +position:fixed; +top:25px; + } } } .navlink { diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php index b1f03e1e..d46b6a3b 100644 --- a/src/classes/ContainerUtils.php +++ b/src/classes/ContainerUtils.php @@ -215,6 +215,8 @@ class ContainerUtils extends Container implements ContainerInterface $destinationurl = $this->getRedirectUrl(); if (!isset($_server_info['username'])||!\is_array($url)) { + $destinationurl= (strpos($destinationurl,$container->subFolder)===0?'': $container->subFolder).$destinationurl; + return $destinationurl; } @@ -232,9 +234,8 @@ class ContainerUtils extends Container implements ContainerInterface } $actionurl = Decorator::actionurl($url['url'], $_GET); $destinationurl =str_replace($this->subFolder,'', $actionurl->value($_GET)); -if(strpos($destinationurl,$subject)===0) { - $destinationurl=$this->subFolder.'/'.$destinationurl; -} + $destinationurl= (strpos($destinationurl,$container->subFolder)===0?'': $container->subFolder).$destinationurl; + return $destinationurl; } diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php index 5d7bfe21..5a7c97a1 100644 --- a/src/controllers/LoginController.php +++ b/src/controllers/LoginController.php @@ -99,7 +99,7 @@ class LoginController extends BaseController $login_html .= $this->printMsg($msg, false); } - $login_html .= '<form id="login_form" method="post" name="login_form" action="' . \containerInstance()->subFolder . '/login?server=' . \htmlspecialchars($server_id) . '">'; + $login_html .= '<p class="clearfix"> </p><p><form id="login_form" method="post" name="login_form" action="' . \containerInstance()->subFolder . '/login?server=' . \htmlspecialchars($server_id) . '"></p>'; $md5_server = \md5($server_id); // Pass request vars through form (is this a security risk???) diff --git a/src/controllers/TreeController.php b/src/controllers/TreeController.php index cca10b87..9786a3d7 100644 --- a/src/controllers/TreeController.php +++ b/src/controllers/TreeController.php @@ -204,6 +204,7 @@ class TreeController extends BaseController } else { $parent = ['children' => false]; } + //ddd($parent); if (true === $print) { if (isset($_REQUEST['children'])) { diff --git a/src/router.php b/src/router.php index 0aa90273..e869454c 100644 --- a/src/router.php +++ b/src/router.php @@ -187,9 +187,9 @@ $app->get('/', function ( ) { $subject = 'intro'; $query_string = $request->getUri()->getQuery(); - return $response->withStatus(302)->withHeader('Location',$nextPath); - - return $this->view->maybeRenderIframes($response, $subject, $query_string); + $className = $this->view->getControllerClassName($subject); + $controller = new $className($this); + return $controller->render(); }); $app->get('[/{path:.*}]', function ( |