aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvincent-peugnet <v.peugnet@free.fr>2020-01-30 01:54:50 +0100
committervincent-peugnet <v.peugnet@free.fr>2020-01-30 01:55:00 +0100
commit40ef00fee7286a186673ff3fb26b6802421b2bc4 (patch)
treed148fff0a745e72454cfc8b704048478a2cdc07a
parentcdd3895f772d60404c73abf9067b0f0a09e4ebf2 (diff)
downloadwcms-40ef00fee7286a186673ff3fb26b6802421b2bc4.tar.gz
wcms-40ef00fee7286a186673ff3fb26b6802421b2bc4.zip
work on thumbnail admin
-rw-r--r--app/class/Config.php13
-rw-r--r--app/class/Page.php26
-rw-r--r--app/view/templates/admin.php12
-rw-r--r--app/view/templates/editleftbar.php33
-rw-r--r--assets/css/tagcolors.css17
5 files changed, 69 insertions, 32 deletions
diff --git a/app/class/Config.php b/app/class/Config.php
index 555129b..6ddb3e4 100644
--- a/app/class/Config.php
+++ b/app/class/Config.php
@@ -23,6 +23,7 @@ abstract class Config
protected static $defaultbody = '%HEADER%'. PHP_EOL .PHP_EOL . '%NAV%'. PHP_EOL .PHP_EOL . '%ASIDE%'. PHP_EOL .PHP_EOL . '%MAIN%'. PHP_EOL .PHP_EOL . '%FOOTER%';
protected static $defaultpage = '';
protected static $defaultfavicon = '';
+ protected static $defaultthumbnail = '';
protected static $analytics = '';
protected static $externallinkblank = true;
protected static $internallinkblank = false;
@@ -204,6 +205,11 @@ abstract class Config
return self::$defaultfavicon;
}
+ public static function defaultthumbnail()
+ {
+ return self::$defaultthumbnail;
+ }
+
public static function analytics()
{
return self::$analytics;
@@ -363,6 +369,13 @@ abstract class Config
}
}
+ public static function setdefaultthumbnail($defaultthumbnail)
+ {
+ if(is_string($defaultthumbnail)) {
+ self::$defaultthumbnail = $defaultthumbnail;
+ }
+ }
+
public static function setdefaultpage($defaultpage)
{
if(is_string($defaultpage)) {
diff --git a/app/class/Page.php b/app/class/Page.php
index 7475b6b..fff98dc 100644
--- a/app/class/Page.php
+++ b/app/class/Page.php
@@ -17,7 +17,6 @@ class Page extends Dbitem
protected $datemodif;
protected $daterender;
protected $css;
- protected $quickcss;
protected $javascript;
protected $body;
protected $header;
@@ -76,7 +75,6 @@ class Page extends Dbitem
$this->setdatemodif($now);
$this->setdaterender($now);
$this->setcss('');
- $this->setquickcss([]);
$this->setjavascript('');
$this->setbody('');
$this->setheader('');
@@ -93,7 +91,7 @@ class Page extends Dbitem
$this->settemplatebody('');
$this->settemplatecss('');
$this->settemplatejavascript('');
- $this->settemplateoptions(['externalcss', 'externaljavascript', 'favicon', 'reccursivecss', 'quickcss']);
+ $this->settemplateoptions(['externalcss', 'externaljavascript', 'favicon', 'thumbnail', 'reccursivecss']);
$this->setfavicon('');
$this->setauthors([]);
$this->setinvites([]);
@@ -228,15 +226,6 @@ class Page extends Dbitem
return $this->css;
}
- public function quickcss($type = 'array')
- {
- if ($type == 'json') {
- return json_encode($this->quickcss);
- } elseif ($type == 'array') {
- return $this->quickcss;
- }
- }
-
public function javascript($type = 'string')
{
return $this->javascript;
@@ -365,9 +354,9 @@ class Page extends Dbitem
$template['javascript'] = $this->templatejavascript;
$template['cssreccursive'] = $this->checkoption('reccursive');
- $template['cssquickcss'] = $this->checkoption('quickcss');
$template['externalcss'] = $this->checkoption('externalcss');
$template['cssfavicon'] = $this->checkoption('favicon');
+ $template['cssthumbnail'] = $this->checkoption('thumbnail');
$template['externaljavascript'] = $this->checkoption('externaljavascript');
@@ -381,7 +370,7 @@ class Page extends Dbitem
function checkoption($option)
{
- if (in_array('reccursive', $this->templateoptions)) {
+ if (in_array($option, $this->templateoptions)) {
return true;
} else {
return false;
@@ -536,15 +525,6 @@ class Page extends Dbitem
}
- public function setquickcss($quickcss)
- {
- if (is_string($quickcss)) {
- $quickcss = json_decode($quickcss, true);
- }
- if (is_array($quickcss)) {
- $this->quickcss = $quickcss;
- }
- }
public function setjavascript($javascript)
{
diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 7186f26..ab71957 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -229,6 +229,18 @@
?>
</select>
+ <label for="defaultfavicon">Default thumbnail</label>
+ <select name="defaultthumbnail" id="defaultthumbnail" form="admin">
+ <option value="">--no thumbnail--</option>
+ <?php
+ foreach ($thumbnaillist as $thumbnail) {
+ ?>
+ <option value="<?= $thumbnail ?>" <?= Wcms\Config::defaultthumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
+ <?php
+ }
+ ?>
+ </select>
+
<h2 id="databases">Databases</h2>
diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index 8302090..a7a8be6 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -43,11 +43,26 @@
?>
</select>
- <div id="thumbnail">
- <label for="thumbnail">Thumbnail</label>
- <input type="file" id="thumbnail" name="thumbnail" accept=".jpg, .JPG, .jpeg, .JPEG">
- <img src="<?= Wcms\Model::thumbnailpath() ?><?= $page->id() ?>.jpg" alt="no-thumbnail">
- </div>
+
+ <label for="thumbnail">Thumbnail</label>
+ <select name="thumbnail" id="thumbnail">
+ <?php
+ if(!empty($page->templatebody()) && $page->template()['thumbnail']) {
+ ?>
+ <option value="<?= $page->thumbnail() ?>">--using template thumbnail--</option>
+ <?php
+ } else {
+ echo '<option value="">--no thumbnail--</option>';
+ foreach ($thumbnaillist as $thumbnail) {
+ ?>
+ <option value="<?= $thumbnail ?>" <?= $page->thumbnail() === $thumbnail ? 'selected' : '' ?>><?= $thumbnail ?></option>
+ <?php
+ }
+ }
+ ?>
+ </select>
+
+
@@ -98,10 +113,6 @@
<label for="oreccursivecss">Reccursive template</label>
</div>
<div class="subtemplate">
- <input type="checkbox" name="templateoptions[]" id="oquickcss" value="quickcss" <?= in_array('quickcss', $page->templateoptions()) ? 'checked' : '' ?>>
- <label for="oquickcss">Quickcss</label>
- </div>
- <div class="subtemplate">
<input type="checkbox" name="templateoptions[]" id="oexternalcss" value="externalcss" <?= in_array('externalcss', $page->templateoptions()) ? 'checked' : '' ?>>
<label for="oexternalcss">External CSS</label>
</div>
@@ -109,6 +120,10 @@
<input type="checkbox" name="templateoptions[]" id="ofavicon" value="favicon" <?= in_array('favicon', $page->templateoptions()) ? 'checked' : '' ?>>
<label for="ofavicon">Favicon</label>
</div>
+ <div class="subtemplate">
+ <input type="checkbox" name="templateoptions[]" id="othumbnail" value="thumbnail" <?= in_array('thumbnail', $page->templateoptions()) ? 'checked' : '' ?>>
+ <label for="othumbnail">Thumbnail</label>
+ </div>
<?php
} else {
foreach($page->templateoptions() as $option) {
diff --git a/assets/css/tagcolors.css b/assets/css/tagcolors.css
new file mode 100644
index 0000000..97a28d4
--- /dev/null
+++ b/assets/css/tagcolors.css
@@ -0,0 +1,17 @@
+
+.tag_color { background-color: #785ae2; }
+.tag_w { background-color: #d660e7; }
+.tag_sans { background-color: #a44432; }
+.tag_secret { background-color: #f449d8; }
+.tag_fiit { background-color: #d5ccfc; }
+.tag_salle { background-color: #488d4f; }
+.tag_ab { background-color: #6f8934; }
+.tag_template { background-color: #85e961; }
+.tag_tttaaaaggggeee { background-color: #654760; }
+.tag_salle01 { background-color: #57f55c; }
+.tag_event { background-color: #d1bc49; }
+.tag_delire { background-color: #8c967a; }
+.tag_phasme { background-color: #a23e85; }
+.tag_animal { background-color: #c85b73; }
+.tag_blague { background-color: #6ac3f3; }
+.tag_festival { background-color: #67a46c; } \ No newline at end of file