Skip to content

Commit

Permalink
re #76 factorized search/result
Browse files Browse the repository at this point in the history
  • Loading branch information
allan-simon committed Jul 5, 2013
1 parent 0aba578 commit b943bb6
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 39 deletions.
2 changes: 1 addition & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 25 additions & 0 deletions app/src/views/webs/commons/search/result.tmpl
Original file line number Diff line number Diff line change
@@ -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() %>
<h2><% gt "Research results for \"{1}\"" using query %></h2>
<% include end_module() %>
<% foreach article in articles %>
<% item %>
<% include begin_module() %>
<h3><% include article_link(article) %></h3>
<%= article.content | ext markdown %>
<% include end_module() %>
<% end %>
<% end foreach %>

<% end template %>



<% end view %>
<% end skin %>
21 changes: 1 addition & 20 deletions app/src/views/webs/responsive/search/result.tmpl
Original file line number Diff line number Diff line change
@@ -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() %>
<h2><% gt "Research results for \"{1}\"" using query %></h2>
<% include end_module() %>
<% foreach article in articles %>
<% item %>
<% include begin_module() %>
<h3><% include article_link(article) %></h3>
<%= 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 %>
19 changes: 1 addition & 18 deletions app/src/views/webs/tatoeba/search/result.tmpl
Original file line number Diff line number Diff line change
@@ -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() %>
<h2><% gt "Research results for \"{1}\"" using query %></h2>
<% include end_module() %>
<% foreach article in articles %>
<% item %>
<% include begin_module() %>
<h3><% include article_link(article) %></h3>
<%= 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 %>

0 comments on commit b943bb6

Please sign in to comment.