Changeset 3190


Ignore:
Timestamp:
Mar 13, 2007, 11:05:42 AM (15 years ago)
Author:
Johan Enell
Message:

Merged log:branches/2.2.2#3116:3186 to trunk.

Location:
trunk
Files:
89 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/3rd-party-components.txt

    r3153 r3190  
    202202
    203203More info : http://subclipse.tigris.org/svnant.html
    204 Version   : 1.0.0
     204Version   : 1.1.0.RC2
    205205License   : Apache Software License 1.1 (apache.license.txt)
    206206Jar files : svnant.jar, javasvn.jar, svnClientAdapter.jar, svnjavahl.jar
  • trunk/src/clients/web/net/sf/basedb/clients/web/formatter/FormatterSettings.java

    r2981 r3190  
    8080  {
    8181    sc.setUserClientSetting("formatter.number.decimals", Integer.toString(numDecimals));
    82     sc.setSessionSetting("formatter.number", null);
     82    sc.setSessionSetting("formatter.double", null);
     83    sc.setSessionSetting("formatter.float", null);
    8384  }
    8485 
  • trunk/src/core/common-queries.xml

    r3086 r3190  
    202202    <description>
    203203      Load the ID of all users which has a quota group from one of the given groups.
     204    </description>
     205  </query>
     206
     207  <query id="GET_USER_IDS_FOR_PROJECT" type="HQL">
     208    <sql>
     209      SELECT up.userId
     210      FROM UserProjects up
     211      WHERE up.projectId = :projectId
     212    </sql>
     213    <description>
     214      Load the ID of all users which are direct member of the given project
     215    </description>
     216  </query>
     217
     218  <query id="GET_GROUP_IDS_FOR_PROJECT" type="HQL">
     219    <sql>
     220      SELECT gp.groupId
     221      FROM GroupProjects gp
     222      WHERE gp.projectId = :projectId
     223    </sql>
     224    <description>
     225      Load the ID of all groups which are direct member of the given project
    204226    </description>
    205227  </query>
     
    25232545  </query>
    25242546
    2525   <query id="GET_SUM_USED_QUANTITY_EVENTS" type="HQL">
    2526     <sql>
    2527       SELECT evt.bioMaterial, SUM(evt.usedQuantity)
     2547  <query id="GET_USED_QUANTITY_EVENTS" type="HQL">
     2548    <sql>
     2549      SELECT evt.bioMaterial, evt.usedQuantity
    25282550      FROM BioMaterialEventData evt
    2529       GROUP BY evt.bioMaterial
    2530     </sql>
    2531     <description>
    2532       A HQL query that loads the sum of the used quantity
    2533       grouped by the biomaterial for all BioMaterialEvent:s.
    2534     </description>
    2535   </query>
    2536  
    2537   <query id="GET_SUM_USED_QUANTITY_SOURCES" type="HQL">
    2538     <sql>
    2539       SELECT index(src), SUM(src.usedQuantity)
     2551    </sql>
     2552    <description>
     2553      A HQL query that loads the biomaterial and the used quantity
     2554      for all BioMaterialEvent:s.
     2555    </description>
     2556  </query>
     2557 
     2558  <query id="GET_USED_QUANTITY_SOURCES" type="HQL">
     2559    <sql>
     2560      SELECT index(src), src.usedQuantity
    25402561      FROM BioMaterialEventData evt
    25412562      JOIN evt.sources src
    2542       GROUP BY index(src)
    2543     </sql>
    2544     <description>
    2545       A HQL query that loads the sum of the used quantity
    2546       grouped by the biomaterial for all sources to
    2547       BioMaterialEvent:s.
     2563    </sql>
     2564    <description>
     2565      A HQL query that loads the used quantity
     2566      for all sources to BioMaterialEvent:s.
    25482567    </description>
    25492568  </query>
  • trunk/src/core/net/sf/basedb/core/Group.java

    r2898 r3190  
    2929import net.sf.basedb.core.query.Hql;
    3030
     31import java.util.Collection;
    3132import java.util.HashSet;
    3233import java.util.Set;
     
    124125  public static Set<Integer> getGroupsRecursive(DbControl dc, Set<Integer> groups)
    125126  {
     127    return getGroupsRecursive(dc.getHibernateSession(), groups);
     128  }
     129
     130  static Set<Integer> getGroupsRecursive(org.hibernate.Session session, Collection<Integer> groups)
     131  {
    126132    Set<Integer> allGroups = new HashSet<Integer>(groups);
    127133    if (allGroups.size() > 0)
    128134    {
    129135     
    130       org.hibernate.Query query = HibernateUtil.getPredefinedQuery(dc.getHibernateSession(),
     136      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session,
    131137        "GET_CHILDGROUPS_IDS_FOR_GROUPS");
    132138      /*
     
    143149    return allGroups;
    144150  }
     151
    145152 
    146153  /**
  • trunk/src/core/net/sf/basedb/core/Install.java

    r3086 r3190  
    102102    method.
    103103  */
    104   public static final int NEW_SCHEMA_VERSION = 29;
    105 
     104  public static final int NEW_SCHEMA_VERSION = 30;
     105 
    106106  public static synchronized void createTables(boolean update, final ProgressReporter progress)
    107107    throws BaseException
  • trunk/src/core/net/sf/basedb/core/Keyring.java

    r2981 r3190  
    450450    Load all users which are member of at least one group where the
    451451    logged in user is also a member and put that information
    452     in the {@link #users} variable.
     452    in the {@link #users} variable. If a project is active, also load the members
     453    and owner of that project.
    453454  */
    454455  private void loadUsers(org.hibernate.Session session)
    455456    throws BaseException
    456457  {
    457     Set<Integer> temp;
     458    Set<Integer> temp = new HashSet<Integer>();
    458459    try
    459460    {
     
    468469        */
    469470        query.setParameterList("groups", groups, org.hibernate.Hibernate.INTEGER);
    470         temp = new HashSet<Integer>(HibernateUtil.loadList(Integer.class, query));
     471        temp.addAll(HibernateUtil.loadList(Integer.class, query));
    471472       
    472473        // Get the users that have a quota group among the same groups
     
    479480        query.setParameterList("groups", groups, org.hibernate.Hibernate.INTEGER);
    480481        temp.addAll(HibernateUtil.loadList(Integer.class, query));
     482      }
     483     
     484      if (projectId != 0)
     485      {
     486        // Get the owner of the active project
     487        ProjectData pd = HibernateUtil.loadData(session, ProjectData.class, projectId);
     488        temp.add(pd.getOwner().getId());
    481489       
    482         users = Collections.unmodifiableSet(temp);
    483       }
     490        // Get direct members of the active project
     491        org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_IDS_FOR_PROJECT");
     492        /*
     493          SELECT up.userId
     494          FROM UserProjects up
     495          WHERE up.projectId = :projectId
     496        */
     497        query.setInteger("projectId", projectId);
     498        temp.addAll(HibernateUtil.loadList(Integer.class, query));
     499       
     500        // Get groups that are direct members of the active project
     501        query = HibernateUtil.getPredefinedQuery(session, "GET_GROUP_IDS_FOR_PROJECT");
     502        /*
     503          SELECT gp.groupId
     504          FROM GroupProjects gp
     505          WHERE gp.projectId = :projectId
     506        */
     507        query.setInteger("projectId", projectId);
     508        // Load the direct groups and subgroups
     509        Set<Integer> projectGroups = Group.getGroupsRecursive(session, HibernateUtil.loadList(Integer.class, query));
     510
     511        // Load users that are members of the project groups
     512        temp.addAll(User.getAllMembers(session, projectGroups));
     513       
     514      }
     515      users = Collections.unmodifiableSet(temp);
    484516    }
    485517    catch (HibernateException ex)
     
    717749  {
    718750    if (getReload() && !reload()) projectData = null;
     751    int oldProjectId = projectId;
    719752    if (projectData == null)
    720753    {
     
    725758    {
    726759      projectId = projectData.getId();
    727       org.hibernate.Session session = null;
    728       org.hibernate.Transaction tx = null;
    729       try
    730       {
    731         session = HibernateUtil.newSession();
    732         tx = HibernateUtil.newTransaction(session);
    733         loadMaxProjectPermission(session, projectData);
    734         loadProjectKeys(session);
    735       }
    736       catch (BaseException ex)
    737       {
    738         projectId = 0;
    739         maxProjectPermission = 0;
    740         throw ex;
    741       }
    742       finally
    743       {
    744         if (tx != null) HibernateUtil.commit(tx);
    745         if (session != null) HibernateUtil.close(session);
    746       }
    747     }
     760    }
     761    reload = projectId != oldProjectId;
    748762  }
    749763 
  • trunk/src/core/net/sf/basedb/core/Trashcan.java

    r2218 r3190  
    9090            if (item.hasPermission(Permission.DELETE))
    9191            {
    92               if (!useLimit || (index >= firstItem && index < lastItem))
     92              SharedItem parent = item instanceof ChildItem ?
     93                  dc.getItem(SharedItem.class, ((ChildItem)item).getSharedParent()) : null;
     94             
     95              if ( (parent != null && parent.isOwner()) || (parent == null))
    9396              {
    94                 items.add((Removable)item);
     97                if (!useLimit || (index >= firstItem && index < lastItem))
     98                {
     99                  items.add((Removable)item);
     100                }
     101                index++;
     102                totalItems++;
    95103              }
    96               index++;
    97               totalItems++;
    98104            }
    99105          }
  • trunk/src/core/net/sf/basedb/core/Update.java

    r3120 r3190  
    346346  <tr>
    347347    <td>29</td>
     348    <td>
     349      No changes at all except increasing the schema version number.
     350      The veryfication of remaining quantity is moved to next update of schema version.
     351    </td>
     352  </tr>
     353 
     354  <tr>
     355    <td>30</td>
    348356    <td>
    349357      No schema change as such, but we need to verify and possibly update the
     
    505513      }
    506514     
     515     
     516      if (schemaVersion < 30)
     517      {
     518        if (progress != null) progress.display((int)(29*progress_factor), "--Updating schema version: " + schemaVersion + " -> 30...");     
     519        schemaVersion = updateToSchemaVersion30(session);
     520      }
     521     
    507522      /*
    508       if (schemaVersion < 30)
    509       {
    510         if (progress != null) progress.display((int)(29*progress_factor), "--Updating schema version: " + schemaVersion + " -> 30...");
    511         schemaVersion = setSchemaVersionInTransaction(session, 30);
     523      if (schemaVersion < 31)
     524      {
     525        if (progress != null) progress.display((int)(30*progress_factor), "--Updating schema version: " + schemaVersion + " -> 30...");
     526        schemaVersion = setSchemaVersionInTransaction(session, 31);
    512527        - or -
    513         schemaVersion = updateToSchemaVersion30(session);
     528        schemaVersion = updateToSchemaVersion31(session);
    514529      }
    515530      ... etc...
     
    10711086  /**
    10721087    Vefify and update the remaining quantity of all biomaterials.
    1073     @return The new schema version (=29)
     1088    @return The new schema version (=30)
    10741089  */
    1075   private static int updateToSchemaVersion29(org.hibernate.Session session)
     1090  private static int updateToSchemaVersion30(org.hibernate.Session session)
    10761091    throws BaseException
    10771092  {
    1078     final int schemaVersion = 29;
     1093    final int schemaVersion = 30;
    10791094   
    10801095    org.hibernate.Transaction tx = null;
     
    10861101      Map<MeasuredBioMaterialData, Float> remaining = new HashMap<MeasuredBioMaterialData, Float>();
    10871102     
    1088       // Load sum of used quantity for all events
     1103      // Load used quantity for all events
    10891104      org.hibernate.Query eventQuery = HibernateUtil.getPredefinedQuery(session,
    1090         "GET_SUM_USED_QUANTITY_EVENTS");
    1091       /*
    1092         SELECT evt.bioMaterial, SUM(evt.usedQuantity)
    1093         FROM BioMaterialEventData evt
    1094         GROUP BY evt.bioMaterial
    1095       */
    1096       // Load sum of used quantity for sources to all events
     1105        "GET_USED_QUANTITY_EVENTS");
     1106        /*       
     1107          SELECT evt.bioMaterial, evt.usedQuantity
     1108          FROM BioMaterialEventData evt
     1109        */
     1110     
     1111      // Load used quantity for sources to all events
    10971112      org.hibernate.Query sourcesQuery = HibernateUtil.getPredefinedQuery(session,
    1098         "GET_SUM_USED_QUANTITY_SOURCES");
     1113        "GET_USED_QUANTITY_SOURCES");
    10991114        /*
    1100           SELECT index(src), SUM(src.usedQuantity)
     1115          SELECT index(src), src.usedQuantity
    11011116          FROM BioMaterialEventData evt
    1102           JOIN evt.sources src
    1103           GROUP BY index(src)
     1117          JOIN evt.sources src         
    11041118         */
    11051119      List<Object[]> events = HibernateUtil.loadList(Object[].class, eventQuery);
     
    11071121     
    11081122      // Calculate the remaining quantity for each biomaterial
    1109       // o[0] = biomaterial, o[1] = sum of used quantity
     1123      // o[0] = biomaterial, o[1] = used quantity     
    11101124      for (Object[] o : events)
    11111125      {
    1112         MeasuredBioMaterialData bioMaterial = (MeasuredBioMaterialData)o[0];
    1113         Double sumUsedQuantity = (Double)o[1];
    1114         if (sumUsedQuantity != null)
     1126        MeasuredBioMaterialData bioMaterial = (MeasuredBioMaterialData)o[0];       
     1127        Float usedQuantity = (Float)o[1];       
     1128        if (usedQuantity != null)
    11151129        {
    11161130          Float currentRemaining = remaining.get(bioMaterial);
    11171131          if (currentRemaining == null) currentRemaining = 0.0f;
    1118           currentRemaining = currentRemaining - sumUsedQuantity.floatValue();
     1132          currentRemaining = currentRemaining - usedQuantity;
    11191133          remaining.put(bioMaterial, currentRemaining);
    11201134        }
     
    11431157      // Commit the changes
    11441158      HibernateUtil.commit(tx);
    1145       log.info("updateToSchemaVersion29: OK");
     1159      log.info("updateToSchemaVersion30: OK");
    11461160    }
    11471161    catch (BaseException ex)
    11481162    {
    11491163      if (tx != null) HibernateUtil.rollback(tx);
    1150       log.error("updateToSchemaVersion29: FAILED", ex);
     1164      log.error("updateToSchemaVersion30: FAILED", ex);
    11511165      throw ex;
    11521166    }
  • trunk/src/core/net/sf/basedb/core/User.java

    r2902 r3190  
    3636
    3737import java.util.ArrayList;
     38import java.util.Collection;
    3839import java.util.Date;
    3940import java.util.HashSet;
     
    124125  public static Set<Integer> getAllMembers(DbControl dc, Set<Integer> groupIds)
    125126  {
     127    return getAllMembers(dc.getHibernateSession(), groupIds);
     128  }
     129 
     130  static Set<Integer> getAllMembers(org.hibernate.Session session, Collection<Integer> groupIds)
     131  {
    126132    Set<Integer> userIds = new HashSet<Integer>();
    127133    if (groupIds != null && groupIds.size() > 0)
    128134    {
    129       org.hibernate.Session session = dc.getHibernateSession();
    130135      // Get the users which are members of the same groups
    131136      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_USER_IDS_FOR_GROUPS");
     
    149154    }
    150155    return userIds;
    151    
    152   }
     156  }
     157
    153158 
    154159  /**
  • trunk/src/core/net/sf/basedb/core/query/Hql.java

    r2497 r3190  
    2727import net.sf.basedb.core.InvalidDataException;
    2828import net.sf.basedb.core.InvalidUseOfNullException;
     29import net.sf.basedb.core.data.BasicData;
    2930
    3031import java.util.regex.Pattern;
     
    5556
    5657  /**
    57     Create an expression representing an item. In the query the actual
    58     value used is the id of the entity. See {@link #property(String, String)}
    59     for a code example.
     58    Create an expression representing an item which is a subclass of BasicItem.
     59    In the query the actual value used is the id of the entity.
     60    See {@link #property(String, String)} for a code example.
    6061
    6162    @param entity The entity
    62     @throws InvalidDataException If the etity is null
     63    @throws InvalidDataException If the entity is null
     64    @see #entity(BasicData)
    6365  */
    6466  public static Expression entity(BasicItem entity)
     
    6971  }
    7072 
     73  /**
     74    Create an expression representing an item which is a subclass of BasicData,
     75    for example a reporter. In the query the actual value used is the id of the entity.
     76    See {@link #property(String, String)} for a code example.
     77 
     78    @param entity The entity
     79    @throws InvalidDataException If the entity is null
     80    @see #entity(BasicItem)
     81    @since 2.2.2
     82  */
     83  public static Expression entity(BasicData entity)
     84    throws InvalidDataException
     85  {
     86    if (entity == null) throw new InvalidUseOfNullException("entity");
     87    return new HqlEntityExpression(entity);
     88  }
     89   
    7190  /**
    7291    Same as <code>property(null, property)</code>.
  • trunk/src/core/net/sf/basedb/core/query/HqlEntityExpression.java

    r2667 r3190  
    2929import net.sf.basedb.core.BasicItem;
    3030import net.sf.basedb.core.BaseException;
     31import net.sf.basedb.core.data.BasicData;
    3132
    3233/**
     
    3940  @version 2.0
    4041  @see Hql#entity(BasicItem)
     42  @see Hql#entity(BasicData)
    4143  @base.modified $Date$
    4244*/
     
    4446  implements Expression
    4547{
    46   private final BasicItem item;
     48  private final int id;
     49  private final String item;
    4750
    4851  HqlEntityExpression(BasicItem item)
    4952  {
    50     this.item = item;
     53    this.id = item.getId();
     54    this.item = item.toString();
     55  }
     56 
     57  /**
     58    @since 2.2.2
     59  */
     60  HqlEntityExpression(BasicData data)
     61  {
     62    this.id = data.getId();
     63    this.item = data.toString();
    5164  }
    5265
     
    6073    if (query.getQueryType() == QueryType.HQL)
    6174    {
    62       return Integer.toString(item.getId());
     75      return Integer.toString(id);
    6376    }
    6477    else
     
    8194  public String toString()
    8295  {
    83     return item.toString();
     96    return item;
    8497  }
    8598  // -------------------------------------------
  • trunk/src/core/net/sf/basedb/util/Values.java

    r2981 r3190  
    628628      result.append(lNumber).append(".");
    629629      String theDecimals = Long.toString(Math.round(fNumber*exp-lNumber*exp));
    630       result.append(theDecimals);
    631630      if (theDecimals.length() < decimals)
    632631      {
     
    636635        }
    637636      }
     637      result.append(theDecimals);
    638638    }
    639639    if (unit != null) result.append(unit);
  • trunk/src/core/net/sf/basedb/util/overview/ExperimentOverview.java

    r3062 r3190  
    281281    this.annotatableParents = new HashMap<Annotatable, Set<Annotatable>>();
    282282   
    283     // Load 'Required for MIAME' annotation types
     283    // Load 'Required for MIAME' annotation types (parameter='false' must also be set)
    284284    ItemQuery<AnnotationType> query = initQuery(AnnotationType.getQuery(null), "name");
    285285    query.restrict(
    286286      Restrictions.eq(
    287287        Hql.property("requiredForMiame"),
    288         Expressions.parameter("flag", true, Type.BOOLEAN)
     288        Expressions.parameter("miameFlag", true, Type.BOOLEAN)
     289      )
     290    );
     291    query.restrict(
     292      Restrictions.eq(
     293        Hql.property("protocolParameter"),
     294        Expressions.parameter("parameterFlag", false, Type.BOOLEAN)
    289295      )
    290296    );
     
    619625      for (Node factorNode : efNode.getChildren())
    620626      {
    621         Node annotationNode = annotationsNode.getChild("annotationtype." + factorNode.getItem().getId());
     627        Node annotationNode = annotationsNode == null ?
     628            null : annotationsNode.getChild("annotationtype." + factorNode.getItem().getId());
    622629        if (annotationNode == null)
    623630        {
     
    15411548          failures.add(new Failure(Validator.MISSING_PARAMETER, parentNode,
    15421549            "Missing parameter value: " + pp.getName(),
    1543             new Fix("Add parameter value", parentItem, pp, false)));
     1550            new Fix("Add parameter value for: " + pp.getName(), parentItem, pp, false)));
    15441551        }
    15451552      }
     
    15791586        {
    15801587          AnnotationType at = a.getAnnotationType();
    1581           if (protocol == null || protocol.isParameter(at))
     1588          // Protocol parameters are handled elsewhere
     1589          if (protocol == null || !protocol.isParameter(at))
    15821590          {
    15831591            Node atNode = new Node("annotationtype."+at.getId(), at.getName(), annotationsNode, at);
  • trunk/www/admin/annotationtypecategories/list_categories.jsp

    r2978 r3190  
    451451      {
    452452        %>
    453         <tbl:panel><%=annotationTypeCategories == null || annotationTypeCategories.getTotalCount() == 0 ? "No annotation type categories where found" : "No annotation types categories on this page. Please select another page!" %></tbl:panel>
     453        <tbl:panel><%=annotationTypeCategories == null || annotationTypeCategories.getTotalCount() == 0 ? "No annotation type categories were found" : "No annotation types categories on this page. Please select another page!" %></tbl:panel>
    454454        <%
    455455      }
  • trunk/www/admin/annotationtypes/list_annotationtypes.jsp

    r2978 r3190  
    572572      {
    573573        %>
    574         <tbl:panel><%=annotationTypes == null || annotationTypes.getTotalCount() == 0 ? "No annotation types where found" : "No annotation types on this page. Please select another page!" %></tbl:panel>
     574        <tbl:panel><%=annotationTypes == null || annotationTypes.getTotalCount() == 0 ? "No annotation types were found" : "No annotation types on this page. Please select another page!" %></tbl:panel>
    575575        <%
    576576      }
  • trunk/www/admin/clients/help/list_help.jsp

    r2978 r3190  
    381381      {
    382382        %>
    383         <tbl:panel><%=help == null || help.getTotalCount() == 0 ? "No help where found" : "No help on this page. Please select another page!" %></tbl:panel>
     383        <tbl:panel><%=help == null || help.getTotalCount() == 0 ? "No help were found" : "No help on this page. Please select another page!" %></tbl:panel>
    384384        <%
    385385      }
  • trunk/www/admin/clients/list_clients.jsp

    r2978 r3190  
    421421      {
    422422        %>
    423         <tbl:panel><%=clients == null || clients.getTotalCount() == 0 ? "No client applications where found" : "No client applications on this page. Please select another page!" %></tbl:panel>
     423        <tbl:panel><%=clients == null || clients.getTotalCount() == 0 ? "No client applications were found" : "No client applications on this page. Please select another page!" %></tbl:panel>
    424424        <%
    425425      }
  • trunk/www/admin/diskusage/details/view_details.jsp

    r2978 r3190  
    499499        {
    500500          %>
    501           <tbl:panel><%=totalCount == 0 ? "No items where found" : "No items on this page. Please select another page!" %></tbl:panel>
     501          <tbl:panel><%=totalCount == 0 ? "No items were found" : "No items on this page. Please select another page!" %></tbl:panel>
    502502          <%
    503503        }
  • trunk/www/admin/diskusage/list_groups.jsp

    r2978 r3190  
    441441      {
    442442        %>
    443         <tbl:panel><%=groups == null || groups.getTotalCount() == 0 ? "No groups where found" : "No groups on this page. Please select another page!" %></tbl:panel>
     443        <tbl:panel><%=groups == null || groups.getTotalCount() == 0 ? "No groups were found" : "No groups on this page. Please select another page!" %></tbl:panel>
    444444        <%
    445445      }
  • trunk/www/admin/diskusage/list_users.jsp

    r2978 r3190  
    597597      {
    598598        %>
    599         <tbl:panel><%=users == null || users.getTotalCount() == 0 ? "No users where found" : "No users on this page. Please select another page!" %></tbl:panel>
     599        <tbl:panel><%=users == null || users.getTotalCount() == 0 ? "No users were found" : "No users on this page. Please select another page!" %></tbl:panel>
    600600        <%
    601601      }
  • trunk/www/admin/extravaluetypes/list_extravaluetypes.jsp

    r2978 r3190  
    431431      {
    432432        %>
    433         <tbl:panel><%=extraValueTypes == null || extraValueTypes.getTotalCount() == 0 ? "No extra value types where found" : "No extra value types on this page. Please select another page!" %></tbl:panel>
     433        <tbl:panel><%=extraValueTypes == null || extraValueTypes.getTotalCount() == 0 ? "No extra value types were found" : "No extra value types on this page. Please select another page!" %></tbl:panel>
    434434        <%
    435435      }
  • trunk/www/admin/filetypes/list_filetypes.jsp

    r2978 r3190  
    303303      {
    304304        %>
    305         <tbl:panel><%=fileTypes == null || fileTypes.getTotalCount() == 0 ? "No file types where found" : "No file types on this page. Please select another page!" %></tbl:panel>
     305        <tbl:panel><%=fileTypes == null || fileTypes.getTotalCount() == 0 ? "No file types were found" : "No file types on this page. Please select another page!" %></tbl:panel>
    306306        <%
    307307      }
  • trunk/www/admin/groups/list_groups.jsp

    r2978 r3190  
    462462      {
    463463        %>
    464         <tbl:panel><%=groups == null || groups.getTotalCount() == 0 ? "No groups where found" : "No groups on this page. Please select another page!" %></tbl:panel>
     464        <tbl:panel><%=groups == null || groups.getTotalCount() == 0 ? "No groups were found" : "No groups on this page. Please select another page!" %></tbl:panel>
    465465        <%
    466466      }
  • trunk/www/admin/hardware/list_hardware.jsp

    r2978 r3190  
    452452      {
    453453        %>
    454         <tbl:panel><%=hardware == null || hardware.getTotalCount() == 0 ? "No hardware where found" : "No hardware on this page. Please select another page!" %></tbl:panel>
     454        <tbl:panel><%=hardware == null || hardware.getTotalCount() == 0 ? "No hardware were found" : "No hardware on this page. Please select another page!" %></tbl:panel>
    455455        <%
    456456      }
  • trunk/www/admin/hardwaretypes/list_hardwaretypes.jsp

    r2978 r3190  
    414414      {
    415415        %>
    416         <tbl:panel><%=hardwareTypes == null || hardwareTypes.getTotalCount() == 0 ? "No hardware types where found" : "No hardware types on this page. Please select another page!" %></tbl:panel>
     416        <tbl:panel><%=hardwareTypes == null || hardwareTypes.getTotalCount() == 0 ? "No hardware types were found" : "No hardware types on this page. Please select another page!" %></tbl:panel>
    417417        <%
    418418      }
  • trunk/www/admin/jobagents/list_agents.jsp

    r2978 r3190  
    570570      {
    571571        %>
    572         <tbl:panel><%=agents == null || agents.getTotalCount() == 0 ? "No job agents where found" : "No job agents on this page. Please select another page!" %></tbl:panel>
     572        <tbl:panel><%=agents == null || agents.getTotalCount() == 0 ? "No job agents were found" : "No job agents on this page. Please select another page!" %></tbl:panel>
    573573        <%
    574574      }
  • trunk/www/admin/mimetypes/list_mimetypes.jsp

    r2978 r3190  
    394394      {
    395395        %>
    396         <tbl:panel><%=mimeTypes == null || mimeTypes.getTotalCount() == 0 ? "No MIME types where found" : "No MIME types on this page. Please select another page!" %></tbl:panel>
     396        <tbl:panel><%=mimeTypes == null || mimeTypes.getTotalCount() == 0 ? "No MIME types were found" : "No MIME types on this page. Please select another page!" %></tbl:panel>
    397397        <%
    398398      }
  • trunk/www/admin/news/list_news.jsp

    r2978 r3190  
    388388      {
    389389        %>
    390         <tbl:panel><%=news == null || news.getTotalCount() == 0 ? "No news where found" : "No news on this page. Please select another page!" %></tbl:panel>
     390        <tbl:panel><%=news == null || news.getTotalCount() == 0 ? "No news were found" : "No news on this page. Please select another page!" %></tbl:panel>
    391391        <%
    392392      }
  • trunk/www/admin/pluginconfigurations/list_configurations.jsp

    r2978 r3190  
    521521      {
    522522        %>
    523         <tbl:panel><%=configurations == null || configurations.getTotalCount() == 0 ? "No configurations where found" : "No configurations on this page. Please select another page!" %></tbl:panel>
     523        <tbl:panel><%=configurations == null || configurations.getTotalCount() == 0 ? "No configurations were found" : "No configurations on this page. Please select another page!" %></tbl:panel>
    524524        <%
    525525      }
  • trunk/www/admin/plugindefinitions/list_plugins.jsp

    r2978 r3190  
    676676      {
    677677        %>
    678         <tbl:panel><%=plugins == null || plugins.getTotalCount() == 0 ? "No plugins where found" : "No plugins on this page. Please select another page!" %></tbl:panel>
     678        <tbl:panel><%=plugins == null || plugins.getTotalCount() == 0 ? "No plugins were found" : "No plugins on this page. Please select another page!" %></tbl:panel>
    679679        <%
    680680      }
  • trunk/www/admin/plugintypes/list_plugintypes.jsp

    r2978 r3190  
    414414      {
    415415        %>
    416         <tbl:panel><%=pluginTypes == null || pluginTypes.getTotalCount() == 0 ? "No plugin types where found" : "No plugin types on this page. Please select another page!" %></tbl:panel>
     416        <tbl:panel><%=pluginTypes == null || pluginTypes.getTotalCount() == 0 ? "No plugin types were found" : "No plugin types on this page. Please select another page!" %></tbl:panel>
    417417        <%
    418418      }
  • trunk/www/admin/protocols/list_protocol.jsp

    r2978 r3190  
    458458      {
    459459        %>
    460         <tbl:panel><%=protocols == null || protocols.getTotalCount() == 0 ? "No protocols where found" : "No protocols on this page. Please select another page!" %></tbl:panel>
     460        <tbl:panel><%=protocols == null || protocols.getTotalCount() == 0 ? "No protocols were found" : "No protocols on this page. Please select another page!" %></tbl:panel>
    461461        <%
    462462      }
  • trunk/www/admin/protocoltypes/list_protocoltype.jsp

    r2978 r3190  
    419419      {
    420420        %>
    421         <tbl:panel><%=protocolTypes == null || protocolTypes.getTotalCount() == 0 ? "No protocol types where found" : "No protocol types on this page. Please select another page!" %></tbl:panel>
     421        <tbl:panel><%=protocolTypes == null || protocolTypes.getTotalCount() == 0 ? "No protocol types were found" : "No protocol types on this page. Please select another page!" %></tbl:panel>
    422422        <%
    423423      }
  • trunk/www/admin/quota/list_quota.jsp

    r2978 r3190  
    374374      {
    375375        %>
    376         <tbl:panel><%=quota == null || quota.getTotalCount() == 0 ? "No quota where found" : "No quota on this page. Please select another page!" %></tbl:panel>
     376        <tbl:panel><%=quota == null || quota.getTotalCount() == 0 ? "No quota were found" : "No quota on this page. Please select another page!" %></tbl:panel>
    377377        <%
    378378      }
  • trunk/www/admin/quotatypes/list_quotatypes.jsp

    r2978 r3190  
    303303      {
    304304        %>
    305         <tbl:panel><%=quotaTypes == null || quotaTypes.getTotalCount() == 0 ? "No quota types where found" : "No quota types on this page. Please select another page!" %></tbl:panel>
     305        <tbl:panel><%=quotaTypes == null || quotaTypes.getTotalCount() == 0 ? "No quota types were found" : "No quota types on this page. Please select another page!" %></tbl:panel>
    306306        <%
    307307      }
  • trunk/www/admin/reportertypes/list_reportertypes.jsp

    r2978 r3190  
    351351      {
    352352        %>
    353         <tbl:panel><%=reporterTypes == null || reporterTypes.getTotalCount() == 0 ? "No reporter types where found" : "No reporter types on this page. Please select another page!" %></tbl:panel>
     353        <tbl:panel><%=reporterTypes == null || reporterTypes.getTotalCount() == 0 ? "No reporter types were found" : "No reporter types on this page. Please select another page!" %></tbl:panel>
    354354        <%
    355355      }
  • trunk/www/admin/roles/list_roles.jsp

    r2978 r3190  
    407407      {
    408408        %>
    409         <tbl:panel><%=roles == null || roles.getTotalCount() == 0 ? "No roles where found" : "No roles on this page. Please select another page!" %></tbl:panel>
     409        <tbl:panel><%=roles == null || roles.getTotalCount() == 0 ? "No roles were found" : "No roles on this page. Please select another page!" %></tbl:panel>
    410410        <%
    411411      }
  • trunk/www/admin/software/list_software.jsp

    r2978 r3190  
    452452      {
    453453        %>
    454         <tbl:panel><%=software == null || software.getTotalCount() == 0 ? "No software where found" : "No software on this page. Please select another page!" %></tbl:panel>
     454        <tbl:panel><%=software == null || software.getTotalCount() == 0 ? "No software were found" : "No software on this page. Please select another page!" %></tbl:panel>
    455455        <%
    456456      }
  • trunk/www/admin/softwaretypes/list_softwaretypes.jsp

    r2978 r3190  
    357357      {
    358358        %>
    359         <tbl:panel><%=softwareTypes == null || softwareTypes.getTotalCount() == 0 ? "No software types where found" : "No software types on this page. Please select another page!" %></tbl:panel>
     359        <tbl:panel><%=softwareTypes == null || softwareTypes.getTotalCount() == 0 ? "No software types were found" : "No software types on this page. Please select another page!" %></tbl:panel>
    360360        <%
    361361      }
  • trunk/www/admin/users/list_users.jsp

    r2978 r3190  
    624624      {
    625625        %>
    626         <tbl:panel><%=users == null || users.getTotalCount() == 0 ? "No users where found" : "No users on this page. Please select another page!" %></tbl:panel>
     626        <tbl:panel><%=users == null || users.getTotalCount() == 0 ? "No users were found" : "No users on this page. Please select another page!" %></tbl:panel>
    627627        <%
    628628      }
  • trunk/www/biomaterials/biosources/list_biosources.jsp

    r2978 r3190  
    531531      {
    532532        %>
    533         <tbl:panel><%=bioSources == null || bioSources.getTotalCount() == 0 ? "No biosources where found" : "No biosources on this page. Please select another page!" %></tbl:panel>
     533        <tbl:panel><%=bioSources == null || bioSources.getTotalCount() == 0 ? "No biosources were found" : "No biosources on this page. Please select another page!" %></tbl:panel>
    534534        <%
    535535      }
  • trunk/www/biomaterials/events/list_events.jsp

    r2978 r3190  
    521521      {
    522522        %>
    523         <tbl:panel><%=events == null || events.getTotalCount() == 0 ? "No events where found" : "No events on this page. Please select another page!" %></tbl:panel>
     523        <tbl:panel><%=events == null || events.getTotalCount() == 0 ? "No events were found" : "No events on this page. Please select another page!" %></tbl:panel>
    524524        <%
    525525      }
  • trunk/www/biomaterials/extracts/list_extracts.jsp

    r2978 r3190  
    656656      {
    657657        %>
    658         <tbl:panel><%=extracts == null || extracts.getTotalCount() == 0 ? "No extracts where found" : "No extracts on this page. Please select another page!" %></tbl:panel>
     658        <tbl:panel><%=extracts == null || extracts.getTotalCount() == 0 ? "No extracts were found" : "No extracts on this page. Please select another page!" %></tbl:panel>
    659659        <%
    660660      }
  • trunk/www/biomaterials/labeledextracts/list_labeledextracts.jsp

    r2978 r3190  
    668668      {
    669669        %>
    670         <tbl:panel><%=labeledExtracts == null || labeledExtracts.getTotalCount() == 0 ? "No labeled extracts where found" : "No labeled extracts on this page. Please select another page!" %></tbl:panel>
     670        <tbl:panel><%=labeledExtracts == null || labeledExtracts.getTotalCount() == 0 ? "No labeled extracts were found" : "No labeled extracts on this page. Please select another page!" %></tbl:panel>
    671671        <%
    672672      }
  • trunk/www/biomaterials/labels/list_labels.jsp

    r2978 r3190  
    417417      {
    418418        %>
    419         <tbl:panel><%=labels == null || labels.getTotalCount() == 0 ? "No labels where found" : "No labels on this page. Please select another page!" %></tbl:panel>
     419        <tbl:panel><%=labels == null || labels.getTotalCount() == 0 ? "No labels were found" : "No labels on this page. Please select another page!" %></tbl:panel>
    420420        <%
    421421      }
  • trunk/www/biomaterials/samples/list_samples.jsp

    r2978 r3190  
    652652      {
    653653        %>
    654         <tbl:panel><%=samples == null || samples.getTotalCount() == 0 ? "No samples where found" : "No samples on this page. Please select another page!" %></tbl:panel>
     654        <tbl:panel><%=samples == null || samples.getTotalCount() == 0 ? "No samples were found" : "No samples on this page. Please select another page!" %></tbl:panel>
    655655        <%
    656656      }
  • trunk/www/common/context/manage.jsp

    r2978 r3190  
    187187        {
    188188          %>
    189           <tbl:panel>No presets where found</tbl:panel>
     189          <tbl:panel>No presets were found</tbl:panel>
    190190          <%
    191191        }
  • trunk/www/common/import/no_fileformat.jsp

    r2978 r3190  
    105105      <base:note type="info" title="No matching file format">
    106106      <br>
    107       We couldn't find any file format mathing the file <b><%=file.getPath().toString()%></b>.
     107      No file format that matches the file <b><%=file.getPath().toString()%></b> could be found.
    108108      <br><br>
    109109      </base:note>
  • trunk/www/include/scripts/table.js

    r3077 r3190  
    222222  {
    223223    var frm = document.forms[tableId];
    224     if (Forms.numChecked(frm) < 2)
    225     {
    226       alert('Please select at least two items in the list');
     224    if (Forms.numChecked(frm) < 1)
     225    {
     226      alert('Please select at least one item in the list');
    227227      return;
    228228    }
  • trunk/www/include/styles/table.css

    r2306 r3190  
    3333  width: 100%;
    3434  background: #E0E0E0;
    35   margin-bottom: -10px;
    36   padding-bottom: -10px;
     35  margin-bottom: 0px;
     36  padding-bottom: 0px;
     37}
     38
     39form {
     40  margin-bottom: 0px;
     41  padding-bottom: 0px;     
    3742}
    3843
  • trunk/www/lims/arraybatches/list_batches.jsp

    r2978 r3190  
    568568      {
    569569        %>
    570         <tbl:panel><%=batches == null || batches.getTotalCount() == 0 ? "No array batches where found" : "No array batches on this page. Please select another page!" %></tbl:panel>
     570        <tbl:panel><%=batches == null || batches.getTotalCount() == 0 ? "No array batches were found" : "No array batches on this page. Please select another page!" %></tbl:panel>
    571571        <%
    572572      }
  • trunk/www/lims/arraydesigns/features/list_features.jsp

    r2978 r3190  
    649649      {
    650650        %>
    651         <tbl:panel><%=features == null || features.getTotalCount() == 0 ? "No features where found" : "No features on this page. Please select another page!" %></tbl:panel>
     651        <tbl:panel><%=features == null || features.getTotalCount() == 0 ? "No features were found" : "No features on this page. Please select another page!" %></tbl:panel>
    652652        <%
    653653      }
  • trunk/www/lims/arraydesigns/list_designs.jsp

    r2978 r3190  
    570570      {
    571571        %>
    572         <tbl:panel><%=designs == null || designs.getTotalCount() == 0 ? "No array designs where found" : "No array designs on this page. Please select another page!" %></tbl:panel>
     572        <tbl:panel><%=designs == null || designs.getTotalCount() == 0 ? "No array designs were found" : "No array designs on this page. Please select another page!" %></tbl:panel>
    573573        <%
    574574      }
  • trunk/www/lims/arrayslides/list_slides.jsp

    r2978 r3190  
    558558      {
    559559        %>
    560         <tbl:panel><%=slides == null || slides.getTotalCount() == 0 ? "No array slides where found" : "No array slides on this page. Please select another page!" %></tbl:panel>
     560        <tbl:panel><%=slides == null || slides.getTotalCount() == 0 ? "No array slides were found" : "No array slides on this page. Please select another page!" %></tbl:panel>
    561561        <%
    562562      }
  • trunk/www/lims/geometries/list_geometries.jsp

    r2978 r3190  
    422422      {
    423423        %>
    424         <tbl:panel><%=geometries == null || geometries.getTotalCount() == 0 ? "No plate geometries where found" : "No plate geometries on this page. Please select another page!" %></tbl:panel>
     424        <tbl:panel><%=geometries == null || geometries.getTotalCount() == 0 ? "No plate geometries were found" : "No plate geometries on this page. Please select another page!" %></tbl:panel>
    425425        <%
    426426      }
  • trunk/www/lims/platemappings/list_mappings.jsp

    r3097 r3190  
    488488      {
    489489        %>
    490         <tbl:panel><%=mappings == null || mappings.getTotalCount() == 0 ? "No plate mappings where found" : "No plate mappings on this page. Please select another page!" %></tbl:panel>
     490        <tbl:panel><%=mappings == null || mappings.getTotalCount() == 0 ? "No plate mappings were found" : "No plate mappings on this page. Please select another page!" %></tbl:panel>
    491491        <%
    492492      }
  • trunk/www/lims/plates/events/list_events.jsp

    r2978 r3190  
    461461      {
    462462        %>
    463         <tbl:panel><%=events == null || events.getTotalCount() == 0 ? "No events where found" : "No events on this page. Please select another page!" %></tbl:panel>
     463        <tbl:panel><%=events == null || events.getTotalCount() == 0 ? "No events were found" : "No events on this page. Please select another page!" %></tbl:panel>
    464464        <%
    465465      }
  • trunk/www/lims/plates/list_plates.jsp

    r2978 r3190  
    637637      {
    638638        %>
    639         <tbl:panel><%=plates == null || plates.getTotalCount() == 0 ? "No plates where found" : "No plates on this page. Please select another page!" %></tbl:panel>
     639        <tbl:panel><%=plates == null || plates.getTotalCount() == 0 ? "No plates were found" : "No plates on this page. Please select another page!" %></tbl:panel>
    640640        <%
    641641      }
  • trunk/www/lims/plates/wells/list_wells.jsp

    r2978 r3190  
    567567      {
    568568        %>
    569         <tbl:panel><%=wells == null || wells.getTotalCount() == 0 ? "No wells where found" : "No wells on this page. Please select another page!" %></tbl:panel>
     569        <tbl:panel><%=wells == null || wells.getTotalCount() == 0 ? "No wells were found" : "No wells on this page. Please select another page!" %></tbl:panel>
    570570        <%
    571571      }
  • trunk/www/lims/platetypes/eventtypes/list_eventtypes.jsp

    r2978 r3190  
    398398      {
    399399        %>
    400         <tbl:panel><%=eventTypes == null || eventTypes.getTotalCount() == 0 ? "No event types where found" : "No event types on this page. Please select another page!" %></tbl:panel>
     400        <tbl:panel><%=eventTypes == null || eventTypes.getTotalCount() == 0 ? "No event types were found" : "No event types on this page. Please select another page!" %></tbl:panel>
    401401        <%
    402402      }
  • trunk/www/lims/platetypes/list_platetypes.jsp

    r2978 r3190  
    483483      {
    484484        %>
    485         <tbl:panel><%=plateTypes == null || plateTypes.getTotalCount() == 0 ? "No plate types where found" : "No plate types on this page. Please select another page!" %></tbl:panel>
     485        <tbl:panel><%=plateTypes == null || plateTypes.getTotalCount() == 0 ? "No plate types were found" : "No plate types on this page. Please select another page!" %></tbl:panel>
    486486        <%
    487487      }
  • trunk/www/my_base/messages/list_messages.jsp

    r2978 r3190  
    400400      {
    401401        %>
    402         <tbl:panel><%=messages == null || messages.getTotalCount() == 0 ? "No messages where found" : "No messages on this page. Please select another page!" %></tbl:panel>
     402        <tbl:panel><%=messages == null || messages.getTotalCount() == 0 ? "No messages were found" : "No messages on this page. Please select another page!" %></tbl:panel>
    403403        <%
    404404      }
  • trunk/www/my_base/projects/items/list_items.jsp

    r2978 r3190  
    356356      {
    357357        %>
    358         <tbl:panel><%=items == null || items.size() == 0 ? "No items where found" : "No items on this page. Please select another page!" %></tbl:panel>
     358        <tbl:panel><%=items == null || items.size() == 0 ? "No items were found" : "No items on this page. Please select another page!" %></tbl:panel>
    359359        <%
    360360      }
  • trunk/www/my_base/projects/list_projects.jsp

    r2978 r3190  
    402402      {
    403403        %>
    404         <tbl:panel><%=projects == null || projects.getTotalCount() == 0 ? "No projects where found" : "No projects on this page. Please select another page!" %></tbl:panel>
     404        <tbl:panel><%=projects == null || projects.getTotalCount() == 0 ? "No projects were found" : "No projects on this page. Please select another page!" %></tbl:panel>
    405405        <%
    406406      }
  • trunk/www/my_base/user/preferences.jsp

    r2978 r3190  
    390390      </td>
    391391    </tr>
     392    <%
     393    int numDecimals = FormatterSettings.getNumDecimals(sc);
     394    %>
     395    <tr>
     396      <td class="prompt">Decimals</td>
     397      <td>
     398        <select name="decimals">
     399        <%
     400        for (int i = 0; i < 8; i++)
     401        {
     402          %>
     403          <option value="<%=i%>" <%=numDecimals == i ? "selected" : ""%>><%=i%>
     404          <%
     405        }
     406        %>
     407        <option value="-1" <%=numDecimals < 0 ? "selected" : ""%>>all
     408        </select>
     409      </td>
     410    </tr>
    392411   
    393412    </table>
  • trunk/www/my_base/user/submit_user.jsp

    r2978 r3190  
    126126    cc.setRecent("dateFormats", dateFormat, maxRecent);
    127127    cc.setRecent("dateTimeFormats", dateTimeFormat, maxRecent);
     128
     129    int numDecimals = Values.getInt(request.getParameter("decimals"), 2);
     130    FormatterSettings.setNumDecimals(sc, numDecimals);
    128131   
    129132    sc.setUserClientSetting("plugins.sendmessage", Values.getString(request.getParameter("sendmessage"), "0"));
  • trunk/www/views/experiments/bioassays/list_bioassays.jsp

    r2978 r3190  
    346346          image="<%=createPermission ? "runplugin.gif" : "runplugin_disabled.gif"%>"
    347347          onclick="<%="runPlugin('RunListAnalysisPlugin')"%>"
    348           title="Run plugin&hellip;"
     348          title="Run analysis&hellip;"
    349349          tooltip="<%=createPermission ? "Run an analysis plugin" :
    350350            "You do not have permission to analyze this experiment"%>"
     
    505505      {
    506506        %>
    507         <tbl:panel><%=bioAssays == null || bioAssays.getTotalCount() == 0 ? "No bioassays where found" : "No bioassays on this page. Please select another page!" %></tbl:panel>
     507        <tbl:panel><%=bioAssays == null || bioAssays.getTotalCount() == 0 ? "No bioassays were found" : "No bioassays on this page. Please select another page!" %></tbl:panel>
    508508        <%
    509509      }
  • trunk/www/views/experiments/bioassaysets/analysis_tree.jsp

    r3096 r3190  
    377377    function initTree()
    378378    {
    379       var bigDir = getRoot()+'/images/joust/big/';
     379      var bigDir = getRoot()+'images/joust/big/';
    380380      IconStore.init(bigDir, 18, 22);
    381381      IconStore.addIcon('BioAssaySet', bigDir + 'bioassayset.gif', 18, 22);
     
    932932      {
    933933        %>
    934         <tbl:panel>No bioassay sets or transformations where found.</tbl:panel>
     934        <tbl:panel>No bioassay sets or transformations were found.</tbl:panel>
    935935        <%
    936936      }
  • trunk/www/views/experiments/bioassaysets/view_bioassayset.jsp

    r2978 r3190  
    267267        image="<%=createPermission ? "runplugin.gif" : "runplugin_disabled.gif"%>"
    268268        onclick="<%="runAnalysisPlugin(" + itemId + ")"%>"
    269         title="Run plugin&hellip;"
     269        title="Run analysis&hellip;"
    270270        tooltip="<%=createPermission ? "Run an analysis plugin" :
    271271          "You do not have permission to analyze this experiment"%>"
  • trunk/www/views/experiments/explorer/search/list.jsp

    r2978 r3190  
    289289      {
    290290        %>
    291         <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters where found" : "No reporters on this page. Please select another page!" %></tbl:panel>
     291        <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters were found" : "No reporters on this page. Please select another page!" %></tbl:panel>
    292292        <%
    293293      }
  • trunk/www/views/experiments/list_experiments.jsp

    r2978 r3190  
    557557      {
    558558        %>
    559         <tbl:panel><%=experiments == null || experiments.getTotalCount() == 0 ? "No experiments where found" : "No experiments on this page. Please select another page!" %></tbl:panel>
     559        <tbl:panel><%=experiments == null || experiments.getTotalCount() == 0 ? "No experiments were found" : "No experiments on this page. Please select another page!" %></tbl:panel>
    560560        <%
    561561      }
  • trunk/www/views/experiments/spotdata/list_spotdata.jsp

    r2993 r3190  
    377377      {
    378378        %>
    379         <tbl:panel><%=spotData == null || spotData.getTotalCount() == 0 ? "No spot data where found" : "No spot data on this page. Please select another page!" %></tbl:panel>
     379        <tbl:panel><%=spotData == null || spotData.getTotalCount() == 0 ? "No spot data were found" : "No spot data on this page. Please select another page!" %></tbl:panel>
    380380        <%
    381381      }
  • trunk/www/views/formulas/list_formulas.jsp

    r2978 r3190  
    541541      {
    542542        %>
    543         <tbl:panel><%=formulas == null || formulas.getTotalCount() == 0 ? "No formulas where found" : "No formulas on this page. Please select another page!" %></tbl:panel>
     543        <tbl:panel><%=formulas == null || formulas.getTotalCount() == 0 ? "No formulas were found" : "No formulas on this page. Please select another page!" %></tbl:panel>
    544544        <%
    545545      }
  • trunk/www/views/hybridizations/list_hybridizations.jsp

    r2978 r3190  
    653653      {
    654654        %>
    655         <tbl:panel><%=hybridizations == null || hybridizations.getTotalCount() == 0 ? "No hybridizations where found" : "No hybridizations on this page. Please select another page!" %></tbl:panel>
     655        <tbl:panel><%=hybridizations == null || hybridizations.getTotalCount() == 0 ? "No hybridizations were found" : "No hybridizations on this page. Please select another page!" %></tbl:panel>
    656656        <%
    657657      }
  • trunk/www/views/items/list_items.jsp

    r2978 r3190  
    332332      {
    333333        %>
    334         <tbl:panel><%=allItems == null || allItems.size() == 0 ? "No items where found" : "No items on this page. Please select another page!" %></tbl:panel>
     334        <tbl:panel><%=allItems == null || allItems.size() == 0 ? "No items were found" : "No items on this page. Please select another page!" %></tbl:panel>
    335335        <%
    336336      }
  • trunk/www/views/jobs/list_jobs.jsp

    r2978 r3190  
    620620      {
    621621        %>
    622         <tbl:panel><%=jobs == null || jobs.getTotalCount() == 0 ? "No jobs where found" : "No jobs on this page. Please select another page!" %></tbl:panel>
     622        <tbl:panel><%=jobs == null || jobs.getTotalCount() == 0 ? "No jobs were found" : "No jobs on this page. Please select another page!" %></tbl:panel>
    623623        <%
    624624      }
  • trunk/www/views/rawbioassays/list_rawbioassays.jsp

    r2978 r3190  
    665665      {
    666666        %>
    667         <tbl:panel><%=rawBioAssays == null || rawBioAssays.getTotalCount() == 0 ? "No raw bioassays where found" : "No raw bioassays on this page. Please select another page!" %></tbl:panel>
     667        <tbl:panel><%=rawBioAssays == null || rawBioAssays.getTotalCount() == 0 ? "No raw bioassays were found" : "No raw bioassays on this page. Please select another page!" %></tbl:panel>
    668668        <%
    669669      }
  • trunk/www/views/rawbioassays/rawdata/list_rawdata.jsp

    r2978 r3190  
    805805      {
    806806        %>
    807         <tbl:panel><%=rawData == null || rawData.getTotalCount() == 0 ? "No raw data where found" : "No raw data on this page. Please select another page!" %></tbl:panel>
     807        <tbl:panel><%=rawData == null || rawData.getTotalCount() == 0 ? "No raw data were found" : "No raw data on this page. Please select another page!" %></tbl:panel>
    808808        <%
    809809      }
  • trunk/www/views/reporterlists/list_reporterlists.jsp

    r2978 r3190  
    439439      {
    440440        %>
    441         <tbl:panel><%=reporterLists == null || reporterLists.getTotalCount() == 0 ? "No reporter lists where found" : "No reporter lists on this page. Please select another page!" %></tbl:panel>
     441        <tbl:panel><%=reporterLists == null || reporterLists.getTotalCount() == 0 ? "No reporter lists were found" : "No reporter lists on this page. Please select another page!" %></tbl:panel>
    442442        <%
    443443      }
  • trunk/www/views/reporterlists/reporters/list_reporters.jsp

    r2978 r3190  
    477477      {
    478478        %>
    479         <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters where found" : "No reporters on this page. Please select another page!" %></tbl:panel>
     479        <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters were found" : "No reporters on this page. Please select another page!" %></tbl:panel>
    480480        <%
    481481      }
  • trunk/www/views/reporters/list_reporters.jsp

    r2978 r3190  
    453453      {
    454454        %>
    455         <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters where found" : "No reporters on this page. Please select another page!" %></tbl:panel>
     455        <tbl:panel><%=reporters == null || reporters.getTotalCount() == 0 ? "No reporters were found" : "No reporters on this page. Please select another page!" %></tbl:panel>
    456456        <%
    457457      }
  • trunk/www/views/scans/images/list_images.jsp

    r2978 r3190  
    429429      {
    430430        %>
    431         <tbl:panel><%=images == null || images.getTotalCount() == 0 ? "No images where found" : "No images on this page. Please select another page!" %></tbl:panel>
     431        <tbl:panel><%=images == null || images.getTotalCount() == 0 ? "No images were found" : "No images on this page. Please select another page!" %></tbl:panel>
    432432        <%
    433433      }
  • trunk/www/views/scans/list_scans.jsp

    r2978 r3190  
    575575      {
    576576        %>
    577         <tbl:panel><%=scans == null || scans.getTotalCount() == 0 ? "No scans where found" : "No scans on this page. Please select another page!" %></tbl:panel>
     577        <tbl:panel><%=scans == null || scans.getTotalCount() == 0 ? "No scans were found" : "No scans on this page. Please select another page!" %></tbl:panel>
    578578        <%
    579579      }
  • trunk/www/views/sessions/list_sessions.jsp

    r2982 r3190  
    361361      {
    362362        %>
    363         <tbl:panel><%=sessions == null || sessions.getTotalCount() == 0 ? "No sessions where found" : "No sessions on this page. Please select another page!" %></tbl:panel>
     363        <tbl:panel><%=sessions == null || sessions.getTotalCount() == 0 ? "No sessions were found" : "No sessions on this page. Please select another page!" %></tbl:panel>
    364364        <%
    365365      }
  • trunk/www/views/trashcan/list_trash.jsp

    r2978 r3190  
    323323      {
    324324        %>
    325         <tbl:panel><%=trash == null || trash.size() == 0 ? "No items where found" : "No items on this page. Please select another page!" %></tbl:panel>
     325        <tbl:panel><%=trash == null || trash.size() == 0 ? "No items were found" : "No items on this page. Please select another page!" %></tbl:panel>
    326326        <%
    327327      }
Note: See TracChangeset for help on using the changeset viewer.