/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 22383f95

Added by Andreas Kohlbecker almost 7 years ago

ID 22383f954d526ced5db157f7d79e72c549d38b99
Parent b9e9f59b
Child 63d5030d

fix #6820 synonymy can be placed in the general page instead of being a tab

       $page_part = variable_get('cdm_dataportal_taxonpage_tabs', 1) ? $page_part : 'all';
       $synonymy_as_tab = variable_get(CDM_SYNONYMY_AS_TAB, CDM_SYNONYMY_AS_TAB_DEFAULT) === 1;
       if(!$synonymy_as_tab){
         unset($tabsToDisplay["Synonymy"]);
+      }
       $media = _load_media_for_taxon($taxon);
-...
         taxon_page_tabs_hidden('keys');
+      }
         // --- GET TaxonNodeAgentRelations --- //
         $current_classification_uuid = get_current_classification_uuid();
         $taxon_node_agent_relations_pager = cdm_ws_get(CDM_WS_PORTAL_TAXON_TAXONNODEAGENTRELATIONS,
             array(
                 $taxon->uuid,
                 $current_classification_uuid,
             ),
             "pageSize=1&pageIndex=0"// we are only interested into the count so we are fetching only one item, o is not possible!
         );
         if (!$taxon_node_agent_relations_pager || $taxon_node_agent_relations_pager->count == 0){
             taxon_page_tabs_hidden('experts');
+        }
       // --- GET TaxonNodeAgentRelations --- //
       $current_classification_uuid = get_current_classification_uuid();
       $taxon_node_agent_relations_pager = cdm_ws_get(CDM_WS_PORTAL_TAXON_TAXONNODEAGENTRELATIONS,
           array(
               $taxon->uuid,
               $current_classification_uuid,
           ),
           "pageSize=1&pageIndex=0"// we are only interested into the count so we are fetching only one item, o is not possible!
       );
       if (!$taxon_node_agent_relations_pager || $taxon_node_agent_relations_pager->count == 0){
           taxon_page_tabs_hidden('experts');
+      }
         if ($tabsToDisplay["Synonymy"] == '0') {
       if (!isset($tabsToDisplay["Synonymy"]) || $tabsToDisplay["Synonymy"] == '0') {
         taxon_page_tabs_hidden('synonymy');
+      }
-...
         $merged_tree = merged_taxon_feature_tree($taxon);
         $render_array['general'] = compose_cdm_taxon_page_profile($taxon, $merged_tree, $media);
         $render_array['general'] = compose_cdm_taxon_page_profile($taxon, $merged_tree, $media, !$synonymy_as_tab);
         $render_array['general']['#weight'] = $weight++;
         $render_array['general']['#prefix'] = '<div id="general" class="page-part">';
         $render_array['general']['#suffix'] = '</div>';
-...
+      }
       // --- PAGE PART: SYNONYMY --- //
       if (($page_part == 'synonymy' || $page_part == 'all')) {
       if ((($page_part == 'synonymy' || $page_part == 'all') && $synonymy_as_tab)) {
         $synonymy_html = '<div id="synonymy" class="page-part">';
         if ($page_part == 'all') {
           $synonymy_html .= '<h2>' . t(cdm_taxonpage_tab_label('Synonymy')) . '</h2>';
-...
+     *
      * @ingroup compose
      */
     function compose_cdm_taxon_page_profile($taxon, $merged_tree, $media) {
     function compose_cdm_taxon_page_profile($taxon, $merged_tree, $media, $add_synonymy) {
       $render_array = array();
-...
+        }
+      }
       if($add_synonymy){
         $render_array['synonymy'] = markup_to_render_array(
           theme('cdm_taxon_page_synonymy', array('taxon' => $taxon, 'addAcceptedTaxon' => true)),
           -102
         );
+      }
       $pseudo_feature_blocks = array();
       $pseudo_feature_block_toc_items = array();

     define('DISTRIBUTION_ORDER_MODE_DEFAULT', 'TREE');
     define('DISTRIBUTION_TREE_OMIT_LEVELS', 'distribution_tree_omit_levels');
     define('CDM_SYNONYMY_AS_TAB', 'cdm_synonymy_as_tab');
     define('CDM_SYNONYMY_AS_TAB_DEFAULT', 1);
     /**
      * Returns the array of implemented taxon page tabs.
      * The array has fixed integer keys which must not be changed.
      */
     function get_taxon_tabs_list() {
       return array(
       $opts = array(
 => 'General',
 => 'Synonymy',
 => 'Images',
-...
 => 'Keys',
 => 'Experts',
       );
       if(variable_get(CDM_SYNONYMY_AS_TAB, CDM_SYNONYMY_AS_TAB_DEFAULT) !== 1){
         // skip the Synonymy if it is shown in  the general tab
         unset($opts[1]);
+      }
       return $opts;
+    }
     define('CDM_TAXONPAGE_TAB_WEIGHT', 'cdm_taxonpage_tab_weight');
-...
         '#type' => 'checkbox',
         '#title' => t('Tabbed taxon page'),
         '#default_value' => variable_get('cdm_dataportal_taxonpage_tabs', 1),
         '#description' => t('<p>If selected split the taxon page into individual
         '#description' => t('If selected split the taxon page into individual
           tabs for description, images, synonymy and specimens. If not the taxon
           data is rendered as a long single page without tabs.</p>'),
           data is rendered as a long single page without tabs.'),
       );
       $form['taxon_tabs'][CDM_SYNONYMY_AS_TAB] = array(
         '#type' => 'checkbox',
         '#title' => t('Synonymy as tab'),
         '#default_value' => variable_get(CDM_SYNONYMY_AS_TAB, CDM_SYNONYMY_AS_TAB_DEFAULT),
         '#description' => t('The synonymy can be moved to its own tab. This is only applicable when the tabbed taxon page option is activated.'),
         '#disabled' =>  variable_get('cdm_dataportal_taxonpage_tabs', 1) !== 1
       );
       $form['taxon_tabs']['cdm_taxonpage_tabs_visibility'] = array(

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 22383f95

Added by Andreas Kohlbecker almost 7 years ago

Related issues