Merge pull request #13 from dignajar/master

New pull request

bl-kernel/boot/rules/99.themes.php

@@ -64,9 +64,9 @@ function buildThemes()
 // ============================================================================
 
 // Load the language file
-$languageFilename = PATH_THEME.DS.'languages'.DS.$Site->locale().'.json';
+$languageFilename = PATH_THEME.'languages'.DS.$Site->locale().'.json';
 if( !Sanitize::pathFile($languageFilename) ) {
-	$languageFilename = PATH_THEME.DS.'languages'.DS.'en_US.json';
+	$languageFilename = PATH_THEME.'languages'.DS.'en_US.json';
 }
 
 if( Sanitize::pathFile($languageFilename) )

bl-languages/ms_MY.json

@@ -0,0 +1,233 @@
+{
+	"language-data":
+	{
+		"native": "Bahasa Melayu (Malaysia)",
+		"english-name": "Malay",
+		"last-update": "2016-01-24",
+		"author": "Hakim Zulkufli",
+		"email": "nozomi@iamnobuna.ga",
+		"website": "http://www.iamnobuna.ga/"
+	},
+
+	"username": "Name pengguna",
+	"password": "Kata laluan",
+	"confirm-password": "Sahkan kata laluan",
+	"editor": "Penyunting",
+	"dashboard": "Papan Pemuka",
+	"role": "Peranan",
+	"post": "Post",
+	"posts": "Posts",
+	"users": "Pengguna",
+	"administrator": "Pentadbir",
+	"add": "Tambah",
+	"cancel": "Batal",
+	"content": "Kandungan",
+	"title": "Tajuk",
+	"no-parent": "Tiada induk",
+	"edit-page": "Sunting halaman",
+	"edit-post": "Sunting post",
+	"add-a-new-user": "Tambah pengguna baru",
+	"parent": "Induk",
+	"friendly-url": "URL mesra",
+	"description": "Perihal",
+	"posted-by": "Ditulis oleh",
+	"tags": "Tag",
+	"position": "Posisi",
+	"save": "Simpan",
+	"draft": "Draf",
+	"delete": "Buang",
+	"registered": "Telah didaftar",
+	"Notifications": "Pemberitahuan",
+	"profile": "Profil",
+	"email": "E-mel",
+	"settings": "Tetapan",
+	"general": "Umum",
+	"advanced": "Lanjutan",
+	"regional": "Kawasan",
+	"about": "About",
+	"login": "Log masuk",
+	"logout": "Log keluar",
+	"manage": "Urus",
+	"themes": "Tema",
+	"prev-page": "Halaman sebelumnya",
+	"next-page": "Halaman seterusnya",
+	"configure-plugin": "Tetapkan pemalam",
+	"confirm-delete-this-action-cannot-be-undone": "Sahkan pembuangan? Tindakan ini tidak boleh dibatalkan.",
+	"site-title": "Tajuk laman",
+	"site-slogan": "Slogan laman",
+	"site-description": "Perihal laman",
+	"footer-text": "Text kaki",
+	"posts-per-page": "Artikel per halaman",
+	"site-url": "URL laman",
+	"writting-settings": "Tetapan penulisan",
+	"url-filters": "Penapis URL",
+	"page": "Halaman",
+	"pages": "Halaman-halaman",
+	"home": "Home",
+	"welcome-back": "Selamat Pulang",
+	"language": "Bahasa",
+	"website": "Laman web",
+	"timezone": "Zon masa",
+	"locale": "Locale",
+	"new-post": "Artikel baharu",
+	"new-page": "Halaman baharu",
+	"html-and-markdown-code-supported": "Kod HTML dan Markdown boleh digunakan",
+	"manage-posts": "Urus artikel",
+	"published-date": "Tarikh terbitan",
+	"modified-date": "Tarikh diubahsuai",
+	"empty-title": "Tajuk kosong",
+	"plugins": "Pemalam",
+	"install-plugin": "Pasang pemalam",
+	"uninstall-plugin": "Nyahpasang pemalam",
+	"new-password": "Kata laluan baharu",
+	"edit-user": "Sunting pengguna",
+	"publish-now": "Terbitkan sekarang",
+	"first-name": "Nama sendiri",
+	"last-name": "Nama keluarga",
+	"bludit-version": "Versi Bludit",
+	"powered-by": "Dikuasai oleh",
+	"recent-posts": "Artikel Baharu",
+	"manage-pages": "Urus halaman",
+	"advanced-options": "Tetapan lanjutan",
+	"user-deleted": "Pengguna telah dibuang",
+	"page-added-successfully": "Halaman telah berjaya ditambah",
+	"post-added-successfully": "Artikel telah berjaya ditambah",
+	"the-post-has-been-deleted-successfully": "Artikel telah berjaya dibuang",
+	"the-page-has-been-deleted-successfully": "Halaman telah berjaya dibuang",
+	"username-or-password-incorrect": "Nama pengguna atau kata laluan tidak betul",
+	"database-regenerated": "Pangkalan data telah dijanakan semula",
+	"the-changes-have-been-saved": "Perubahan telah disimpan",
+	"enable-more-features-at": "Tambahkan lebih ciri-ciri di",
+	"username-already-exists": "Kata pengguna sudah wujud",
+	"username-field-is-empty": "Medan kata pengguna kosong",
+	"the-password-and-confirmation-password-do-not-match":"Kata laluan dan pengesahan kata laluan tidak sama",
+	"user-has-been-added-successfully": "Pengguna berjaya ditambah",
+	"you-do-not-have-sufficient-permissions": "Anda tidak mempunyai kebenaran untuk mengakses halaman ini, sila hubungi pentadbir.",
+	"settings-advanced-writting-settings": "Tetapan->Lanjutan->Tetapan penulisan",
+	"new-posts-and-pages-synchronized": "Semua artikel dan halaman baharu telah disepadukan.",
+	"you-can-choose-the-users-privilege": "Anda boleh tetapkan hak istimewa pengguna tersebut. Penyunting hanya boleh mencipta halaman dan menulis artikel.",
+	"email-will-not-be-publicly-displayed": "E-mel tidak akan dipaparkan secara awam. Digalakkan untuk pemulihan kata laluan dan pemberitahuan.",
+	"use-this-field-to-name-your-site": "Gunakan medan ini untuk namakan laman web anda. Ianya akan dipaparkan di atas setiap halaman laman web anda.",
+	"use-this-field-to-add-a-catchy-phrase": "Gunakan medan ini untuk tambahkan frasa menarik di laman web anda.",
+	"you-can-add-a-site-description-to-provide": "Anda boleh gunakan ini sebagai biografi pendek atau perihal laman web anda.",
+	"you-can-add-a-small-text-on-the-bottom": "Anda boleh tambahkan teks kecil di bawah setiap halaman. Contohnya: hak cipta, pemilik, tarikh, dll.",
+	"number-of-posts-to-show-per-page": "Bilangan artikel per halaman.",
+	"the-url-of-your-site": "URL laman web anda.",
+	"add-or-edit-description-tags-or": "Tambah atau sunting perihal dan tag atau ubah URL mesra.",
+	"select-your-sites-language": "Pilih bahasa laman web anda.",
+	"select-a-timezone-for-a-correct": "Pilih zon masa yang betul untuk paparan tarikh dan masa yang tepat.",
+	"you-can-use-this-field-to-define-a-set-of": "You can use this field to define a set of parameters related to the language, country and special preferences.",
+	"you-can-use-this-field-to-define-a-set-of": "Tetapkan set parameter berkaitan dengan bahasa, negara dan keutamaan istimewa.",
+	"you-can-modify-the-url-which-identifies":"Anda boleh mengubah URL yang mengenalpasti sesuatu artikel atau halaman menggunakan kata kunci yang boleh dibaca oleh manusia. Tidak lebih daripada 150 aksara.",
+	"this-field-can-help-describe-the-content": "Huraikan secara ringkas kandungan ini. Tidak lebih daripada 150 aksara.",
+
+	"delete-the-user-and-all-its-posts":"Buang pengguna dan semua artikel olehnya.",
+	"delete-the-user-and-associate-its-posts-to-admin-user": "Buang pengguna dan alihkan semua artikelnya kepada pentadbir.",
+	"read-more": "Baca lagi",
+	"show-blog": "Paparkan blog",
+	"default-home-page": "Laman utama lalai",
+	"version": "Versi",
+	"there-are-no-drafts": "Tiada draf",
+	"create-a-new-article-for-your-blog":"Tulis artikel baharu untuk blog anda.",
+	"create-a-new-page-for-your-website":"Cipta page baharu untuk laman web anda.",
+	"invite-a-friend-to-collaborate-on-your-website":"Jemput rakan untuk bekerjasama di laman web anda.",
+	"change-your-language-and-region-settings":"Tukar tetapan bahasa dan kawasan anda.",
+	"language-and-timezone":"Bahasa dan zon masa",
+	"author": "Pengarang",
+	"start-here": "Mula di sini",
+	"install-theme": "Pasang tema",
+	"first-post": "Artikel pertama",
+	"congratulations-you-have-successfully-installed-your-bludit": "Tahniah, anda telah berjaya memasang **Bludit** anda!",
+	"whats-next": "Apa yang anda boleh lakukan seterusnya?",
+
+	"follow-bludit-on": "Ikut Bludit di",
+	"visit-the-support-forum": "Lawat [forum](http://forum.bludit.com) untuk bantuan",
+	"read-the-documentation-for-more-information": "Baca [documentasi](http://docs.bludit.com) untuk maklumat lanjut",
+	"share-with-your-friends-and-enjoy": "Share with your friends and enjoy",
+	"share-with-your-friends-and-enjoy": "Kongsi dengan rakan anda dan berseronoklah",
+	"the-page-has-not-been-found": "Halaman ini tidak dapat dijumpai.",
+	"error": "Ralat",
+	"bludit-installer": "Pemasang Bludit",
+	"welcome-to-the-bludit-installer": "Selamat datang ke pemasang Bludit",
+	"complete-the-form-choose-a-password-for-the-username-admin": "Lengkapkan borang di bawah, pilih kata laluan untuk pengguna « admin »",
+	"password-visible-field": "Kata laluan, medan yang boleh dilihat!",
+	"install": "Pasang",
+	"choose-your-language": "Pilih bahasa anda",
+	"next": "Seterusnya",
+	"the-password-field-is-empty": "Medan kata laluan kosong",
+	"your-email-address-is-invalid":"Alamat e-mel anda tidak sah.",
+	"proceed-anyway": "Teruskan juga!",
+	"drafts":"Draf-draf",
+	"ip-address-has-been-blocked": "Alamat IP telah dihalang.",
+	"try-again-in-a-few-minutes": "Cuba lagi dalam beberapa minit.",
+	"date": "Tarikh",
+
+	"scheduled": "Berjadual",
+	"publish": "Terbit",
+	"please-check-your-theme-configuration": "Tolong semak tatarajah tema anda.",
+	"plugin-label": "Label pemalam",
+	"enabled": "Dibolehkan",
+	"disabled": "Dilumpuhkan",
+	"cli-mode": "Mod CLI",
+	"command-line-mode": "Mod \"command line\"",
+	"enable-the-command-line-mode-if-you-add-edit": "Bolehkan sekiranya anda menambah, menyunting atau membuang artikel dan halaman melalui sistem fail",
+
+	"configure": "Tetapkan tatarajah",
+	"uninstall": "Nyahpasang",
+	"change-password": "Tukar kata laluan",
+	"to-schedule-the-post-just-select-the-date-and-time": "Untuk jadualkan artikel, pilih masa dan tarikh.",
+	"write-the-tags-separated-by-commas": "Tuliskan tag diasingkan dengan koma",
+	"status": "Status",
+	"published": "Telah diterbit",
+	"scheduled-posts": "Artikel berjadual",
+	"statistics": "Statistik",
+	"name": "Nama",
+	"email-account-settings":"Tetap akaun e-emel",
+	"sender-email": "E-mel pengirim",
+	"emails-will-be-sent-from-this-address":"E-mel akan dikirim oleh alamat ini.",
+	"bludit-login-access-code": "BLUDIT - Kod akses log masuk",
+	"check-your-inbox-for-your-login-access-code":"Semak peti masuk anda untuk akses kod",
+	"there-was-a-problem-sending-the-email":"Terdapat masalah ketika menghantar e-mel tersebut",
+	"back-to-login-form": "Kembali ke borang log masuk",
+	"send-me-a-login-access-code": "Hantarkan saya kod akses log masuk",
+	"get-login-access-code": "Dapatkan kod akses log masuk",
+	"email-notification-login-access-code": "<p>Ini adalah pemberitahuan daripada laman web anda, {{WEBSITE_NAME}}.</p><p>Anda telah memohon untuk mendapatkan kod akses log masuk, sila ikut pautan berikut:</p><p>{{LINK}}</p>",
+	"there-are-no-scheduled-posts": "Tiada artikel berjadual.",
+	"show-password": "Paparkan kata laluan",
+	"edit-or-remove-your=pages": "Sunting atau buang halaman anda.",
+	"edit-or-remove-your-blogs-posts": "Sunting atau buang artikel di blog anda.",
+	"general-settings": "Tetapan umum",
+	"advanced-settings": "Tetapan lanjutan",
+	"manage-users": "Urus pengguna-pengguna",
+	"view-and-edit-your-profile": "Lihat dan sunting profil anda.",
+
+	"password-must-be-at-least-6-characters-long": "Kata laluan perlu mempunyai sekurang-kurangnya 6 aksara",
+	"images": "Gambar-gambar",
+	"upload-image": "Muat naik gambar",
+	"drag-and-drop-or-click-here": "Seret dan lepaskan atau klik di sini",
+	"insert-image": "Masukkan gambar",
+	"supported-image-file-types": "Jenis fail gambar yang disokong",
+	"date-format": "Format tarikh",
+	"time-format": "Format waktu",
+	"chat-with-developers-and-users-on-gitter":"Sembang dengan pembangun dan pengguna di [Gitter](https://gitter.im/dignajar/bludit)",
+	"this-is-a-brief-description-of-yourself-our-your-site":"Ini ialah perihal ringkas anda atau laman web anda. Untuk mengubahnya, pergi ke Panel Pentadbir -> Tetapan -> Pemalam dan tetapkan tatarajah pemalam \"About\".",
+	"profile-picture": "Gambar profil",
+	"the-about-page-is-very-important": "Halaman \"About\" anda ialah satu alat yang penting dan berkuasa untuk klien dan rakan kerja yang berpotensi. Bagi mereka yang tertanya-tanya siapakah di sebalik laman web anda, halaman \"About\" anda merupakan sumber maklumat utama.",
+	"change-this-pages-content-on-the-admin-panel": "Ubah kandungan halaman ini di Panel Pentadbir -> Urus -> Urus halaman dan klik halaman \"About\".",
+	"about-your-site-or-yourself": "Mengenai laman web atau diri anda",
+	"welcome-to-bludit": "Selamat datang ke Bludit",
+
+	"site-information": "Maklumat laman web",
+	"date-and-time-formats": "Format tarikh dan masa",
+	"activate": "Aktifkan",
+	"deactivate": "Nyahaktifkan",
+
+	"cover-image": "Gambar tudung",
+	"blog": "Blog",
+	"more-images": "Lagi gambar",
+	"double-click-on-the-image-to-add-it": "Klik dua kali pada gambar untuk menambahkannya",
+	"click-here-to-cancel": "Klik di sini untuk membatalkannya.",
+	"type-the-tag-and-press-enter": "Taipkan tag dan tekan \"enter\".",
+	"manage-your-bludit-from-the-admin-panel": "Uruskan Bludit anda di [panel pentadbir]({{ADMIN_AREA_LINK}})",
+	"there-are-no-images":"Tiada gambar"
+}

