Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[コア] twitter・facebookボタンの汎用化対応 #1769

Merged
merged 2 commits into from Jul 19, 2023
Merged

[コア] twitter・facebookボタンの汎用化対応 #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56c1fe4
refactor: ブログ, 表示条件のTwitter・Twitterアイコン表示のコードのスリム化
akagane99 Jul 19, 2023
d3f95ef
refactor: twitter・facebookボタンの汎用化対応
akagane99 Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions resources/views/plugins/common/facebook.blade.php
View file
Open in desktop
Expand Up @@ -2,16 +2,15 @@
* facebook ボタンテンプレート
*
* @param $post_title (プラグインで項目名が異なることがあるため、あえて明示的変数にしています)
* @param $share_connect_url
* @param $frame_config_name 取得するFrameConfigの設定名
*
* // 暗黙で利用
* @param $frame
* @param $frame_configs
* @param $page
* @param $post (インクルード元と名前が異なる場合は、インクルード元から名前指定の引数で渡すようにしてください)
--}}
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_facebook_button) == ShowType::show)
@if (FrameConfig::getConfigValueAndOld($frame_configs, $frame_config_name) == ShowType::show)
<a class="btn btn-sm btn-link btn-light border"
href="javascript:void window.open('{{urlencode("http://www.facebook.com/share.php?u=")}}{{url("/plugin/blogs/show/$page->id/$frame_id/$post->id&t=$post_title")}}','_blank');">
href="javascript:void window.open('{{urlencode("http://www.facebook.com/share.php?u=")}}{{url("$share_connect_url&t=$post_title")}}','_blank');">
<h6 class="d-inline"><i class="fab fa-facebook-square"></i></h6>
</a>
@endif
9 changes: 4 additions & 5 deletions resources/views/plugins/common/twitter.blade.php
View file
Open in desktop
Expand Up @@ -2,16 +2,15 @@
* Twitter アイコンテンプレート
*
* @param $post_title (プラグインで項目名が異なることがあるため、あえて明示的変数にしています)
* @param $share_connect_url
* @param $frame_config_name 取得するFrameConfigの設定名
*
* // 暗黙で利用
* @param $frame
* @param $frame_configs
* @param $page
* @param $post (インクルード元と名前が異なる場合は、インクルード元から名前指定の引数で渡すようにしてください)
--}}
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_twitter_button) == ShowType::show)
@if (FrameConfig::getConfigValueAndOld($frame_configs, $frame_config_name) == ShowType::show)
<a class="btn btn-sm btn-link btn-light border"
href="javascript:void window.open('{{urlencode("http://twitter.com/intent/tweet?text=$post_title ")}}{{urlencode(url("/plugin/blogs/show/$page->id/$frame_id/$post->id"))}}','_blank');">
href="javascript:void window.open('{{urlencode("http://twitter.com/intent/tweet?text=$post_title ")}}{{urlencode(url($share_connect_url))}}','_blank');">
<h6 class="d-inline"><i class="fab fa-twitter"></i></h6>
</a>
@endif
8 changes: 6 additions & 2 deletions resources/views/plugins/user/blogs/default/blogs.blade.php
View file
Open in desktop
Expand Up @@ -182,12 +182,16 @@

{{-- Twitterボタン --}}
@include('plugins.common.twitter', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_twitter_button,
])

{{-- Facebookボタン --}}
@include('plugins.common.facebook', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_facebook_button,
])

{{-- タグ --}}
Expand Down
58 changes: 22 additions & 36 deletions resources/views/plugins/user/blogs/default/blogs_setting_frame.blade.php
View file
Open in desktop
Expand Up @@ -143,49 +143,35 @@ class="form-control col-sm-3 @if ($errors->has(BlogFrameConfig::blog_view_count)

