jford       2003/11/02 21:29:44

  Modified:    webapp/WEB-INF/templates/vm/portlets/html
                        portlet-category-form.vm portlet-form.vm
  Log:
  Added ability to choose existing groups/categories when adding a category
  
  PR: Bugzilla #24342
  
  Revision  Changes    Path
  1.4       +33 -1     
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-category-form.vm
  
  Index: portlet-category-form.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-category-form.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- portlet-category-form.vm  12 Jul 2003 03:59:40 -0000      1.3
  +++ portlet-category-form.vm  3 Nov 2003 05:29:44 -0000       1.4
  @@ -1,3 +1,19 @@
  +<script>
  +     function updateCategory()
  +     {
  +       var categoryIndex = 
document.AddCategoryForm.existing_categories.selectedIndex;
  +       var category = 
document.AddCategoryForm.existing_categories[categoryIndex].value;
  +       document.AddCategoryForm.category_name.value = category;
  +     }
  +     
  +     function updateGroup()
  +     {
  +       var groupIndex = document.AddCategoryForm.existing_groups.selectedIndex;
  +       var group = document.AddCategoryForm.existing_groups[groupIndex].value;
  +       document.AddCategoryForm.category_group.value = group;
  +     }
  +</script>
  +
   <table bgcolor="#ffffff" cellpadding="5">
     <tr>
       <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
  @@ -47,7 +63,7 @@
     </tr>
     <tr>
       <td align="center" bgcolor="$!{skin.TitleBackgroundColor}">
  -      <form name="PortletForm" method="post" 
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
  +      <form name="AddCategoryForm" method="post" 
action="$jslink.getPaneByName("PortletForm").setAction("portlets.PortletUpdateAction")">
           <input type="hidden" name="mode" value="update"/>
           <input type="hidden" name="portlet_name" value="$!entry.Name"/>
           <input type="hidden" name="tab" value="categories"/>
  @@ -59,6 +75,14 @@
               <td bgcolor="$!{skin.TitleBackgroundColor}">
                 <input type="text" name="category_name"/>
               </td>
  +            <td bgcolor="$!{skin.TitleBackgroundColor}">
  +              <select name="existing_categories" onChange="updateCategory();">
  +                     <option 
value="">$l10n.REGISTRY_EDITOR_PORTLET_PICK_CATEGORY</option>
  +             #foreach($category in $categories)
  +               <option value="$category.name">$category.name</option>
  +             #end
  +              </select>
  +            </td>
             </tr>
             <tr>
               <td bgcolor="$!{skin.TitleBackgroundColor}">
  @@ -66,6 +90,14 @@
               </td>
               <td bgcolor="$!{skin.TitleBackgroundColor}">
                 <input type="text" name="category_group"/>
  +            </td>
  +            <td bgcolor="$!{skin.TitleBackgroundColor}">
  +              <select name="existing_groups" onChange="updateGroup();">
  +                     <option 
value="">$l10n.REGISTRY_EDITOR_PORTLET_PICK_GROUP</option>
  +                #foreach($group in $groups)
  +               <option value="$group.name">$group.name</option>
  +                #end
  +              </select>
               </td>
             </tr>
             <tr>
  
  
  
  1.5       +8 -4      
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-form.vm
  
  Index: portlet-form.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-form.vm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- portlet-form.vm   4 Jun 2003 20:59:33 -0000       1.4
  +++ portlet-form.vm   3 Nov 2003 05:29:44 -0000       1.5
  @@ -117,10 +117,14 @@
         <td bgcolor="$!{skin.TitleBackgroundColor}">
           <font face="$ui.sansSerifFonts">
             <select name="parent">
  -              <option value="">No Parent</option>
  -              #foreach($parent in $parents)
  -                  <option value="$parent" #if($!data.user.getTemp("parent") == 
$parent) selected="true" #end>$parent</option>
  -              #end
  +              <option value="">$l10n.REGISTRY_EDITOR_PORTLET_NOPARENT</option>
  +                #foreach($parent in $parents)
  +                       #if($parent.Title)
  +                         <option value="$parent.name" 
#if($!data.user.getTemp("parent") == $parent.name) selected="true" 
#end>$parent.title</option>
  +                       #else
  +                         <option value="$parent.name" 
#if($!data.user.getTemp("parent") == $parent.name) selected="true" 
#end>$parent.name</option>
  +                       #end
  +                     #end
             </select>
           </font>
         </td>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to