bl-languages/uk_UA.json

@@ -3,7 +3,7 @@
 	{
 		"native": "Українська (Україна)",
 		"english-name": "Ukrainian",
-		"last-update": "2015-12-02",
+		"last-update": "2016-01-23",
 		"author": "Allec Bernz",
 		"email": "admin@allec.info",
 		"website": "allec.info"
@@ -138,7 +138,7 @@
 	"first-post": "Перша публікація",
 	"congratulations-you-have-successfully-installed-your-bludit": "Вітаємо, Ви успішно встановили ваш **Bludit**",
 	"whats-next": "Що далі",
-	"manage-your-bludit-from-the-admin-panel": "Керуйте вашим Bludit через [панель управління](./admin/)",
+
 	"follow-bludit-on": "Слідуйте за Bludit на",
 	"visit-the-support-forum": "Відвідайте [форум](http://forum.bludit.com) для підтримки",
 	"read-the-documentation-for-more-information": "Читайте [документацію](http://docs.bludit.com) для отримання додаткової інформації",
@@ -218,5 +218,14 @@
 	"site-information": "Інформація про сайт",
 	"date-and-time-formats": "Формати дати й часу",
 	"activate": "Активувати",
-	"deactivate": "Деактивувати"
+	"deactivate": "Деактивувати",
+
+	"cover-image": "Зображення обкладинки",
+	"blog": "Блог",
+	"more-images": "Більше зображень",
+	"double-click-on-the-image-to-add-it": "Двічі клацніть на зображення, щоб додати його.",
+	"click-here-to-cancel": "Натисніть тут, щоб скасувати.",
+	"type-the-tag-and-press-enter": "Введіть тег і натисніть Enter.",
+	"manage-your-bludit-from-the-admin-panel": "Керуйте вашим Bludit через [панель управління]({{ADMIN_AREA_LINK}})",
+	"there-are-no-images":"Немає зображень"
 }

