Index: /Users/gsilver/sakai-src/sakai-trunk/content/content-impl/impl/src/java/org/sakaiproject/content/impl/CollectionAccessFormatter.java =================================================================== --- /Users/gsilver/sakai-src/sakai-trunk/content/content-impl/impl/src/java/org/sakaiproject/content/impl/CollectionAccessFormatter.java (revision 46642) +++ /Users/gsilver/sakai-src/sakai-trunk/content/content-impl/impl/src/java/org/sakaiproject/content/impl/CollectionAccessFormatter.java (working copy) @@ -147,7 +147,10 @@ String webappRoot = ServerConfigurationService.getServerUrl(); out.println(""); - if (basedir != null) + out.println(""); + if (basedir != null) { out.println(""); + out.println("
"); // for content listing it's best to use a real title if (basedir != null) - out.println("

Contents of " + access + path + "

"); + out.println("

Contents of " + access + path + "

"); else { - out.println("

" + pl.getProperty(ResourceProperties.PROP_DISPLAY_NAME) + "

"); + out.println("

" + pl.getProperty(ResourceProperties.PROP_DISPLAY_NAME) + "

Show/hide descriptions

"); String desc = pl.getProperty(ResourceProperties.PROP_DESCRIPTION); - if (desc != null && !desc.equals("")) out.println("

" + desc + "

"); + if (desc != null && !desc.equals("")) out.println("
" + desc + "
"); } - - out.println(""); + if (sferyx) + out.println("
"); + else + out.println(""); else if (basedir != null) - out.println(""); + out.println("
  • Up one level
    • "); else - out.println(""); + out.println("
  • Up one level
    • "); } else if (sferyx) out @@ -283,18 +290,19 @@ + Validator.escapeHtml(xs) + ""); else if (basedir != null) - out.println(""); + + Validator.escapeHtml(xs) + ""); else { String desc = properties.getProperty(ResourceProperties.PROP_DESCRIPTION); - if (desc == null) desc = ""; - - out.println(""); + + "" + desc + ""); } } else @@ -315,17 +323,19 @@ + ""); else if (basedir != null) - out.println(""); + out.println("
  •   " + Validator.escapeHtml(xs) + "" + filesize + + ", " + createdBy + ", " + filetype + ", " + modifiedTime + "
    • "); else { String desc = properties.getProperty(ResourceProperties.PROP_DESCRIPTION); - if (desc == null) desc = ""; - - out.println(""); + + "" + desc + ""); } } } @@ -338,12 +348,11 @@ + Validator.escapeHtml(xs) + "\">"); else if (basedir != null) - out.println(""); + out.println("
  •   " + Validator.escapeHtml(xs) + "
    • "); else - out.println(""); + out.println("
  • " + Validator.escapeHtml(xs) + + "
    • "); } } @@ -354,9 +363,12 @@ if (out != null && printedHeader) { - out.println("
    Up one levelFolder" + "" - + "" + "" + "
    Up one level [Folder]
    File Folder 
     " - + Validator.escapeHtml(xs) + "Folder" + "" + "" - + "" + "
    " + if ((desc == null) || desc.equals("")) + desc = ""; + else + desc = "
    " + Validator.escapeHtml(desc) + "
    "; + out.println("
  • " + Validator.escapeHtml(properties.getProperty(ResourceProperties.PROP_DISPLAY_NAME)) - + " [Folder]
    		• " + Validator.escapeHtml(desc) + "
      " + modifiedTime + "
      " + Validator.escapeHtml(xs) + "" + filesize - + "" + createdBy + "" + filetype + "" + modifiedTime + "
    " + if ((desc == null) || desc.equals("")) + desc = ""; + else + desc = "
    " + Validator.escapeHtml(desc) + "
    "; + out.println("
  • " + Validator.escapeHtml(properties.getProperty(ResourceProperties.PROP_DISPLAY_NAME)) - + "
    		• " + Validator.escapeHtml(desc) + "
       
      " + Validator.escapeHtml(xs) + "" + "" - + "" + "" + "
    " + Validator.escapeHtml(xs) - + "
    "); + if (sferyx) + out.println(""); + else + out.println("