summaryrefslogtreecommitdiffstats
path: root/template/admin/html/page/form.php
diff options
context:
space:
mode:
authorThomas Lange <code@nerdmind.de>2017-08-11 03:24:07 +0200
committerThomas Lange <code@nerdmind.de>2017-08-11 03:24:07 +0200
commita9684792106e4de3aa622d33a0ed7780cbd67ad0 (patch)
tree4051a0a99e2b4388bd919d3c90444d6b612a0400 /template/admin/html/page/form.php
parent6c550895ef0f27bf84b8a5d7917eeee3e3122f67 (diff)
downloadblog-d8af3c95848bf56eb82cda07463406a98fd6de30.tar.gz
blog-d8af3c95848bf56eb82cda07463406a98fd6de30.tar.xz
blog-d8af3c95848bf56eb82cda07463406a98fd6de30.zip
Several changes have been made in this commit, which together with the previous commits result in version 2.3:v2.3
+ Optimization: Originally, the core and template languages were completely separated in the logic of the Language class and you had to use "$Language->text()" to get a core language string and "$Language->template()" to get a template language string. Since this commit, the core and template language strings are still located in different files, but you now have to use "$Language->text()" for core and template language strings both. Thus, you can now even overwrite a core language string from the language file of a template if the core language string does not satisfy you. + Deprecated: The method "$Language->template()" was marked as deprecated and will be removed in further versions (currently, it's just an alias for "$Language->text()"). Template upgrade to version 2.3 (only for customized templates): SEARCH: $Language->template REPLACE: $Language->text
Diffstat (limited to 'template/admin/html/page/form.php')
-rw-r--r--template/admin/html/page/form.php30
1 files changed, 15 insertions, 15 deletions
diff --git a/template/admin/html/page/form.php b/template/admin/html/page/form.php
index c0bc7e4..ad7387f 100644
--- a/template/admin/html/page/form.php
+++ b/template/admin/html/page/form.php
@@ -20,7 +20,7 @@
</div>
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-user"></i></div>
- <div class="form-label-flex"><label for="form_user"><?=$Language->template('label_user')?></label></div>
+ <div class="form-label-flex"><label for="form_user"><?=$Language->text('label_user')?></label></div>
<div class="form-field-flex">
<select id="form_user" name="user">
<?php foreach($FORM['USER_LIST'] as $user): ?>
@@ -33,39 +33,39 @@
<div class="flex flex-responsive">
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-file-text-o"></i></div>
- <div class="form-label-flex"><label for="form_name"><?=$Language->template('label_name')?></label></div>
+ <div class="form-label-flex"><label for="form_name"><?=$Language->text('label_name')?></label></div>
<div class="form-field-flex"><input id="form_name" name="name" value="<?=escapeHTML($FORM['DATA']['NAME'])?>" /></div>
</div>
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-link"></i></div>
- <div class="form-label-flex"><label for="form_slug"><?=$Language->template('label_slug')?></label></div>
+ <div class="form-label-flex"><label for="form_slug"><?=$Language->text('label_slug')?></label></div>
<div class="form-field-flex"><input id="form_slug" name="slug" value="<?=escapeHTML($FORM['DATA']['SLUG'])?>" /></div>
</div>
</div>
<div class="flex flex-responsive">
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-clock-o"></i></div>
- <div class="form-label-flex"><label for="form_time_insert"><?=$Language->template('label_insert')?></label></div>
+ <div class="form-label-flex"><label for="form_time_insert"><?=$Language->text('label_insert')?></label></div>
<div class="form-field-flex"><input id="form_time_insert" name="time_insert" placeholder="[YYYY-MM-DD HH:II:SS]" value="<?=escapeHTML($FORM['DATA']['TIME_INSERT'])?>" /></div>
</div>
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-clock-o"></i></div>
- <div class="form-label-flex"><label for="form_time_update"><?=$Language->template('label_update')?></label></div>
+ <div class="form-label-flex"><label for="form_time_update"><?=$Language->text('label_update')?></label></div>
<div class="form-field-flex"><input id="form_time_update" name="time_update" placeholder="<?=escapeHTML($FORM['DATA']['TIME_UPDATE'] ? $FORM['DATA']['TIME_UPDATE'] : '[CURRENT_TIMESTAMP]')?>" value="" /></div>
</div>
</div>
<div class="flex flex-direction-column">
<div id="button-list-wrapper">
<ul id="markdown-list" class="button-list markdown">
- <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->template('markdown_bold')?>"></li>
- <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->template('markdown_italic')?>"></li>
- <li data-markdown="heading" class="fa fa-header" title="<?=$Language->template('markdown_heading')?>"></li>
- <li data-markdown="link" class="fa fa-link" title="<?=$Language->template('markdown_link')?>"></li>
- <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->template('markdown_image')?>"></li>
- <li data-markdown="code" class="fa fa-code" title="<?=$Language->template('markdown_code')?>"></li>
- <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->template('markdown_quote')?>"></li>
- <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->template('markdown_list_ul')?>"></li>
- <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->template('markdown_list_ol')?>"></li>
+ <li data-markdown="bold" class="fa fa-bold" title="<?=$Language->text('markdown_bold')?>"></li>
+ <li data-markdown="italic" class="fa fa-italic" title="<?=$Language->text('markdown_italic')?>"></li>
+ <li data-markdown="heading" class="fa fa-header" title="<?=$Language->text('markdown_heading')?>"></li>
+ <li data-markdown="link" class="fa fa-link" title="<?=$Language->text('markdown_link')?>"></li>
+ <li data-markdown="image" class="fa fa-picture-o" title="<?=$Language->text('markdown_image')?>"></li>
+ <li data-markdown="code" class="fa fa-code" title="<?=$Language->text('markdown_code')?>"></li>
+ <li data-markdown="quote" class="fa fa-quote-right" title="<?=$Language->text('markdown_quote')?>"></li>
+ <li data-markdown="list_ul" class="fa fa-list-ul" title="<?=$Language->text('markdown_list_ul')?>"></li>
+ <li data-markdown="list_ol" class="fa fa-list-ol" title="<?=$Language->text('markdown_list_ol')?>"></li>
</ul>
</div>
<textarea id="content-editor" name="body" placeholder="[…]"><?=escapeHTML($FORM['DATA']['BODY'])?></textarea>
@@ -92,7 +92,7 @@
<?php elseif($FORM['TYPE'] === 'UPDATE'): ?>
<input id="update-button" type="submit" name="update" value="<?=$Language->text('update')?>" />
<?php elseif($FORM['TYPE'] === 'DELETE'): ?>
- <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->template('sure')?>" />
+ <input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" />
<?php endif; ?>
</div>
</form> \ No newline at end of file