Polish website

mixitconf · May 2, 2017 · 15bab08 · 15bab08
1 parent b6d3594
commit 15bab08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/main/kotlin/mixit/web/handler/BlogHandler.kt b/src/main/kotlin/mixit/web/handler/BlogHandler.kt
@@ -63,7 +63,7 @@ fun Post.toDto(author: User, language: Language) = PostDto(
         addedAt.formatDate(language),
         title[language] ?: "",
         headline[language] ?: "",
-        if (content != null) content[language] else  "")
+        if (content != null) content[language] else  null)
 
 class Feed(
         val title: String,

diff --git a/src/main/resources/templates/post.mustache b/src/main/resources/templates/post.mustache
@@ -15,8 +15,10 @@
         <div class="column large-8 large-offset-2">
             <div class="callout">
 			    <p>{{#markdown}}{{post.headline}}{{/markdown}}</p>
+                {{#post.content}}
                 <hr />
 			    <p>{{#markdown}}{{post.content}}{{/markdown}}</p>
+                {{/post.content}}
 		    </div>
 	    </div>
  	</div>

diff --git a/src/main/resources/templates/talk.mustache b/src/main/resources/templates/talk.mustache
@@ -22,8 +22,10 @@
                 <h1 class="text-center mxt-title--talk">{{talk.title}}</h1>
                 <hr />
                 <p>{{#markdown}}{{talk.summary}}{{/markdown}}</p>
-                <hr />
-                {{#talk.description}}<p>{{#markdown}}{{talk.description}}{{/markdown}}</p>{{/talk.description}}
+                {{#talk.description}}
+                    <hr />
+                    <p>{{#markdown}}{{talk.description}}{{/markdown}}</p>
+                {{/talk.description}}
                 <p class="subheader"><strong>
                     {{#talk.video}}
                         <hr />

diff --git a/src/main/resources/templates/talks.mustache b/src/main/resources/templates/talks.mustache
@@ -59,7 +59,7 @@
                                     {{/speakers}}
                                 </ul>
                                 <hr />
-                                <a href="{{localePrefix}}/{{event}}/{{slug}}" class="button hollow" target="_blank">{{#i18n}}talks.readmore{{/i18n}}</a>
+                                <a href="{{localePrefix}}/{{event}}/{{slug}}" class="button hollow">{{#i18n}}talks.readmore{{/i18n}}</a>
                             </div>
                         </div>
                     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ @@
                                         {{/speakers}}
                                     </ul>
                                     <hr />
-                                    <a href="{{localePrefix}}/{{event}}/{{slug}}" class="button hollow" target="_blank">{{#i18n}}talks.readmore{{/i18n}}</a>
+                                    <a href="{{localePrefix}}/{{event}}/{{slug}}" class="button hollow">{{#i18n}}talks.readmore{{/i18n}}</a>
                                 </div>
                             </div>
                         </div>
@@ Expand Down @@