r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

improves in User interface responsive and dictionary updates

This commit is contained in:
Diego Najar 2018-08-19 17:45:49 +02:00
parent 49dc45a90b
commit a3df822c65
43 changed files with 221 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bl-kernel/admin/themes/booty/css/bludit.css
View File

@ -19,6 +19,16 @@ body {
}
}
/* for small devices */
@media (max-width: 575.98px) {
#jsmediaManagerButton,
#jscategoryButton,
#jsdescriptionButton {
width: 100%;
text-align: left;
}
}
a {
color: #4a90e2;
}

14
bl-kernel/admin/themes/booty/html/media.php
View File

@ -22,14 +22,14 @@ $numberOfPages = count($listOfFilesByPage);
<!--
UPLOAD INPUT
-->
<h3 class="mt-2 mb-3">Upload</h3>
<h3 class="mt-2 mb-3"><?php $L->p('Upload'); ?></h3>
<!-- Form and Input file -->
<form name="bluditFormUpload" id="jsbluditFormUpload" enctype="multipart/form-data">
<input type="hidden" name="tokenCSRF" value="<?php echo $security->getTokenCSRF() ?>">
<div class="custom-file">
<input type="file" class="custom-file-input" id="jsbluditInputFiles" name="bluditInputFiles[]" multiple>
<label class="custom-file-label" for="jsbluditInputFiles">Choose images</label>
<label class="custom-file-label" for="jsbluditInputFiles"><?php $L->p('Choose images to upload'); ?></label>
</div>
</form>
@ -41,12 +41,12 @@ $numberOfPages = count($listOfFilesByPage);
<!--
MANAGER
-->
<h3 class="mt-4 mb-3">Manage</h3>
<h3 class="mt-4 mb-3"><?php $L->p('Manage'); ?></h3>
<!-- Table for list files -->
<table id="jsbluditMediaTable" class="table">
<tr>
<td>There are not images.</td>
<td><?php $L->p('There are no images'); ?></td>
</tr>
</table>
@ -96,9 +96,9 @@ function displayFiles(files) {
'<td class="information">'+
'<div class="pb-2">'+filename+'<\/div>'+
'<div>'+
'<button onClick="editorInsertMedia(\''+filename+'\'); closeMediaManager();" type="button" class="btn btn-primary btn-sm mr-2">Insert<\/button>'+
'<button onClick="setCoverImage(\''+filename+'\'); closeMediaManager();" type="button" class="btn btn-primary btn-sm mr-2">Set as cover image<\/button>'+
'<button onClick="deleteMedia(\''+filename+'\')" type="button" class="btn btn-sm float-right">Delete<\/button>'+
'<button type="button" class="btn btn-primary btn-sm mr-2" onClick="editorInsertMedia(\''+filename+'\'); closeMediaManager();"><?php $L->p('Insert') ?><\/button>'+
'<button type="button" class="btn btn-primary btn-sm" onClick="setCoverImage(\''+filename+'\'); closeMediaManager();"><?php $L->p('Set as cover image') ?><\/button>'+
'<button type="button" class="btn btn-secondary btn-sm float-right" onClick="deleteMedia(\''+filename+'\')"><?php $L->p('Delete') ?><\/button>'+
'<\/div>'+
'<\/td>'+
'<\/tr>';

86
bl-kernel/admin/themes/booty/html/navbar.php
View File

@ -1,34 +1,54 @@
<nav class="navbar navbar-light bg-light d-block d-lg-none">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="#"><?php echo (defined('BLUDIT_PRO'))?'BLUDIT PRO':'BLUDIT' ?></a>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>"><?php $L->p('Dashboard') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'new-content' ?>"><?php $L->p('New content') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>"><?php $L->p('Content') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>"><?php $L->p('Categories') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>"><?php $L->p('Users') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'settings' ?>"><?php $L->p('Settings') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>"><?php $L->p('Plugins') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>"><?php $L->p('Themes') ?></a>
</li>
</ul>
</div>
<nav class="navbar navbar-expand-md navbar-dark bg-dark text-uppercase d-block d-md-none">
<div class="container">
<span class="navbar-brand">
<?php echo (defined('BLUDIT_PRO'))?'BLUDIT PRO':'BLUDIT' ?></span>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'dashboard' ?>">
<?php $L->p('Dashboard') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ROOT ?>">
<?php $L->p('Website') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'new-content' ?>">
<?php $L->p('New content') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'content' ?>">
<?php $L->p('Content') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'categories' ?>">
<?php $L->p('Categories') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'users' ?>">
<?php $L->p('Users') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'settings' ?>">
<?php $L->p('Site') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'plugins' ?>">
<?php $L->p('Plugins') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'themes' ?>">
<?php $L->p('Themes') ?></a>
</li>
<li class="nav-item">
<a class="nav-link" href="<?php echo HTML_PATH_ADMIN_ROOT.'about' ?>">
<?php $L->p('About') ?></a>
</li>
</ul>
</div>
</div>
</nav>

2
bl-kernel/admin/themes/booty/index.php
View File

@ -67,7 +67,7 @@
</div>
<!-- RIGHT MAIN -->
<div class="col-lg-10 pt-4">
<div class="col-lg-10 pt-3">
<?php
if (Sanitize::pathFile(PATH_ADMIN_VIEWS, $layout['view'].'.php')) {
include(PATH_ADMIN_VIEWS.$layout['view'].'.php');

4
bl-kernel/admin/views/dashboard.php
View File

@ -1,6 +1,6 @@
<div id="dashboard" class="container mt-3">
<div id="dashboard" class="container">
<div class="row">
<div class="col-md-7">
<div class="col-md-7 d-none d-sm-block">
<!-- Quick Links -->
<div class="container border-bottom pb-4">

2
bl-kernel/admin/views/login.php
View File

@ -28,7 +28,7 @@ echo Bootstrap::formOpen(array());
</div>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary mr-2 w-100 text-" name="save">'.$L->g('Login').'</button>
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100" name="save">'.$L->g('Login').'</button>
</div>
';

12
bl-kernel/admin/views/new-content.php
View File

@ -62,10 +62,10 @@
<input value="" class="form-control form-control-lg rounded-0 " id="jstitle" name="title" placeholder="<?php $L->p('Enter title') ?>" type="text">
</div>
<div class="form-group m-0 mt-1">
<button id="jsmediaManagerButton" type="button" class="btn btn-form btn-sm" data-toggle="modal" data-target="#jsbluditMediaModal"><span class="oi oi-image"></span> <?php $L->p('Media Manager') ?></button>
<button id="jscategoryButton" type="button" class="btn btn-form btn-sm" data-toggle="modal" data-target="#jscategoryModal"><span class="oi oi-tag"></span> <?php $L->p('Category') ?>: <span class="option">-</span></button>
<button id="jsdescriptionButton" type="button" class="btn btn-form btn-sm" data-toggle="modal" data-target="#jsdescriptionModal"><span class="oi oi-tag"></span> <?php $L->p('Description') ?>: <span class="option">-</span></button>
<div class="form-group m-0">
<button id="jsmediaManagerButton" type="button" class="mt-1 btn btn-form btn-sm d-block d-sm-inline d-sm-none" data-toggle="modal" data-target="#jsbluditMediaModal"><span class="oi oi-image"></span> <?php $L->p('Media Manager') ?></button>
<button id="jscategoryButton" type="button" class="mt-1 btn btn-form btn-sm" data-toggle="modal" data-target="#jscategoryModal"><span class="oi oi-tag"></span> <?php $L->p('Category') ?>: <span class="option">-</span></button>
<button id="jsdescriptionButton" type="button" class="mt-1 btn btn-form btn-sm" data-toggle="modal" data-target="#jsdescriptionModal"><span class="oi oi-tag"></span> <?php $L->p('Description') ?>: <span class="option">-</span></button>
</div>
<div class="form-group mt-1">
@ -176,8 +176,6 @@
'tip'=>$L->g('Write a template name to filter the page in the theme and change the style of the page.')
));
echo Bootstrap::formTitle(array('title'=>$L->g('SEO')));
// Tags
echo Bootstrap::formInputText(array(
'name'=>'tags',
@ -186,6 +184,8 @@
'tip'=>$L->g('Write the tags separated by comma')
));
echo Bootstrap::formTitle(array('title'=>$L->g('SEO')));
// Friendly URL
echo Bootstrap::formInputText(array(
'name'=>'slug',

2
bl-kernel/admin/views/settings.php
View File

@ -7,7 +7,7 @@ echo Bootstrap::pageTitle(array('title'=>$L->g('Settings'), 'icon'=>'cog'));
<!-- TABS -->
<ul class="nav nav-tabs" id="dynamicTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="true"><?php $L->p('General') ?></a>
<a class="nav-link active" id="general-tab" data-toggle="tab" href="#general" role="tab" aria-controls="general" aria-selected="true"><?php $L->p('Site') ?></a>
</li>
<li class="nav-item">
<a class="nav-link " id="advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="advanced" aria-selected="false"><?php $L->p('Advanced') ?></a>

2
bl-kernel/admin/views/user-password.php
View File

@ -47,7 +47,7 @@ echo Bootstrap::formOpen(array());
echo '
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary mr-2" name="save">'.$L->g('Save').'</button>
<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'users" role="button">'.$L->g('Cancel').'</a>
<a class="btn btn-secondary" href="'.HTML_PATH_ADMIN_ROOT.'edit-user/'.$user->username().'" role="button">'.$L->g('Cancel').'</a>
</div>
';

4
bl-languages/ar_MA.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/bg_BG.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/cs_CZ.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/de_CH.json
View File

@ -350,5 +350,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/de_DE.json
View File

@ -351,5 +351,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

5
bl-languages/en.json
View File

@ -345,5 +345,8 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert",
"upload": "Upload"
}

12
bl-languages/es.json
View File

@ -338,11 +338,13 @@
"tag": "Etiqueta",
"drag-and-drop-to-sort-the-plugins": "Arrastrar y soltar para ordenar los plugins.",
"seo": "SEO",
"documentation": "Documentation",
"forum-support": "Forum support",
"chat-support": "Chat support",
"documentation": "Documentación",
"forum-support": "Foro",
"chat-support": "Chat",
"quick-links": "Enlaces rápidos",
"leave-empty-for-autocomplete-by-bludit": "Deje vacío para ser autocompletado por Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"choose-a-password-for-the-user-admin": "Elija una contraseña para el usuario <code>admin<\/code>",
"access-denied": "Acceso denegado",
"choose-images-to-upload": "Elige imágenes para subir",
"insert": "Insertar"
}

