Project

General

Profile

« Previous | Next » 

Revision 95944919

Added by Andreas Kohlbecker almost 13 years ago

fixing #2532 (Don't show file name for images if descritpion is given.)

View differences:

modules/cdm_dataportal/theme/cdm_dataportal.common.theme
47 47
}
48 48

  
49 49
function taxon_in_current_tree ($taxon_uuid) {
50
	$taxon_nodes = cdm_ws_get(CDM_WS_PORTAL_TAXON_TAXONNODES, $taxon_uuid);
51
	$taxon_in_current_tree = false;
52
	foreach($taxon_nodes as $node){
53
		if(get_taxonomictree_uuid_selected() == $node->classification->uuid){
54
			$taxon_in_current_tree = true;
55
			break;
56
		}
57
	}
58
	return $taxon_in_current_tree;
50
  $taxon_nodes = cdm_ws_get(CDM_WS_PORTAL_TAXON_TAXONNODES, $taxon_uuid);
51
  $taxon_in_current_tree = false;
52
  foreach($taxon_nodes as $node){
53
    if(get_taxonomictree_uuid_selected() == $node->classification->uuid){
54
      $taxon_in_current_tree = true;
55
      break;
56
    }
57
  }
58
  return $taxon_in_current_tree;
59 59
}
60 60
/**
61 61
 * TODO if getting fragment from request is possible remove $_REQUEST['highlite'] HACK
......
70 70
 */
71 71

  
72 72
function uuid_anchor($uuid, $innerHTML){
73
	$highlite = $_REQUEST['highlite'] == $uuid;
74
	return '<a name="'.$uuid.'" ></a><span class="'.($highlite ? 'highlite' : '').'">'.$innerHTML.'</span>';
73
  $highlite = $_REQUEST['highlite'] == $uuid;
74
  return '<a name="'.$uuid.'" ></a><span class="'.($highlite ? 'highlite' : '').'">'.$innerHTML.'</span>';
75 75
}
76 76

  
77 77
/**
......
84 84
 */
85 85
function tagNameParts($name, $numOfNameTokens){
86 86

  
87
	$out = '<span class="name">';
88

  
89
	$token = strtok($name, " \n\t");
90
	$i = 0;
91
	$noSpace = true;
92
	while($token != false){
93
		if($i == $numOfNameTokens){
94
			$out .= '</span> <span class="authors">';
95
			$noSpace = true;
96
		}
97
		$out .= ($noSpace?'':' ').$token;
98
		$noSpace = false;
99
		$token = strtok(" \n\t");
100
		$i++;
101
	}
102
	return $out.'</span>';
87
  $out = '<span class="name">';
88

  
89
  $token = strtok($name, " \n\t");
90
  $i = 0;
91
  $noSpace = true;
92
  while($token != false){
93
    if($i == $numOfNameTokens){
94
      $out .= '</span> <span class="authors">';
95
      $noSpace = true;
96
    }
97
    $out .= ($noSpace?'':' ').$token;
98
    $noSpace = false;
99
    $token = strtok(" \n\t");
100
    $i++;
101
  }
102
  return $out.'</span>';
103 103
}
104 104

  
105 105
/**
......
113 113
 * @return String of HTML
114 114
 */
