r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'bluditv2' into patch-1

This commit is contained in:
Diego Najar 2017-09-24 01:26:37 +02:00 committed by GitHub
parent 1d48b1c323 63a1aa93f3
commit 4cc427370b
29 changed files with 200 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bl-kernel/admin/views/dashboard.php
View File

@ -146,7 +146,7 @@
echo '<li>'.$Language->g('There are no draft pages').'</li>';
}
else {
$keys = array_keys($scheduledPages);
$keys = array_keys($draftPages);
foreach($keys as $key) {
$page = buildPage($key);
echo '<li><a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$page->key().'">'.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'</a></li>';

2
bl-kernel/admin/views/pages.php
View File

@ -40,7 +40,7 @@ function table($status, $icon='arrow-circle-o-down') {
if (!empty($list)) {
echo '<tr>
<td style="color: #aaa; font-size: 0.9em; text-transform: uppercase;"><i class="fa fa-'.$icon.'" aria-hidden="true"></i> '.$status.'</td>
<td style="color: #aaa; font-size: 0.9em; text-transform: uppercase;"><i class="fa fa-'.$icon.'" aria-hidden="true"></i> '.$Language->g($status).'</td>
<td></td>
<td></td>
</tr>';

4
bl-kernel/admin/views/settings-advanced.php
View File

@ -32,7 +32,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
HTML::formSelect(array(
'name'=>'homepage',
'label'=>$L->g('Home page'),
'label'=>$L->g('Homepage'),
'options'=>$homepageOptions,
'selected'=>$Site->homepage(),
'class'=>'uk-width-1-3 uk-form-medium',
@ -55,7 +55,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
HTML::formSelect(array(
'name'=>'orderBy',
'label'=>$L->g('Order content By'),
'options'=>array('date'=>'Date','position'=>'Position'),
'options'=>array('date'=>$L->g('Date'),'position'=>$L->g('Position')),
'selected'=>$Site->orderBy(),
'class'=>'uk-width-1-3 uk-form-medium',
'tip'=>$L->g('Order the content by position to build a Website')

5
bl-kernel/dbpages.class.php
View File

@ -285,11 +285,12 @@ class dbPages extends dbJSON
public function getStaticDB()
{
$tmp = $this->db;
foreach($tmp as $key=>$fields) {
if($fields['status']!='static') {
foreach ($tmp as $key=>$fields) {
if ($fields['status']!='static') {
unset($tmp[$key]);
}
}
uasort($tmp, array($this, 'sortByPositionLowToHigh'));
return $tmp;
}

9
bl-languages/GR.json
View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/ar_MA.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/bg_BG.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

2
bl-languages/de_CH.json
View File

@ -219,4 +219,4 @@
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Seite bearbeitet"
}
}

9
bl-languages/de_DE.json
View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/es.json
View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/fa_IR.JSON
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/fi_FI.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/fr_FR.json
View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/he_IL.json
View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/hu_HU.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/it_IT.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/ja_JP.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/ms_MY.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/nl_NL.json
View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/pl_PL.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/pt_BR.json
View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/pt_PT.json
View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/ro_RO.json
View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/ru_RU.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/tr_TR.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/uk_UA.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/vi_VN.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/zh_CN.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}

9
bl-languages/zh_TW.json
View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page",
"this-field-is-used-when-you-order-the-pages-by-position": "This field is used when you order the pages by position.",
"about-your-site-or-yourself": "About your site or yourself",
"homepage": "Homepage"
"homepage": "Homepage",
"disabled": "Disabled",
"to-enable-the-user-you-must-set-a-new-password": "To enable the user you must set a new password.",
"delete-the-user-and-associate-his-pages-to-admin-user": "Delete the user and associate his pages to admin user",
"delete-the-user-and-all-his-pages": "Delete the user and all his pages",
"user-disabled": "User disabled",
"user-password-changed": "User password changed",
"page-edited": "Page edited"
}