portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm
Date Sat, 20 Jul 2002 02:04:28 GMT
taylor      2002/07/19 19:04:28

  Modified:    webapp/WEB-INF/templates/vm/portlets/html browser-psml.vm
  Log:
  Changed the browser table to show the borders. Removed the bugs related to commonality between
two psml files.
  
  Revision  Changes    Path
  1.4       +68 -22    jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm
  
  Index: browser-psml.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-psml.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- browser-psml.vm	3 Jul 2002 02:29:50 -0000	1.3
  +++ browser-psml.vm	20 Jul 2002 02:04:28 -0000	1.4
  @@ -1,6 +1,11 @@
  -<table width="50%" border="0" cellpadding="0" cellspacing="0">
  +<table width=100%" border="1" cellpadding="0" cellspacing="0">
  +<tr>
  +    <td colspan="5"><img src="images/blank.gif" width="20%" height="1" border="0"></td>
  +    <td><img src="images/blank.gif" width="80%" height="1" border="0"></td>
  +</tr>
  +
   #foreach ( $entry in $psml )
  -    
  +
       #if($!entry.GroupName)
           #set ($category = "Group")
           #set ($catName = $!entry.GroupName)
  @@ -23,13 +28,13 @@
       #else
           #set ($mediaType = "null")
       #end
  -    
  +
       #if ($!entry.Language)
           #set ($language = $!entry.Language)
       #else
           #set ($language = "null")
       #end
  -    
  +
       #if ($!entry.Country)
           #set ($country = $!entry.Country)
       #else
  @@ -45,12 +50,13 @@
       #elseif($!entry.UserName)
           #set ($link1 = $jslink.setUser($catName,$entry.Name))
       #end
  -    
  +
       #if ($category != "null")
           #if ($prevCategory == $category)
           #else
               <tr>
                   <td style="font-size:10">$!category</td>
  +                <td colspan=5><img src="images/blank.gif" height="1" border="0"></td>
               </tr>
           #end
       #end
  @@ -59,22 +65,34 @@
           #if($prevCatName == $catName)
           #else
               <tr>
  -                <td style="font-size:10">&nbsp;</td>
  +                <td><img src="images/blank.gif"height="1" border="0"></td>
                   <td style="font-size:10">$!catName</td>
  +                <td colspan=4><img src="images/blank.gif" height="1" border="0"></td>
               </tr>
           #end
       #end
   
       #if ($mediaType != "null")
  -        #set ($link1 = $link1.addPathInfo("mediaType",$mediaType))
  +        #set ($link1 = $link1.addPathInfo("media-type",$mediaType))
           #set ($blank = $blank + 1 )
           #if($prevMediaType == $mediaType)
  +            #if($prevCatName == $catName)
  +            #else
  +            <tr>
  +                #foreach ($index in [1..$blank])
  +                    <td><img src="images/blank.gif" height="1" border="0"></td>
  +                #end
  +                <td style="font-size:10">$mediaType</td>
  +                <td colspan="3"><img src="images/blank.gif" height="1" border="0"></td>
  +        </tr>
  +            #end
           #else
               <tr>
                   #foreach ($index in [1..$blank])
  -                    <td style="font-size:10">&nbsp;</td>
  +                <td><img src="images/blank.gif" height="1" border="0"></td>
                   #end
                   <td style="font-size:10">$mediaType</td>
  +                <td colspan="3"><img src="images/blank.gif" height="1" border="0"></td>
               </tr>
           #end
       #end
  @@ -83,12 +101,23 @@
           #set ($link1 = $link1.addPathInfo("language",$language))
           #set ($blank = $blank + 1 )
           #if($prevLanguage == $language)
  +            #if ($prevMediaType == $mediaType)
  +            #else
  +            <tr>
  +                #foreach ($index in [1..$blank])
  +                    <td style="font-size:10">&nbsp;</td>
  +                #end
  +                <td style="font-size:10">$language</td>
  +                <td colspan="2"><img src="images/blank.gif"height="1" border="0"></td>
  +            </tr>
  +            #end
           #else
           <tr>
               #foreach ($index in [1..$blank])
                   <td style="font-size:10">&nbsp;</td>
               #end
  -            <td style="font-size:10">$language</td>
  +                <td style="font-size:10">$language</td>
  +                <td colspan="2"><img src="images/blank.gif"height="1" border="0"></td>
           </tr>
           #end
       #end
  @@ -97,12 +126,23 @@
           #set ($link1 = $link1.addPathInfo("country",$country))
           #set ($blank = $blank + 1 )
           #if($prevCountry == $country)
  +            #if($prevLanguage == $language)
  +            #else
  +            <tr>
  +                #foreach ($index in [1..$blank])
  +                    <td style="font-size:10">&nbsp;</td>
  +                #end
  +                <td style="font-size:10">$country</td>
  +                <td><img src="images/blank.gif" height="1" border="0"></td>
  +            </tr>
  +            #end
           #else
           <tr>
               #foreach ($index in [1..$blank])
                   <td style="font-size:10">&nbsp;</td>
               #end
  -            <td style="font-size:10">$country</td>
  +                <td style="font-size:10">$country</td>
  +                <td><img src="images/blank.gif" height="1" border="0"></td>
           </tr>
           #end
       #end
  @@ -111,19 +151,25 @@
       <tr>
           #set ($blank = $blank + 1 )
           #foreach ($index in [1..$blank])
  -            <td style="font-size:10">&nbsp;</td>
  +                <td><img src="images/blank.gif"height="1" border="0"></td>
           #end
  -        <td>
  -            <a style="font-size:10" href="$link1">$!entry.Name</a>
  -        </td>
  -        #set ($link2 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","delete").addQueryData("entityid",
$!entry.Path))
  -        <td>
  -            <a style="font-size:10" href='$link2'>Delete</a>
  -        </td>
  -        #set ($link3 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","insert").addQueryData("entityid",
$!entry.Path))
  -        <td>
  -            <a style="font-size:10" href='$link3'>Clone</a>
  +        #set ($number = 6 - $blank)
  +        <td colspan=$number>
  +        <table width="100%" border=0 cellpadding=0 cellspacing=0>
  +            <tr>
  +                <td align=left>
  +                    <a style="font-size:10" href="$link1">$!entry.Name </a>&nbsp;&nbsp;
  +                </td>
  +                <td align=right>
  +                    #set ($link2 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","delete").addQueryData("entityid",
$!entry.Path))
  +                    <a style="font-size:10" href='$link2'>Delete</a>&nbsp;&nbsp;&nbsp;&nbsp;
  +                    #set ($link3 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","insert").addQueryData("entityid",
$!entry.Path))
  +                    <a style="font-size:10" href='$link3'>Clone</a>
  +                </td>
  +            </tr>
  +        </table>
           </td>
  +        
       </tr>
   
       #set ($prevCategory = $category)
  @@ -136,7 +182,7 @@
   <tr/>
   <tr>
       #set ($link4 = $jslink.setPaneByName("PsmlForm").addQueryData("mode","insert"))
  -    <td>
  +    <td colspan=6 align="left">
           <a style="font-size:10" href='$link4'>Add</a>
       </td>
   </tr>
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message