Browse Source

Add cvitjs to node view and add additional help text to node edit form.

Lacey Sanderson 7 years ago
parent
commit
22a0f6f85e
2 changed files with 21 additions and 17 deletions
  1. 20 17
      includes/blast_ui.node.inc
  2. 1 0
      theme/node--blastdb.tpl.php

+ 20 - 17
includes/blast_ui.node.inc

@@ -67,7 +67,7 @@ function blastdb_form($node, &$form_state) {
   $form = array();
 
   $form['#validate'] = array('blastdb_form_validate');
-  
+
   $form['#attached']['css'] = array(
     drupal_get_path('module', 'blast_ui') . '/theme/css/form.css',
   );
@@ -106,7 +106,7 @@ function blastdb_form($node, &$form_state) {
   $form['dbxref'] = array(
     '#type' => 'fieldset',
     '#title' => 'Link-outs',
-    '#description' => 'These settings will be used to <em>transform the hit name into a 
+    '#description' => 'These settings will be used to <em>transform the hit name into a
       link to additional information</em>.',
     '#prefix' => '<div id="link-outs">',
     '#suffix' => '</div>',
@@ -122,13 +122,13 @@ function blastdb_form($node, &$form_state) {
   $form['dbxref']['dbxref_linkout_type'] = array(
     '#type' => 'radios',
     '#title' => 'Link-out Type',
-    '#description' => 'This determines how the URL to be linked to is formed. <strong>Make 
-      sure the database chosen supports this type of link</strong> (ie: the database 
+    '#description' => 'This determines how the URL to be linked to is formed. <strong>Make
+      sure the database chosen supports this type of link</strong> (ie: the database
       should point to a GBrowse instance if you choose GBrowse here).',
     '#options' => $options,
     '#default_value' => $linkout_type,
   );
-  
+
   // Add information about each format to the description.
   if ($linkout_type) {
     $form['dbxref']['dbxref_linkout_type']['#description'] .= '
@@ -229,7 +229,7 @@ function blastdb_form($node, &$form_state) {
       '#default_value' => (isset($node->linkout->db_id->db_id)) ? $node->linkout->db_id->db_id : 0
     );
   }
-    
+
   // CViTjs settings, if enabled
   if (variable_get('blast_ui_cvitjs_enabled', false)) {
     $form['cvitjs'] = array(
@@ -239,7 +239,7 @@ function blastdb_form($node, &$form_state) {
       '#prefix' => '<div id="cvitjs-settings">',
       '#suffix' => '</div>',
     );
-    
+
     $form['cvitjs']['cvitjs_enabled'] = array(
       '#type' => 'checkbox',
       '#title' => t('Show BLAST hits on the genome in the results page.'),
@@ -250,6 +250,9 @@ function blastdb_form($node, &$form_state) {
 //        'wrapper' => 'cvitjs-settings',
 //      )
     );
+    $form['cvitjs']['cvitjs_enabled']['#description'] .= '
+        <p class="blastdb-extra-info">Target Genome Configuration should be under <strong>[data.'.$node->db_name.']</strong> in the main cvit.conf.</p>';
+
 
     if (isset($form_state['values'])) {
       $cvitjs_enabled = $form_state['values']['cvitjs_enabled'];
@@ -261,7 +264,7 @@ function blastdb_form($node, &$form_state) {
       $cvitjs_enabled = false;
     }
   }
-  
+
   return $form;
 }
 
@@ -313,7 +316,7 @@ function blastdb_insert($node) {
       $regex = $node->dbxref_id_type;
     }
   }
-  
+
   $db_id = 0;
   if (isset($node->db_id)) {
     $db_id = $node->db_id;
@@ -326,7 +329,7 @@ function blastdb_insert($node) {
   if (!isset($node->cvitjs_enabled)) {
     $node->cvitjs_enabled = 0;
   }
-    
+
   // Actually insert the record.
   db_insert('blastdb')->fields(array(
     'nid'                 => $node->nid,
@@ -365,7 +368,7 @@ function blastdb_update($node) {
       $regex = $node->dbxref_id_type;
     }
   }
-  
+
   $db_id = 0;
   if (isset($node->db_id)) {
     $db_id = $node->db_id;
@@ -374,11 +377,11 @@ function blastdb_update($node) {
   if (!$node->cvitjs_enabled) {
     $node->cvitjs_enabled = 0;
   }
-    
+
   if (!$node->dbxref_linkout_type) {
     $node->dbxref_linkout_type = 'none';
   }
-  
+
   // Update the record.
   db_update('blastdb')->fields(array(
     'name'                => $node->db_name,
@@ -414,9 +417,9 @@ function blastdb_delete($node) {
 function blastdb_load($nodes) {
 
   $sql = "
-    SELECT nid, name, path, dbtype, dbxref_id_regex, dbxref_db_id, 
+    SELECT nid, name, path, dbtype, dbxref_id_regex, dbxref_db_id,
            dbxref_linkout_type, cvitjs_enabled
-    FROM {blastdb} 
+    FROM {blastdb}
     WHERE nid IN (:nids)";
   $result = db_query($sql, array(':nids' => array_keys($nodes)));
 
@@ -441,7 +444,7 @@ function blastdb_load($nodes) {
       tripal_report_error(
         'blast_ui',
         TRIPAL_ERROR,
-        'Unable to find details on the type of link-out choosen (%type). Have you defined hook_blast_linkout_info()? Make sure to clear the cache once you do so.',       
+        'Unable to find details on the type of link-out choosen (%type). Have you defined hook_blast_linkout_info()? Make sure to clear the cache once you do so.',
         array('%type' => $record->dbxref_linkout_type)
       );
     }
@@ -494,7 +497,7 @@ function blastdb_load($nodes) {
       // Support complex link-outs.
       $nodes[$record->nid]->linkout->type = $record->dbxref_linkout_type;
       $nodes[$record->nid]->linkout->url_function = $type['process function'];
-   
+
     }
     // If there is no linkout then provide some defaults.
     else {

+ 1 - 0
theme/node--blastdb.tpl.php

@@ -105,6 +105,7 @@
       <tr><th>RegEx</th><td><?php print $node->linkout->regex; ?></td></tr>
       <tr><th>Link-out Type</th><td><?php print $node->linkout->type; ?></td></tr>
 <?php } ?>
+      <tr><th>Whole Genome Viewer</th><td><?php print ($node->cvitjs_enabled) ? 'Enabled' : 'Disabled'; ?></td></tr>
     </table>
 
     <?php