Changeset 814

Timestamp:

04/18/08 15:47:34 (5 months ago)

Author:

seancribbs

Message:

Merge branch 'master' of git://github.com/mghaught/radiant

Files:

• trunk/radiant/app/models/standard_tags.rb (modified) (1 diff)
• trunk/radiant/spec/models/standard_tags_spec.rb (modified) (1 diff)

trunk/radiant/app/models/standard_tags.rb

@@ -332 +332 @@
-        tag.expand
-    end
+  end
+
+  desc %{
+    Renders the contained elements if the current contextual page is either the actual page or one of its parents.
+
+                This is typically used inside another tag (like <r:children:each>) to add conditional mark-up if the child element is or descends from the current page.
+                    
+    *Usage:*
+    <pre><code><r:if_ancestor_or_self>...</if_ancestor_or_self></code></pre>
+  }  
+        tag "if_ancestor_or_self" do |tag|
+                tag.expand if (tag.globals.actual_page.ancestors + [tag.globals.actual_page]).include?(tag.locals.page)
+        end
+        
+  desc %{
+    Renders the contained elements if the current contextual page is also the actual page.
+
+                This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is the current page.
+                
+                *Usage:*
+    <pre><code><r:if_self>...</if_self></code></pre>
+  }
+  tag "if_self" do |tag|
+    tag.expand if tag.locals.page == tag.globals.actual_page
-  end
-  

trunk/radiant/spec/models/standard_tags_spec.rb

@@ -464 +464 @@
-  end
-  
+        describe "<r:if_ancestor_or_self>" do
+          it "should render the tag's content when the current page is an ancestor of tag.locals.page" do
+        page(:home).should render(%{<r:find url="/radius"><r:if_ancestor_or_self>true</r:if_ancestor_or_self></r:find>}).as('true')
+          end     
+        
+                it "should not render the tag's content when current page is not an ancestor of tag.locals.page" do
+            page(:parent).should render(%{<r:find url="/radius"><r:if_ancestor_or_self>true</r:if_ancestor_or_self></r:find>}).as('')
+          end
+        end
+
-  private
-