diff --git a/bl-kernel/admin/controllers/content.php b/bl-kernel/admin/controllers/content.php index 8d7e94b4..42172756 100644 --- a/bl-kernel/admin/controllers/content.php +++ b/bl-kernel/admin/controllers/content.php @@ -4,7 +4,7 @@ // Check role // ============================================================================ -checkRole(array('admin', 'editor')); +checkRole(array('admin', 'editor', 'author')); // ============================================================================ // Functions @@ -41,8 +41,8 @@ $scheduled = $pages->getScheduledDB(true); $static = $pages->getStaticDB(true); $sticky = $pages->getStickyDB(true); -// If the user is an Editor filter the content he/she can edit -if (checkRole(array('editor'), false)) { +// If the user is an Author filter the content he/she can edit +if (checkRole(array('author'), false)) { $published = filterContentOwner($published); $drafts = filterContentOwner($drafts); $scheduled = filterContentOwner($scheduled); diff --git a/bl-kernel/admin/controllers/edit-content.php b/bl-kernel/admin/controllers/edit-content.php index 16c83d99..9fcbae16 100644 --- a/bl-kernel/admin/controllers/edit-content.php +++ b/bl-kernel/admin/controllers/edit-content.php @@ -4,7 +4,7 @@ // Check role // ============================================================================ -if (checkRole(array('editor'), false)) { +if (checkRole(array('author'), false)) { try { $pageKey = isset($_POST['key']) ? $_POST['key'] : $layout['parameters']; $page = new Page($pageKey); diff --git a/bl-kernel/admin/controllers/new-content.php b/bl-kernel/admin/controllers/new-content.php index b8239dc7..882e24ef 100644 --- a/bl-kernel/admin/controllers/new-content.php +++ b/bl-kernel/admin/controllers/new-content.php @@ -4,7 +4,7 @@ // Check role // ============================================================================ -checkRole(array('admin', 'editor')); +checkRole(array('admin', 'editor', 'author')); // ============================================================================ // Functions diff --git a/bl-kernel/admin/themes/booty/html/sidebar.php b/bl-kernel/admin/themes/booty/html/sidebar.php index 2a2d75eb..bf55e110 100644 --- a/bl-kernel/admin/themes/booty/html/sidebar.php +++ b/bl-kernel/admin/themes/booty/html/sidebar.php @@ -6,25 +6,23 @@ - - - + + - @@ -76,6 +74,6 @@ diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php index bb4cfc6e..70af9f9a 100644 --- a/bl-kernel/admin/views/content.php +++ b/bl-kernel/admin/views/content.php @@ -195,7 +195,7 @@ function table($type) {
  • - get('First'); ?> + get('First'); ?>
  • @@ -210,7 +210,7 @@ function table($type) {
  • - get('Last'); ?> + get('Last'); ?>
  • diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php index 7e3a8047..3d2d06f0 100644 --- a/bl-kernel/admin/views/edit-content.php +++ b/bl-kernel/admin/views/edit-content.php @@ -55,8 +55,8 @@ echo Bootstrap::formOpen(array(
    - - + +
    diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php index 9d93c485..b7f0e0ff 100644 --- a/bl-kernel/admin/views/edit-user.php +++ b/bl-kernel/admin/views/edit-user.php @@ -53,7 +53,7 @@ echo Bootstrap::formSelect(array( 'name'=>'role', 'label'=>$L->g('Role'), - 'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), + 'options'=>array('author'=>$L->g('Author'), 'editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), 'selected'=>$user->role(), 'class'=>'', 'tip'=>'' diff --git a/bl-kernel/admin/views/new-user.php b/bl-kernel/admin/views/new-user.php index 07f0ea70..fe52df36 100644 --- a/bl-kernel/admin/views/new-user.php +++ b/bl-kernel/admin/views/new-user.php @@ -48,8 +48,8 @@ echo Bootstrap::formSelect(array( 'name'=>'role', 'label'=>$L->g('Role'), - 'options'=>array('editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), - 'selected'=>'Editor', + 'options'=>array('author'=>$L->g('Author'), 'editor'=>$L->g('Editor'), 'admin'=>$L->g('Administrator')), + 'selected'=>'Author', 'class'=>'', 'tip'=>'' )); diff --git a/bl-kernel/users.class.php b/bl-kernel/users.class.php index f9eb16df..3b2c57d7 100644 --- a/bl-kernel/users.class.php +++ b/bl-kernel/users.class.php @@ -7,7 +7,7 @@ class Users extends dbJSON { 'lastName'=>'', 'nickname'=>'', 'description'=>'', - 'role'=>'editor', // admin, editor + 'role'=>'author', // admin, editor, author 'password'=>'', 'salt'=>'!Pink Floyd!Welcome to the machine!', 'email'=>'',