summaryrefslogtreecommitdiffstats
path: root/template/admin/html/user
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/user
parent6c550895ef0f27bf84b8a5d7917eeee3e3122f67 (diff)
downloadblog-a9684792106e4de3aa622d33a0ed7780cbd67ad0.tar.gz
blog-a9684792106e4de3aa622d33a0ed7780cbd67ad0.tar.xz
blog-a9684792106e4de3aa622d33a0ed7780cbd67ad0.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/user')
-rw-r--r--template/admin/html/user/delete.php4
-rw-r--r--template/admin/html/user/form.php34
-rw-r--r--template/admin/html/user/index.php2
-rw-r--r--template/admin/html/user/insert.php2
-rw-r--r--template/admin/html/user/item.php2
-rw-r--r--template/admin/html/user/update.php2
6 files changed, 23 insertions, 23 deletions
diff --git a/template/admin/html/user/delete.php b/template/admin/html/user/delete.php
index dac4185..01927b2 100644
--- a/template/admin/html/user/delete.php
+++ b/template/admin/html/user/delete.php
@@ -1,6 +1,6 @@
<h1><i class="fa fa-trash-o"></i><?=$Language->text('delete_user')?></h1>
-<p><?=$Language->template('delete_user_desc')?></p>
+<p><?=$Language->text('delete_user_desc')?></p>
-<p class="red"><?=$Language->template('delete_user_warning')?></p>
+<p class="red"><?=$Language->text('delete_user_warning')?></p>
<?=$HTML?> \ No newline at end of file
diff --git a/template/admin/html/user/form.php b/template/admin/html/user/form.php
index 2d3625c..a9d4b0a 100644
--- a/template/admin/html/user/form.php
+++ b/template/admin/html/user/form.php
@@ -20,58 +20,58 @@
</div>
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-key"></i></div>
- <div class="form-label-flex"><label for="form_password"><?=$Language->template('label_password')?></label></div>
+ <div class="form-label-flex"><label for="form_password"><?=$Language->text('label_password')?></label></div>
<div class="form-field-flex"><input id="form_password" name="password" placeholder="[NO CHANGE]" type="password" /></div>
</div>
</div>
<div class="flex flex-responsive">
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-user"></i></div>
- <div class="form-label-flex"><label for="form_fullname"><?=$Language->template('label_fullname')?></label></div>
+ <div class="form-label-flex"><label for="form_fullname"><?=$Language->text('label_fullname')?></label></div>
<div class="form-field-flex"><input id="form_fullname" name="fullname" value="<?=escapeHTML($FORM['DATA']['FULLNAME'])?>" /></div>
</div>
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-envelope-o"></i></div>
- <div class="form-label-flex"><label for="form_mailaddr"><?=$Language->template('label_mailaddr')?></label></div>
+ <div class="form-label-flex"><label for="form_mailaddr"><?=$Language->text('label_mailaddr')?></label></div>
<div class="form-field-flex"><input id="form_mailaddr" name="mailaddr" value="<?=escapeHTML($FORM['DATA']['MAILADDR'])?>" /></div>
</div>
</div>
<div class="flex flex-responsive">
<div class="flex-item">
<div class="form-icon-flex"><i class="fa fa-user-secret"></i></div>
- <div class="form-label-flex"><label for="form_username"><?=$Language->template('label_username')?></label></div>
+ <div class="form-label-flex"><label for="form_username"><?=$Language->text('label_username')?></label></div>
<div class="form-field-flex"><input id="form_username" name="username" value="<?=escapeHTML($FORM['DATA']['USERNAME'])?>" /></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>
@@ -98,7 +98,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
diff --git a/template/admin/html/user/index.php b/template/admin/html/user/index.php
index cbeea9b..bc34402 100644
--- a/template/admin/html/user/index.php
+++ b/template/admin/html/user/index.php
@@ -1,5 +1,5 @@
<h1><i class="fa fa-user"></i><?=$Language->text('user_overview')?><a class="brackets" href="<?=Application::getAdminURL("user/insert.php")?>"><?=$Language->text('insert')?></a></h1>
-<p><?=$Language->template('overview_user_desc')?></p>
+<p><?=$Language->text('overview_user_desc')?></p>
<ul class="item-list user">
<?php foreach($LIST['USERS'] as $user): ?>
diff --git a/template/admin/html/user/insert.php b/template/admin/html/user/insert.php
index 54598ee..4613da3 100644
--- a/template/admin/html/user/insert.php
+++ b/template/admin/html/user/insert.php
@@ -1,4 +1,4 @@
<h1><i class="fa fa-user"></i><?=$Language->text('insert_user')?></h1>
-<p><?=$Language->template('insert_user_desc')?></p>
+<p><?=$Language->text('insert_user_desc')?></p>
<?=$HTML?> \ No newline at end of file
diff --git a/template/admin/html/user/item.php b/template/admin/html/user/item.php
index 5efbae3..6cb9e7a 100644
--- a/template/admin/html/user/item.php
+++ b/template/admin/html/user/item.php
@@ -2,7 +2,7 @@
<header>
<h2><i class="fa fa-user"></i><?=escapeHTML($USER['ATTR']['FULLNAME'])?><span>#<?=$USER['ATTR']['ID']?></span></h2>
<div>
- <time class="brackets" datetime="<?=$USER['ATTR']['TIME_INSERT']?>"><?=parseDatetime($USER['ATTR']['TIME_INSERT'], $Language->template('date_format'))?></time>
+ <time class="brackets" datetime="<?=$USER['ATTR']['TIME_INSERT']?>"><?=parseDatetime($USER['ATTR']['TIME_INSERT'], $Language->text('date_format'))?></time>
</div>
</header>
<blockquote cite="<?=$USER['URL']?>">
diff --git a/template/admin/html/user/update.php b/template/admin/html/user/update.php
index 6f7ddae..6748cae 100644
--- a/template/admin/html/user/update.php
+++ b/template/admin/html/user/update.php
@@ -1,4 +1,4 @@
<h1><i class="fa fa-user"></i><?=$Language->text('update_user')?></h1>
-<p><?=$Language->template('update_user_desc')?></p>
+<p><?=$Language->text('update_user_desc')?></p>
<?=$HTML?> \ No newline at end of file