Changeset 2469


Ignore:
Timestamp:
Jul 11, 2006, 6:21:02 PM (16 years ago)
Author:
dominic
Message:

annotate.jsp update to add categories and modified java doc comment for base.java

Location:
branches/dominic_annotations
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dominic_annotations/src/clients/web/net/sf/basedb/clients/web/Base.java

    r2410 r2469  
    615615  /**
    616616    Gets the category that an annotation type belongs to. The result will include
    617     all categries owned by or shared to the logged in user or
     617    all categories owned by or shared to the logged in user or
    618618    the active project and belonging to the specified.
    619619    @param dc The database control object obatined for the session
    620620    @param annotationType The <code>AnnotationType</code> object
    621     @return An <code>ItemQuery</code> object
     621    @return the name of the <code>AnnotationTypeCategory</code> object
    622622  */
    623623  public static String getAnnotationTypesCategoryQuery(DbControl dc,AnnotationType annotationType)
  • branches/dominic_annotations/www/common/annotations/annotate.jsp

    r2345 r2469  
    7979      String label = HTML.encodeTags(Values.trimString(at.getName(), 25));
    8080      String fullLabel = HTML.encodeTags(at.getName());
     81      String categoryname=HTML.encodeTags(Base.getAnnotationTypesCategoryQuery(dc,at));
    8182      List values = null;
    8283      if (as != null && as.hasAnnotation(at))
     
    107108      }
    108109      icon = "<img id=\"icon_"+at.getId()+"\" src=\"../../images/"+icon+"\" class=\"icon\">";
    109       sb.append("<div class=\"param\" id=\"prompt_"+at.getId()+"\" onclick=\"parametersOnClick('"+at.getId()+"')\" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\""+fullLabel+"\">"+icon+label+"</div>");
     110      sb.append("<div class=\"param\" id=\"prompt_"+at.getId()+"\" onclick=\"parametersOnClick('"+at.getId()+"')\" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\""+fullLabel+"\">"+icon+label+categoryname+"</div>");
    110111      %>
    111112      new Parameter('<%=at.getId()%>', '<%=HTML.javaScriptEncode(at.getName())%>', <%=at.getMultiplicity()%>, <%=at.isEnumeration()%>, false, values);
     
    354355        </div>
    355356        <base:icon image="hasvalues.gif" /> = has value(s)
     357        <b>Here We Are ooooooooooooooo</b>
    356358      </td>
    357359      <td width="50%">
Note: See TracChangeset for help on using the changeset viewer.