Changeset 5159


Ignore:
Timestamp:
Oct 23, 2009, 1:25:20 PM (12 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1405: Use 'description' as help text for job parameters if the plug-in hasn't set any help text in the RequestInformation?

Removed the generic (not so helpful) help text that the Base1PluginExecuter sets in the RequestInformation?.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

    r5095 r5159  
    11431143        Request.COMMAND_CONFIGURE_JOB,
    11441144        "Configure job",
    1145         "Set the parameters needed for this plugin.",
     1145        null,
    11461146        parameters);
    11471147    }
  • trunk/www/common/plugin/configure.jsp

    r5060 r5159  
    103103  String jobName = Values.getString(request.getParameter("job_name"), title);
    104104  StringBuilder sb = new StringBuilder();
    105  
     105  String helpText = ri.getDescription();
     106  if (helpText == null && pluginConfig != null) helpText = pluginConfig.getDescription();
     107  if (helpText == null) helpText = plugin.getDescription();
    106108  List<File> recentFiles = null;
    107109  %>
    108 
    109110  <base:page type="popup" title="<%=title%>">
    110111  <base:head scripts="plugin.js,parameters.js,ajax.js" styles="parameters.css">
     
    704705   
    705706      <div class="pluginhelp">
    706         <%=HTML.niceFormat(ri.getDescription())%>
     707        <%=HTML.niceFormat(helpText)%>
    707708      </div>
    708709
  • trunk/www/include/styles/parameters.css

    r4889 r5159  
    11/* $Id$
    22  ------------------------------------------------------------------
    3   Copyright (C) 2006 Jari Häkkinen, Nicklas Nordborg
     3  Copyright (C) 2006 Jari Hkkinen, Nicklas Nordborg
    44
    55  This file is part of BASE - BioArray Software Environment.
     
    6767  padding: 2px;
    6868  margin: 8px;
     69  max-height: 70px;
     70  overflow: auto;
    6971}
    7072
Note: See TracChangeset for help on using the changeset viewer.