Merge pull request #3 from bludit/master

Pull request
This commit is contained in:
Edi 2017-10-26 10:48:39 +02:00 committed by GitHub
commit 6bb843c13a
7 changed files with 42 additions and 16 deletions

View File

@ -14,7 +14,7 @@ Bludit supports **Markdown** and **HTML code** for the content.
[![Bludit PRO](https://img.shields.io/badge/Bludit-PRO-blue.svg)](https://pro.bludit.com/)
Social networks
Social Networks
---------------
- [Twitter](https://twitter.com/bludit)
@ -27,23 +27,38 @@ Requirements
You just need a web server with PHP support.
PHP v5.3 or higher.
PHP mbstring module for full UTF-8 support.
PHP gd module for image processing.
PHP dom module for DOM manipulation.
PHP json module for JSON manipulation.
Supported web servers:
Bludit supports almost every webserver
PHP Built-in web server
- PHP v5.3 or higher.
- PHP [mbstring](http://php.net/manual/en/book.mbstring.php) module for full UTF-8 support.
- PHP [gd](http://php.net/manual/en/book.image.php) module for image processing.
- PHP [dom](http://php.net/manual/en/book.dom.php) module for DOM manipulation.
- PHP [json](http://php.net/manual/en/book.json.php) module for JSON manipulation.
- Webserver with PHP support
- Supported web servers:
* Bludit supports almost every webserver
* PHP Built-in web server
Installation guide
Installation Guide
------------------
1. Download the latest version from https://cdn.bludit.com/builds/bludit_latest.zip
2. Extract the zip file into a directory like `bludit`.
3. Upload the directory `bludit` to your server/hosting.
1. Download the latest version from the official page. [Bludit.com](https://www.bludit.com)
2. Extract the zip file into a directory like bludit.
3. Upload the directory `bludit` to your web server or hosting.
4. Visit your domain https://example.com/bludit/
5. Follow the Bludit Installer to configure the website.
Docker Image
------------
Bludit provides an official Docker image.
- https://hub.docker.com/r/bludit/docker/
License
-------
Bludit is open source software licensed under the [MIT license](https://tldrlegal.com/license/mit-license).

View File

@ -325,7 +325,9 @@ button.aslink:hover {
}
.bl-publish-sidebar {
display: none !important;
width: 100% !important;
padding: 0 !important;
margin-bottom: 25px !important;
}
.bl-publish-view {

View File

@ -1,10 +1,10 @@
<?php defined('BLUDIT') or die('Bludit CMS.');
// Bludit version
define('BLUDIT_VERSION', '2.0');
define('BLUDIT_VERSION', '2.0.1');
define('BLUDIT_CODENAME', 'Morty');
define('BLUDIT_RELEASE_DATE', '2017-10-16');
define('BLUDIT_BUILD', '20171016');
define('BLUDIT_RELEASE_DATE', '2017-10-23');
define('BLUDIT_BUILD', '20171023');
// Debug mode
// Change to FALSE, for prevent warning or errors on browser

View File

@ -2,7 +2,7 @@
class TCP {
public static function http($url, $method='GET', $verifySSL=true, $timeOut=1, $followRedirections=true, $binary=true, $headers=false)
public static function http($url, $method='GET', $verifySSL=true, $timeOut=10, $followRedirections=true, $binary=true, $headers=false)
{
if( function_exists('curl_version') ) {
$ch = curl_init();

View File

@ -26,8 +26,8 @@ class pluginLatestContent extends Plugin {
$html .= '<div>';
$html .= '<label>'.$Language->get('Home link').'</label>';
$html .= '<select name="homeLink">';
$html .= '<option value="true" '.($this->getValue('showCero')?'checked':'').'>'.$Language->get('Enabled').'</option>';
$html .= '<option value="false" '.($this->getValue('showCero')?'checked':'').'>'.$Language->get('Disabled').'</option>';
$html .= '<option value="true" '.($this->getValue('homeLink')===true?'selected':'').'>'.$Language->get('Enabled').'</option>';
$html .= '<option value="false" '.($this->getValue('homeLink')===false?'selected':'').'>'.$Language->get('Disabled').'</option>';
$html .= '</select>';
$html .= '<span class="tip">'.$Language->get('Show the home link on the sidebar').'</span>';
$html .= '</div>';

View File

@ -0,0 +1,9 @@
{
"plugin-data":
{
"name": "Static pages",
"description": "Показывает статические страницы на боковой панели. Это может быть полезно если вы создаёте блог с дополнительными страницами."
},
"home-link": "Главная страница",
"show-the-home-link-on-the-sidebar": "Показывать ссылку на главную страницу на боковой панели."
}

View File

@ -37,7 +37,7 @@ class pluginVersion extends Plugin {
}
if ($this->newVersion()) {
$html = '<div id="plugin-version"><a href="https://www.bludit.com">'.$Language->get('New version available').'</a></div>';
$html = '<div id="plugin-version"><a href="https://www.bludit.com"><i class="fa fa-download" aria-hidden="true"></i> '.$Language->get('New version available').'</a></div>';
} else {
if(defined('BLUDIT_PRO')) {
$html = '<div id="plugin-version">Bludit PRO v'.BLUDIT_VERSION.'</div>';