Changeset 796:3f73e7a26c84

Timestamp:

10/19/09 10:11:20 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@797

Message:

partially updated for the new response objects

Files:

• WebContent/WEB-INF/resources/templates/xhtml10.vm (modified) (2 diffs)

WebContent/WEB-INF/resources/templates/xhtml10.vm

@@ -45 +45 @@
                 $ucn.evaluate($lang, $ref, "<span class=\"name\">$unicorncall.getObserverName($observationName, $lang)#if($observation.Rating) ($observation.Rating/100)#end</span>")
                 #if ($observation.getFilteredRequestUri())<a class="direct_link" href="$observation.getFilteredRequestUri()" title="$direct_link_title_1">$direct_link_label</a>
-                #else <a class="direct_link" href="$observation.getBaseURI($observationName)" title="$direct_link_title_2">$direct_link_label</a>#end
+                #else <a class="direct_link" href="$observation.getHTMLRequestUri()" title="$direct_link_title_2">$direct_link_label</a>#end
         </h2>
         
         <div class="results block">
+        #if ($observation.hasGroups())
+                #foreach($group in $observation.getGroups())
+                        #if (!$group.hasParent())
+                                <div>$group.getTitle()</div>
+                                <div>$group.getDescription()</div>
+                                #foreach($message in $observation.getMessages())
+                                        #if ($message.getGroupName() && $message.getGroupName() == $group.getName())
+                                                <div style="margin-left:25px">$message.getTitle()
+                                                $message.getDescription()</div>
+                                        #end
+                                #end
+                                #foreach($group in $observation.getGroupChildren($group))
+                                        <div class="child" style="margin-left:50px">$group.getTitle()</div>
+                                        <div class="child" style="margin-left:50px">$group.getDescription()</div>
+                                        #foreach($message in $observation.getMessages())
+                                                #if ($message.getGroupName() && $message.getGroupName() == $group.getName())
+                                                        <div style="margin-left:75px">$message.getTitle()
+                                                        $message.getDescription()</div>
+                                                #end
+                                        #end
+                                        #foreach($group in $observation.getGroupChildren($group))
+                                                <div class="child2" style="margin-left:100px">$group.getTitle()</div>
+                                                <div class="child2" style="margin-left:100px">$group.getDescription()</div>
+                                                #foreach($message in $observation.getMessages())
+                                                        #if ($message.getGroupName() && $message.getGroupName() == $group.getName())
+                                                                <div style="margin-left:125px">$message.getTitle()
+                                                                $message.getDescription()</div>
+                                                        #end
+                                                #end
+                                        #end
+                                #end
+                        #end
+                #end
+        #else
+        
         #if ($infoCount && $infoCount > 0)
                 <div class="section infos" id="${observationName}_info">
@@ -192 +227 @@
                 </div>
         #end
+        
+        #end
         </div>
 </div>