check p

@@ -100,6 +100,7 @@ module Kanjai
         end
       end
       session[:url] = @url
+      session[:current_page_id] = @page_data.page.id
     end
 
 

@@ -12,7 +12,19 @@ module Kanjai
 
       Nokogiri::HTML::Builder.with(@doc) do |subparts|
         @repeat_type_index = {}
-        TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0])
+        if type == "subMenuTemplate"
+          type = "menu" 
+          current_page = nil
+          if session[:current_page_id]
+            current_page = Kanjai::Page.find_by_id(session[:current_page_id])
+            while current_page && current_page.parent && current_page.page_template == current_page.parent.page_template
+              current_page = current_page.parent
+            end
+          end
+          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0], current_page)
+        else
+          TemplateGenerator.method("#{type}_generator").call(session, domain, elements, subparts, @original_hash_value[0])
+        end
       end
 
       @doc.css("img[@src]").each do |x|
@@ -32,10 +44,10 @@ module Kanjai
           case item[:name]
             when 'text'
               content = item[:source]
-              if current_page
-                content = content.gsub('###link###', current_page.menu_url('http://', lang = nil))
-                     .gsub('###title###', current_page.lang_attributes(domain.page_langs.default, :title))
-              end
+              #if current_page
+              #  content = content.gsub('###link###', current_page.menu_url('http://', lang = nil))
+              #       .gsub('###title###', current_page.lang_attributes(domain.page_langs.default, :title))
+              #end
               subparts << content
             when 'repeat'
               #get template for normal state, active state and separator
@@ -273,7 +285,8 @@ module Kanjai
               end
             elsif item[:name] == 'p'
               if item[:children].count > 0
-                subparts << "<p>#{self.replace_text_marker('p', item[:children][0][:source], hash_value).html_safe}</p>"
+                #subparts << "<p>#{self.replace_text_marker('p', item[:children][0][:source], hash_value).html_safe}</p>"
+                subparts.p(attributes, self.replace_text_marker('p', item[:children][0][:source], hash_value).html_safe)
               end
             else
               subparts.send(item[:name], attributes) do |next_subparts|

 module Kanjai
-  VERSION = "0.0.303"
+  VERSION = "0.0.304"
 end