Project

General

Profile

« Previous | Next » 

Revision 34dd7be9

Added by Andreas Kohlbecker about 11 years ago

paging for specimens implemented, common pager functions modified also for taxon search

View differences:

7.x/modules/cdm_dataportal/theme/cdm_dataportal.page.theme
182 182
                "The 'FeatureTree' for the generation of natural language representations is not configured correctly,"
183 183
                ." please select a 'FeatureTree' in the !settings",
184 184
                array(
185
              		'!settings' => l(t('CDM Dataportal Settings'), 'admin/config/cdm_dataportal/layout/taxon'))
186
              		),
187
              	'warning');
185
                  '!settings' => l(t('CDM Dataportal Settings'), 'admin/config/cdm_dataportal/layout/taxon'))
186
                  ),
187
                'warning');
188 188
            } else {
189 189
              $taxonDescription->elements = NULL;
190 190
              $taxonDescription->elements = array(
......
367 367
    $special_annotations_array[] = $taxon->name;
368 368
    $special_annotations_array[] = $taxon;
369 369
    $accepted_name .= theme('cdm_annotations_as_footnotekeys', array(
370
    		'cdmBase_list' => $special_annotations_array,
371
    		'footnote_list_key' => RenderHints::getRenderPath() . '-annotations')
372
    	);
370
        'cdmBase_list' => $special_annotations_array,
371
        'footnote_list_key' => RenderHints::getRenderPath() . '-annotations')
372
      );
373 373
  }
374 374

  
375 375
  // --- Render homotypic synonymy group
......
422 422
 *     objects (currently this function can only handle taxon instances =>
423 423
 *     TODO)
424 424
 *   - path: The target path for the pager links, this will usually point to
425
 *     'cdm_dataportal/search/results/taxon'.
426
 *   - query_parameters: The query parameters to be used in the pager links.
425
 *     'cdm_dataportal/search/results/taxon'
427 426
 *
428 427
 * @ingroup themeable
429 428
 */
430 429
function theme_cdm_search_results($variables) {
431 430
  $pager = $variables['pager'];
432
  $path = $variables['path'];
433
  $query_parameters = $variables['query_parameters'];
434
  $freetextSearchResults = array();
431
  $path = $variables['path'];
432

  
433
  $freetextSearchResults = array();
434

  
435 435
  // The $query_parameters must not contain the 'q' parameter
436 436
  // since this would conflict with the desired target $path.
437 437
  // unset($search_params['q']);
......
486 486
    $out .= theme('cdm_pager', array(
487 487
        'pager' => $pager,
488 488
        'path' => $path,
489
        'parameters' => $query_parameters,
489
        'parameters' => $_REQUEST,
490 490
    ));
491 491
  }
492 492
  else {

Also available in: Unified diff