diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php index 1791ccfac..61ce55fa9 100644 --- a/app/Http/Controllers/SettingController.php +++ b/app/Http/Controllers/SettingController.php @@ -15,7 +15,14 @@ class SettingController extends Controller { $this->checkPermission('settings-manage'); $this->setPageTitle('Settings'); - return view('settings/index'); + + // Get application version + $version = false; + if (function_exists('exec')) { + $version = exec('git describe --always --tags '); + } + + return view('settings/index', ['version' => $version]); } /** diff --git a/public/fonts/roboto-bold-webfont.eot b/public/fonts/roboto-bold-webfont.eot deleted file mode 100644 index 48a565c0c..000000000 Binary files a/public/fonts/roboto-bold-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-bold-webfont.svg b/public/fonts/roboto-bold-webfont.svg deleted file mode 100644 index 79525e8db..000000000 --- a/public/fonts/roboto-bold-webfont.svg +++ /dev/null @@ -1,675 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-bold-webfont.ttf b/public/fonts/roboto-bold-webfont.ttf deleted file mode 100644 index 25564cacc..000000000 Binary files a/public/fonts/roboto-bold-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-bold-webfont.woff b/public/fonts/roboto-bold-webfont.woff deleted file mode 100644 index 8a2cdccba..000000000 Binary files a/public/fonts/roboto-bold-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-bold-webfont.woff2 b/public/fonts/roboto-bold-webfont.woff2 deleted file mode 100644 index 2442142ff..000000000 Binary files a/public/fonts/roboto-bold-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-bolditalic-webfont.eot b/public/fonts/roboto-bolditalic-webfont.eot deleted file mode 100644 index afe5a43cd..000000000 Binary files a/public/fonts/roboto-bolditalic-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-bolditalic-webfont.svg b/public/fonts/roboto-bolditalic-webfont.svg deleted file mode 100644 index 5ce8417ea..000000000 --- a/public/fonts/roboto-bolditalic-webfont.svg +++ /dev/null @@ -1,675 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-bolditalic-webfont.ttf b/public/fonts/roboto-bolditalic-webfont.ttf deleted file mode 100644 index 85b3cd430..000000000 Binary files a/public/fonts/roboto-bolditalic-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-bolditalic-webfont.woff b/public/fonts/roboto-bolditalic-webfont.woff deleted file mode 100644 index b71887e2c..000000000 Binary files a/public/fonts/roboto-bolditalic-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-bolditalic-webfont.woff2 b/public/fonts/roboto-bolditalic-webfont.woff2 deleted file mode 100644 index efdf48bc2..000000000 Binary files a/public/fonts/roboto-bolditalic-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-italic-webfont.eot b/public/fonts/roboto-italic-webfont.eot deleted file mode 100644 index e6b647dd6..000000000 Binary files a/public/fonts/roboto-italic-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-italic-webfont.svg b/public/fonts/roboto-italic-webfont.svg deleted file mode 100644 index fc472420a..000000000 --- a/public/fonts/roboto-italic-webfont.svg +++ /dev/null @@ -1,666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-italic-webfont.ttf b/public/fonts/roboto-italic-webfont.ttf deleted file mode 100644 index d43bf8b06..000000000 Binary files a/public/fonts/roboto-italic-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-italic-webfont.woff b/public/fonts/roboto-italic-webfont.woff deleted file mode 100644 index fb4e64cc0..000000000 Binary files a/public/fonts/roboto-italic-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-italic-webfont.woff2 b/public/fonts/roboto-italic-webfont.woff2 deleted file mode 100644 index a2004e2f1..000000000 Binary files a/public/fonts/roboto-italic-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-light-webfont.eot b/public/fonts/roboto-light-webfont.eot deleted file mode 100644 index b720697f5..000000000 Binary files a/public/fonts/roboto-light-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-light-webfont.svg b/public/fonts/roboto-light-webfont.svg deleted file mode 100644 index 3d23bff80..000000000 --- a/public/fonts/roboto-light-webfont.svg +++ /dev/null @@ -1,670 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-light-webfont.ttf b/public/fonts/roboto-light-webfont.ttf deleted file mode 100644 index a112e0076..000000000 Binary files a/public/fonts/roboto-light-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-light-webfont.woff b/public/fonts/roboto-light-webfont.woff deleted file mode 100644 index 6c0f95e3e..000000000 Binary files a/public/fonts/roboto-light-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-light-webfont.woff2 b/public/fonts/roboto-light-webfont.woff2 deleted file mode 100644 index 2ace0ad77..000000000 Binary files a/public/fonts/roboto-light-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-lightitalic-webfont.eot b/public/fonts/roboto-lightitalic-webfont.eot deleted file mode 100644 index e2641bd5e..000000000 Binary files a/public/fonts/roboto-lightitalic-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-lightitalic-webfont.svg b/public/fonts/roboto-lightitalic-webfont.svg deleted file mode 100644 index d9f8868dc..000000000 --- a/public/fonts/roboto-lightitalic-webfont.svg +++ /dev/null @@ -1,670 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-lightitalic-webfont.ttf b/public/fonts/roboto-lightitalic-webfont.ttf deleted file mode 100644 index cd0dceea9..000000000 Binary files a/public/fonts/roboto-lightitalic-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-lightitalic-webfont.woff b/public/fonts/roboto-lightitalic-webfont.woff deleted file mode 100644 index 8312da091..000000000 Binary files a/public/fonts/roboto-lightitalic-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-lightitalic-webfont.woff2 b/public/fonts/roboto-lightitalic-webfont.woff2 deleted file mode 100644 index f8ed688d0..000000000 Binary files a/public/fonts/roboto-lightitalic-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-medium-webfont.eot b/public/fonts/roboto-medium-webfont.eot deleted file mode 100644 index 97f5e5054..000000000 Binary files a/public/fonts/roboto-medium-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-medium-webfont.svg b/public/fonts/roboto-medium-webfont.svg deleted file mode 100644 index 2c07e1d5c..000000000 --- a/public/fonts/roboto-medium-webfont.svg +++ /dev/null @@ -1,680 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-medium-webfont.ttf b/public/fonts/roboto-medium-webfont.ttf deleted file mode 100644 index 8def2440a..000000000 Binary files a/public/fonts/roboto-medium-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-medium-webfont.woff b/public/fonts/roboto-medium-webfont.woff deleted file mode 100644 index 211f4cca3..000000000 Binary files a/public/fonts/roboto-medium-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-medium-webfont.woff2 b/public/fonts/roboto-medium-webfont.woff2 deleted file mode 100644 index 93c620be8..000000000 Binary files a/public/fonts/roboto-medium-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-mediumitalic-webfont.eot b/public/fonts/roboto-mediumitalic-webfont.eot deleted file mode 100644 index fd43abc8d..000000000 Binary files a/public/fonts/roboto-mediumitalic-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-mediumitalic-webfont.svg b/public/fonts/roboto-mediumitalic-webfont.svg deleted file mode 100644 index 4f573a619..000000000 --- a/public/fonts/roboto-mediumitalic-webfont.svg +++ /dev/null @@ -1,680 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-mediumitalic-webfont.ttf b/public/fonts/roboto-mediumitalic-webfont.ttf deleted file mode 100644 index 91119dbfa..000000000 Binary files a/public/fonts/roboto-mediumitalic-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-mediumitalic-webfont.woff b/public/fonts/roboto-mediumitalic-webfont.woff deleted file mode 100644 index 0b290a080..000000000 Binary files a/public/fonts/roboto-mediumitalic-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-mediumitalic-webfont.woff2 b/public/fonts/roboto-mediumitalic-webfont.woff2 deleted file mode 100644 index 886bd287d..000000000 Binary files a/public/fonts/roboto-mediumitalic-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-regular-webfont.eot b/public/fonts/roboto-regular-webfont.eot deleted file mode 100644 index 9ef2f019c..000000000 Binary files a/public/fonts/roboto-regular-webfont.eot and /dev/null differ diff --git a/public/fonts/roboto-regular-webfont.svg b/public/fonts/roboto-regular-webfont.svg deleted file mode 100644 index 8bf6da3bf..000000000 --- a/public/fonts/roboto-regular-webfont.svg +++ /dev/null @@ -1,666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/roboto-regular-webfont.ttf b/public/fonts/roboto-regular-webfont.ttf deleted file mode 100644 index 615002876..000000000 Binary files a/public/fonts/roboto-regular-webfont.ttf and /dev/null differ diff --git a/public/fonts/roboto-regular-webfont.woff b/public/fonts/roboto-regular-webfont.woff deleted file mode 100644 index dd5f8d0ce..000000000 Binary files a/public/fonts/roboto-regular-webfont.woff and /dev/null differ diff --git a/public/fonts/roboto-regular-webfont.woff2 b/public/fonts/roboto-regular-webfont.woff2 deleted file mode 100644 index 4d5654f9b..000000000 Binary files a/public/fonts/roboto-regular-webfont.woff2 and /dev/null differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-100.woff b/public/fonts/roboto-v15-cyrillic_latin-100.woff new file mode 100644 index 000000000..4eb2be6a1 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-100.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-100.woff2 b/public/fonts/roboto-v15-cyrillic_latin-100.woff2 new file mode 100644 index 000000000..007b90e85 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-100.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-100italic.woff b/public/fonts/roboto-v15-cyrillic_latin-100italic.woff new file mode 100644 index 000000000..fa7e51bc8 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-100italic.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-100italic.woff2 b/public/fonts/roboto-v15-cyrillic_latin-100italic.woff2 new file mode 100644 index 000000000..f27a169cb Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-100italic.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-300.woff b/public/fonts/roboto-v15-cyrillic_latin-300.woff new file mode 100644 index 000000000..ace052941 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-300.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-300.woff2 b/public/fonts/roboto-v15-cyrillic_latin-300.woff2 new file mode 100644 index 000000000..0c093b91c Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-300.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-300italic.woff b/public/fonts/roboto-v15-cyrillic_latin-300italic.woff new file mode 100644 index 000000000..7984971e7 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-300italic.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-300italic.woff2 b/public/fonts/roboto-v15-cyrillic_latin-300italic.woff2 new file mode 100644 index 000000000..46ed6c7cc Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-300italic.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-500.woff b/public/fonts/roboto-v15-cyrillic_latin-500.woff new file mode 100644 index 000000000..8ae98f2de Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-500.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-500.woff2 b/public/fonts/roboto-v15-cyrillic_latin-500.woff2 new file mode 100644 index 000000000..fba67842e Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-500.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-500italic.woff b/public/fonts/roboto-v15-cyrillic_latin-500italic.woff new file mode 100644 index 000000000..560968d16 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-500italic.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-500italic.woff2 b/public/fonts/roboto-v15-cyrillic_latin-500italic.woff2 new file mode 100644 index 000000000..cc41bf873 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-500italic.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-700.woff b/public/fonts/roboto-v15-cyrillic_latin-700.woff new file mode 100644 index 000000000..7d19e332d Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-700.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-700.woff2 b/public/fonts/roboto-v15-cyrillic_latin-700.woff2 new file mode 100644 index 000000000..e2274a4fb Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-700.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-700italic.woff b/public/fonts/roboto-v15-cyrillic_latin-700italic.woff new file mode 100644 index 000000000..1604c8763 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-700italic.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-700italic.woff2 b/public/fonts/roboto-v15-cyrillic_latin-700italic.woff2 new file mode 100644 index 000000000..f950ca2aa Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-700italic.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-italic.woff b/public/fonts/roboto-v15-cyrillic_latin-italic.woff new file mode 100644 index 000000000..d76d13d6a Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-italic.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-italic.woff2 b/public/fonts/roboto-v15-cyrillic_latin-italic.woff2 new file mode 100644 index 000000000..a80f41528 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-italic.woff2 differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-regular.woff b/public/fonts/roboto-v15-cyrillic_latin-regular.woff new file mode 100644 index 000000000..a2ada2f46 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-regular.woff differ diff --git a/public/fonts/roboto-v15-cyrillic_latin-regular.woff2 b/public/fonts/roboto-v15-cyrillic_latin-regular.woff2 new file mode 100644 index 000000000..a3b35e686 Binary files /dev/null and b/public/fonts/roboto-v15-cyrillic_latin-regular.woff2 differ diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index de87950dc..97d8a89e2 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -15,7 +15,7 @@ module.exports = function (ngApp, events) { */ ngApp.directive('toggleSwitch', function () { return { - restrict: 'E', + restrict: 'A', template: toggleSwitchTemplate, scope: true, link: function (scope, element, attrs) { @@ -198,6 +198,30 @@ module.exports = function (ngApp, events) { } scope.tinymce.extraSetups.push(tinyMceSetup); + + // Custom tinyMCE plugins + tinymce.PluginManager.add('customhr', function(editor) { + editor.addCommand('InsertHorizontalRule', function() { + var hrElem = document.createElement('hr'); + var cNode = editor.selection.getNode(); + var parentNode = cNode.parentNode; + parentNode.insertBefore(hrElem, cNode); + }); + + editor.addButton('hr', { + icon: 'hr', + tooltip: 'Horizontal line', + cmd: 'InsertHorizontalRule' + }); + + editor.addMenuItem('hr', { + icon: 'hr', + text: 'Horizontal line', + cmd: 'InsertHorizontalRule', + context: 'insert' + }); + }); + tinymce.init(scope.tinymce); } } diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js index de7b3e687..5617fa5be 100644 --- a/resources/assets/js/pages/page-form.js +++ b/resources/assets/js/pages/page-form.js @@ -11,7 +11,7 @@ var mceOptions = module.exports = { extended_valid_elements: 'pre[*]', automatic_uploads: false, valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]", - plugins: "image table textcolor paste link fullscreen imagetools code hr autosave lists", + plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists", imagetools_toolbar: 'imageoptions', toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen", content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}", diff --git a/resources/assets/sass/_fonts.scss b/resources/assets/sass/_fonts.scss index 8cf677779..c9dff31e1 100644 --- a/resources/assets/sass/_fonts.scss +++ b/resources/assets/sass/_fonts.scss @@ -1,102 +1,97 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on December 30, 2015 */ +// Generated using https://google-webfonts-helper.herokuapp.com + +/* roboto-100 - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-bold-webfont.eot'); - src: url('/fonts/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-bold-webfont.woff2') format('woff2'), - url('/fonts/roboto-bold-webfont.woff') format('woff'), - url('/fonts/roboto-bold-webfont.ttf') format('truetype'), - url('/fonts/roboto-bold-webfont.svg#robotobold') format('svg'); - font-weight: bold; font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), + url('/fonts/roboto-v15-cyrillic_latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-100italic - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-bolditalic-webfont.eot'); - src: url('/fonts/roboto-bolditalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-bolditalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-bolditalic-webfont.woff') format('woff'), - url('/fonts/roboto-bolditalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-bolditalic-webfont.svg#robotobold_italic') format('svg'); - font-weight: bold; font-style: italic; + font-weight: 100; + src: local('Roboto Thin Italic'), local('Roboto-ThinItalic'), + url('/fonts/roboto-v15-cyrillic_latin-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-300 - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-italic-webfont.eot'); - src: url('/fonts/roboto-italic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-italic-webfont.woff2') format('woff2'), - url('/fonts/roboto-italic-webfont.woff') format('woff'), - url('/fonts/roboto-italic-webfont.ttf') format('truetype'), - url('/fonts/roboto-italic-webfont.svg#robotoitalic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-light-webfont.eot'); - src: url('/fonts/roboto-light-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-light-webfont.woff2') format('woff2'), - url('/fonts/roboto-light-webfont.woff') format('woff'), - url('/fonts/roboto-light-webfont.ttf') format('truetype'), - url('/fonts/roboto-light-webfont.svg#robotolight') format('svg'); + font-style: normal; font-weight: 300; - font-style: normal; + src: local('Roboto Light'), local('Roboto-Light'), + url('/fonts/roboto-v15-cyrillic_latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-300italic - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-lightitalic-webfont.eot'); - src: url('/fonts/roboto-lightitalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-lightitalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-lightitalic-webfont.woff') format('woff'), - url('/fonts/roboto-lightitalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-lightitalic-webfont.svg#robotolight_italic') format('svg'); + font-style: italic; font-weight: 300; - font-style: italic; + src: local('Roboto Light Italic'), local('Roboto-LightItalic'), + url('/fonts/roboto-v15-cyrillic_latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-regular - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-medium-webfont.eot'); - src: url('/fonts/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-medium-webfont.woff2') format('woff2'), - url('/fonts/roboto-medium-webfont.woff') format('woff'), - url('/fonts/roboto-medium-webfont.ttf') format('truetype'), - url('/fonts/roboto-medium-webfont.svg#robotomedium') format('svg'); - font-weight: 500; font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), + url('/fonts/roboto-v15-cyrillic_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-italic - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-mediumitalic-webfont.eot'); - src: url('/fonts/roboto-mediumitalic-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-mediumitalic-webfont.woff2') format('woff2'), - url('/fonts/roboto-mediumitalic-webfont.woff') format('woff'), - url('/fonts/roboto-mediumitalic-webfont.ttf') format('truetype'), - url('/fonts/roboto-mediumitalic-webfont.svg#robotomedium_italic') format('svg'); - font-weight: 500; font-style: italic; + font-weight: 400; + src: local('Roboto Italic'), local('Roboto-Italic'), + url('/fonts/roboto-v15-cyrillic_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* roboto-500 - cyrillic_latin */ @font-face { font-family: 'Roboto'; - src: url('/fonts/roboto-regular-webfont.eot'); - src: url('/fonts/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-regular-webfont.woff2') format('woff2'), - url('/fonts/roboto-regular-webfont.woff') format('woff'), - url('/fonts/roboto-regular-webfont.ttf') format('truetype'), - url('/fonts/roboto-regular-webfont.svg#robotoregular') format('svg'); - font-weight: normal; font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), + url('/fonts/roboto-v15-cyrillic_latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* roboto-500italic - cyrillic_latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 500; + src: local('Roboto Medium Italic'), local('Roboto-MediumItalic'), + url('/fonts/roboto-v15-cyrillic_latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* roboto-700 - cyrillic_latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), + url('/fonts/roboto-v15-cyrillic_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* roboto-700italic - cyrillic_latin */ +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 700; + src: local('Roboto Bold Italic'), local('Roboto-BoldItalic'), + url('/fonts/roboto-v15-cyrillic_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+ */ + url('/fonts/roboto-v15-cyrillic_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-mono-regular - latin */ -// https://google-webfonts-helper.herokuapp.com @font-face { font-family: 'Roboto Mono'; font-style: normal; diff --git a/resources/assets/sass/_forms.scss b/resources/assets/sass/_forms.scss index 4a505c5f8..482cf54bd 100644 --- a/resources/assets/sass/_forms.scss +++ b/resources/assets/sass/_forms.scss @@ -248,4 +248,9 @@ div[editor-type="markdown"] .title-input.page-title input[type="text"] { .image-picker img { background-color: #BBB; +} + +div[toggle-switch] { + height: 18px; + width: 150px; } \ No newline at end of file diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 7e38154d5..1d4f2ebda 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -4,11 +4,11 @@ @include('settings/navbar', ['selected' => 'settings']) -
+

Settings

-
+ {!! csrf_field() !!}

App Settings

@@ -21,12 +21,12 @@
- +

For performance reasons, all images are public by default, This option adds a random, hard-to-guess characters in front of image names. Ensure directory indexes are not enabled to prevent easy access.

- +
@@ -61,7 +61,7 @@
- +
@@ -78,7 +78,7 @@

If domain restriction is used then email confirmation will be required and the below value will be ignored.

- +
@@ -94,6 +94,9 @@
+ + BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }} +