From be49d1f366da155737d05a17f73cf1c3d246c67e Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sat, 19 Jun 2021 01:37:36 +0200 Subject: Remove ID form field (and rearrange other fields) This commit removes the ID form field, enlarges the title form field and rearranges the other form fields in the grid layout. --- admin/page/insert.php | 3 +-- admin/post/insert.php | 3 +-- admin/user/insert.php | 3 +-- theme/admin/html/page/form.php | 27 ++++++++++----------------- theme/admin/html/post/form.php | 27 ++++++++++----------------- theme/admin/html/user/form.php | 27 ++++++++++----------------- theme/admin/rsrc/css/import/_responsive.scss | 5 +++++ theme/admin/rsrc/css/main.css | 8 ++++++++ theme/admin/rsrc/css/main.scss | 5 +++++ 9 files changed, 51 insertions(+), 57 deletions(-) diff --git a/admin/page/insert.php b/admin/page/insert.php index 5d4339a..979dbd9 100644 --- a/admin/page/insert.php +++ b/admin/page/insert.php @@ -12,8 +12,7 @@ require '../../core/application.php'; $Attribute = new Page\Attribute(); -if(HTTP::issetPOST('id', 'user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { - $Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE); +if(HTTP::issetPOST('user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { $Attribute->set('user', HTTP::POST('user')); $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name'))); $Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL); diff --git a/admin/post/insert.php b/admin/post/insert.php index 5b2ec52..6b1876e 100644 --- a/admin/post/insert.php +++ b/admin/post/insert.php @@ -12,8 +12,7 @@ require '../../core/application.php'; $Attribute = new Post\Attribute(); -if(HTTP::issetPOST('id', 'user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { - $Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE); +if(HTTP::issetPOST('user', 'slug', 'name', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { $Attribute->set('user', HTTP::POST('user')); $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('name'))); $Attribute->set('name', HTTP::POST('name') ? HTTP::POST('name') : NULL); diff --git a/admin/user/insert.php b/admin/user/insert.php index 9a84fa9..acb49ad 100644 --- a/admin/user/insert.php +++ b/admin/user/insert.php @@ -12,8 +12,7 @@ require '../../core/application.php'; $Attribute = new User\Attribute(); -if(HTTP::issetPOST('id', 'slug', 'username', 'password', 'fullname', 'mailaddr', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { - $Attribute->set('id', HTTP::POST('id') ? HTTP::POST('id') : FALSE); +if(HTTP::issetPOST('slug', 'username', 'password', 'fullname', 'mailaddr', 'body', 'argv', 'time_insert', 'time_update', 'insert')) { $Attribute->set('slug', HTTP::POST('slug') ? HTTP::POST('slug') : generateSlug(HTTP::POST('username'))); $Attribute->set('username', HTTP::POST('username') ? HTTP::POST('username') : NULL); $Attribute->set('password', HTTP::POST('password') ? password_hash(HTTP::POST('password'), PASSWORD_BCRYPT, ['cost' => 10]) : FALSE); diff --git a/theme/admin/html/page/form.php b/theme/admin/html/page/form.php index eee61bf..c0ffe2f 100644 --- a/theme/admin/html/page/form.php +++ b/theme/admin/html/page/form.php @@ -13,11 +13,18 @@
- + + +
+ +
+ +
- id="form_id" name="id" type="number" placeholder="AUTO_INCREMENT" value="" /> +
- - -
- -
- - - -
- -
- diff --git a/theme/admin/html/post/form.php b/theme/admin/html/post/form.php index 58ac122..dbf0ab5 100644 --- a/theme/admin/html/post/form.php +++ b/theme/admin/html/post/form.php @@ -13,11 +13,18 @@
- + + +
+ +
+ +
- id="form_id" name="id" type="number" placeholder="AUTO_INCREMENT" value="" /> +
- - -
- -
- - - -
- -
- diff --git a/theme/admin/html/user/form.php b/theme/admin/html/user/form.php index 7e370e5..54e21a1 100644 --- a/theme/admin/html/user/form.php +++ b/theme/admin/html/user/form.php @@ -13,25 +13,25 @@
- + -
- id="form_id" name="id" type="number" placeholder="AUTO_INCREMENT" value="" /> +
+
- +
- +
- +
- +
- - -
- -
- diff --git a/theme/admin/rsrc/css/import/_responsive.scss b/theme/admin/rsrc/css/import/_responsive.scss index e387c98..2a7cebb 100644 --- a/theme/admin/rsrc/css/import/_responsive.scss +++ b/theme/admin/rsrc/css/import/_responsive.scss @@ -60,6 +60,11 @@ .form-grid { grid-template-columns: auto auto; + + &-item.first { + grid-column-start: 2; + grid-column-end: 3; + } } .actions { diff --git a/theme/admin/rsrc/css/main.css b/theme/admin/rsrc/css/main.css index 73a9e6a..cfc6db9 100644 --- a/theme/admin/rsrc/css/main.css +++ b/theme/admin/rsrc/css/main.css @@ -518,6 +518,10 @@ table, td { border-top: 0.05rem solid #AAA; border-right: 0.05rem solid #AAA; } +.form-grid-item.first { + grid-column-start: 2; + grid-column-end: 5; +} .form-border-box { border: 0.05rem solid #AAA; @@ -745,6 +749,10 @@ label:after { .form-grid { grid-template-columns: auto auto; } + .form-grid-item.first { + grid-column-start: 2; + grid-column-end: 3; + } .actions { float: none; diff --git a/theme/admin/rsrc/css/main.scss b/theme/admin/rsrc/css/main.scss index 6cfaf05..d1f43c9 100644 --- a/theme/admin/rsrc/css/main.scss +++ b/theme/admin/rsrc/css/main.scss @@ -578,6 +578,11 @@ table, td { border-top: 0.05rem solid #AAA; border-right: 0.05rem solid #AAA; } + + &-item.first { + grid-column-start: 2; + grid-column-end: 5; + } } .form-border-box { -- cgit v1.2.3