Changeset 6144


Ignore:
Timestamp:
Sep 21, 2012, 10:13:29 AM (9 years ago)
Author:
Nicklas Nordborg
Message:

References #1727: Move to HTML5

  • Remaining pages in the View menu
  • Added 'doctype' property to <page> taglib (default=html)
  • Updated version numbers in taglib descriptors (*.tld)
  • Updated XSD, etc. in web.xml
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/dist/extended-properties.xml

    r4888 r6144  
    4343      <link
    4444        regexp="\w+\.\d+"
    45         url="http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=unigene&amp;term={value}[ClusterID]"
     45        url="http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=unigene&amp;term={value}%5BClusterID%5D"
    4646      />
    4747    </property>
  • trunk/config/dist/web.xml

    r5900 r6144  
    33  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    44  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
    5   http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
    6    version="2.5">
     5  http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     6   version="3.0">
    77   
    88<!--
     
    6464  -->
    6565  <servlet>
     66    <description>Starts and stops BASE when Tomcat is starting and stopping</description>
     67    <display-name>BASE Start/Stop servlet</display-name>
    6668    <servlet-name>BASE</servlet-name>
    6769    <servlet-class>net.sf.basedb.clients.web.servlet.StartStopServlet</servlet-class>
     
    7173  <!-- The View servlet used to download files in view mode -->
    7274  <servlet>
     75    <description>Servlet for viewing files in the BASE file system</description>
     76    <display-name>File view servlet</display-name>
    7377    <servlet-name>view</servlet-name>
    7478    <servlet-class>
     
    9195  <!-- The Download servlet used to download files in download mode -->
    9296  <servlet>
     97    <description>
     98      Servlet for downloading files from the BASE file system. Is the same as
     99      the 'view' servlet but sets the 'Content-Disposition' response header to
     100      force browsers to prompt with a 'Save As' dialog.
     101    </description>
     102    <display-name>File download servlet</display-name>
    93103    <servlet-name>download</servlet-name>
    94104    <servlet-class>
     
    115125  <!-- The Upload servlet used to upload files  -->
    116126  <servlet>
     127    <description>Servlet that handles file upload</description>
     128    <display-name>File upload servlet</display-name>
    117129    <servlet-name>upload</servlet-name>
    118130    <servlet-class>
     
    127139  <!-- The SpotImage servlet used to view spot images in a raw bioassay -->
    128140  <servlet>
     141    <description>Servlet for viewing spot images created from raw bioassay data</description>
     142    <display-name>Spot images servlet</display-name>
    129143    <servlet-name>spotimage</servlet-name>
    130144    <servlet-class>
     
    139153  <!-- The Generic PlotServlet for the HTML plot tool -->
    140154  <servlet>
     155    <description>A generic plotter for analyzed data</description>
     156    <display-name>Plot servlet</display-name>
    141157    <servlet-name>plotter</servlet-name>
    142158    <servlet-class>
     
    171187  <!-- The ExperimentExplorer PlotServlet  -->
    172188  <servlet>
     189    <description>A specialied plot servlet for the experiment explorer</description>
     190    <display-name>Experiment explorer plot servlet</display-name>
    173191    <servlet-name>eeplotter</servlet-name>
    174192    <servlet-class>
     
    184202  <!-- Comment out this servlet to disable the RSS feed -->
    185203  <servlet>
     204    <description>Generate an RSS feed from public BASE news</description>
     205    <display-name>News RSS feed servlet</display-name>
    186206    <servlet-name>news-feed</servlet-name>
    187207    <servlet-class>
     
    197217  <!-- Axis2 servlets for web services -->
    198218  <servlet>
     219    <display-name>Apache-Axis Servlet</display-name>
    199220    <servlet-name>AxisServlet</servlet-name>
    200     <display-name>Apache-Axis Servlet</display-name>
    201221    <servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
    202222    <load-on-startup>3</load-on-startup>
    203223  </servlet>
    204224  <servlet>
     225    <display-name>Apache-Axis Servlet (REST)</display-name>
    205226    <servlet-name>AxisRESTServlet</servlet-name>
    206     <display-name>Apache-Axis Servlet (REST)</display-name>
    207227    <servlet-class>org.apache.axis2.transport.http.AxisRESTServlet</servlet-class>
    208228  </servlet>
     
    218238  <!-- Extensions servlet for managing extensions to the web client -->
    219239  <servlet>
     240    <description>
     241      Starts up the extensions system in the web client and handles request for
     242      servlets inside extensions.
     243    </description>
     244    <display-name>Web client extensions manager</display-name>
    220245    <servlet-name>ExtensionsServlet</servlet-name>
    221     <display-name>Web client extensions manager</display-name>
    222246    <servlet-class>net.sf.basedb.clients.web.servlet.ExtensionsServlet</servlet-class>
    223247    <load-on-startup>2</load-on-startup>
     
    235259  <!-- EXPERIMENTAL!! -->
    236260    <servlet>
     261      <description>
     262        Handles compilation of *.xjsp files which are like normal *.jsp files but the
     263        classpath also include the JAR(s) for the extension.
     264      </description>
     265      <display-name>XJSP compiler for extensions (experimental!)</display-name>
    237266        <servlet-name>xjsp</servlet-name>
    238267        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
     
    269298  <!-- A filter that sets the character encoding on all *.jsp and *.xjsp files -->
    270299  <filter>
     300    <description>Filter that set the character encoding in the Content-Type response header.</description>
     301    <display-name>Character encoding filter</display-name>
    271302    <filter-name>characterEncoding</filter-name>
    272303    <filter-class>net.sf.basedb.clients.web.servlet.CharacterEncodingFilter</filter-class>
     
    289320  <!--
    290321  <filter>
     322    <description>
     323      A filter that can be used to set the 'Cache-Control' response header.
     324      Primary use is to disable caching of *.css and *.js files in development
     325      mode.
     326    </description>
     327    <display-name>Cache control filter</display-name>
    291328    <filter-name>noCache</filter-name>
    292329    <filter-class>net.sf.basedb.clients.web.servlet.CacheControlFilter</filter-class>
  • trunk/src/clients/web/net/sf/basedb/clients/web/formatter/ExtendedPropertyFormatter.java

    r6127 r6144  
    2222package net.sf.basedb.clients.web.formatter;
    2323
     24import net.sf.basedb.clients.web.util.HTML;
    2425import net.sf.basedb.core.ExtendedProperty;
    2526import net.sf.basedb.util.formatter.Formatter;
     
    6465    if (link != null)
    6566    {
    66       formattedValue = "<a href=\""+link+"\" target=\"_blank\">"+value+"</a>";
     67      formattedValue = "<a href=\""+HTML.encodeTags(link)+"\" target=\"_blank\">"+value+"</a>";
    6768    }
    6869    return formattedValue;
  • trunk/src/clients/web/net/sf/basedb/clients/web/taglib/Page.java

    r6138 r6144  
    5757   &lt;base:page
    5858      type=default|popup|include
    59     title=...
    60     menu=...
     59    title=...
     60    menu=...
     61    doctype=...
    6162   &gt;
    6263</pre>
     
    9091  <tr>
    9192    <td>menu</td>
    92     <td>standard</td>
     93    <td>auto</td>
    9394    <td>no</td>
    9495    <td>
     
    9899    </td>
    99100  </tr>
     101  <tr>
     102    <td>doctype</td>
     103    <td>html</td>
     104    <td>no</td>
     105    <td>
     106      The doctype to use in the generated html page. The default is <i>html</i> which
     107      is the new HTML5 doctype. Use <i>HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"</i>
     108      to get the older HTML 4 doctype.
     109    </td>
     110  </tr>
    100111  </table>
    101112 
     
    144155  private String menu = "auto";
    145156
     157  /**
     158    The <!doctype xxx> setting.
     159  */
     160  private String doctype = "html";
     161 
    146162  /**
    147163    The type of the current page.
     
    235251  }
    236252 
     253  public void setDoctype(String doctype)
     254  {
     255    this.doctype = doctype;
     256  }
     257 
     258  public String getDoctype()
     259  {
     260    return doctype;
     261  }
     262 
    237263  /*
    238264    Server methods
     
    282308    {
    283309      StringBuilder sb = new StringBuilder();
    284       sb.append("<!DOCTYPE html>\n");
     310      sb.append("<!doctype ").append(getDoctype()).append(">\n");
    285311      sb.append("<html>\n");
    286312      try
    287313      {
     314        pageContext.getOut().clearBuffer();
    288315        pageContext.getOut().print(sb.toString());
    289316      }
  • trunk/www/WEB-INF/base.tld

    r6096 r6144  
    2929
    3030  <!-- The version number of this tag library -->
    31   <tlibversion>1.0</tlibversion>
     31  <tlibversion>3</tlibversion>
    3232
    3333  <!-- The JSP specification version required to function -->
    34   <jspversion>1.1</jspversion>
     34  <jspversion>2.2</jspversion>
    3535
    3636  <!-- The short name of this tag library -->
     
    4141  <!-- General information about this tag library -->
    4242  <info>
    43     The beginnings of a tag library for Base version 2
     43    The main taglibs for BASE are defined here.
    4444  </info>
    4545
     
    6262      <rtexprvalue>true</rtexprvalue>
    6363    </attribute>
     64    <attribute>
     65      <name>doctype</name>
     66      <required>false</required>
     67      <rtexprvalue>true</rtexprvalue>
     68    </attribute>
    6469  </tag>
    6570
  • trunk/www/WEB-INF/extensions.tld

    r4870 r6144  
    2727
    2828  <!-- The version number of this tag library -->
    29   <tlibversion>1.0</tlibversion>
     29  <tlibversion>3</tlibversion>
    3030
    3131  <!-- The JSP specification version required to function -->
    32   <jspversion>1.1</jspversion>
     32  <jspversion>2.2</jspversion>
    3333
    3434  <!-- The short name of this tag library -->
  • trunk/www/WEB-INF/menu.tld

    r5918 r6144  
    2828
    2929  <!-- The version number of this tag library -->
    30   <tlibversion>1.0</tlibversion>
     30  <tlibversion>3</tlibversion>
    3131
    3232  <!-- The JSP specification version required to function -->
    33   <jspversion>1.1</jspversion>
     33  <jspversion>2.2</jspversion>
    3434
    3535  <!-- The short name of this tag library -->
  • trunk/www/WEB-INF/path.tld

    r4889 r6144  
    2727
    2828  <!-- The version number of this tag library -->
    29   <tlibversion>1.0</tlibversion>
     29  <tlibversion>3</tlibversion>
    3030
    3131  <!-- The JSP specification version required to function -->
    32   <jspversion>1.1</jspversion>
     32  <jspversion>2.2</jspversion>
    3333
    3434  <!-- The short name of this tag library -->
  • trunk/www/WEB-INF/tab.tld

    r6096 r6144  
    2828
    2929  <!-- The version number of this tag library -->
    30   <tlibversion>1.0</tlibversion>
     30  <tlibversion>3</tlibversion>
    3131
    3232  <!-- The JSP specification version required to function -->
    33   <jspversion>1.1</jspversion>
     33  <jspversion>2.2</jspversion>
    3434
    3535  <!-- The short name of this tag library -->
  • trunk/www/WEB-INF/table.tld

    r6096 r6144  
    2929
    3030  <!-- The version number of this tag library -->
    31   <tlibversion>1.0</tlibversion>
     31  <tlibversion>3</tlibversion>
    3232
    3333  <!-- The JSP specification version required to function -->
    34   <jspversion>1.1</jspversion>
     34  <jspversion>2.2</jspversion>
    3535
    3636  <!-- The short name of this tag library -->
  • trunk/www/views/formulas/edit_formula.jsp

    r6136 r6144  
    5252<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
    5353<%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
     54<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
    5455<%
    5556final Item itemType = Item.FORMULA;
     
    503504            </td>
    504505            <td><base:button onclick="removeOnClick()" title="Remove" /></td>
     506            <td></td>
    505507          </tr>
    506508          <tr>
  • trunk/www/views/reporterlists/edit_reporterlist.jsp

    r6136 r6144  
    4343<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
    4444<%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
     45<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
    4546<%
    4647final Item itemType = Item.REPORTERLIST;
     
    272273      <tr class="dynamic">
    273274        <th>Description</th>
    274         <td nowrap>
    275           <textarea <%=clazz%> rows="4" cols="40" name="description"
     275        <td>
     276          <textarea <%=clazz%> rows="6" name="description"
    276277            ><%=HTML.encodeTags(reporterList == null ? cc.getPropertyValue("description") : reporterList.getDescription())%></textarea>
    277278        </td>
  • trunk/www/views/reporterlists/merge.jsp

    r6136 r6144  
    139139        <td><%=HTML.encodeTags(reporterList.getName())%></td>
    140140        <td rowspan="2">
    141           <img id="mergeImage" src="../../images/set_operations/union_union.png">
     141          <img id="mergeImage" src="../../images/set_operations/union_union.png" alt="">
    142142        </td>
    143143      </tr>
  • trunk/www/views/reporterlists/reporters/add_reporters_frameset.jsp

    r6136 r6144  
    7171    <h1>Select reporters</h1>
    7272    <div id="f1" class="content"><iframe name="reporters"
    73       src="../../reporters/index.jsp?ID=<%=ID%>&mode=selectmultiplenobuttons"
    74       style="width: 100%; height: 100%;"></iframe></div>
     73      src="../../reporters/index.jsp?ID=<%=ID%>&amp;mode=selectmultiplenobuttons"
     74      class="absolutefull" style="width: 100%; height: 100%;"></iframe></div>
    7575   
    7676    <base:buttongroup subclass="dialogbuttons topborder">
  • trunk/www/views/reporters/edit_reporter.jsp

    r6136 r6144  
    5858<%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
    5959<%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
     60<%@ taglib prefix="ext" uri="/WEB-INF/extensions.tld" %>
    6061<%
    6162final Item itemType = Item.REPORTER;
     
    293294      <tr class="dynamic">
    294295        <th>Description</th>
    295         <td nowrap>
     296        <td>
    296297          <textarea <%=clazz%> rows="6" name="description"
    297298            ><%=HTML.encodeTags(reporter == null ? cc.getPropertyValue("description") : reporter.getDescription())%></textarea>
Note: See TracChangeset for help on using the changeset viewer.