0
@@ -107,6 +107,10 @@ class Site < ActiveRecord::Base
0
     "/#{search_path}?q=#{CGI::escapeHTML(query)}#{%(&page=#{CGI::escapeHTML(page.to_s)}) unless page.blank?}"
0
   end
0
 
0
+  def tag_url(*tags)
0
+    ['', tag_path, *tags] * '/'
0
+  end
0
+
0
   def accept_comments?
0
     comment_age.to_i > -1
0
   end

0
@@ -55,13 +55,13 @@
0
       <label for="site_search_path">Url that the search area is available at.</label>
0
     </dt>
0
     <dd><%= f.text_field :search_path %></dd>
0
-    <% if @templates.any? -%>
0
+    <% if @layouts.any? -%>
0
     <dt>
0
-      <label for="site_search_template">Template used by the search area</label>
0
+      <label for="site_search_layout">Layout template used by the search area</label>
0
     </dt>
0
     <dd>
0
-      <select name="site[search_template]">
0
-        <%= options_from_templates_for_select(@templates, @site.search_template) %>
0
+      <select name="site[search_layout]">
0
+        <%= options_from_templates_for_select(@layouts, @site.search_layout) %>
0
       </select>
0
     </dd>
0
     <% end -%>
0
@@ -69,13 +69,13 @@
0
       <label for="site_tag_path">Url that the tag area is available at.</label>
0
     </dt>
0
     <dd><%= f.text_field :tag_path %></dd>
0
-    <% if @templates.any? -%>
0
+    <% if @layouts.any? -%>
0
     <dt>
0
-      <label for="site_tag_template">Template used by the tag area</label>
0
+      <label for="site_tag_layout">Layout template used by the tag area</label>
0
     </dt>
0
     <dd>
0
-      <select name="site[tag_template]">
0
-        <%= options_from_templates_for_select(@templates, @site.tag_template) %>
0
+      <select name="site[tag_layout]">
0
+        <%= options_from_templates_for_select(@layouts, @site.tag_layout) %>
0
       </select>
0
     </dd>
0
     <% end -%>

0
@@ -2,7 +2,7 @@
0
 # migrations feature of ActiveRecord to incrementally modify your database, and
0
 # then regenerate this schema definition.
0
 
0
-ActiveRecord::Schema.define(:version => 57) do
0
+ActiveRecord::Schema.define(:version => 58) do
0
 
0
   create_table "assets", :force => true do |t|
0
     t.column "content_type",     :string
0
@@ -141,8 +141,8 @@ ActiveRecord::Schema.define(:version => 57) do
0
     t.column "permalink_style",   :string
0
     t.column "search_path",       :string
0
     t.column "tag_path",          :string
0
-    t.column "search_template",   :string
0
-    t.column "tag_template",      :string
0
+    t.column "search_layout",     :string
0
+    t.column "tag_layout",        :string
0
   end
0
 
0
   create_table "taggings", :force => true do |t|

0
@@ -7,7 +7,8 @@ module Mephisto
0
         :single  => [:single,   :index],
0
         :archive => [:archive,  :index],
0
         :search  => [:search,   :archive, :index],
0
-        :error   => [:error,    :index]
0
+        :error   => [:error,    :index],
0
+        :tag     => [:tag,      :archive, :index]
0
       }
0
     
0
       @@template_types = (@@hierarchy.values.flatten.uniq << :layout).collect! { |f| "#{f}.liquid" }

0
@@ -105,9 +105,13 @@ module Mephisto
0
         File.join(section.url, section['archive_path'], date.year.to_s, date.month.to_s)
0
       end
0
       
0
-      def tag_url(tags)
0
+      def tag_url(*tags)
0
         tags = [tags] ; tags.flatten!
0
-        absolute_url @context['site']['tag_path'], *tags
0
+        absolute_url @context['site'].source.tag_url(*tags)
0
+      end
0
+
0
+      def search_url(query, page = nil)
0
+        absolute_url @context['site'].source.search_url(query, page)
0
       end
0
 
0
       def page_url(page)

0
@@ -29,4 +29,15 @@ context "Url Filter" do
0
     assert_equal "/stylesheets/foo.css", stylesheet_url('foo.css')
0
     assert_equal "/images/foo.gif",      asset_url('foo.gif')
0
   end
0
+  
0
+  specify "should generate tag urls" do
0
+    assert_equal "/tags",         tag_url
0
+    assert_equal "/tags/foo",     tag_url('foo')
0
+    assert_equal "/tags/foo/bar", tag_url('foo', 'bar')
0
+  end
0
+  
0
+  specify "should generate search urls" do
0
+    assert_equal '/search?q=abc',        search_url('abc')
0
+    assert_equal '/search?q=abc&page=2', search_url('abc', 2)
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -36,6 +36,12 @@ context "Site" do
0
     assert_equal '/search?q=abc',        sites(:first).search_url('abc')
0
     assert_equal '/search?q=abc&page=2', sites(:first).search_url('abc', 2)
0
   end
0
+  
0
+  specify "should generate tag url" do
0
+    assert_equal '/tags',         sites(:first).tag_url
0
+    assert_equal '/tags/foo',     sites(:first).tag_url('foo')
0
+    assert_equal '/tags/foo/bar', sites(:first).tag_url('foo', 'bar')
0
+  end
0
 end
0
 
0
 context "Default Site Options" do