{{-- Twitterアイコン表示 --}}
<div class="form-group row">
<label class="{{$frame->getSettingLabelClass()}}">{{BlogFrameConfig::getDescription('blog_display_twitter_button')}}</label>
<label class="{{$frame->getSettingLabelClass()}}">{{BlogFrameConfig::getDescription(BlogFrameConfig::blog_display_twitter_button)}}</label>
<div class="{{$frame->getSettingInputClass(true)}}">
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_twitter_button) == '' ||
FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_twitter_button) == ShowType::not_show)
<input type="radio" value="{{ShowType::not_show}}" id="{{BlogFrameConfig::blog_display_twitter_button}}_0" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{ShowType::not_show}}" id="{{BlogFrameConfig::blog_display_twitter_button}}_0" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="{{BlogFrameConfig::blog_display_twitter_button}}_0" id="label_{{BlogFrameConfig::blog_display_twitter_button}}_0">{{ShowType::getDescription(ShowType::not_show)}}</label>
</div>
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_twitter_button) == ShowType::show)
<input type="radio" value="{{ShowType::show}}" id="{{BlogFrameConfig::blog_display_twitter_button}}_1" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{ShowType::show}}" id="{{BlogFrameConfig::blog_display_twitter_button}}_1" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="{{BlogFrameConfig::blog_display_twitter_button}}_1" id="label_{{BlogFrameConfig::blog_display_twitter_button}}_1">{{ShowType::getDescription(ShowType::show)}}</label>
</div>
@foreach (ShowType::getMembers() as $enum_value => $enum_label)
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_twitter_button, ShowType::not_show) == $enum_value)
<input type="radio" value="{{$enum_value}}" id="blog_display_twitter_button_{{$enum_value}}" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{$enum_value}}" id="blog_display_twitter_button_{{$enum_value}}" name="{{BlogFrameConfig::blog_display_twitter_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="blog_display_twitter_button_{{$enum_value}}">{{$enum_label}}</label>
</div>
@endforeach
</div>
</div>

{{-- Facebookアイコン表示 --}}
<div class="form-group row">
<label class="{{$frame->getSettingLabelClass()}}">{{BlogFrameConfig::getDescription('blog_display_facebook_button')}}</label>
<label class="{{$frame->getSettingLabelClass()}}">{{BlogFrameConfig::getDescription(BlogFrameConfig::blog_display_facebook_button)}}</label>
<div class="{{$frame->getSettingInputClass(true)}}">
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_facebook_button) == '' ||
FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_facebook_button) == ShowType::not_show)
<input type="radio" value="{{ShowType::not_show}}" id="{{BlogFrameConfig::blog_display_facebook_button}}_0" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{ShowType::not_show}}" id="{{BlogFrameConfig::blog_display_facebook_button}}_0" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="{{BlogFrameConfig::blog_display_facebook_button}}_0" id="label_{{BlogFrameConfig::blog_display_facebook_button}}_0">{{ShowType::getDescription(ShowType::not_show)}}</label>
</div>
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_facebook_button) == ShowType::show)
<input type="radio" value="{{ShowType::show}}" id="{{BlogFrameConfig::blog_display_facebook_button}}_1" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{ShowType::show}}" id="{{BlogFrameConfig::blog_display_facebook_button}}_1" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="{{BlogFrameConfig::blog_display_facebook_button}}_1" id="label_{{BlogFrameConfig::blog_display_facebook_button}}_1">{{ShowType::getDescription(ShowType::show)}}</label>
</div>
@foreach (ShowType::getMembers() as $enum_value => $enum_label)
<div class="custom-control custom-radio custom-control-inline">
@if (FrameConfig::getConfigValueAndOld($frame_configs, BlogFrameConfig::blog_display_facebook_button, ShowType::not_show) == $enum_value)
<input type="radio" value="{{$enum_value}}" id="blog_display_facebook_button_{{$enum_value}}" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input" checked="checked">
@else
<input type="radio" value="{{$enum_value}}" id="blog_display_facebook_button_{{$enum_value}}" name="{{BlogFrameConfig::blog_display_facebook_button}}" class="custom-control-input">
@endif
<label class="custom-control-label text-nowrap" for="blog_display_facebook_button_{{$enum_value}}">{{$enum_label}}</label>
</div>
@endforeach
</div>
</div>

Expand Down
8 changes: 6 additions & 2 deletions resources/views/plugins/user/blogs/default/blogs_show.blade.php
View file
Open in desktop
Expand Up @@ -116,12 +116,16 @@

{{-- Twitterボタン --}}
@include('plugins.common.twitter', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_twitter_button,
])

{{-- Facebookボタン --}}
@include('plugins.common.facebook', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_facebook_button,
])

{{-- タグ --}}
Expand Down
8 changes: 6 additions & 2 deletions resources/views/plugins/user/blogs/designbase/blogs_show.blade.php
View file
Open in desktop
Expand Up @@ -64,12 +64,16 @@

{{-- Twitterボタン --}}
@include('plugins.common.twitter', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_twitter_button,
])

{{-- Facebookボタン --}}
@include('plugins.common.facebook', [
'post_title' => $post->post_title,
'post_title' => $post->post_title,
'share_connect_url' => "/plugin/blogs/show/$page->id/$frame_id/$post->id",
'frame_config_name' => BlogFrameConfig::blog_display_facebook_button,
])
{{-- タグ --}}
@isset($post_tags)
Expand Down