diff options
| -rw-r--r-- | app/class/controllerconnect.php | 3 | ||||
| -rw-r--r-- | app/class/controlleruser.php | 2 | ||||
| -rw-r--r-- | app/view/templates/edithelp.php | 2 | ||||
| -rw-r--r-- | app/view/templates/media.php | 2 | ||||
| -rw-r--r-- | assets/css/home.css | 16 | ||||
| -rw-r--r-- | composer.json | 2 |
6 files changed, 20 insertions, 7 deletions
diff --git a/app/class/controllerconnect.php b/app/class/controllerconnect.php index 355de1d..2e3f976 100644 --- a/app/class/controllerconnect.php +++ b/app/class/controllerconnect.php @@ -36,6 +36,9 @@ class Controllerconnect extends Controller $this->user = $this->usermanager->login($_POST['pass']); if($this->user != false) { $this->usermanager->writesession($this->user); + $_SESSION['workspace']['showleftpanel'] = true; + $_SESSION['workspace']['showrightpanel'] = false; + } } if (!empty($id)) { diff --git a/app/class/controlleruser.php b/app/class/controlleruser.php index 495fab5..2b32993 100644 --- a/app/class/controlleruser.php +++ b/app/class/controlleruser.php @@ -66,7 +66,7 @@ class Controlleruser extends Controller $this->routedirectget('user', ['error' => 'change_password']); } elseif (empty($userupdate->level())) { $this->routedirectget('user', ['error' => 'wrong_level']); - } elseif ($user->level() === 10 && $userupdate->level() !== 10) { + } elseif ($user->level() === 10 && $userupdate->level() !== 10 && $this->user->id() === $user->id()) { $this->routedirectget('user', ['error' => 'cant_edit_yourself']); } else { $this->usermanager->add($userupdate); diff --git a/app/view/templates/edithelp.php b/app/view/templates/edithelp.php index ff0ade5..8f52fe2 100644 --- a/app/view/templates/edithelp.php +++ b/app/view/templates/edithelp.php @@ -1,6 +1,6 @@ <h4>update shortcut</h4> - <kbd>ALT</kbd> + <kbd>X</kbd> + <kbd>CTRL</kbd> + <kbd>S</kbd> <h4>Synthax</h4> <p> 📏<a href="https://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown encoding</a> diff --git a/app/view/templates/media.php b/app/view/templates/media.php index 613efd1..1b63b16 100644 --- a/app/view/templates/media.php +++ b/app/view/templates/media.php @@ -85,7 +85,7 @@ foreach ($medialist as $media) { <td><?= $media->width() ?></td> <td><?= $media->height() ?></td> <td><?= $media->length() ?></td> - <td><code> + <td class="code"><code> <?php if($media->type() == 'image') { ?> diff --git a/assets/css/home.css b/assets/css/home.css index 1b61b25..f9c0a99 100644 --- a/assets/css/home.css +++ b/assets/css/home.css @@ -5,7 +5,7 @@ div#flex { display: flex; - height: -webkit-fill-available; + height: 100%; } div#options { @@ -23,6 +23,10 @@ body { background-color: lightgrey; font-family: monospace; font-size: 15px; + position: fixed; + display: flex; + flex-direction: column; + width: 100%; } .menu { @@ -41,7 +45,6 @@ tr:hover { #topbar { background-color: #7b97b9; - position: fixed; width: 100%; padding: 3px 0.5%; } @@ -70,8 +73,9 @@ th { } main { - padding-top: 30px; margin: 0 0.5%; + flex: 1; + overflow-y: auto; } main.admin input, select, textarea { @@ -234,6 +238,12 @@ main.media code { +td.code { + background-color: darkslategrey; +} + + + main.user table form { display: inline-block; } diff --git a/composer.json b/composer.json index 1256b4c..72e5195 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "michelf/php-markdown": "^1.8", "league/plates": "3.*", "jamesmoss/flywheel": "^0.5.2", - "php": "^7.2", + "php": "^5.6.0", "altorouter/altorouter": "^1.2" } } |