Merge pull request #150 from ContentsViewer/pre

tagデザイン修正. タグ提示調整

Author: ContentsViewer

Client/ContentsViewer/ContentsViewerStandard.css

@@ -745,14 +745,13 @@ ul.tagline {
   padding: 0;
   list-style: none;
 }
-
 ul.tagline li {
+  position: relative;
   display: inline-block;
   /* margin: 0 0 .3em 1em; */
   margin: 0 0 2px 10px;
   padding: 0;
 }
-
 ul.tagline li a,
 ul.tagline li a:visited {
   position: relative;
@@ -768,10 +767,6 @@ ul.tagline li a:visited {
   -webkit-transition: 0.2s;
   transition: 0.2s;
 }
-ul.tagline li.suggested a,
-ul.tagline li.suggested a:visited{
-  opacity: 0.5;
-}
 ul.tagline li a::before {
   position: absolute;
   top: 0;
@@ -798,30 +793,62 @@ ul.tagline li a::after {
   background-color: #fff;
   border-radius: 100%;
 }
-
-ul.tagline li span {
+ul.tagline li.suggested a,
+ul.tagline li.suggested a:visited{
+  border: solid 1px #3498db;
+  border-left: none;
+  height: 18px;
+  line-height: 18px;;
+  background-color: transparent;
+  color: #3498db;
+}
+ul.tagline li.suggested a::after{
+  background-color: #3498db;
+}
+ul.tagline li.suggested a::before {
+  top: -1px;
+}
+ul.tagline li.suggested::after {
+  position: absolute;
+  content: "";
+  width: 0;
+  height: 0;
+  left: -9px;
+  top: 50%;
+  margin-top: -8px;
+  border-color: transparent #fff transparent transparent;
+  border-style: solid;
+  border-width: 9px 9px 9px 0px;
+  pointer-events: none;
+  -webkit-transition: 0.2s;
+  transition: 0.2s;
+}
+/* ul.tagline li span {
   display: block;
   max-width: 100px;
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
-}
-
+} */
 ul.tagline li a:hover {
-  background-color: #555;
-  color: #fff;
+  background-color: #555 !important;
+  color: #fff !important;
+  border-color: #555 !important;
 }
-
 ul.tagline li a:hover::before {
-  border-right-color: #555;
+  border-right-color: #555 !important;
+}
+ul.tagline li.suggested a:hover::after{
+  background-color: #fff;
+}
+ul.tagline li.suggested:hover::after{
+  opacity: 0;
 }
-
 .left-right-content-link-container {
   margin-top: 41px;
   margin-bottom: 19px;
   overflow: hidden;
 }
-
 a.left-content-link,
 a.right-content-link {
   background-color: rgba(206, 128, 0, 0.5);
@@ -1998,6 +2025,14 @@ a.directory .name, a.file .name{
   [theme="dark"] ul.tagline li a:not(:hover) {
     background-color: var(--tag-background-color);
   }
+  [theme="dark"] ul.tagline li.suggested a:not(:hover) {
+    background-color: transparent;
+    border-color: var(--tag-background-color);
+    color: var(--tag-background-color);
+  }
+  [theme="dark"] ul.tagline li.suggested::after {
+    border-color: transparent #1f1f1f transparent transparent;
+  }
   [theme="dark"] ul.tagline li a:not(:hover)::before {
     border-color: transparent var(--tag-background-color) transparent transparent;
   }

Frontend/contents-viewer.php

@@ -99,6 +99,7 @@
 $metaFileName = ContentsDatabaseManager::GetRelatedMetaFileName($contentPath);
 // メタデータの読み込み
 ContentsDatabaseManager::LoadRelatedMetadata($contentPath);
+$tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
 
 
 // --- navigator作成 -------------------------------------------------
@@ -158,18 +159,12 @@
 ContentsDatabase::SaveMetadata($metaFileName);
 
 $suggestedTags = [];
-if(SearchEngine\Index::Load(
-    CONTENTS_HOME_DIR . $vars['rootDirectory'] . '/.index.tagmap' . $layerSuffix
-)){
-    $titleQuery = NotBlankText(
-        [$currentContent->title, ContentsDatabaseManager::GetContentPathInfo($currentContent->path)['filename']]
-    );
-    $suggestions = SearchEngine\Searcher::Search($titleQuery);
-    foreach($suggestions as $i => $suggested){
-        if($suggested['score'] < 0.8 || in_array($suggested['id'], $currentContent->tags, true)){
-            continue;
-        }
-        $suggestedTags[] = $suggested['id'];
+$contentTitle = NotBlankText(
+    [$currentContent->title, ContentsDatabaseManager::GetContentPathInfo($currentContent->path)['filename']]
+);
+foreach($tag2path as $tag => $paths){
+    if(strpos($contentTitle, $tag) !== false && !in_array($tag, $currentContent->tags, true)){
+        $suggestedTags[] = $tag;
     }
 }
 
@@ -230,8 +225,7 @@
 
 // tagList と 最新のコンテンツ 設定
 if ($currentContent->IsRoot()){
-    $vars['tagList'] = (array_key_exists('tag2path', ContentsDatabase::$metadata) ?
-        ContentsDatabase::$metadata['tag2path'] : []);
+    $vars['tagList'] = $tag2path;
     $out = ContentsDatabaseManager::GetSortedContentsByUpdatedTime(array_keys(ContentsDatabase::$metadata['latest']));
 
     ContentsDatabase::LoadMetadata($metaFileName);

Frontend/related-viewer.php

@@ -30,8 +30,8 @@
 $vars['rootContentPath'] = ContentsDatabaseManager::GetRelatedRootFile($vars['contentPath']);
 $vars['rootDirectory'] = substr(GetTopDirectory($vars['rootContentPath']), 1);
 
-// ContentsDatabaseManager::LoadRelatedMetadata($vars['rootContentPath']);
-// $tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
+ContentsDatabaseManager::LoadRelatedMetadata($vars['rootContentPath']);
+$tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
 // $path2tag = array_key_exists('path2tag', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['path2tag'] : [];
 // ksort($tag2path);
 
@@ -72,16 +72,11 @@
 $title = NotBlankText(
     [$currentContent->title, ContentsDatabaseManager::GetContentPathInfo($currentContent->path)['filename']]
 );
-
-if(SearchEngine\Index::Load(
-    CONTENTS_HOME_DIR . $vars['rootDirectory'] . '/.index.tagmap' . $layerSuffix
-)){
-    $suggestions = SearchEngine\Searcher::Search($title);
-    foreach($suggestions as $i => $suggested){
-        if($suggested['score'] < 0.8 || in_array($suggested['id'], $currentContent->tags, true)){
-            continue;
-        }
-        $titleTagSuggestions[] = ['tag' => $suggested['id'], 'suggestions' => []];
+$titleTagFullMatch = false;
+foreach($tag2path as $tag => $paths){
+    if(strpos($title, $tag) !== false && !in_array($tag, $currentContent->tags, true)){
+        $titleTagFullMatch = ($title === $tag);
+        $titleTagSuggestions[] = ['tag' => $tag, 'suggestions' => []];
     }
 }
 
@@ -94,7 +89,8 @@
         $titleQuery = NotBlankText([$parent->title, $parentPathInfo['filename']]) . ' ' . $titleQuery;
     }
 }
-if($title !== $titleQuery || count($titleTagSuggestions) <= 0){
+
+if(!$titleTagFullMatch || $titleQuery !== $title){
     $titleSuggestions = SelectSuggestions(
         SearchEngine\Searcher::Search($titleQuery), $currentContent->path, $childPathList, 0.5
     );