git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit/page: update remote ckeditor to version 4.15.1
[minimedit.git]
/
page.inc.php
diff --git
a/page.inc.php
b/page.inc.php
index 7a54bf7424b59603c98509a65ae83da5962bcf1b..5753b649f43829eb9c5e8e70220770257b6b31e1 100644
(file)
--- a/
page.inc.php
+++ b/
page.inc.php
@@
-7,9
+7,12
@@
print "<header>\n";
ob_start();
include 'menu.inc.html';
ob_start();
ob_start();
include 'menu.inc.html';
ob_start();
-if (
!empty($User)
) {
+if (
$User and property_exists($User, 'login') and $User->login
) {
print '<div class="login"><p>';
print '<div class="login"><p>';
- printf('<span>Ingelogd: <b><a href="%s">%s</a></b></span>', '/login', $User->login);
+ printf('<span title="ingelogd">%s <a href="%s">%s</a></span>',
+ '<span class="icon icon-user">👤</span>',
+ '/login', $User->login
+ );
if ($User->admin("edit $Page$Args")) {
$editpage = $Page.$Args;
if (is_dir($editpage)) {
if ($User->admin("edit $Page$Args")) {
$editpage = $Page.$Args;
if (is_dir($editpage)) {
@@
-21,7
+24,7
@@
if (!empty($User)) {
$editpage .= '.html';
}
if (!file_exists($editpage) or is_writable($editpage)) {
$editpage .= '.html';
}
if (!file_exists($editpage) or is_writable($editpage)) {
- print ' <a
href="#edit">Wijzig
</a>';
+ print ' <a
class="icon icon-edit" href="#edit" title="wijzig">✍
</a>';
}
}
print "</p></div>\n";
}
}
print "</p></div>\n";
@@
-44,12
+47,12
@@
register_shutdown_function(function () {
print "</footer>\n";
global $User, $Page, $Args;
print "</footer>\n";
global $User, $Page, $Args;
- if (
!empty($User)
and $User->admin("edit $Page$Args")) {
+ if (
$User
and $User->admin("edit $Page$Args")) {
$ckesrc = '/lib/ckeditor'; # local install
if (!file_exists(DOCROOT . $ckesrc)) {
$ckesrc = '/lib/ckeditor'; # local install
if (!file_exists(DOCROOT . $ckesrc)) {
- $ckesrc = '//cdn.ckeditor.com/4.
7.3
/full-all'; # remote fallback
+ $ckesrc = '//cdn.ckeditor.com/4.
15.1
/full-all'; # remote fallback
}
}
- printf(
'<script src="%s"></script>'."
\n", "$ckesrc/ckeditor.js");
+ printf(
"<script>var ckesrc = '%s'</script>
\n", "$ckesrc/ckeditor.js");
print '<script src="/edit/page.js"></script>'."\n";
}
print '<script src="/edit/page.js"></script>'."\n";
}