Changeset 5159

Timestamp:

Oct 23, 2009, 1:25:20 PM (14 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:

• src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (1 diff)
• www/common/plugin/configure.jsp (modified) (2 diffs)
• www/include/styles/parameters.css (modified) (2 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -1143 +1143 @@
         Request.COMMAND_CONFIGURE_JOB,
         "Configure job",
-        "Set the parameters needed for this plugin.",
+        null,
         parameters);
     }

trunk/www/common/plugin/configure.jsp

@@ -103 +103 @@
   String jobName = Values.getString(request.getParameter("job_name"), title);
   StringBuilder sb = new StringBuilder();
-  
+  String helpText = ri.getDescription();
+  if (helpText == null && pluginConfig != null) helpText = pluginConfig.getDescription();
+  if (helpText == null) helpText = plugin.getDescription();
   List<File> recentFiles = null;
   %>
-
   <base:page type="popup" title="<%=title%>">
   <base:head scripts="plugin.js,parameters.js,ajax.js" styles="parameters.css">
@@ -704 +705 @@
     
       <div class="pluginhelp">
-        <%=HTML.niceFormat(ri.getDescription())%>
+        <%=HTML.niceFormat(helpText)%>
       </div>
 

trunk/www/include/styles/parameters.css

@@ -1 +1 @@
 /* $Id$
   ------------------------------------------------------------------
-  Copyright (C) 2006 Jari Häkkinen, Nicklas Nordborg
+  Copyright (C) 2006 Jari H�kkinen, Nicklas Nordborg
 
   This file is part of BASE - BioArray Software Environment.
@@ -67 +67 @@
   padding: 2px;
   margin: 8px;
+  max-height: 70px;
+  overflow: auto;
 }