3
1
sirjeff 4 долоо хоног өмнө
parent
commit
815d2b10f3

+ 3 - 1
Controller/ProjectBrandingController.php

@@ -19,7 +19,9 @@ class ProjectBrandingController extends BaseController {
       $branding = [
         "project_id" => $project["id"],
         "logo_url" => $values["logo_url"],
-        "accent_color" => $values["accent_color"],
+        "foreground_color" => $values["foreground_color"],
+        "background_color" => $values["background_color"],
+        "second_background_color" => $values["second_background_color"],
         "enabled" => isset($values["enabled"]) ? 1 : 0,
       ];
       

+ 1 - 1
Plugin.php

@@ -44,7 +44,7 @@ class Plugin extends Base {
   }
   
   public function getPluginVersion() {
-    return "1.0.1";
+    return "1.0.3";
   }
   
   public function getPluginHomepage() {

+ 17 - 1
Schema/Sqlite.php

@@ -2,7 +2,23 @@
 
 use PDO;
 
-const VERSION = 2;
+const VERSION = 3;
+
+function version_3(PDO $pdo) {
+  $pdo->exec('DROP TABLE project_branding;');
+  $pdo->exec('
+    CREATE TABLE IF NOT EXISTS project_branding (
+      id INTEGER PRIMARY KEY,
+      project_id INTEGER NOT NULL,
+      logo_url TEXT,
+      foreground_color TEXT,
+      background_color TEXT,
+      second_background_color TEXT,
+      enabled INTEGER DEFAULT 0,
+      FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE
+    );
+  ');
+}
 
 function version_2(PDO $pdo) {
   $pdo->exec('DROP TABLE project_branding;');

+ 1 - 1
Template/custom_style.php

@@ -1,7 +1,7 @@
 <?php if (isset($branding["enabled"]) && $branding["enabled"] == 1 && !empty($branding["accent_color"])): ?>
   <style>
     :root {
-      --kanboard-accent-color: <?= $branding["accent_color"] ?>;
+      --kanboard-accent-color: <?= $branding["background_color"] ?>;
     }
   </style>
 <?php endif ?>

+ 8 - 1
Template/header.php

@@ -21,8 +21,15 @@ if (isset($project) && isset($project["id"])) {
 
 <?php if (isset($branding["enabled"]) && $branding["enabled"] == 1 && !empty($branding["logo_url"])): ?>
 <style>
+header{
+background-color:<?= $branding['background_color'] ?>;
+}
+.project-header{
+ background-color:<?= $branding['second_background_color'] ?>;
+}
 h1 {
-color:<?= $branding['accent_color'] ?>;
+ color:<?= $branding['foreground_color'] ?>;
+ background-color:<?= $branding['background_color'] ?>;
 }
 span.logo a{
 vertical-align: middle;

+ 4 - 4
Template/project/branding_styles.php

@@ -1,14 +1,14 @@
 <?php if (isset($branding["enabled"]) && $branding["enabled"] == 1 && !empty($branding["accent_color"])): ?>
 <style>
   .app-main .sidebar a.active, .btn-blue, .project-main .views-switcher a.active {
-    color: <?= $branding["accent_color"] ?> !important;
+    color: <?= $branding["foreground_color"] ?> !important;
   }
   .btn-blue {
-    background-color: <?= $branding["accent_color"] ?> !important;
-    border-color: <?= $branding["accent_color"] ?> !important;
+    background-color: <?= $branding["foreground_color"] ?> !important;
+    border-color: <?= $branding["foreground_color"] ?> !important;
   }
   .project-header .views-switcher a.active::after, .view-project-header .views-switcher a.active::after {
-    background-color: <?= $branding["accent_color"] ?> !important;
+    background-color: <?= $branding["foreground_color"] ?> !important;
   }
 </style>
 <?php endif ?>

+ 8 - 2
Template/project_branding/show.php

@@ -15,8 +15,14 @@
   <?= $this->form->label(t("Logo URL"), "logo_url") ?>
   <?= $this->form->text("logo_url", $branding, [], ['placeholder="https://example.com/logo.png"']) ?>
   
-  <?= $this->form->label(t("Accent Color"), "accent_color") ?>
-  <?= $this->form->text("accent_color", $branding, [], ['type="color"']) ?>
+  <?= $this->form->label(t("Foreground Color"), "foreground_color") ?>
+  <?= $this->form->text("foreground_color", $branding, [], ['type="color"']) ?>
+
+  <?= $this->form->label(t("Background Color"), "background_color") ?>
+  <?= $this->form->text("background_color", $branding, [], ['type="color"']) ?>
+  
+  <?= $this->form->label(t("Secondary Background Color"), "second_background_color") ?>
+  <?= $this->form->text("second_background_color", $branding, [], ['type="color"']) ?>
   
   <div class="form-actions">
     <button type="submit" class="btn btn-blue"><?= t("Save") ?></button>

+ 1 - 1
ver

@@ -1 +1 @@
-1.0.1
+1.0.3