4
bl-languages/fa_IR.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/fi_FI.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/fr_FR.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/gr.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/he_IL.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/hu_HU.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/it_IT.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/ja_JP.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/ms_MY.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/nl_NL.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/pl_PL.json
View File

@ -345,5 +345,7 @@
"quick-links": "Na skróty",
"leave-empty-for-autocomplete-by-bludit": "Bludit automatycznie uzupełni to pole, jeśli pozostawisz je puste.",
"choose-a-password-for-the-user-admin": "Wybierz hasło dla użytkownika <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/pt_BR.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/pt_PT.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/ro_RO.json
View File

@ -341,5 +341,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/ru_RU.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/tr_TR.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/uk_UA.json
View File

@ -345,5 +345,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/vi_VN.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/zh_CN.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

4
bl-languages/zh_TW.json
View File

@ -344,5 +344,7 @@
"quick-links": "Quick links",
"leave-empty-for-autocomplete-by-bludit": "Leave empty for autocomplete by Bludit.",
"choose-a-password-for-the-user-admin": "Choose a password for the user <code>admin<\/code>",
"access-denied": "Access denied"
"access-denied": "Access denied",
"choose-images-to-upload": "Choose images to upload",
"insert": "Insert"
}

2
bl-plugins/simple-stats/plugin.php
View File

