aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Merge photo comments feature #114

Merged
aheathershaw merged 28 commits from feature/4-commenting-on-photos into master 2018-10-05 23:37:26 +01:00
Conversation 0 Commits 28 Files Changed 155 +24
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2e71b0084 - Show all commits

2
app/Helpers/ConfigHelper.php
View File

@ -98,6 +98,7 @@ class ConfigHelper
return array( return array(
'albums_menu_parents_only' => false, 'albums_menu_parents_only' => false,
'albums_menu_number_items' => 10, 'albums_menu_number_items' => 10,
'allow_photo_comments' => false,
'allow_self_registration' => true, 'allow_self_registration' => true,
'analytics_code' => '', 'analytics_code' => '',
'app_name' => trans('global.app_name'), 'app_name' => trans('global.app_name'),
@ -111,6 +112,7 @@ class ConfigHelper
'hotlink_protection' => false, 'hotlink_protection' => false,
'items_per_page' => 12, 'items_per_page' => 12,
'items_per_page_admin' => 10, 'items_per_page_admin' => 10,
'photo_comments_require_login' => true,
'public_statistics' => true, 'public_statistics' => true,
'recaptcha_enabled_registration' => false, 'recaptcha_enabled_registration' => false,
'recaptcha_secret_key' => '', 'recaptcha_secret_key' => '',

2
app/Http/Controllers/Admin/DefaultController.php
View File

@ -231,9 +231,11 @@ class DefaultController extends Controller
$checkboxKeys = [ $checkboxKeys = [
'albums_menu_parents_only', 'albums_menu_parents_only',
'allow_photo_comments',
'allow_self_registration', 'allow_self_registration',
'enable_visitor_hits', 'enable_visitor_hits',
'hotlink_protection', 'hotlink_protection',
'photo_comments_require_login',
'recaptcha_enabled_registration', 'recaptcha_enabled_registration',
'remove_copyright', 'remove_copyright',
'require_email_verification', 'require_email_verification',

4
resources/lang/en/forms.php
View File

@ -47,6 +47,10 @@ return [
'save_action' => 'Save Changes', 'save_action' => 'Save Changes',
'select' => 'Select', 'select' => 'Select',
'select_current_text' => '(current)', 'select_current_text' => '(current)',
'settings_allow_photo_comments' => 'Allow comments on photos',
'settings_allow_photo_comments_help' => 'With this option enabled, users can comment on individual photos.',
'settings_photo_comments_require_login' => 'Require login before posting comments',
'settings_photo_comments_require_login_help' => 'If this option is enabled, users must login before they can post comments.',
'settings_hotlink_protection' => 'Prevent hot-linking to images', 'settings_hotlink_protection' => 'Prevent hot-linking to images',
'settings_hotlink_protection_help' => 'With this option enabled, direct linking to images is not allowed. Photos can only be viewed through Blue Twilight.', 'settings_hotlink_protection_help' => 'With this option enabled, direct linking to images is not allowed. Photos can only be viewed through Blue Twilight.',
'settings_restrict_originals_download' => 'Restrict access to original images', 'settings_restrict_originals_download' => 'Restrict access to original images',

16
resources/views/themes/base/admin/settings.blade.php
View File

@ -330,6 +330,22 @@
{{-- Social --}} {{-- Social --}}
<div role="tabpanel" class="tab-pane" id="social-tab"> <div role="tabpanel" class="tab-pane" id="social-tab">
<div class="form-check"> <div class="form-check">
<input type="checkbox" class="form-check-input" id="allow-photo-comments" name="allow_photo_comments" @if (old('allow_photo_comments', UserConfig::get('allow_photo_comments')))checked="checked"@endif>
<label class="form-check-label" for="allow-photo-comments">
<strong>@lang('forms.settings_allow_photo_comments')</strong><br/>
@lang('forms.settings_allow_photo_comments_help')
</label>
</div>
<div class="form-check mt-3">
<input type="checkbox" class="form-check-input" id="photo-comments-require-login" name="photo_comments_require_login" @if (old('photo_comments_require_login', UserConfig::get('photo_comments_require_login')))checked="checked"@endif>
<label class="form-check-label" for="photo-comments-require-login">
<strong>@lang('forms.settings_photo_comments_require_login')</strong><br/>
@lang('forms.settings_photo_comments_require_login_help')
</label>
</div>
<div class="form-check mt-3">
<input type="checkbox" class="form-check-input" id="social-user-profiles" name="social_user_profiles" @if (old('social_user_profiles', UserConfig::get('social_user_profiles')))checked="checked"@endif> <input type="checkbox" class="form-check-input" id="social-user-profiles" name="social_user_profiles" @if (old('social_user_profiles', UserConfig::get('social_user_profiles')))checked="checked"@endif>
<label class="form-check-label" for="social-user-profiles"> <label class="form-check-label" for="social-user-profiles">
<strong>@lang('forms.settings_social_user_profiles')</strong><br/> <strong>@lang('forms.settings_social_user_profiles')</strong><br/>