diff --git a/bl-kernel/abstract/plugin.class.php b/bl-kernel/abstract/plugin.class.php index 1cd1080a..3fd2be03 100644 --- a/bl-kernel/abstract/plugin.class.php +++ b/bl-kernel/abstract/plugin.class.php @@ -28,6 +28,7 @@ class Plugin { // (array) Database fields, only for initialize public $dbFields; + // (boolean) Enable or disable default Save and Cancel button on plugin settings public $formButtons; function __construct() @@ -274,7 +275,8 @@ class Plugin { } // Returns the parameters after the URI, FALSE if the URI doesn't match with the webhook - public function webhook($URI=false) + // Example: https://www.mybludit.com/api/foo/bar + public function webhook($URI=false, $returnsAfterURI=false) { global $Url; @@ -290,6 +292,10 @@ class Plugin { return false; } + if($returnsAfterURI) { + return mb_substr($URI, $length); + } + Log::set(__METHOD__.LOG_SEP.'Webhook requested.'); return true; } diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css index 521b58a9..225787c9 100644 --- a/bl-kernel/admin/themes/default/css/default.css +++ b/bl-kernel/admin/themes/default/css/default.css @@ -98,14 +98,20 @@ body { max-width: 1800px; } +#bl-navbar img.logo { + height: 25px; + margin-bottom: 6px; + margin-left: 15px; + margin-right: 5px; +} + #bl-navbar a { color: #fff; } #bl-navbar a.bl-brand { - font-size: 20px; - line-height: 60px; - margin: 0 0 0 35px; + font-size: 15px; + line-height: 35px; text-transform: uppercase; color: #fff; } @@ -116,7 +122,7 @@ body { #bl-navbar .bl-navbar-right { float: right; - line-height: 60px; + line-height: 35px; margin: 0 35px 0 0; } @@ -637,41 +643,27 @@ div.plugin-links > span.separator { list-style-type: none; margin: 15px 0; padding: 0; - font-size: 0.9em; + font-size: 1em; text-align: center; } +#paginator li.next { + margin-left: 1em; +} + +#paginator li.previous { + margin-right: 1em; +} + #paginator a { color: #2672ec; } #paginator li { display: inline; - float: none !important; + margin: 0 5px; } -#paginator li.left { - margin-right: 10px; -} - -#paginator li.list { - background: #e0e0e0; - color: #747474; - padding: 2px 11px; - margin: 0px 15px; -} - -#paginator li.right { - margin-left: 10px; -} - -#paginator li.next { - margin-right: 1em; -} - -#paginator li.previous { - margin-left: 1em; -} /* ----------- PLUGINS FORM ----------- */ diff --git a/bl-kernel/admin/themes/default/img/favicon.png b/bl-kernel/admin/themes/default/img/favicon.png index 517c6c12..cdcd6e2a 100644 Binary files a/bl-kernel/admin/themes/default/img/favicon.png and b/bl-kernel/admin/themes/default/img/favicon.png differ diff --git a/bl-kernel/admin/themes/default/img/logo.svg b/bl-kernel/admin/themes/default/img/logo.svg new file mode 100644 index 00000000..fb19074c --- /dev/null +++ b/bl-kernel/admin/themes/default/img/logo.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/bl-kernel/admin/themes/default/index.php b/bl-kernel/admin/themes/default/index.php index c6b809b2..8dce91ad 100644 --- a/bl-kernel/admin/themes/default/index.php +++ b/bl-kernel/admin/themes/default/index.php @@ -8,7 +8,7 @@ <?php echo $layout['title'] ?> - + @@ -57,16 +57,14 @@ $(document).ready(function() {