r1498 - xwiki/trunk/src/main/web/templates

[Phung Hai Nam]

Author: namphunghai
Date: 2006-11-03 11:05:07 +0100 (Fri, 03 Nov 2006)
New Revision: 1498

Modified:
   xwiki/trunk/src/main/web/templates/browsewysiwyg.vm
   xwiki/trunk/src/main/web/templates/searchwysiwyg.vm
Log:
Indent the code of browsewysiwyg.vm and searchwysiwyg.vm

Modified: xwiki/trunk/src/main/web/templates/browsewysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/browsewysiwyg.vm	2006-11-03 04:42:49 UTC (rev 1497)
+++ xwiki/trunk/src/main/web/templates/browsewysiwyg.vm	2006-11-03 10:05:07 UTC (rev 1498)
@@ -6,29 +6,21 @@
         #set($text = "")
     #end
     <p style="font-weight:bold"> $msg.get("listofallexistspages") : </p>
-    #if ($text == "")
-        #set($sql = "")
-    #else
-        #set ($sql = "where doc.web like '%$text%'  order by doc.date desc")
-    #end
 
+    #set ($sql = "where doc.web like '%$text%'  order by doc.date desc")
     #set ($start = 0)
     #set ($nb = 50)
 
-    <!--
-    Sql: $sql
-    Sql: $start
-    Sql: $nb
-    -->
     <table width="95%">
-    #foreach ($item in $xwiki.searchDocuments($sql , $nb , $start))
-    #if ($xwiki.hasAccessLevel("view", "${context.database}:${item}"))
-    <tr>
-    #set($bentrydoc = $xwiki.getDocument($item))
-      <td>* <a href="#" onclick="document.forms[0].wiki_page.value='$bentrydoc.name';if ('$doc.web' != '$bentrydoc.web') document.forms[0].wiki_space.value='$bentrydoc.web'; else document.forms[0].wiki_space.value=''; return false;">
-          $bentrydoc.name </a>created by  $xwiki.getLocalUserName($bentrydoc.author) on $xwiki.formatDate($bentrydoc.date,"MMMM dd, yyyy HH:mm") </td>
-    </tr>
-    #end
-    #end
+        #foreach ($item in $xwiki.searchDocuments($sql , $nb , $start))
+            #if ($xwiki.hasAccessLevel("view", "${context.database}:${item}"))
+                <tr>
+                    #set($bentrydoc = $xwiki.getDocument($item))
+                    <td>* <a href="#" onclick="document.forms[0].wiki_page.value='$bentrydoc.name';if ('$doc.web' != '$bentrydoc.web') document.forms[0].wiki_space.value='$bentrydoc.web'; else document.forms[0].wiki_space.value=''; return false;">
+                        $bentrydoc.name </a>created by  $xwiki.getLocalUserName($bentrydoc.author) on $xwiki.formatDate($bentrydoc.date,"MMMM dd, yyyy HH:mm")
+                     </td>
+                 </tr>
+            #end
+        #end
     </table>
 </div>
\ No newline at end of file

Modified: xwiki/trunk/src/main/web/templates/searchwysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/searchwysiwyg.vm	2006-11-03 04:42:49 UTC (rev 1497)
+++ xwiki/trunk/src/main/web/templates/searchwysiwyg.vm	2006-11-03 10:05:07 UTC (rev 1498)
@@ -1,46 +1,33 @@
 <div class="xwikidatacontent">
     #set($rsvc= $xwiki.xWiki.getRightService())
     #if ($request.getParameter("space"))
-    #set ($space = $request.getParameter("space") )
+        #set ($space = $request.getParameter("space") )
     #else
-    #set($space = "")
+        #set($space = "")
     #end
 
     #if ($request.getParameter("page"))
-    #set ($page = $request.getParameter("page") )
+        #set ($page = $request.getParameter("page") )
     #else
-    #set($page = "")
+        #set($page = "")
     #end
+
     <p style="font-weight:bold"> $msg.get("listofresultspages") : </p>
-    #if (($page == "") && ($space == ""))
-        #set($sql = "")
-    #elseif($page == "")
-        #set($sql = "where doc.web like '%$space%' order by doc.date desc")
-    #elseif($space == "")
-        #set($sql = "where doc.name like '%$page%' order by doc.date desc")
-    #else
-        #set($sql = "where doc.web like '%$space%' and doc.name like '%$page%' order by doc.date desc")
-    #end
 
+    #set($sql = "where doc.web like '%$space%' and doc.name like '%$page%' order by doc.date desc")
     #set ($start = 0)
     #set ($nb = 50)
 
-    <!--
-    Sql: $sql
-    Sql: $start
-    Sql: $nb
-    -->
     <table width="95%">
-
     #foreach ($item in $xwiki.searchDocuments($sql , $nb , $start))
-    #if ($xwiki.hasAccessLevel("view", "${context.database}:${item}"))
-    <tr>
-    #set($bentrydoc = $xwiki.getDocument($item))
-     <td>* <a href="#" onclick="document.forms[0].wiki_page.value='$bentrydoc.name';if ('$doc.web' != '$bentrydoc.web') document.forms[0].wiki_space.value='$bentrydoc.web'; else document.forms[0].wiki_space.value=''; return false;">
-          $bentrydoc.name </a>created by  $xwiki.getLocalUserName($bentrydoc.author) on $xwiki.formatDate($bentrydoc.date,"MMMM dd, yyyy HH:mm") </td>
-    </tr>
+        #if ($xwiki.hasAccessLevel("view", "${context.database}:${item}"))
+            <tr>
+                #set($bentrydoc = $xwiki.getDocument($item))
+                <td>* <a href="#" onclick="document.forms[0].wiki_page.value='$bentrydoc.name';if ('$doc.web' != '$bentrydoc.web') document.forms[0].wiki_space.value='$bentrydoc.web'; else document.forms[0].wiki_space.value=''; return false;">
+                       $bentrydoc.name </a>created by  $xwiki.getLocalUserName($bentrydoc.author) on $xwiki.formatDate($bentrydoc.date,"MMMM dd, yyyy HH:mm")
+                </td>
+            </tr>
+        #end
     #end
-    #end
     </table>
-
 </div>
\ No newline at end of file