BASICテンプレートのTrip表示を復活させた。

satopian · Nov 2, 2024 · 7e578b9 · 7e578b9
1 parent 6d94638
commit 7e578b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/potiboard5/templates/basic/basic.css b/potiboard5/templates/basic/basic.css
@@ -294,7 +294,7 @@ input.pch_upload {
 }
 
 .article_info_desc {
-	padding-right: 4px;
+	padding-right: 2px;
 	display: inline-block;
 }
 
@@ -871,6 +871,11 @@ tr.deltable_tr{
 	background-color: #fff7f7;
 }
 
+span.article_info_trip {
+		margin: 0 0 0 -4px;
+		padding-right: 2px;
+}
+
 .use_neo,.use_animation,.bold_gray {
 	font-weight: 700;
 	color: #666;

diff --git a/potiboard5/templates/basic/main.blade.php b/potiboard5/templates/basic/main.blade.php
@@ -116,8 +116,7 @@
 		@if(!isset($res['not_deleted'])||$res['not_deleted'])
 		<div class="article_info">
 			<span class="article_info_name"><a href="{{$self}}?mode=search&page=1&imgsearch=on&query={{$res['encoded_name']}}&radio=2"
-			target="_blank" rel="noopener">{{$res['name']}}</a></span>
-			@if($res['trip'])<span class="article_info_desc">{{$res['trip']}}</span>@endif
+			target="_blank" rel="noopener">{{$res['name']}}</a></span>@if($res['trip'])<span class="article_info_trip">{{$res['trip']}}</span>@endif
 			@if($res['url'])<span class="article_info_desc">[<a href="{{$res['url']}}" target="_blank"
 					rel="nofollow noopener noreferrer">URL</a>]</span> @endif
 			@if($res['id'])<span class="article_info_desc">ID:{{$res['id']}}</span>@endif

diff --git a/potiboard5/templates/basic/res.blade.php b/potiboard5/templates/basic/res.blade.php
@@ -57,13 +57,10 @@
 
 		@foreach ($oya as $i=>$ress)
 
-{{-- <!--親記事グループ--> --}}
-{{-- 個別スレッドのループここから --}}
 {{-- スレッドのループ --}}
 {{-- 親記事グループ --}}
 <article>
 	@if(isset($ress) and !@empty($ress))
-
 	@foreach ($ress as $i => $res)
 	{{-- 親記事ヘッダ --}}
 	@if ($loop->first)
@@ -81,12 +78,12 @@
 		@if(!isset($res['not_deleted'])||$res['not_deleted'])
 		<div class="article_info">
 			<span class="article_info_name"><a href="{{$self}}?mode=search&page=1&imgsearch=on&query={{$res['encoded_name']}}&radio=2"
-					target="_blank" rel="noopener">{{$res['name']}}</a></span>
-					@if($res['trip'])<span class="article_info_desc">{{$res['trip']}}</span>@endif
-					@if($res['url'])<span class="article_info_desc">[<a href="{{$res['url']}}" target="_blank"
+			target="_blank" rel="noopener">{{$res['name']}}</a></span>@if($res['trip'])<span class="article_info_trip">{{$res['trip']}}</span>@endif
+			@if($res['url'])<span class="article_info_desc">[<a href="{{$res['url']}}" target="_blank"
 					rel="nofollow noopener noreferrer">URL</a>]</span> @endif
 			@if($res['id'])<span class="article_info_desc">ID:{{$res['id']}}</span>@endif
-			<span class="article_info_desc">{{$res['now']}}</span>@if($res['painttime'])<span
+			<span class="article_info_desc">{{$res['now']}}</span>
+			@if($res['painttime'])<span
 			class="article_info">描画時間:{{$res['painttime']}}</span>@endif
 			@if($res['tool'])<span class="article_info_desc">Tool:{{$res['tool']}}</span>@endif
 			@if($res['updatemark'])<span class="article_info_desc">{{$res['updatemark']}}</span>@endif
@@ -113,6 +110,7 @@ class="article_info_animation">☆<a href="{{$self}}?mode=openpch&pch={{$res['pc
 			</div>
 			@endif
 			<div class="comment">{!!$res['com']!!}</div>
+
 			{{-- // $res/tab…TAB順用連番
 			// $res/imgsrc…サムネイルがあるとき、サムネイルURL。サムネイルがないとき、画像URL
 			// $res/w…画像サイズ(横)