@ -164,7 +164,7 @@ EOF;
if (empty($lines)) {
return 0;
}
$login = new Login();
$tmp = array();
foreach ($lines as $line) {
$data = json_decode($line);

2
bl-plugins/tinymce/metadata.json
View File

@ -2,7 +2,7 @@
"author": "TinyMCE",
"email": "",
"website": "https://www.tinymce.com",
"version": "4.8.0",
"version": "4.8.2",
"releaseDate": "2018-07-11",
"license": "GPL v2",
"compatible": "3.0",

27
bl-plugins/tinymce/plugin.php
View File

@ -12,6 +12,7 @@ class pluginTinymce extends Plugin {
$this->dbFields = array(
'toolbar1'=>'formatselect bold italic bullist numlist blockquote alignleft aligncenter alignright link pagebreak image removeformat code',
'toolbar2'=>'',
'mobileToolbar'=>'bold italic bullist formatselect',
'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern'
);
}
@ -30,6 +31,11 @@ class pluginTinymce extends Plugin {
$html .= '<input name="toolbar2" id="jstoolbar2" type="text" value="'.$this->getValue('toolbar2').'">';
$html .= '</div>';
$html .= '<div>';
$html .= '<label>'.$L->get('Mobile toolbar').'</label>';
$html .= '<input name="mobileToolbar" id="jsmobileToolbar" type="text" value="'.$this->getValue('mobileToolbar').'">';
$html .= '</div>';
$html .= '<div>';
$html .= '<label>'.$L->get('Plugins').'</label>';
$html .= '<input name="plugins" id="jsplugins" type="text" value="'.$this->getValue('plugins').'">';
@ -49,14 +55,23 @@ class pluginTinymce extends Plugin {
public function adminBodyEnd()
{
global $L;
if (!in_array($GLOBALS['ADMIN_CONTROLLER'], $this->loadOnController)) {
return false;
}
global $L;
// Detect if the user is browsing in a mobile
if ($this->isMobile()) {
$toolbar1 = $this->getValue('mobileToolbar');
$toolbar2 = '';
$min_height = '320';
} else {
$toolbar1 = $this->getValue('toolbar1');
$toolbar2 = $this->getValue('toolbar2');
$min_height = '500';
}
$toolbar1 = $this->getValue('toolbar1');
$toolbar2 = $this->getValue('toolbar2');
$plugins = $this->getValue('plugins');
$lang = 'en';
@ -87,7 +102,7 @@ tinymce.init({
selector: "#jseditor",
theme: "modern",
skin: "bludit",
min_height: 500,
min_height: $min_height,
max_height: 1000,
element_format : "html",
entity_encoding : "raw",
@ -112,4 +127,8 @@ tinymce.init({
EOF;
return $script;
}
private function isMobile() {
return preg_match("/(android|avantgo|blackberry|bolt|boost|cricket|docomo|fone|hiptop|mini|mobi|palm|phone|pie|tablet|up\.browser|up\.link|webos|wos)/i", $_SERVER["HTTP_USER_AGENT"]);
}
}

2
bl-plugins/tinymce/tinymce/plugins/paste/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
bl-plugins/tinymce/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

76
bl-themes/alternative/php/navbar.php
View File

@ -17,61 +17,29 @@
<?php endforeach ?>
<!-- Social Networks -->
<?php if ($site->github()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->github(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/github.svg' ?>" alt="github icon" />
</a>
</li>
<?php endif ?>
<?php
$socialNetworks = array(
// Key => Label
'github'=>'Github',
'twitter'=>'Twitter',
'facebook'=>'Facebook',
'googleplus'=>'Google Plus',
'instagram'=>'Instagram',
'codepen'=>'Codepen',
'linkedin'=>'Linkedin'
);
?>
<?php if ($site->twitter()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->twitter(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/twitter.svg' ?>" alt="twitter icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->facebook()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->facebook(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/facebook.svg' ?>" alt="facebook icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->googleplus()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->googleplus(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/googleplus.svg' ?>" alt="googleplus icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->instagram()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->instagram(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/instagram.svg' ?>" alt="instgram icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->codepen()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->codepen(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/codepen.svg' ?>" alt="codepen icon" />
</a>
</li>
<?php endif ?>
<?php if ($site->linkedin()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->linkedin(); ?>" target="_blank">
<img class="nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/linkedin.svg' ?>" alt="linkedin icon" />
</a>
</li>
<?php endif ?>
<?php foreach ($socialNetworks as $key=>$label): ?>
<?php if ($site->{$key}()): ?>
<li class="nav-item">
<a class="nav-link" href="<?php echo $site->{$key}(); ?>" target="_blank">
<img class="d-none d-sm-block nav-svg-icon" src="<?php echo DOMAIN_THEME.'img/'.$key.'.svg' ?>" alt="icon" />
<span class="d-inline d-sm-none"><?php echo $label; ?></span>
</a>
</li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
</div>

5
install.php
View File

@ -499,6 +499,7 @@ function install($adminPassword, $timezone)
'position'=>1,
'toolbar1'=>'formatselect bold italic bullist numlist blockquote alignleft aligncenter alignright link pagebreak image removeformat code',
'toolbar2'=>'',
'mobileToolbar'=>'bold italic bullist formatselect',
'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern'
),
JSON_PRETTY_PRINT),
@ -605,7 +606,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
<div id="jsshowPassword" style="cursor: pointer;" class="text-center pt-0 text-muted"><?php $L->p('Show password') ?></div>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary mr-2 w-100" name="install"><?php $L->p('Install') ?></button>
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100" name="install"><?php $L->p('Install') ?></button>
</div>
</form>
<?php
@ -625,7 +626,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
</select>
<div class="form-group mt-4">
<button type="submit" class="btn btn-primary mr-2 w-100"><?php $L->p('Next') ?></button>
<button type="submit" class="btn btn-primary btn-lg mr-2 w-100"><?php $L->p('Next') ?></button>
</div>
</form>
<?php