/ - Diff - EDIT - EDIT Project Management

modules/cdm_dataportal/cdm_dataportal.css
32	32	padding: 0;
33	33	}
34	34
	35	#block-cdm-dataportal-back-to-search-results {
	36	float: right;
	37	}
	38
35	39	#cdm-ws-debug-table {
36	40	width: 100%;
37	41	}

      *  -  grant new permission 'access cdm content' to default roles
      */
     function cdm_dataportal_update_7400() {
       $tasks_performed = array();
       // additional permission for the anonymous user	authenticated user roles
       $additional_default_permissions = array(
         'access cdm content'
       );
       user_role_grant_permissions(1, $additional_default_permissions); // anonymous user
       user_role_grant_permissions(2, $additional_default_permissions); // authenticated user
       $tasks_performed = array();
       $tasks_performed[] = "grant new permission 'access cdm content' to default roles";
       // enable the back_to_search_results block
       $show_button = variable_get('cdm_dataportal_show_back_to_search_results');
       if(isset($show_button) &&  $show_button == 1) {
         $default_theme = variable_get('theme_default', 'zen_dataportal');
         _block_rehash($default_theme); // ensure the block table is up to date
         db_update('block')
           ->fields(array(
             'weight' => 20,
             'region' => 'navigation',
             'status' => 1,
           ))
           ->condition('delta', 'back_to_search_results')
           ->condition('theme', 'zen_dataportal')
           ->execute();
           db_update('block')
             ->fields(array(
               'weight' => -20,
               'region' => 'content',
               'status' => 1,
             ))
             ->condition('delta', 'back_to_search_results')
             ->condition('theme', 'zen_dataportal', '<>')
             ->execute();
         $tasks_performed[] = "back_to_search_results block enabled";
+      }
       // $tasks_performed[] = _remove_variable('cdm_dataportal_show_back_to_search_results');
       return join(', ',$tasks_performed);
+    }
     /* ======================================================================== */

         // $block[0]["info"] = t("CDM DataPortal DevLinks");
         // $block[1]["info"] = t("CDM DataPortal Credits");
         $block["2"] = array(
             "info" => t("CDM Search Taxa"),
             "info" => t("CDM - Search Taxa"),
             "cache" => DRUPAL_NO_CACHE
           );
         // $block[3]["info"] = t("CDM Filters");
         $block["4"]["info"] = t("CDM Dataportal Print");
         $block["keys"]["info"] = t("CDM identification keys");
         $block["4"]["info"] = t("CDM  - Dataportal Print");
         $block["keys"]["info"] = t("CDM - Identification keys");
         $block["fundedByEDIT"]["info"] = t('Funded by EDIT');
         $block["classification_breadcrumbs"] =  array(
             'info' => t('Classification breadcrumbs'),
             'info' => t('CDM - Classification breadcrumbs'),
             'cache' => DRUPAL_CACHE_PER_PAGE
           );
         $block["taxonomic_children"] =  array(
           'info' => t('Taxonomic children'),
           'info' => t('CDM - Taxonomic children'),
           'cache' => DRUPAL_CACHE_PER_PAGE
         );
         $block["back_to_search_results"] =  array(
           'title' => '<none>',
           'info' => t('CDM - Back to search Results'),
           'cache' => DRUPAL_CACHE_PER_PAGE,
           'visibility' => BLOCK_VISIBILITY_LISTED,
           'pages' => "cdm_dataportal/taxon/*", // multiple page paths separated by "\n"!!!
         );
         return $block;
+    }
-...
           $block['subject'] = '<none>';
           $block['content'] = compose_taxonomic_children($taxon_uuid);
           return $block;
         case 'back_to_search_results':
           $block['subject'] = '<none>';
           if (isset($_SESSION['cdm']['search'])) {
             $block['content'] = l(t('Back to search result'), "http://" . $_SERVER['SERVER_NAME'] . $_SESSION['cdm']['last_search']);
+          }
           return $block;
         default:
           return null;
+      }
+    }

       // -------------------------------------------- //
       $render_array['back_to_search'] = markup_to_render_array(theme('cdm_back_to_search_result_button'), -103);
       if (variable_get('cdm_dataportal_display_is_accepted_for', CDM_DATAPORTAL_DISPLAY_IS_ACCEPTED_FOR) && isset($_REQUEST['acceptedFor'])) {
         $render_array['accepted_for'] = markup_to_render_array(cdm_accepted_for($_REQUEST['acceptedFor']), $weight++);
+      }

       // After the standard_install() the dataportal
       // customization can be applied
       include_once DRUPAL_ROOT . '/profiles/standard/standard.install';
       require_once DRUPAL_ROOT . '/profiles/standard/standard.install';
       standard_install();
       // >>> admin/appearance/settings