bl-plugins/disqus/plugin.php

@@ -33,7 +33,7 @@ class pluginDisqus extends Plugin {
 		{
 			global $Site;
 
-			if( !empty($Site->homePage()) ) {
+			if( Text::isNotEmpty($Site->homePage()) ) {
 				$this->disable = true;
 			}
 		}

bl-themes/blogme/assets/css/bludit.css

@@ -1,7 +1,7 @@
 /* Blogme hacks */
 
 #wrapper {
-	max-width: 1100px !important;
+	width: 1100px !important;
 }
 
 #sidebar {
@@ -63,3 +63,17 @@ h2 {
 img {
 	width: 100%;
 }
+
+#menu-bottom {
+	bottom: 0;
+	display: block;
+	margin: 20px;
+	background: rgba(220, 220, 220, 0.52);
+	position: fixed;
+	right: 0;
+	border-radius: 3px;
+}
+
+#menu-bottom > a {
+	margin: 0 10px;
+}

bl-themes/blogme/assets/js/main.js

@@ -7,8 +7,8 @@
 (function($) {
 
 	skel.breakpoints({
-		xlarge:	'(max-width: 1680px)',
+		xlarge:	'(max-width: 1100px)',
-		large:	'(max-width: 1280px)',
+		large:	'(max-width: 1000px)',
 		medium:	'(max-width: 980px)',
 		small:	'(max-width: 736px)',
 		xsmall:	'(max-width: 480px)'

bl-themes/blogme/index.php

@@ -51,5 +51,12 @@
 	<!-- Plugins Site Body End -->
 	<?php Theme::plugins('siteBodyEnd') ?>
 
+	<div id="menu-bottom">
+	<?php
+		//echo '<a href="'.HTML_PATH_THEME.'">'.$L->g('Home').'</a>';
+		echo '<a href="#">'.$L->g('Top').'</a>';
+	?>
+	</div>
+
 </body>
 </html>

bl-themes/blogme/languages/en_US.json

@@ -3,5 +3,6 @@
 	{
 		"name": "Blogme",
 		"description": "Minimalist and clean, with cover image supported, based on Future Imperfect."
-	}
+	},
+	"top": "Top"
 }

bl-themes/blogme/php/head.php

@@ -10,11 +10,13 @@
 <!--[if lte IE 8]><link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/ie8.css" /><![endif]-->
 <link rel="stylesheet" href="<?php echo HTML_PATH_THEME ?>assets/css/bludit.css">
 
+<link rel="shortcut icon" href="<?php echo HTML_PATH_THEME ?>img/favicon.png" type="image/x-icon">
+
 <?php
 
+Theme::fontAwesome();
+
 // Plugins for head
 Theme::plugins('siteHead');
 
-Theme::fontAwesome();
-
 ?>

bl-themes/blogme/php/home.php

@@ -9,7 +9,7 @@
 	<header>
 		<div class="title">
 			<h1><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h1>
-			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('username'):$Post->user('firstName') ?></span></div>
+			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('firstName'):$Post->user('username') ?></span></div>
 		</div>
 	</header>
 

bl-themes/blogme/php/post.php

@@ -9,7 +9,7 @@
 	<header>
 		<div class="title">
 			<h1><a href="<?php echo $Post->permalink() ?>"><?php echo $Post->title() ?></a></h1>
-			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('username'):$Post->user('firstName') ?></span></div>
+			<div class="info"><span><i class="fa fa-clock-o"></i> <?php echo $Post->date() ?></span><span><i class="fa fa-user"></i> <?php echo Text::isNotEmpty($Post->user('firstName'))?$Post->user('firstName'):$Post->user('username') ?></span></div>
 		</div>
 	</header>