diff options
author | Thomas Lange <code@nerdmind.de> | 2017-04-27 12:37:01 +0200 |
---|---|---|
committer | Thomas Lange <code@nerdmind.de> | 2017-04-27 12:37:01 +0200 |
commit | 22dacc02179643ddd4578a34cf8693ef86791cf7 (patch) | |
tree | e5d575fcf12d30aee0eb21e4259ed5d611df37de /template/admin/html | |
parent | 39944454324b4c66b8cf2444cca17c149208dfac (diff) | |
download | blog-22dacc02179643ddd4578a34cf8693ef86791cf7.tar.gz blog-22dacc02179643ddd4578a34cf8693ef86791cf7.tar.xz blog-22dacc02179643ddd4578a34cf8693ef86791cf7.zip |
Several changes have been made in this commit, which together with the previous commits result in version 2.0 (database update required):v2.0
+ Implemented [core]: A new database field has been added to all tables to define optional "arguments" for a page, post or user through the content editor. These arguments will be parsed into key->value pairs and can be used within templates to do something special. Please read the wiki of this repository for further information about this new feature.
+ Bugfix [core]: The function "makeSlugURL" had not convert uppercase umlauts to lowercase because "strtolower" was used instead of the multibyte equivalent "mb_strtolower".
+ Optimization [core]: The first regular expression within the function "makeSlugURL" has been optimized (checking for uppercase characters at this point is unnecessary because $string is only lowercase).
+ Optimization [all templates]: Markup for the pagination.php has been simplified (a little bit).
+ Optimization [admin template]: The javascript for the arrow key navigation has been outsourced to the main.js file.
+ Optimization [admin template]: The javascript file will now be included with the "defer" attribute.
+ Optimization [standard template]: Some language variables have been changed.
Database update to version 2.0 (no existing data will be lost or changed):
ALTER TABLE `page` ADD `argv` VARCHAR(100) NULL DEFAULT NULL AFTER `body`;
ALTER TABLE `post` ADD `argv` VARCHAR(100) NULL DEFAULT NULL AFTER `body`;
ALTER TABLE `user` ADD `argv` VARCHAR(100) NULL DEFAULT NULL AFTER `body`;
Diffstat (limited to 'template/admin/html')
-rw-r--r-- | template/admin/html/main.php | 2 | ||||
-rw-r--r-- | template/admin/html/page/form.php | 3 | ||||
-rw-r--r-- | template/admin/html/pagination.php | 51 | ||||
-rw-r--r-- | template/admin/html/post/form.php | 3 | ||||
-rw-r--r-- | template/admin/html/user/form.php | 3 |
5 files changed, 28 insertions, 34 deletions
diff --git a/template/admin/html/main.php b/template/admin/html/main.php index d2fba38..bed186e 100644 --- a/template/admin/html/main.php +++ b/template/admin/html/main.php @@ -5,7 +5,7 @@ <meta name="referrer" content="origin-when-crossorigin" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <link rel="stylesheet" href="<?=Application::getTemplateURL('rsrc/main.css')?>" /> - <script src="<?=Application::getTemplateURL('rsrc/main.js')?>"></script> + <script defer src="<?=Application::getTemplateURL('rsrc/main.js')?>"></script> <title><?=escapeHTML($NAME)?> | Administration</title> </head> <body> diff --git a/template/admin/html/page/form.php b/template/admin/html/page/form.php index 00a9c11..7d91af9 100644 --- a/template/admin/html/page/form.php +++ b/template/admin/html/page/form.php @@ -53,6 +53,9 @@ <section class="flex flex-padding"> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> </section> + <section class="flex flex-padding background flex-arguments"> + <input id="L_ARGV" name="argv" maxlength="100" placeholder="[ARGUMENT_FOO=one|ARGUMENT_BAR=two …]" value="<?=escapeHTML($FORM['DATA']['ARGV'])?>" /> + </section> <section class="flex flex-padding background flex-emoticons"> <ul class="button-list emoticons"> <?php foreach(getEmoticons() as $emoticon => $data):?> diff --git a/template/admin/html/pagination.php b/template/admin/html/pagination.php index 31b5378..42eb378 100644 --- a/template/admin/html/pagination.php +++ b/template/admin/html/pagination.php @@ -1,45 +1,30 @@ -<section id="site-navi"> +<div id="site-navi"> <?php if($THIS > 1): ?> - <div><a href="<?=sprintf($HREF, $THIS-1)?>"><i class="fa fa-arrow-left"></i></a></div> + <div><a id="prev-site" href="<?=sprintf($HREF, $THIS-1)?>"><i class="fa fa-arrow-left"></i></a></div> <?php else: ?> <div><a class="disabled"><i class="fa fa-arrow-left"></i></a></div> <?php endif; ?> - <section> - <div> - <ol> - <?php for($currentItem = 1; $currentItem <= $LAST; ++$currentItem): ?> - <?php - $href = sprintf($HREF, $currentItem); - $class = NULL; - $currentItemHTML = $currentItem; - if($currentItem === $THIS) { - $class = ' class="active"'; - } + <div> + <ol> + <?php + for($current = 1; $current <= $LAST; ++$current) { + $class = ''; + $href = sprintf($HREF, $current); - echo '<li'.$class.'><a href="'.$href.'">'.$currentItemHTML.'</a></li>'; - ?> + if($current === $THIS) { + $class = ' class="active"'; + } - <?php endfor; ?> - </ol> - </div> - </section> + echo "<li{$class}><a href=\"{$href}\">{$current}</a></li>"; + } + ?> + </ol> + </div> <?php if($THIS < $LAST): ?> - <div><a href="<?=sprintf($HREF, $THIS+1)?>"><i class="fa fa-arrow-right"></i></a></div> + <div><a id="next-site" href="<?=sprintf($HREF, $THIS+1)?>"><i class="fa fa-arrow-right"></i></a></div> <?php else: ?> <div><a class="disabled"><i class="fa fa-arrow-right"></i></a></div> <?php endif; ?> -</section> - -<script> - var prevPageURL = <?php echo json_encode($THIS > 1 ? sprintf($HREF, $THIS-1) : FALSE); ?>; - var nextPageURL = <?php echo json_encode($THIS < $LAST ? sprintf($HREF, $THIS+1) : FALSE); ?>; - - document.addEventListener('keyup', function(event) { - if(!event.ctrlKey && !event.shiftKey) { - (event.keyCode === 37 && prevPageURL) && (window.location.href = prevPageURL); - (event.keyCode === 39 && nextPageURL) && (window.location.href = nextPageURL); - } - }, false) -</script>
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/template/admin/html/post/form.php b/template/admin/html/post/form.php index 1156c6c..9603ded 100644 --- a/template/admin/html/post/form.php +++ b/template/admin/html/post/form.php @@ -53,6 +53,9 @@ <section class="flex flex-padding"> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> </section> + <section class="flex flex-padding background flex-arguments"> + <input id="L_ARGV" name="argv" maxlength="100" placeholder="[ARGUMENT_FOO=one|ARGUMENT_BAR=two …]" value="<?=escapeHTML($FORM['DATA']['ARGV'])?>" /> + </section> <section class="flex flex-padding background flex-emoticons"> <ul class="button-list emoticons"> <?php foreach(getEmoticons() as $emoticon => $data):?> diff --git a/template/admin/html/user/form.php b/template/admin/html/user/form.php index 4822dd5..374181c 100644 --- a/template/admin/html/user/form.php +++ b/template/admin/html/user/form.php @@ -59,6 +59,9 @@ <section class="flex flex-padding"> <textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea> </section> + <section class="flex flex-padding background flex-arguments"> + <input id="L_ARGV" name="argv" maxlength="100" placeholder="[ARGUMENT_FOO=one|ARGUMENT_BAR=two …]" value="<?=escapeHTML($FORM['DATA']['ARGV'])?>" /> + </section> <section class="flex flex-padding background flex-emoticons"> <ul class="button-list emoticons"> <?php foreach(getEmoticons() as $emoticon => $data):?> |