diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 3e1c62c..522f43d 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6) project(tatowiki) # set the version -set(PROJECT_VERSION "0.20.0") +set(PROJECT_VERSION "0.20.1") set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}) add_custom_target( dist diff --git a/app/src/views/webs/commons/search/result.tmpl b/app/src/views/webs/commons/search/result.tmpl new file mode 100644 index 0000000..f4a1212 --- /dev/null +++ b/app/src/views/webs/commons/search/result.tmpl @@ -0,0 +1,25 @@ +<% c++ #include "contents/Search.h" %> +<% skin %> +<% view common_search_result uses contents::search::Result extends master %> +<% template title() %><% gt "Research results for: \"{1}\" " using query %><% end template %> + + +<% template main_content() %> + <% include begin_module() %> +

<% gt "Research results for \"{1}\"" using query %>

+ <% include end_module() %> + <% foreach article in articles %> + <% item %> + <% include begin_module() %> +

<% include article_link(article) %>

+ <%= article.content | ext markdown %> + <% include end_module() %> + <% end %> + <% end foreach %> + +<% end template %> + + + +<% end view %> +<% end skin %> diff --git a/app/src/views/webs/responsive/search/result.tmpl b/app/src/views/webs/responsive/search/result.tmpl index 02b4203..1868e48 100644 --- a/app/src/views/webs/responsive/search/result.tmpl +++ b/app/src/views/webs/responsive/search/result.tmpl @@ -1,25 +1,6 @@ <% c++ #include "contents/Search.h" %> <% skin %> -<% view search_result uses contents::search::Result extends master %> -<% template title() %><% gt "Research results for: \"{1}\" " using query %><% end template %> - - -<% template main_content() %> - <% include begin_module() %> -

<% gt "Research results for \"{1}\"" using query %>

- <% include end_module() %> - <% foreach article in articles %> - <% item %> - <% include begin_module() %> -

<% include article_link(article) %>

- <%= article.content | ext markdown %> - <% include end_module() %> - <% end %> - <% end foreach %> - -<% end template %> - - +<% view search_result uses contents::search::Result extends common_search_result %> <% end view %> <% end skin %> diff --git a/app/src/views/webs/tatoeba/search/result.tmpl b/app/src/views/webs/tatoeba/search/result.tmpl index 418259f..1868e48 100644 --- a/app/src/views/webs/tatoeba/search/result.tmpl +++ b/app/src/views/webs/tatoeba/search/result.tmpl @@ -1,23 +1,6 @@ <% c++ #include "contents/Search.h" %> <% skin %> -<% view search_result uses contents::search::Result extends master %> -<% template title() %><% gt "Research results for: \"{1}\" " using query %><% end template %> - - -<% template main_content() %> - <% include begin_module() %> -

<% gt "Research results for \"{1}\"" using query %>

- <% include end_module() %> - <% foreach article in articles %> - <% item %> - <% include begin_module() %> -

<% include article_link(article) %>

- <%= article.content | ext markdown %> - <% include end_module() %> - <% end %> - <% end foreach %> - -<% end template %> +<% view search_result uses contents::search::Result extends common_search_result %> <% end view %> <% end skin %>