fix topics indicator in submission editor

diff --git a/src/newslash_web/css/newslash/editor.less b/src/newslash_web/css/newslash/editor.less
index 4e542c3..786efe4 100644 (file)
--- a/src/newslash_web/css/newslash/editor.less
+++ b/src/newslash_web/css/newslash/editor.less
@@ -1,3 +1,11 @@
 /* editor.less */
 
-textarea.editor { &:extend(.tallest); }
\ No newline at end of file
+textarea.editor { &:extend(.tallest); }
+
+.tag-editor {
+    .topic-items li {
+        &:extend(.flatten);
+        text-align: center;
+        img { display: block; }
+    }
+}

diff --git a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
index 46106d6..13bd296 100644 (file)
--- a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
@@ -300,23 +300,23 @@ sub _generate_site_config {
         $mod_reasons->{$k} = $reasons->{$k}->{name};
     }
 
-    # my $keywords = {};
-    # for my $topic (@$topics) {
-    #     my $lc_keyword = lc($topic->{keyword});
-    #     my $lc_textname = lc($topic->{textname});
-    #     $keywords->{$lc_keyword} = {keyword => $topic->{keyword},
-    #                                 textname => $topic->{textname},
-    #                                 image => $topic->{image}};
-    #     if ($lc_keyword ne $lc_textname) {
-    #         $keywords->{$lc_textname} = $keywords->{$lc_keyword};
-    #     }
-    # }
+    my $keywords = {};
+    for my $topic (@$topics) {
+        my $lc_keyword = lc($topic->{keyword});
+        my $lc_textname = lc($topic->{textname});
+        $keywords->{$lc_keyword} = {keyword => $topic->{keyword},
+                                    textname => $topic->{textname},
+                                    image => $topic->{image}};
+        if ($lc_keyword ne $lc_textname) {
+            $keywords->{$lc_textname} = $keywords->{$lc_keyword};
+        }
+    }
 
     my $value = {
                  modReasons => $mod_reasons,
                  siteInfo => { topic_icon_base_url => $c->config->{Site}->{topic_icon_base_url} },
-                 #topics => $keywords,
-                 topics => \@topic_texts,
+                 topics => $keywords,
+                 #topics => \@topic_texts,
                  editorConfig => $c->config->{Editor},
                  acl2Types => {},
                 };

diff --git a/src/newslash_web/public/js/ns-util.js b/src/newslash_web/public/js/ns-util.js
index b669326..fcb2ed3 100644 (file)
--- a/src/newslash_web/public/js/ns-util.js
+++ b/src/newslash_web/public/js/ns-util.js
@@ -73,8 +73,9 @@ var nsUtil = {
   },
 
   topicIconURL: function topicIconURL(keyword) {
-    if (keyword && siteConfig.topics[keyword] && topics[keyword].image) {
-      return siteInfo.topicIconBaseURL + "/" + topics[keyword].image;
+    var topics = siteConfig.topics;
+    if (keyword && topics[keyword] && topics[keyword].image) {
+      return siteConfig.siteInfo.topic_icon_base_url + "/" + topics[keyword].image;
     }
     return "";
   },

diff --git a/src/newslash_web/templates/common/article/editor.html.tt2 b/src/newslash_web/templates/common/article/editor.html.tt2
index 144ce70..b2d8a54 100644 (file)
--- a/src/newslash_web/templates/common/article/editor.html.tt2
+++ b/src/newslash_web/templates/common/article/editor.html.tt2
@@ -79,7 +79,7 @@
 
       <div class="topics">
         <label>トピックス（タグに応じて自動的に設定されます）：</label>
-        <ol class="list-inline">
+        <ol class="topic-items">
           <li v-for="topic in currentTopics">
             <img :src="topicIconURL(topic)" v-show="topicIconURL(topic)" />
             <span v-text="topic"></span>