diff --git a/admin/README.md b/admin/README.md deleted file mode 100644 index 46ec6cbf..00000000 --- a/admin/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Bludit - -If you are reading this, you must enable rewrite module. - -Documentation: -- http://docs.bludit.com/en/getting-started/requirements -- http://docs.bludit.com/en/troubleshooting/browser-returns-not-found \ No newline at end of file diff --git a/install.php b/install.php index f2bc046d..b08d9e3d 100644 --- a/install.php +++ b/install.php @@ -469,7 +469,7 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) - + diff --git a/admin/controllers/about.php b/kernel/admin/controllers/about.php similarity index 100% rename from admin/controllers/about.php rename to kernel/admin/controllers/about.php diff --git a/admin/controllers/add-user.php b/kernel/admin/controllers/add-user.php similarity index 100% rename from admin/controllers/add-user.php rename to kernel/admin/controllers/add-user.php diff --git a/admin/controllers/configure-plugin.php b/kernel/admin/controllers/configure-plugin.php similarity index 100% rename from admin/controllers/configure-plugin.php rename to kernel/admin/controllers/configure-plugin.php diff --git a/admin/controllers/dashboard.php b/kernel/admin/controllers/dashboard.php similarity index 100% rename from admin/controllers/dashboard.php rename to kernel/admin/controllers/dashboard.php diff --git a/admin/controllers/edit-page.php b/kernel/admin/controllers/edit-page.php similarity index 100% rename from admin/controllers/edit-page.php rename to kernel/admin/controllers/edit-page.php diff --git a/admin/controllers/edit-post.php b/kernel/admin/controllers/edit-post.php similarity index 100% rename from admin/controllers/edit-post.php rename to kernel/admin/controllers/edit-post.php diff --git a/admin/controllers/edit-user.php b/kernel/admin/controllers/edit-user.php similarity index 100% rename from admin/controllers/edit-user.php rename to kernel/admin/controllers/edit-user.php diff --git a/admin/controllers/install-plugin.php b/kernel/admin/controllers/install-plugin.php similarity index 100% rename from admin/controllers/install-plugin.php rename to kernel/admin/controllers/install-plugin.php diff --git a/admin/controllers/install-theme.php b/kernel/admin/controllers/install-theme.php similarity index 100% rename from admin/controllers/install-theme.php rename to kernel/admin/controllers/install-theme.php diff --git a/admin/controllers/login-email.php b/kernel/admin/controllers/login-email.php similarity index 100% rename from admin/controllers/login-email.php rename to kernel/admin/controllers/login-email.php diff --git a/admin/controllers/login.php b/kernel/admin/controllers/login.php similarity index 100% rename from admin/controllers/login.php rename to kernel/admin/controllers/login.php diff --git a/admin/controllers/logout.php b/kernel/admin/controllers/logout.php similarity index 100% rename from admin/controllers/logout.php rename to kernel/admin/controllers/logout.php diff --git a/admin/controllers/new-page.php b/kernel/admin/controllers/new-page.php similarity index 100% rename from admin/controllers/new-page.php rename to kernel/admin/controllers/new-page.php diff --git a/admin/controllers/new-post.php b/kernel/admin/controllers/new-post.php similarity index 100% rename from admin/controllers/new-post.php rename to kernel/admin/controllers/new-post.php diff --git a/admin/controllers/plugins.php b/kernel/admin/controllers/plugins.php similarity index 100% rename from admin/controllers/plugins.php rename to kernel/admin/controllers/plugins.php diff --git a/admin/controllers/settings-advanced.php b/kernel/admin/controllers/settings-advanced.php similarity index 100% rename from admin/controllers/settings-advanced.php rename to kernel/admin/controllers/settings-advanced.php diff --git a/admin/controllers/settings-general.php b/kernel/admin/controllers/settings-general.php similarity index 100% rename from admin/controllers/settings-general.php rename to kernel/admin/controllers/settings-general.php diff --git a/admin/controllers/settings-regional.php b/kernel/admin/controllers/settings-regional.php similarity index 100% rename from admin/controllers/settings-regional.php rename to kernel/admin/controllers/settings-regional.php diff --git a/admin/controllers/settings.php b/kernel/admin/controllers/settings.php similarity index 100% rename from admin/controllers/settings.php rename to kernel/admin/controllers/settings.php diff --git a/admin/controllers/themes.php b/kernel/admin/controllers/themes.php similarity index 100% rename from admin/controllers/themes.php rename to kernel/admin/controllers/themes.php diff --git a/admin/controllers/uninstall-plugin.php b/kernel/admin/controllers/uninstall-plugin.php similarity index 100% rename from admin/controllers/uninstall-plugin.php rename to kernel/admin/controllers/uninstall-plugin.php diff --git a/admin/controllers/user-password.php b/kernel/admin/controllers/user-password.php similarity index 100% rename from admin/controllers/user-password.php rename to kernel/admin/controllers/user-password.php diff --git a/admin/controllers/users.php b/kernel/admin/controllers/users.php similarity index 100% rename from admin/controllers/users.php rename to kernel/admin/controllers/users.php diff --git a/admin/themes/default/css/default.css b/kernel/admin/themes/default/css/default.css similarity index 98% rename from admin/themes/default/css/default.css rename to kernel/admin/themes/default/css/default.css index 4c58ae51..6bf90eff 100644 --- a/admin/themes/default/css/default.css +++ b/kernel/admin/themes/default/css/default.css @@ -26,6 +26,10 @@ background: #1F5FC4; } +.uk-form legend { + width: 70% !important; +} + .uk-navbar-nav > li > a { border: none; height: 70px; diff --git a/admin/themes/default/css/form-file.min.css b/kernel/admin/themes/default/css/form-file.min.css similarity index 100% rename from admin/themes/default/css/form-file.min.css rename to kernel/admin/themes/default/css/form-file.min.css diff --git a/admin/themes/default/css/installer.css b/kernel/admin/themes/default/css/installer.css similarity index 100% rename from admin/themes/default/css/installer.css rename to kernel/admin/themes/default/css/installer.css diff --git a/admin/themes/default/css/jquery.datetimepicker.css b/kernel/admin/themes/default/css/jquery.datetimepicker.css similarity index 100% rename from admin/themes/default/css/jquery.datetimepicker.css rename to kernel/admin/themes/default/css/jquery.datetimepicker.css diff --git a/admin/themes/default/css/login.css b/kernel/admin/themes/default/css/login.css similarity index 100% rename from admin/themes/default/css/login.css rename to kernel/admin/themes/default/css/login.css diff --git a/admin/themes/default/css/placeholder.min.css b/kernel/admin/themes/default/css/placeholder.min.css similarity index 100% rename from admin/themes/default/css/placeholder.min.css rename to kernel/admin/themes/default/css/placeholder.min.css diff --git a/admin/themes/default/css/progress.min.css b/kernel/admin/themes/default/css/progress.min.css similarity index 100% rename from admin/themes/default/css/progress.min.css rename to kernel/admin/themes/default/css/progress.min.css diff --git a/admin/themes/default/css/uikit.almost-flat.min.css b/kernel/admin/themes/default/css/uikit.almost-flat.min.css similarity index 100% rename from admin/themes/default/css/uikit.almost-flat.min.css rename to kernel/admin/themes/default/css/uikit.almost-flat.min.css diff --git a/admin/themes/default/css/upload.min.css b/kernel/admin/themes/default/css/upload.min.css similarity index 100% rename from admin/themes/default/css/upload.min.css rename to kernel/admin/themes/default/css/upload.min.css diff --git a/admin/themes/default/fonts/FontAwesome.otf b/kernel/admin/themes/default/fonts/FontAwesome.otf similarity index 100% rename from admin/themes/default/fonts/FontAwesome.otf rename to kernel/admin/themes/default/fonts/FontAwesome.otf diff --git a/admin/themes/default/fonts/fontawesome-webfont.eot b/kernel/admin/themes/default/fonts/fontawesome-webfont.eot similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.eot rename to kernel/admin/themes/default/fonts/fontawesome-webfont.eot diff --git a/admin/themes/default/fonts/fontawesome-webfont.ttf b/kernel/admin/themes/default/fonts/fontawesome-webfont.ttf similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.ttf rename to kernel/admin/themes/default/fonts/fontawesome-webfont.ttf diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.woff rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff diff --git a/admin/themes/default/fonts/fontawesome-webfont.woff2 b/kernel/admin/themes/default/fonts/fontawesome-webfont.woff2 similarity index 100% rename from admin/themes/default/fonts/fontawesome-webfont.woff2 rename to kernel/admin/themes/default/fonts/fontawesome-webfont.woff2 diff --git a/admin/themes/default/img/favicon.png b/kernel/admin/themes/default/img/favicon.png similarity index 100% rename from admin/themes/default/img/favicon.png rename to kernel/admin/themes/default/img/favicon.png diff --git a/admin/themes/default/index.php b/kernel/admin/themes/default/index.php similarity index 100% rename from admin/themes/default/index.php rename to kernel/admin/themes/default/index.php diff --git a/admin/themes/default/init.php b/kernel/admin/themes/default/init.php similarity index 78% rename from admin/themes/default/init.php rename to kernel/admin/themes/default/init.php index 1f3db143..af9bff04 100644 --- a/admin/themes/default/init.php +++ b/kernel/admin/themes/default/init.php @@ -207,4 +207,64 @@ class HTML { echo $html; } + public static function profileUploader($username) + { + global $L; + + $html = ' +
+
0%
+
+ +
+ '.$L->g('Upload Image').' +
+ '; + + $html .= ' + '; + + echo $html; + } + } \ No newline at end of file diff --git a/admin/themes/default/js/jquery.datetimepicker.js b/kernel/admin/themes/default/js/jquery.datetimepicker.js similarity index 100% rename from admin/themes/default/js/jquery.datetimepicker.js rename to kernel/admin/themes/default/js/jquery.datetimepicker.js diff --git a/admin/themes/default/js/jquery.min.js b/kernel/admin/themes/default/js/jquery.min.js similarity index 100% rename from admin/themes/default/js/jquery.min.js rename to kernel/admin/themes/default/js/jquery.min.js diff --git a/admin/themes/default/js/uikit.min.js b/kernel/admin/themes/default/js/uikit.min.js similarity index 100% rename from admin/themes/default/js/uikit.min.js rename to kernel/admin/themes/default/js/uikit.min.js diff --git a/admin/themes/default/js/upload.min.js b/kernel/admin/themes/default/js/upload.min.js similarity index 100% rename from admin/themes/default/js/upload.min.js rename to kernel/admin/themes/default/js/upload.min.js diff --git a/admin/themes/default/login.php b/kernel/admin/themes/default/login.php similarity index 100% rename from admin/themes/default/login.php rename to kernel/admin/themes/default/login.php diff --git a/admin/views/about.php b/kernel/admin/views/about.php similarity index 100% rename from admin/views/about.php rename to kernel/admin/views/about.php diff --git a/admin/views/add-user.php b/kernel/admin/views/add-user.php similarity index 100% rename from admin/views/add-user.php rename to kernel/admin/views/add-user.php diff --git a/admin/views/configure-plugin.php b/kernel/admin/views/configure-plugin.php similarity index 100% rename from admin/views/configure-plugin.php rename to kernel/admin/views/configure-plugin.php diff --git a/admin/views/dashboard.php b/kernel/admin/views/dashboard.php similarity index 100% rename from admin/views/dashboard.php rename to kernel/admin/views/dashboard.php diff --git a/admin/views/edit-page.php b/kernel/admin/views/edit-page.php similarity index 100% rename from admin/views/edit-page.php rename to kernel/admin/views/edit-page.php diff --git a/admin/views/edit-post.php b/kernel/admin/views/edit-post.php similarity index 100% rename from admin/views/edit-post.php rename to kernel/admin/views/edit-post.php diff --git a/admin/views/edit-user.php b/kernel/admin/views/edit-user.php similarity index 88% rename from admin/views/edit-user.php rename to kernel/admin/views/edit-user.php index bb336c46..1b9f4f07 100644 --- a/admin/views/edit-user.php +++ b/kernel/admin/views/edit-user.php @@ -2,6 +2,9 @@ HTML::title(array('title'=>$L->g('Edit user'), 'icon'=>'user')); +echo '
'; +echo '
'; + HTML::formOpen(array('id'=>'edit-user-profile-form','class'=>'uk-form-horizontal')); // Security token @@ -92,6 +95,13 @@ if( ($Login->role()==='admin') && ($_user['username']!='admin') ) { HTML::formClose(); +echo '
'; +echo '
'; +echo 'profile picture'; +HTML::profileUploader($_user['username']); +echo '
'; +echo '
'; + ?>