Context Navigation

← Previous Change
Next Change →

Changeset 3219 for trunk/search_templates

Timestamp:

12/03/08 07:58:25 (12 months ago)

Author:

fumiakiy

Message:

Merging the latest of fireball branch to trunk. svn merge -r3095:3215 http://code.sixapart.com/svn/movabletype/branches/fireball . (two conflicts resolved; MT.pm, mt.php and mt-check.cgi merged manually.)

Location:

trunk/search_templates

Files:

: 4 modified

comments.tmpl (modified) (2 diffs)
default.tmpl (modified) (7 diffs)
results_feed.tmpl (modified) (1 diff)
results_feed_rss2.tmpl (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/search_templates/comments.tmpl

r2384	r3219
24	24
25	25	<div id="banner">
26		<h1><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName$></a></h1>
27		<h2><$MTBlogDescription$></h2>
	26	<h1><a href="<$MTBlogURL$>" accesskey="1"><$MTBlogName encode_html="1"$></a></h1>
	27	<h2><$MTBlogDescription encode_html="1"$></h2>
28	28	</div>
29	29
…	…
55	55
56	56	<MTSearchResults>
57		<h3><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></h3>
58		<p><$MTEntryExcerpt$> <$MTEntryEditLink$></p>
59		<p class="posted"><MT_TRANS phrase="Posted in [_1] on [_2]" params="<$MTBlogName$>%%<$MTEntryDate$>"></p>
	57	<h3><a href="<$MTEntryPermalink$>"><$MTEntryTitle encode_html="1"$></a></h3>
	58	<p><$MTEntryExcerpt encode_html="1"$> <$MTEntryEditLink$></p>
	59	<p class="posted"><MT_TRANS phrase="Posted in [_1] on [_2]" params="<$MTBlogName encode_html="1" encode_html="1"$>%%<$MTEntryDate$>"></p>
60	60	</MTSearchResults>
61	61

trunk/search_templates/default.tmpl

r2384	r3219
57	57	<h3 class="search-results-header">
58	58	<MTIfStraightSearch>
59		<MT_TRANS phrase="Matching entries from [_1]" params="<$MTBlogName$>">
	59	<MT_TRANS phrase="Matching entries from [_1]" params="<$MTBlogName encode_html="1" encode_html="1"$>">
60	60	</MTIfStraightSearch>
61	61	<MTIfTagSearch>
62		<MT_TRANS phrase="Entries from [_1] tagged with '[_2]'" params="<$MTBlogName~~$>%%<$MTSearchString~~$>">
	62	<MT_TRANS phrase="Entries from [_1] tagged with '[_2]'" params="<$MTBlogName encode_html="1" encode_html="1"$>%%<$MTSearchString encode_html="1"$>">
63	63	</MTIfTagSearch>
64	64	</h3>
…	…
66	66	</MTBlogResultHeader>
67	67
68		<h3><a href="<$MTEntryPermalink$>"><$MTEntryTitle$></a></h3>
69		<p><$MTEntryExcerpt$> <$MTEntryEditLink$></p>
	68	<h3><a href="<$MTEntryPermalink$>"><$MTEntryTitle encode_html="1"$></a></h3>
	69	<p><$MTEntryExcerpt encode_html="1"$> <$MTEntryEditLink$></p>
70	70	<MTIfTagSearch>
71	71	<div class="entry-tags">
…	…
73	73	<ul class="entry-tags-list">
74	74	<MTEntryTags>
75		<li class="entry-tag"><a href="<$MTTagSearchLink$>&IncludeBlogs=<$MTSearchIncludeBlogs$>" rel="tag"><$MTTagName$></a></li>
	75	<li class="entry-tag"><a href="<$MTTagSearchLink$>&IncludeBlogs=<$MTSearchIncludeBlogs$>" rel="tag"><$MTTagName encode_html="1"$></a></li>
76	76	</MTEntryTags>
77	77	</ul>
…	…
80	80
81	81	<p class="entry-footer">
82		<span class="post-footers"><MT_TRANS phrase="Posted <MTIfNonEmpty tag="EntryAuthorDisplayName">by [_1] </MTIfNonEmpty>on [_2]" params="<$MTEntryAuthorDisplayName$>%%<$MTEntryDate$>"></span>
	82	<span class="post-footers"><MT_TRANS phrase="Posted <MTIfNonEmpty tag="EntryAuthorDisplayName">by [_1] </MTIfNonEmpty>on [_2]" params="<$MTEntryAuthorDisplayName encode_html="1"$>%%<$MTEntryDate$>"></span>
83	83	</p>
84	84
…	…
97	97	<h3 class="search-results-header">
98	98	<MTIfStraightSearch>
99		<MT_TRANS phrase="Entries matching '[_1]'" params="<$MTSearchString$>">
	99	<MT_TRANS phrase="Entries matching '[_1]'" params="<$MTSearchString encode_html="1"$>">
100	100	</MTIfStraightSearch>
101	101	<MTIfTagSearch>
102		<MT_TRANS phrase="Entries tagged with '[_1]'" params="<$MTSearchString$>">
	102	<MT_TRANS phrase="Entries tagged with '[_1]'" params="<$MTSearchString encode_html="1"$>">
103	103	</MTIfTagSearch>
104	104	</h3>
105		<p><MT_TRANS phrase="No pages were found containing '[_1]'." params="<$MTSearchString$>"></p>
	105	<p><MT_TRANS phrase="No pages were found containing '[_1]'." params="<$MTSearchString encode_html="1"$>"></p>
106	106	</MTNoSearchResults>
107	107
…	…
133	133	<MTIfTagSearch>
134	134	<MTSetVar name="search_feed_param" value="tag">
135		<MTSetVarBlock name="search_feed_description"><MT_TRANS phrase="If you use an RSS reader, you can subscribe to a feed of all future entries tagged '[_1]'." params="<$MTSearchString$>"></MTSetVarBlock>
	135	<MTSetVarBlock name="search_feed_description"><MT_TRANS phrase="If you use an RSS reader, you can subscribe to a feed of all future entries tagged '[_1]'." params="<$MTSearchString encode_html="1"$>"></MTSetVarBlock>
136	136	<MTElse>
137	137	<MTSetVar name="search_feed_param" value="search">
138		<MTSetVarBlock name="search_feed_description"><MT_TRANS phrase="If you use an RSS reader, you can subscribe to a feed of all future entries matching '[_1]'." params="<$MTSearchString$>"></MTSetVarBlock>
	138	<MTSetVarBlock name="search_feed_description"><MT_TRANS phrase="If you use an RSS reader, you can subscribe to a feed of all future entries matching '[_1]'." params="<$MTSearchString encode_html="1"$>"></MTSetVarBlock>
139	139	</MTElse>
140	140	</MTIfTagSearch>
…	…
166	166	<ul class="module-list">
167	167	<MTTags>
168		<li class="module-list-item taglevel<$MTTagRank$>"><a href="<$MTTagSearchLink$>" title="<$MTTagCount$>"><$MTTagName$></a></li>
	168	<li class="module-list-item taglevel<$MTTagRank$>"><a href="<$MTTagSearchLink$>" title="<$MTTagCount$>"><$MTTagName encode_html="1"$></a></li>
169	169	</MTTags>
170	170	</ul>

trunk/search_templates/results_feed.tmpl

r1098	r3219
3	3	xmlns="http://www.w3.org/2005/Atom"
4	4	xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
5		<title><MT_TRANS phrase="Search Results for [_1]" params="<$MTSearchString remove_html="1" encode_xml="1"$>"></title>
	5	<title><MT_TRANS phrase="Search Results for [_1]" params="<$MTSearchString remove_html="1" encode_html="1" encode_xml="1"$>"></title>
6	6	<id>tag:<$MTCGIHost exclude_port="1" encode_xml="1"$>,<$MTDate format="%Y"$>:<$MTCGIRelativeURL encode_xml="1"$>/feed/<$MTSearchString remove_html="1" encode_xml="1"$></id>
7	7	<link rel="self" type="application/atom+xml" href="<$MTCGIPath$><$MTSearchScript$>?search=<$MTSearchString$>&Template=<$MTSearchTemplateID$>&IncludeBlogs=<$MTSearchIncludeBlogs$>" />

trunk/search_templates/results_feed_rss2.tmpl

r1098	r3219
2	2	<rss version="2.0" xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/">
3	3	<channel>
4		<title><MT_TRANS phrase="Search Results for [_1]" params="<$MTSearchString remove_html="1" encode_xml="1"$>"></title>
	4	<title><MT_TRANS phrase="Search Results for [_1]" params="<$MTSearchString remove_html="1" encode_html="1" encode_xml="1"$>"></title>
5	5	<link><$MTCGIPath$><$MTSearchScript$>?search=<$MTSearchString$>&Template=<$MTSearchTemplateID$>&IncludeBlogs=<$MTSearchIncludeBlogs$></link>
6	6	<language>en-us</language>