-...
+      )
       ->execute();
       $new_blocks = array(
           // enable "CDM Search Taxa" block for all themes
           array(
               'block' => array(
                   'module' => 'cdm_dataportal',
                   'delta' => '2',
                   'theme' => $default_theme,
                   'status' => 1,
                   'weight' => -11,
                   'region' => 'sidebar_first',
                   'pages' => '',
                   'cache' => -1,
+              )
           ),
           // CDM web service debug block
           array(
               'block' => array(
                   'module' => 'cdm_api',
                   'delta' => 'cdm_ws_debug',
                   'theme' => $default_theme,
                   'status' => 1,
                   'weight' => -50,
                   'region' => 'sidebar_first',
                   'pages' => '',
                   'cache' => -1,
               ),
               'block_role' => array(
                   'module' => 'cdm_api',
                   'delta' => 'cdm_ws_debug',
                   'rid' => $admin_role->rid
+              )
       $new_blocks = array();
+    ;
       // enable "CDM Search Taxa" block for all themes
       $block_search_taxa = cdm_dataportal_block_info()["2"];
       $block_search_taxa= array_merge($block_search_taxa, array(
         'module' => 'cdm_dataportal',
         'delta' => '2',
         'theme' => $default_theme,
         'status' => 1,
         'weight' => -11,
         'region' => 'sidebar_first',
         'pages' => '',
       ));
       $new_blocks[] = array(
           'block' => $block_search_taxa
       );
       $block_back_to_search_results = cdm_dataportal_block_info()["back_to_search_results"];
       $block_back_to_search_results= array_merge($block_back_to_search_results, array(
         'module' => 'cdm_dataportal',
         'delta' => 'back_to_search_results',
         'theme' => $default_theme,
         'status' => 1,
         'weight' => 10,
         'region' => 'navigation'
       ));
       $new_blocks[] = array(
         'block' => $block_back_to_search_results
       );
       // CDM web service debug block
       $block_cdm_ws_debug = cdm_api_block_info()['cdm_ws_debug'];
       $block_cdm_ws_debug= array_merge($block_cdm_ws_debug, array(
         'module' => 'cdm_api',
         'delta' => 'cdm_ws_debug',
         'theme' => $default_theme,
         'status' => 1,
         'weight' => -50,
         'region' => 'sidebar_first',
         'pages' => '',
       ));
       $new_blocks[] = array(
           'block' => $block_cdm_ws_debug,
           'block_role' => array(
               'module' => 'cdm_api',
               'delta' => 'cdm_ws_debug',
               'rid' => $admin_role->rid
+          )
       );
       // TODO consider using block_flush_caches() to initially populate the block table with blocks from contributed
       //      modules, and only update the blocks afterwards with block_save()?
       $block_insert = db_insert('block')->fields(array('module', 'delta', 'theme', 'status', 'weight', 'region', 'pages', 'cache'));
       $block_role_insert = db_insert('block_role')->fields(array('module', 'delta', 'rid'));
       foreach ($new_blocks as $block) {

       $form['#submit'][] = 'cdm_settings_layout_taxon_submit';
       $form['cdm_dataportal_show_back_to_search_results'] = array(
           '#type' => 'checkbox',
           '#title' => t('Show <em>Back to search results</em> link at the taxon site.'),
           '#default_value' => variable_get('cdm_dataportal_show_back_to_search_results', 1),
           '#description' => t('<p>If checked the link to search results is rendered at
            the top of the taxon site. Clicking on the link the last search performed
            is rendered again.</p>'),
       );
       // --------- TABBED TAXON ------- //
       $form['taxon_tabs'] = array(
         '#type' => 'fieldset',

+    }
     /* ============================ special buttons ============================= */
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      */
     function theme_cdm_back_to_search_result_button() {
       $out = '';
       $show_button = variable_get('cdm_dataportal_show_back_to_search_results');
       if (isset($_SESSION['cdm']['search']) && isset($show_button) &&  $show_button == 1) {
         /* ['cdm']['last_search'] */
         // $out .= '<div id="backButton">'.l(t('Back to search result'), $_SESSION
         // ).'</div>';
         $out .= '<div id="backButton" class="clearfix">' . l(t('Back to search result'), "http://" . $_SERVER['SERVER_NAME'] . $_SESSION['cdm']['last_search']) . '</div>';
+      }
       return $out;
+    }
     /**
      * @todo Please document this function.

modules/cdm_dataportal/theme/theme_registry.inc
63	63	'parameters' => array(),
64	64	'attributes' => NULL,
65	65	)),
66		'cdm_back_to_search_result_button' => array('variables' => array()),
67	66	'cdm_back_to_image_gallery_button' => array('variables' => array()),
68	67	'cdm_print_button' => array('variables' => array()),
69	68

       padding: 0.4em 0;
+    }
     span.acceptedFor,
     #backButton {
     span.acceptedFor {
       font-size: 0.9em;
+    }
     #backButton {
     /* Renders the link unusable because it is overlayed by tabs-wrapper. */
     /* margin-top: -2em; */
       margin-top:-0.4em;
+    }
     #cdm-dataportal-settings .form-item fieldset {
       padding: 0.5em;
+    }

themes/palmweb_2/style.css
730	730	position: relative;
731	731	}
732	732
733		#backButton {
734		margin: 0 0 10px;
735		font-size: 80%;
736		}
737
738	733	#funded-by {
739	734	text-align: center;
740	735	}

themes/zen_dataportal/sass/cdm.scss
12	12
13	13	/* style links only for content in blocks and node and backbutton
14	14	added also #identificationKey since there are not yet drupal nodes */
15		.block, .node, #backButton, #identificationKey {
	15	.block, .node, #identificationKey {
16	16	@include cdm-link-style;
17	17	}
18	18
...	...
46	46	}
47	47	}
48	48
49
50		#backButton {
51		text-align: right;
52		}
53
54	49	.breadcrumbs li {
55	50	padding: 0 0 0 0;
56	51	}

Project

General

Profile

EDIT

Revision beb914ef

Added by Andreas Kohlbecker over 7 years ago

Project

General

Profile

EDIT

Revision beb914ef

Added by Andreas Kohlbecker over 7 years ago

Related issues