115 115
function theme_cdm_taggedtext2html(array &$taggedtxt, $tag = 'span', $glue = ' ', $skiptags = array()){
116
	$out = '';
117
	$i = 0;
118
	foreach($taggedtxt as $tt){
119
		if(!in_array($tt->type, $skiptags) && strlen($tt->text) > 0){
120
			$out .= (strlen($out) > 0 && ++$i < count($taggedtxt)? $glue : '').'<'.$tag.' class="'.$tt->type.'">'.t($tt->text).'</'.$tag.'>';
121
		}
122
	}
123
	return $out;
116
  $out = '';
117
  $i = 0;
118
  foreach($taggedtxt as $tt){
119
    if(!in_array($tt->type, $skiptags) && strlen($tt->text) > 0){
120
      $out .= (strlen($out) > 0 && ++$i < count($taggedtxt)? $glue : '').'<'.$tag.' class="'.$tt->type.'">'.t($tt->text).'</'.$tag.'>';
121
    }
122
  }
123
  return $out;
124 124
}
125 125

  
126 126
/* ============================ annotations ============================= */
......
158 158
  if (variable_get('cdm_dataportal_annotations_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
159 159
    return '';
160 160
  }
161
	$footNoteKeys = cdm_annotations_as_footnotekeys($cdmBase, $footnote_list_key);
162
	foreach($footNoteKeys as $a){
163
		//$out .=  theme('cdm_footnote_key', $a, $a->footnoteListKey, (isset($out)? ',' : ''));
164
		$out .=  theme('cdm_footnote_key', $a, (isset($out)? ',' : ''));
165
	}
166
	return $out;
161
  $footNoteKeys = cdm_annotations_as_footnotekeys($cdmBase, $footnote_list_key);
162
  foreach($footNoteKeys as $a){
163
    //$out .=  theme('cdm_footnote_key', $a, $a->footnoteListKey, (isset($out)? ',' : ''));
164
    $out .=  theme('cdm_footnote_key', $a, (isset($out)? ',' : ''));
165
  }
166
  return $out;
167 167
}
168 168

  
169 169

  
......
171 171
  if (variable_get('cdm_dataportal_annotations_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
172 172
    return '';
173 173
  }
174
	return theme('cdm_footnotes', $footnoteListKey . '-annotations', $enclosingTag);
174
  return theme('cdm_footnotes', $footnoteListKey . '-annotations', $enclosingTag);
175 175
}
176 176

  
177 177
function theme_cdm_annotation_content($AnnotationTO){
178 178

  
179
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cdm_annotations.js');
180
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.form.js');
179
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cdm_annotations.js');
180
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.form.js');
181 181

  
182
	$out .= theme('cdm_list_of_annotations', $AnnotationTO->annotationElements);
182
  $out .= theme('cdm_list_of_annotations', $AnnotationTO->annotationElements);
183 183

  
184
	$annotationUrl = cdm_compose_url(CDM_WS_ANNOTATIONS, array($AnnotationTO->uuid));
185
	$annotationProxyUrl = url('cdm_api/proxy/'. urlencode($annotationUrl).'/cdm_annotation_post');
184
  $annotationUrl = cdm_compose_url(CDM_WS_ANNOTATIONS, array($AnnotationTO->uuid));
185
  $annotationProxyUrl = url('cdm_api/proxy/'. urlencode($annotationUrl).'/cdm_annotation_post');
186 186

  
187
	// TODO users have to be authenticated to the dataportal to be able to write annotations
188
	$out .= '
189
  			<div class="annotation_create">
190
  				<form action="'.$annotationProxyUrl.'" method="POST">
191
  					<textarea name="annotation"></textarea>
192
  					<input type="hidden" name="commentator" value="">
193
  					<input type="submit" value="'.t('Save annotation').'" />
194
  				</form>
195
 			</div>
196
	';
187
  // TODO users have to be authenticated to the dataportal to be able to write annotations
188
  $out .= '
189
        <div class="annotation_create">
190
          <form action="'.$annotationProxyUrl.'" method="POST">
191
            <textarea name="annotation"></textarea>
192
            <input type="hidden" name="commentator" value="">
193
            <input type="submit" value="'.t('Save annotation').'" />
194
          </form>
195
       </div>
196
  ';
197 197

  
198
	return $out;
198
  return $out;
199 199
}
200 200

  
201 201
function theme_cdm_list_of_annotations($annotationElements){
202 202

  
203
	$out = '<ul class="annotation_list">';
203
  $out = '<ul class="annotation_list">';
204 204

  
205
	foreach ($annotationElements as $key => $row){
206
		$created[$key] = $row;
207
	}
208
	array_multisort($created, SORT_ASC, $annotationElements);
205
  foreach ($annotationElements as $key => $row){
206
    $created[$key] = $row;
207
  }
208
  array_multisort($created, SORT_ASC, $annotationElements);
209 209

  
210
	foreach ($annotationElements as $annotation){
211
		$out .= '<li>' . $annotation->text . '</li>';
212
	}
210
  foreach ($annotationElements as $annotation){
211
    $out .= '<li>' . $annotation->text . '</li>';
212
  }
213 213

  
214
	$out .= '</ul>';
214
  $out .= '</ul>';
215 215

  
216
	return $out;
216
  return $out;
217 217

  
218 218
}
219 219

  
220 220
/* ============================ footnotes ============================= */
221 221

  
222 222
function theme_cdm_footnote_key($footnoteKey, $separator = '', $highlightable=true, $separator_off = false){
223
	if (!$footnoteKey->footnoteListKey){
224
		return '';
225
	}
226
	if (variable_get('cdm_dataportal_all_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
227
		return '';
228
	}
229

  
230
	if ($separator_off){
231
		$separator = '';
232
	}
233
	$out = '<span class="footnote-key footnote-key-'.$footnoteKey->keyStr.' member-of-footnotes-'.$footnoteKey->footnoteListKey.'">'.$separator
234
	.'<a href="#footnote-'.$footnoteKey->keyStr.'">'.$footnoteKey->keyStr.'</a>'
235
	.'</span>';
236
	return $out;
223
  if (!$footnoteKey->footnoteListKey){
224
    return '';
225
  }
226
  if (variable_get('cdm_dataportal_all_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
227
    return '';
228
  }
229

  
230
  if ($separator_off){
231
    $separator = '';
232
  }
233
  $out = '<span class="footnote-key footnote-key-'.$footnoteKey->keyStr.' member-of-footnotes-'.$footnoteKey->footnoteListKey.'">'.$separator
234
  .'<a href="#footnote-'.$footnoteKey->keyStr.'">'.$footnoteKey->keyStr.'</a>'
235
  .'</span>';
236
  return $out;
237 237
}
238 238

  
239 239
function theme_cdm_footnote($footnoteKey, $footnoteText){
240
	_add_js_footnotes();
241
	$out = '<span class="footnote footnote-'.$footnoteKey.'"><a name="footnote-'.$footnoteKey.'"></a><span class="footnote-anchor">'.$footnoteKey.'.</span>&nbsp;'.$footnoteText.'</span>';
242
	return $out;
240
  _add_js_footnotes();
241
  $out = '<span class="footnote footnote-'.$footnoteKey.'"><a name="footnote-'.$footnoteKey.'"></a><span class="footnote-anchor">'.$footnoteKey.'.</span>&nbsp;'.$footnoteText.'</span>';
242
  return $out;
243 243
}
244 244

  
245 245

  
......
247 247
  if (variable_get('cdm_dataportal_all_footnotes', CDM_DATAPORTAL_ALL_FOOTNOTES)){
248 248
    return '';
249 249
  }
250
	$out = '<'.$enclosingTag.' class="footnotes footnotes-'.$footnoteListKey.' ">' . FootnoteManager::renderFootnoteList($footnoteListKey) . '</'.$enclosingTag.'>';
251
	FootnoteManager::removeFootnoteList($footnoteListKey);
252
	return $out;
250
  $out = '<'.$enclosingTag.' class="footnotes footnotes-'.$footnoteListKey.' ">' . FootnoteManager::renderFootnoteList($footnoteListKey) . '</'.$enclosingTag.'>';
251
  FootnoteManager::removeFootnoteList($footnoteListKey);
252
  return $out;
253 253
}
254 254

  
255 255
function theme_cdm_annotations($annotations, $enclosingTag = 'span'){
256 256
  if(!is_array($annotations)){
257
  	return;
257
    return;
258 258
  }
259 259
  $out = '<'.$enclosingTag.' class="annotations">';
260 260
  $i = 0;
......
266 266
}
267 267

  
268 268
function cdm_exist_footnote($footnote_list, $footnote){
269
	$result = false;
270
	if (is_array($footnote_list)){
271
		foreach ($footnote_list as $element){
272
			if ($element == $footnote){
273
				$result = true;
274
			}
275
		}
276
	}
277
	return $result;
269
  $result = false;
270
  if (is_array($footnote_list)){
271
    foreach ($footnote_list as $element){
272
      if ($element == $footnote){
273
        $result = true;
274
      }
275
    }
276
  }
277
  return $result;
278 278
}
279 279

  
280 280
function cdm_add_footnote_to_array(&$footnote_list, $footnote){
281
	if(!cdm_exist_footnote($footnote_list, $footnote)){
282
		$footnote_list[] = $footnote;
283
	}
281
  if(!cdm_exist_footnote($footnote_list, $footnote)){
282
    $footnote_list[] = $footnote;
283
  }
284 284
}
285 285

  
286 286
/* ============================ pager ============================= */
287 287

  
288 288

  
289 289
function theme_cdm_pager(&$pager, $path, $parameters){
290
	$out = '';
291

  
292
	if ($pager->pagesAvailable > 1) {
293

  
294
		$out .= '<div class="pager">';
295
		if($pager->currentIndex > 0){
296
			$out .= theme('cdm_pager_link', t('« first'), 0,  $pager, $path, $parameters, array('class' => 'pager-first'));
297
			$out .= theme('cdm_pager_link', t('‹ previous'), $pager->currentIndex - 1, $pager, $path, $parameters, array('class' => 'pager-previous'));
298
		}
299

  
300
		if($pager->indices[0] > 0){
301
			$out .= '<div class="pager-list-dots-left">...</div>';
302
		}
303

  
304
		foreach($pager->indices as $index){
305
			$label = $index + 1;
306
			$out .= theme('cdm_pager_link', $label, $index,  $pager, $path, $parameters, array('class' => 'pager-first'));
307
		}
308
		if($pager->indices[count($pager->indices) - 1] < $pager->pagesAvailable - 1){
309
			$out .= '<div class="pager-list-dots-right">...</div>';
310
		}
311

  
312
		if($pager->nextIndex){
313
			$out .= theme('cdm_pager_link', t('next ›'), $pager->nextIndex, $pager, $path, $parameters, array('class' => 'pager-next'));
314
			$out .= theme('cdm_pager_link', t('last »'), $pager->pagesAvailable - 1, $pager, $path, $parameters, array('class' => 'pager-last'));
315
		}
316
		$out .= '</div>';
317

  
318
		return $out;
319
	}
290
  $out = '';
291

  
292
  if ($pager->pagesAvailable > 1) {
293

  
294
    $out .= '<div class="pager">';
295
    if($pager->currentIndex > 0){
296
      $out .= theme('cdm_pager_link', t('« first'), 0,  $pager, $path, $parameters, array('class' => 'pager-first'));
297
      $out .= theme('cdm_pager_link', t('‹ previous'), $pager->currentIndex - 1, $pager, $path, $parameters, array('class' => 'pager-previous'));
298
    }
299

  
300
    if($pager->indices[0] > 0){
301
      $out .= '<div class="pager-list-dots-left">...</div>';
302
    }
303

  
304
    foreach($pager->indices as $index){
305
      $label = $index + 1;
306
      $out .= theme('cdm_pager_link', $label, $index,  $pager, $path, $parameters, array('class' => 'pager-first'));
307
    }
308
    if($pager->indices[count($pager->indices) - 1] < $pager->pagesAvailable - 1){
309
      $out .= '<div class="pager-list-dots-right">...</div>';
310
    }
311

  
312
    if($pager->nextIndex){
313
      $out .= theme('cdm_pager_link', t('next ›'), $pager->nextIndex, $pager, $path, $parameters, array('class' => 'pager-next'));
314
      $out .= theme('cdm_pager_link', t('last »'), $pager->pagesAvailable - 1, $pager, $path, $parameters, array('class' => 'pager-last'));
315
    }
316
    $out .= '</div>';
317

  
318
    return $out;
319
  }
320 320
}
321 321

  
322 322
function theme_cdm_pager_link($text, $linkIndex, &$pager, $path, $parameters = array(), $attributes) {
323 323

  
324
	$out = '';
325
	$parameters['search']['pageNumber'] = $linkIndex;
326
	if ($linkIndex == $pager->currentIndex) {
327
		$out = '<strong>'.$text.'</strong>';
328
	} else {
329
		$queryString = drupal_query_string_encode($parameters);
330
		$out = l($text, $path, $attributes, $queryString);
331
	}
332
	return $out;
324
  $out = '';
325
  $parameters['search']['pageNumber'] = $linkIndex;
326
  if ($linkIndex == $pager->currentIndex) {
327
    $out = '<strong>'.$text.'</strong>';
328
  } else {
329
    $queryString = drupal_query_string_encode($parameters);
330
    $out = l($text, $path, $attributes, $queryString);
331
  }
332
  return $out;
333 333
}
334 334

  
335 335
/* ============================ special buttons ============================= */
336 336

  
337 337
function theme_cdm_back_to_search_result_button(){
338
	$out = '';
339
	$show_button = variable_get('cdm_dataportal_show_back_to_search_results', 1);
340
	if($_SESSION['cdm']['search'] && $show_button){
341
		/*['cdm']['last_search']*/
342
		//$out .= '<div id="backButton">'.l(t('Back to search result'), $_SESSION ).'</div>';
343
		$out .= '<div id="backButton">'.l(t('Back to search result'), "http://" . $_SERVER['SERVER_NAME'] . $_SESSION['cdm']['last_search'] ).'</div>';
344

  
345
	}
346
	return $out;
338
  $out = '';
339
  $show_button = variable_get('cdm_dataportal_show_back_to_search_results', 1);
340
  if($_SESSION['cdm']['search'] && $show_button){
341
    /*['cdm']['last_search']*/
342
    //$out .= '<div id="backButton">'.l(t('Back to search result'), $_SESSION ).'</div>';
343
    $out .= '<div id="backButton">'.l(t('Back to search result'), "http://" . $_SERVER['SERVER_NAME'] . $_SESSION['cdm']['last_search'] ).'</div>';
344

  
345
  }
346
  return $out;
347 347
}
348 348

  
349 349
function theme_cdm_back_to_image_gallery_button(){
350 350

  
351
	$out = '<div id="backToGalleryButton">'.l(t('Back to Images'), $_SESSION['cdm']['last_gallery'] ).'</div>';
351
  $out = '<div id="backToGalleryButton">'.l(t('Back to Images'), $_SESSION['cdm']['last_gallery'] ).'</div>';
352 352

  
353
	return $out;
353
  return $out;
354 354
}
355 355

  
356 356
function theme_cdm_print_button(){
357 357

  
358
	drupal_add_js ('$(document).ready(function() {
358
  drupal_add_js ('$(document).ready(function() {
359 359
         $(\'#print_button\').click(function () {
360 360
         window.print();
361 361
     });
362 362
  });', 'inline');
363 363

  
364
	$output = '<div id="print_button"><img src="'
365
	.drupal_get_path('module', 'cdm_dataportal').'/images/print_icon.gif'
366
	. ' "alt="' . t('Print this page') . ' "title="'.t('Print this page').'" />'; //.t(' Print this page');
367
	//$output .= l(' Print this page', '');
368
	$output .= '<span>Print this page</span>';
369
	$output .= '</div>';
364
  $output = '<div id="print_button"><img src="'
365
  .drupal_get_path('module', 'cdm_dataportal').'/images/print_icon.gif'
366
  . ' "alt="' . t('Print this page') . ' "title="'.t('Print this page').'" />'; //.t(' Print this page');
367
  //$output .= l(' Print this page', '');
368
  $output .= '<span>Print this page</span>';
369
  $output .= '</div>';
370 370

  
371
	return $output;
371
  return $output;
372 372
}
373 373

  
374 374

  
......
377 377
/* ============================ java script functions ============================= */
378 378

  
379 379
function _add_js_thickbox(){
380
	// ---- jQuery thickbox:
381
	/*
382
	 * bug: compat-1.0.js && thickbox.js line 237 .trigger("unload")
383
	 * -> event is not triggered because of problems with compat-1.0.js'
384
	 * see INSTALL.txt
385
	 *
386
	 */
387
	//drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.imagetool.min.js');
388
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/thickbox/thickbox.js');
389
	drupal_add_css(drupal_get_path('module', 'cdm_dataportal').'/js/thickbox/cdm_thickbox.css');
380
  // ---- jQuery thickbox:
381
  /*
382
   * bug: compat-1.0.js && thickbox.js line 237 .trigger("unload")
383
   * -> event is not triggered because of problems with compat-1.0.js'
384
   * see INSTALL.txt
385
   *
386
   */
387
  //drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.imagetool.min.js');
388
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/thickbox/thickbox.js');
389
  drupal_add_css(drupal_get_path('module', 'cdm_dataportal').'/js/thickbox/cdm_thickbox.css');
390 390
}
391 391

  
392 392
function _add_js_lightbox($galleryID){
393
	/*
394
	 * Important Notice:
395
	 * The jquery.lightbox-0.5.js has been modified in order to allow using the "alt" attribute
396
	 * for captions instead of the "title" attribute
397
	 */
398
	$lightBoxBasePath = drupal_get_path('module', 'cdm_dataportal') .'/js/jquery-lightbox-0.5';
399
	drupal_add_js($lightBoxBasePath.'/js/jquery.lightbox-0.5.js');
400
	drupal_add_css($lightBoxBasePath.'/css/jquery.lightbox-0.5.css');
401
	drupal_add_js ('$(document).ready(function() {
393
  /*
394
   * Important Notice:
395
   * The jquery.lightbox-0.5.js has been modified in order to allow using the "alt" attribute
396
   * for captions instead of the "title" attribute
397
   */
398
  $lightBoxBasePath = drupal_get_path('module', 'cdm_dataportal') .'/js/jquery-lightbox-0.5';
399
  drupal_add_js($lightBoxBasePath.'/js/jquery.lightbox-0.5.js');
400
  drupal_add_css($lightBoxBasePath.'/css/jquery.lightbox-0.5.css');
401
  drupal_add_js ('$(document).ready(function() {
402 402
      $(\'#'.$galleryID.' a.lightbox\').lightBox({
403 403
        fixedNavigation:  true,
404 404
        imageLoading:     \''.$lightBoxBasePath.'/images/lightbox-ico-loading.gif\',
......
412 412
}
413 413

  
414 414
function _add_js_footnotes(){
415
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/footnotes.js');
415
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/footnotes.js');
416 416
}
417 417

  
418 418

  
419 419
function _add_js_cluetip(){
420 420

  
421
	//TODO replace by http://www.socialembedded.com/labs/jQuery-Tooltip-Plugin/jQuery-Tooltip-Plugin.html
422
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.cluetip.js');
423
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.dimensions.js');
424
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.hoverIntent.js');
425
	drupal_add_css(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.cluetip.css');
426
	drupal_add_js ("$(document).ready(function(){
421
  //TODO replace by http://www.socialembedded.com/labs/jQuery-Tooltip-Plugin/jQuery-Tooltip-Plugin.html
422
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.cluetip.js');
423
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/jquery.dimensions.js');
424
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.hoverIntent.js');
425
  drupal_add_css(drupal_get_path('module', 'cdm_dataportal').'/js/cluetip/jquery.cluetip.css');
426
  drupal_add_js ("$(document).ready(function(){
427 427
      $('.cluetip').css({color: '#0062C2'}).cluetip({
428 428
        splitTitle: '|',
429 429
        showTitle: true,
......
437 437
}
438 438

  
439 439
function _add_js_ahah(){
440
	drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/ahah-content.js');
440
  drupal_add_js(drupal_get_path('module', 'cdm_dataportal').'/js/ahah-content.js');
441 441
}

Also available in: Unified diff