Merge branch 'bluditv2' into patch-1

bl-kernel/admin/views/dashboard.php

@@ -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>';

bl-kernel/admin/views/pages.php

@@ -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>';

bl-kernel/admin/views/settings-advanced.php

@@ -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')

bl-kernel/dbpages.class.php

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

bl-languages/GR.json

@@ -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"
 }

bl-languages/ar_MA.json

@@ -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"
 }

bl-languages/bg_BG.json

@@ -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"
 }

bl-languages/de_CH.json

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

bl-languages/de_DE.json

@@ -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"
 }

bl-languages/es.json

@@ -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"
 }

bl-languages/fa_IR.JSON

@@ -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"
 }

bl-languages/fi_FI.json

@@ -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"
 }

bl-languages/fr_FR.json

@@ -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"
 }

bl-languages/he_IL.json

@@ -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"
 }

bl-languages/hu_HU.json

@@ -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"
 }

bl-languages/it_IT.json

@@ -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"
 }

bl-languages/ja_JP.json

@@ -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"
 }

bl-languages/ms_MY.json

@@ -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"
 }

bl-languages/nl_NL.json

@@ -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"
 }

bl-languages/pl_PL.json

@@ -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"
 }

bl-languages/pt_BR.json

@@ -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"
 }

bl-languages/pt_PT.json

@@ -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"
 }

bl-languages/ro_RO.json

@@ -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"
 }

bl-languages/ru_RU.json

@@ -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"
 }

bl-languages/tr_TR.json

@@ -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"
 }

bl-languages/uk_UA.json

@@ -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"
 }

bl-languages/vi_VN.json

@@ -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"
 }

bl-languages/zh_CN.json

@@ -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"
 }

bl-languages/zh_TW.json

@@ -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"
 }