Merge branch 'bluditv2' into patch-1

This commit is contained in:
Diego Najar 2017-09-24 01:26:37 +02:00 committed by GitHub
commit 4cc427370b
29 changed files with 200 additions and 31 deletions

View File

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

View File

@ -40,7 +40,7 @@ function table($status, $icon='arrow-circle-o-down') {
if (!empty($list)) { if (!empty($list)) {
echo '<tr> 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>
<td></td> <td></td>
</tr>'; </tr>';

View File

@ -55,7 +55,7 @@ HTML::formOpen(array('class'=>'uk-form-horizontal'));
HTML::formSelect(array( HTML::formSelect(array(
'name'=>'orderBy', 'name'=>'orderBy',
'label'=>$L->g('Order content By'), '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(), 'selected'=>$Site->orderBy(),
'class'=>'uk-width-1-3 uk-form-medium', 'class'=>'uk-width-1-3 uk-form-medium',
'tip'=>$L->g('Order the content by position to build a Website') 'tip'=>$L->g('Order the content by position to build a Website')

View File

@ -290,6 +290,7 @@ class dbPages extends dbJSON
unset($tmp[$key]); unset($tmp[$key]);
} }
} }
uasort($tmp, array($this, 'sortByPositionLowToHigh'));
return $tmp; return $tmp;
} }

View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -213,5 +213,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -211,5 +211,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -212,5 +212,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }

View File

@ -210,5 +210,12 @@
"add-new-page": "Add new page", "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.", "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", "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"
} }