Merge branch 'v0.9' into release

@@ -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]);
     }
 
     /**

@@ -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);
             }
         }

@@ -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;}",

-/* 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-style: normal;
+  font-weight: 300;
+  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-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: italic;
   font-weight: 300;
+  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';
   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-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-weight: 300;
   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-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: 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';
-  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: 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';
-  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: 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;

@@ -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

@@ -4,11 +4,11 @@
 
     @include('settings/navbar', ['selected' => 'settings'])
 
-<div class="container small">
+<div class="container small settings-container">
 
     <h1>Settings</h1>
 
-    <form action="/settings" method="POST">
+    <form action="/settings" method="POST" ng-cloak>
         {!! csrf_field() !!}
 
         <h3>App Settings</h3>
@@ -21,12 +21,12 @@
                 </div>
                 <div class="form-group">
                     <label>Allow public viewing?</label>
-                    <toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></toggle-switch>
+                    <div toggle-switch name="setting-app-public" value="{{ setting('app-public') }}"></div>
                 </div>
                 <div class="form-group">
                     <label>Enable higher security image uploads?</label>
                     <p class="small">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.</p>
-                    <toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></toggle-switch>
+                    <div toggle-switch name="setting-app-secure-images" value="{{ setting('app-secure-images') }}"></div>
                 </div>
                 <div class="form-group">
                     <label for="setting-app-editor">Page editor</label>
@@ -61,7 +61,7 @@
             <div class="col-md-6">
                 <div class="form-group">
                     <label for="setting-registration-enabled">Allow registration?</label>
-                    <toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></toggle-switch>
+                    <div toggle-switch name="setting-registration-enabled" value="{{ setting('registration-enabled') }}"></div>
                 </div>
                 <div class="form-group">
                     <label for="setting-registration-role">Default user role after registration</label>
@@ -78,7 +78,7 @@
                 <div class="form-group">
                     <label for="setting-registration-confirmation">Require email confirmation?</label>
                     <p class="small">If domain restriction is used then email confirmation will be required and the below value will be ignored.</p>
-                    <toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></toggle-switch>
+                    <div toggle-switch name="setting-registration-confirmation" value="{{ setting('registration-confirmation') }}"></div>
                 </div>
             </div>
             <div class="col-md-6">
@@ -94,6 +94,9 @@
         <hr class="margin-top">
 
         <div class="form-group">
+            <span class="float right muted">
+                BookStack @if(strpos($version, 'v') !== 0) version @endif {{ $version }}
+            </span>
             <button type="submit" class="button pos">Save Settings</button>
         </div>
     </form>