aboutsummaryrefslogtreecommitdiff
path: root/app/view
diff options
context:
space:
mode:
authorvincent-peugnet <v.peugnet@free.fr>2019-01-02 19:50:28 +0100
committervincent-peugnet <v.peugnet@free.fr>2019-01-02 19:50:28 +0100
commitafeeafc2a691b661ba2c92250f883fda6bd33392 (patch)
tree6f596f3cf31c1f62e0463ceff4e17e3541762da5 /app/view
parentd5a2af69c6d62475c26dc7e9812f9a977e9dfa12 (diff)
downloadwcms-afeeafc2a691b661ba2c92250f883fda6bd33392.tar.gz
wcms-afeeafc2a691b661ba2c92250f883fda6bd33392.zip
render path check
Diffstat (limited to 'app/view')
-rw-r--r--app/view/templates/backtopbar.php2
-rw-r--r--app/view/templates/edit.php4
-rw-r--r--app/view/templates/editleftbar.php3
-rw-r--r--app/view/templates/updatemerge.php9
4 files changed, 13 insertions, 5 deletions
diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php
index 1243a17..91a2a2c 100644
--- a/app/view/templates/backtopbar.php
+++ b/app/view/templates/backtopbar.php
@@ -22,7 +22,7 @@
<?php } else { ?>
<span>
-<?= $user->level() ?>
+<?= $user->id() ?> <i><?= $user->level() ?></i>
</span>
diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php
index 415fcce..c220678 100644
--- a/app/view/templates/edit.php
+++ b/app/view/templates/edit.php
@@ -10,10 +10,6 @@
<body>
<main class="editor">
- <!-- <?php $this->insert('navart', ['user' => $user, 'art' => $art, 'artexist' => $artexist]) ?> -->
-
-
-
<?php $this->insert('edittopbar', ['art' => $art, 'user' => $user]) ?>
<div id="workspace">
diff --git a/app/view/templates/editleftbar.php b/app/view/templates/editleftbar.php
index 8cd6509..3cc747a 100644
--- a/app/view/templates/editleftbar.php
+++ b/app/view/templates/editleftbar.php
@@ -2,6 +2,9 @@
<input id="showleftpanel" name="workspace[showleftpanel]" value="1" class="toggle" type="checkbox" <?= $showleftpanel == true ? 'checked' : '' ?>>
<label for="showleftpanel" class="toogle">◧</label>
<div id="leftbarpanel" class="panel">
+
+ <input type="hidden" name="thisdatemodif" value="<?= $art->datemodif('string') ?>">
+
<details id="editinfo" open>
<summary>Infos</summary>
<fieldset>
diff --git a/app/view/templates/updatemerge.php b/app/view/templates/updatemerge.php
new file mode 100644
index 0000000..f9d29bf
--- /dev/null
+++ b/app/view/templates/updatemerge.php
@@ -0,0 +1,9 @@
+<?php
+
+
+foreach ($diff as $element) {
+ echo '<h2>' . $element . '</h2>';
+ echo '<textarea style="width: 100%; max-width: 600px; height: 300px;">' . $mergeart->$element() . '</textarea>';
+}
+
+?> \ No newline at end of file