mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-28 21:22:30 +00:00
Merge branch 'footer-links' of git://github.com/james-geiger/BookStack into james-geiger-footer-links
This commit is contained in:
commit
a663364223
@ -37,6 +37,10 @@ return [
|
|||||||
'app_homepage' => 'Application Homepage',
|
'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_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_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' => 'Disable Comments',
|
||||||
'app_disable_comments_toggle' => '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.',
|
'app_disable_comments_desc' => 'Disables comments across all pages in the application. <br> Existing comments are not shown.',
|
||||||
|
17
resources/sass/_footer.scss
Normal file
17
resources/sass/_footer.scss
Normal file
@ -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;
|
||||||
|
}
|
@ -25,4 +25,8 @@ body {
|
|||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
@include lightDark(color, #444, #AAA);
|
@include lightDark(color, #444, #AAA);
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
|
background-color: #F2F2F2;
|
||||||
|
height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
}
|
}
|
@ -95,6 +95,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#content {
|
||||||
|
flex: 1 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Flexbox layout system
|
* Flexbox layout system
|
||||||
*/
|
*/
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
@import "codemirror";
|
@import "codemirror";
|
||||||
@import "components";
|
@import "components";
|
||||||
@import "header";
|
@import "header";
|
||||||
|
@import "footer";
|
||||||
@import "lists";
|
@import "lists";
|
||||||
@import "pages";
|
@import "pages";
|
||||||
|
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
@yield('content')
|
@yield('content')
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@include('common.footer')
|
||||||
|
|
||||||
<div back-to-top class="primary-background print-hidden">
|
<div back-to-top class="primary-background print-hidden">
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
@icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
|
@icon('chevron-up') <span>{{ trans('common.back_to_top') }}</span>
|
||||||
|
10
resources/views/common/footer.blade.php
Normal file
10
resources/views/common/footer.blade.php
Normal file
@ -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
|
@ -179,6 +179,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</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>
|
<div>
|
||||||
<label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
|
<label for="setting-app-custom-head" class="setting-list-label">{{ trans('settings.app_custom_html') }}</label>
|
||||||
|
Loading…
Reference in New Issue
Block a user