From 5bb8c020bd16a80f4815c6ac8e60ac989b871065 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Sat, 11 Mar 2023 14:31:44 +0100 Subject: [PATCH] EditAssetForm: replace widget class with generic content box --- public/css/admin.css | 26 +------------------------- public/js/crop_editor.js | 10 +++++++--- templates/DummyBox.php | 6 +++--- templates/EditAssetForm.php | 30 ++++++++++++++++-------------- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/public/css/admin.css b/public/css/admin.css index 93007cc..8dd510d 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -74,30 +74,6 @@ body { } -/* Admin widgets -------------------*/ -.widget { - background: #fff; - padding: 25px; - box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.3); -} -.widget h3 { - margin: 0 0 1em; - font: 400 18px "Raleway", sans-serif; -} -.widget p, .errormsg p { - margin: 0; -} -.widget ul { - margin: 0; - list-style: none; - padding: 0; -} -.widget li { - line-height: 1.7em; -} - - /* Edit icon on tiled grids -----------------------------*/ .tiled_grid div.landscape, .tiled_grid div.portrait, .tiled_grid div.panorama { @@ -134,7 +110,7 @@ body { color: #fff; } #crop_editor input[type=number] { - width: 50px; + width: 75px; background: #555; color: #fff; } diff --git a/public/js/crop_editor.js b/public/js/crop_editor.js index 555ec83..286f1da 100644 --- a/public/js/crop_editor.js +++ b/public/js/crop_editor.js @@ -3,7 +3,7 @@ class CropEditor { this.opt = opt; this.edit_crop_button = document.createElement("span"); - this.edit_crop_button.className = "btn"; + this.edit_crop_button.className = "btn btn-light"; this.edit_crop_button.textContent = "Edit crop"; this.edit_crop_button.addEventListener('click', this.show.bind(this)); @@ -34,6 +34,7 @@ class CropEditor { this.position.appendChild(source_x_label); this.source_x = document.createElement("input"); + this.source_x.className = 'form-control d-inline'; this.source_x.type = 'number'; this.source_x.addEventListener("change", this.positionBoundary.bind(this)); this.source_x.addEventListener("keyup", this.positionBoundary.bind(this)); @@ -43,6 +44,7 @@ class CropEditor { this.position.appendChild(source_y_label); this.source_y = document.createElement("input"); + this.source_y.className = 'form-control d-inline'; this.source_y.type = 'number'; this.source_y.addEventListener("change", this.positionBoundary.bind(this)); this.source_y.addEventListener("keyup", this.positionBoundary.bind(this)); @@ -52,6 +54,7 @@ class CropEditor { this.position.appendChild(crop_width_label); this.crop_width = document.createElement("input"); + this.crop_width.className = 'form-control d-inline'; this.crop_width.type = 'number'; this.crop_width.addEventListener("change", this.positionBoundary.bind(this)); this.crop_width.addEventListener("keyup", this.positionBoundary.bind(this)); @@ -61,6 +64,7 @@ class CropEditor { this.position.appendChild(crop_height_label); this.crop_height = document.createElement("input"); + this.crop_height.className = 'form-control d-inline'; this.crop_height.type = 'number'; this.crop_height.addEventListener("change", this.positionBoundary.bind(this)); this.crop_height.addEventListener("keyup", this.positionBoundary.bind(this)); @@ -78,13 +82,13 @@ class CropEditor { this.crop_constrain_label.appendChild(this.crop_constrain_text); this.save_button = document.createElement("span"); - this.save_button.className = "btn"; + this.save_button.className = "btn btn-light"; this.save_button.textContent = "Save"; this.save_button.addEventListener('click', this.save.bind(this)); this.position.appendChild(this.save_button); this.abort_button = document.createElement("span"); - this.abort_button.className = "btn btn-red"; + this.abort_button.className = "btn btn-danger"; this.abort_button.textContent = "Abort"; this.abort_button.addEventListener('click', this.hide.bind(this)); this.position.appendChild(this.abort_button); diff --git a/templates/DummyBox.php b/templates/DummyBox.php index 2632384..23dc086 100644 --- a/templates/DummyBox.php +++ b/templates/DummyBox.php @@ -8,9 +8,9 @@ class DummyBox extends SubTemplate { - private $_class; - private $_content; - private $_title; + protected $_class; + protected $_content; + protected $_title; public function __construct($title = '', $content = '', $class = '') { diff --git a/templates/EditAssetForm.php b/templates/EditAssetForm.php index 490b0d2..8bdcdaf 100644 --- a/templates/EditAssetForm.php +++ b/templates/EditAssetForm.php @@ -6,7 +6,7 @@ * Kabuki CMS (C) 2013-2015, Aaron van Geffen *****************************************************************************/ -class EditAssetForm extends SubTemplate +class EditAssetForm extends Template { private $asset; private $thumbs; @@ -17,14 +17,14 @@ class EditAssetForm extends SubTemplate $this->thumbs = $thumbs; } - protected function html_content() + public function html_main() { echo '
-
+
- Delete asset - + Delete asset +

Edit asset \'', $this->asset->getTitle(), '\' (', $this->asset->getFilename(), ')

'; @@ -32,14 +32,15 @@ class EditAssetForm extends SubTemplate $this->section_replace(); echo ' -
'; +
+
'; $this->section_key_info(); $this->section_asset_meta(); echo ' -
-
'; +
+
'; if (!empty($this->thumbs)) $this->section_thumbnails(); @@ -47,11 +48,12 @@ class EditAssetForm extends SubTemplate $this->section_linked_tags(); echo ' -
'; +
'; $this->section_crop_editor(); echo ' +
'; } @@ -59,7 +61,7 @@ class EditAssetForm extends SubTemplate { $date_captured = $this->asset->getDateCaptured(); echo ' -
+

Key info

Title
@@ -81,7 +83,7 @@ class EditAssetForm extends SubTemplate protected function section_linked_tags() { echo ' -
+

Linked tags

    '; @@ -134,7 +136,7 @@ class EditAssetForm extends SubTemplate protected function section_thumbnails() { echo ' -
    +

    Thumbnails

    View: Target: