Merge branch 'footer-links' of git://github.com/james-geiger/BookStack into james...

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 414650d21bac0c5187afc841de93f0f0ea40aaed..878a9991ffd09dd1559cd4bbebdb542680157118 100755 (executable)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -37,6 +37,10 @@ return [
     'app_homepage' => 'Application Homepage',
     'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.',
     'app_homepage_select' => 'Select a page',
+    'app_footer_links' => 'Footer Links',
+    'app_footer_links_desc' => 'Certain countries may require that websites include a privacy policy or terms of service.  You may provide links to those here, which will then be displayed at the bottom of each page.',
+    'app_privacy_policy' => 'Privacy Policy',
+    'app_terms_of_service' => 'Terms of Service',
     'app_disable_comments' => 'Disable Comments',
     'app_disable_comments_toggle' => 'Disable comments',
     'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',

diff --git a/resources/sass/_footer.scss b/resources/sass/_footer.scss
new file mode 100644 (file)
index 0000000..9609115
--- /dev/null
+++ b/resources/sass/_footer.scss
@@ -0,0 +1,17 @@
+/**
+ * Includes the footer links.
+ */
+
+ footer {
+    flex-shrink: 0;
+    padding: .5em;
+    text-align: center;
+  }
+  
+  footer a {
+    margin: 0 .5em;
+  }
+  
+  body.flexbox footer {
+    display: none;
+  }
\ No newline at end of file

diff --git a/resources/sass/_html.scss b/resources/sass/_html.scss
index 57869d6520b04aa6a90ea5405c36d8a95de0927f..0262956691a0f4fc978b72f6ac6d56a25637cf15 100644 (file)
--- a/resources/sass/_html.scss
+++ b/resources/sass/_html.scss
@@ -25,4 +25,8 @@ body {
   line-height: 1.6;
   @include lightDark(color, #444, #AAA);
   -webkit-font-smoothing: antialiased;
-}
\ No newline at end of file
+  background-color: #F2F2F2;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}

diff --git a/resources/sass/_layout.scss b/resources/sass/_layout.scss
index 4873ff2da651ee1575a048a4973f95069fa0a343..c12cae256e6d424dcd3e590c115ecfceca3c20ad 100644 (file)
--- a/resources/sass/_layout.scss
+++ b/resources/sass/_layout.scss
@@ -95,6 +95,10 @@
   }
 }
 
+#content {
+  flex: 1 0 auto;
+}
+
 /**
  * Flexbox layout system
  */

diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss
index 78d94f977f8d0043679557148fc00af97a8cd276..614b7f295a5b22e6adb8eaf428207267ed5ec3c1 100644 (file)
--- a/resources/sass/styles.scss
+++ b/resources/sass/styles.scss
@@ -15,6 +15,7 @@
 @import "codemirror";
 @import "components";
 @import "header";
+@import "footer";
 @import "lists";
 @import "pages";
 

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index a5404a36506ae9d70225034a6eeef749eeb86d28..29e4acee7bf8355f7bbda9b17f240e1483cf001f 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -35,6 +35,8 @@
         @yield('content')
     </div>
 
+    @include('common.footer')
+
     <div back-to-top class="primary-background print-hidden">
         <div class="inner">
             @icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>

diff --git a/resources/views/common/footer.blade.php b/resources/views/common/footer.blade.php
new file mode 100644 (file)
index 0000000..a056f6d
--- /dev/null
+++ b/resources/views/common/footer.blade.php
@@ -0,0 +1,10 @@
+@if(setting('app-privacy-policy') | setting('app-terms-of-service'))
+<footer>
+    @if(setting('app-privacy-policy'))
+        <a href="{{ setting('app-privacy-policy') }}">{{ trans('settings.app_privacy_policy') }}</a>
+    @endif
+    @if(setting('app-terms-of-service'))
+        <a href="{{ setting('app-terms-of-service') }}">{{ trans('settings.app_terms_of_service') }}</a>
+    @endif
+</footer>
+@endif
\ No newline at end of file

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 8adc1045b46d15a8744e15f06d54b3992d07a3e6..34d3cad9293c882ed789cfb91a4a35321487e313 100644 (file)
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -179,6 +179,21 @@
                         </div>
                     </div>
 
+                    <div>
+                        <label for="setting-app-privacy-link" class="setting-list-label">{{ trans('settings.app_footer_links') }}</label>
+                        <p class="small">{{ trans('settings.app_footer_links_desc') }}</p>
+                        <div class="grid half pt-m">
+                            <div>
+                                <label for="setting-app-privacy-policy" class="text-dark">{{ trans('settings.app_privacy_policy') }}</label>
+                                <input type="text" value="{{ setting('app-privacy-policy', '') }}" name="setting-app-privacy-policy" id="setting-app-privacy-policy">
+                            </div>
+                            <div>
+                                <label for="setting-app-terms-of-service" class="text-dark">{{ trans('settings.app_terms_of_service') }}</label>
+                                <input type="text" value="{{ setting('app-terms-of-service', '') }}" name="setting-app-terms-of-service" id="setting-app-terms-of-service">
+                            </div>
+                        </div>
+                    </div>
+
 
                     <div>
                         <label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>