From bb275f269d0a7b0d4de5a3451fe71c94695c2a91 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 19 Oct 2004 19:28:32 +0000 Subject: [PATCH] - merge search results git-svn-id: file:///svn/phpbb/trunk@5004 89ea8834-ac86-4346-8a33-228a782c2dd0 --- .../subSilver/template/search_results.html | 120 ++++++++++++++++++ .../template/search_results_posts.html | 75 ----------- .../template/search_results_topics.html | 66 ---------- 3 files changed, 120 insertions(+), 141 deletions(-) create mode 100644 phpBB/styles/subSilver/template/search_results.html delete mode 100644 phpBB/styles/subSilver/template/search_results_posts.html delete mode 100644 phpBB/styles/subSilver/template/search_results_topics.html diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html new file mode 100644 index 0000000000..451b9a2406 --- /dev/null +++ b/phpBB/styles/subSilver/template/search_results.html @@ -0,0 +1,120 @@ + + + + +
+ + + + + + + + + +
{SEARCH_MATCHES}
{L_SEARCHED_FOR}: {SEARCH_WORDS} {L_IGNORED_TERMS}: {IGNORED_WORDS}{L_SEARCH_IN_RESULTS}:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
  {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LAST_POST} 
{searchresults.TOPIC_FOLDER_IMG}{searchresults.TOPIC_ICON_IMG} + + {UNAPPROVED_IMG}  + + + {REPORTED_IMG}  + +

{topicrow.ATTACH_ICON_IMG} {searchresults.TOPIC_TITLE}

+ +

[ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ]

+ +

in {searchresults.FORUM_TITLE}

+

{searchresults.TOPIC_AUTHOR}

{searchresults.REPLIES}

{searchresults.VIEWS}

 +

{searchresults.LAST_POST_TIME}

+

{searchresults.LAST_POST_AUTHOR}{searchresults.LAST_POST_AUTHOR} + {searchresults.LAST_POST_IMG} +

+
{L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_AUTHOR}{L_MESSAGE}
{searchresults.L_IGNORE_POST}

 {L_FORUM}: {searchresults.FORUM_TITLE}   {L_TOPIC}: {searchresults.TOPIC_TITLE}

{searchresults.POSTER_NAME} + + + +
 {L_POST_SUBJECT}: {searchresults.POST_SUBJECT}
{searchresults.MINI_POST_IMG}{L_POSTED}: {searchresults.POST_DATE} 

{L_REPLIES}: {searchresults.TOPIC_REPLIES}
{L_VIEWS}: {searchresults.TOPIC_VIEWS}

 + + + +
{searchresults.MESSAGE}
{L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
+ + +
+ +
{PAGE_NUMBER} [ {TOTAL_MATCHES} ]
{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
+ +

+ + + + + +
{L_INDEX}
{S_TIMEZONE}
+ +
+ +
+ + \ No newline at end of file diff --git a/phpBB/styles/subSilver/template/search_results_posts.html b/phpBB/styles/subSilver/template/search_results_posts.html deleted file mode 100644 index f1b193aec6..0000000000 --- a/phpBB/styles/subSilver/template/search_results_posts.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - -
- - - - - - - - - -
{SEARCH_MATCHES}
{L_SEARCHED_FOR} {SEARCH_WORDS} {L_IGNORED_TERMS} {IGNORED_WORDS}{L_SEARCH_IN_RESULTS}:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_AUTHOR}{L_MESSAGE}
{searchresults.L_IGNORE_POST}

 {L_FORUM}: {searchresults.FORUM_TITLE}   {L_TOPIC}: {searchresults.TOPIC_TITLE}

{searchresults.POSTER_NAME} - - - -
 {L_POST_SUBJECT}: {searchresults.POST_SUBJECT}
{searchresults.MINI_POST_IMG}{L_POSTED}: {searchresults.POST_DATE} 

{L_REPLIES}: {searchresults.TOPIC_REPLIES}
{L_VIEWS}: {searchresults.TOPIC_VIEWS}

 - - - -
{searchresults.MESSAGE}
{L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
- -
{PAGE_NUMBER} [ {TOTAL_TOPICS} ]
{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
- -

- - - - - -
-

{L_INDEX}

-

{S_TIMEZONE}

-
- -
- -
- - \ No newline at end of file diff --git a/phpBB/styles/subSilver/template/search_results_topics.html b/phpBB/styles/subSilver/template/search_results_topics.html deleted file mode 100644 index 39c24e4b55..0000000000 --- a/phpBB/styles/subSilver/template/search_results_topics.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - -
- - - - - -
{L_INDEX}
{S_TIMEZONE}
- -
- - - - - - - - - -
{SEARCH_MATCHES}
{L_SEARCHED_FOR} {SEARCH_WORDS} {L_IGNORED_TERMS} {IGNORED_WORDS}{L_SEARCH_IN_RESULTS}:
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
  {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LAST_POST} 
{searchresults.TOPIC_FOLDER_IMG}{searchresults.TOPIC_ICON_IMG}{searchresults.TOPIC_TITLE}
{topicrow.GOTO_PAGE}
in {searchresults.FORUM_TITLE}		{searchresults.TOPIC_AUTHOR}{searchresults.TOPIC_REPLIES}{searchresults.TOPIC_VIEWS}{searchresults.LAST_POST_TIME}
{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}
{L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
- -
{PAGE_NUMBER} [ {TOTAL_TOPICS} ]
{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
- -

- - - - - -
{L_INDEX}
{S_TIMEZONE}
- -
- -
- - \ No newline at end of file