[Mapbender-commits] r7343 - in trunk/mapbender: http/extensions
http/extensions/jqueryEasyAccordion
http/extensions/jqueryEasyAccordion/images http/php tools/wms_extent
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Mon Dec 20 10:00:52 EST 2010
Author: armin11
Date: 2010-12-20 07:00:52 -0800 (Mon, 20 Dec 2010)
New Revision: 7343
Added:
trunk/mapbender/http/extensions/jqueryEasyAccordion/
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-1.jpg
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-2.jpg
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-1.jpg
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-2.jpg
trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide.jpg
trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.css
trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.js
trunk/mapbender/http/extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css
Modified:
trunk/mapbender/http/php/mod_showMetadata.php
trunk/mapbender/tools/wms_extent/extent_service.conf
Log:
Some modules from the geoportal.rlp project and a new horizontal accordion jquery plugin.
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-1.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-active-2.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-1.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide-title-inactive-2.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/mapbender/http/extensions/jqueryEasyAccordion/images/slide.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.css
===================================================================
--- trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.css (rev 0)
+++ trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.css 2010-12-20 15:00:52 UTC (rev 7343)
@@ -0,0 +1,40 @@
+ html{font-size:62.5%}
+ body{font-size:1.2em;color:#294f88}
+ .sample{margin:30px;border:1px solid #92cdec;background:#d7e7ff;padding:30px}
+ h1{margin:0 0 20px 0;padding:0;font-size:2em;}
+ h2{margin:40px 0 20px 0;padding:0;font-size:1.6em;}
+ .easy-accordion h2{margin:0px 0 20px 0;padding:0;font-size:1.6em;}
+ p{font-size:1.2em;line-height:170%;margin-bottom:20px}
+
+
+ /* UNLESS YOU KNOW WHAT YOU'RE DOING, DO NOT CHANGE THE FOLLOWING RULES */
+
+ .easy-accordion{display:block;position:relative;overflow:hidden;padding:0;margin:0}
+ .easy-accordion dt,.easy-accordion dd{margin:0;padding:0}
+ .easy-accordion dt,.easy-accordion dd{position:absolute}
+ .easy-accordion dt{margin-bottom:0;margin-left:0;z-index:5;/* Safari */ -webkit-transform: rotate(-90deg); /* Firefox */ -moz-transform: rotate(-90deg);-moz-transform-origin: 20px 0px; /* Internet Explorer */ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);cursor:pointer;}
+ .easy-accordion dd{z-index:1;opacity:0;overflow:hidden}
+ .easy-accordion dd.active{opacity:1;}
+ .easy-accordion dd.no-more-active{z-index:2;opacity:1}
+ .easy-accordion dd.active{z-index:3}
+ .easy-accordion dd.plus{z-index:4}
+ .easy-accordion .slide-number{position:absolute;bottom:0;left:10px;font-weight:normal;font-size:1.1em;/* Safari */ -webkit-transform: rotate(90deg); /* Firefox */ -moz-transform: rotate(90deg); /* Internet Explorer */ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);}
+
+
+ /* FEEL FREE TO CUSTOMIZE THE FOLLOWING RULES */
+ dd p{line-height:120%}
+
+ #accordion-1{width:800px;height:245px;padding:30px;background:#fff;border:1px solid #b5c9e8}
+ #accordion-1 dl{width:800px;height:245px}
+ #accordion-1 dt{height:46px;line-height:44px;text-align:right;padding:0 15px 0 0;font-size:1.1em;font-weight:bold;font-family: Tahoma, Geneva, sans-serif;text-transform:uppercase;letter-spacing:1px;background:#fff url(images/slide-title-inactive-1.jpg) 0 0 no-repeat;color:#26526c}
+ #accordion-1 dt.active{cursor:pointer;color:#fff;background:#fff url(images/slide-title-active-1.jpg) 0 0 no-repeat}
+ #accordion-1 dt.hover{color:#68889b;}
+ #accordion-1 dt.active.hover{color:#fff}
+ #accordion-1 dd{padding:25px;background:url(images/slide.jpg) bottom left repeat-x;border:1px solid #dbe9ea;border-left:0;margin-right:3px}
+ #accordion-1 .slide-number{color:#68889b;left:10px;font-weight:bold}
+ #accordion-1 .active .slide-number{color:#fff;}
+ #accordion-1 a{color:#68889b}
+ #accordion-1 dd img{float:right;margin:0 0 0 30px;}
+ #accordion-1 h2{font-size:2.5em;margin-top:10px}
+ #accordion-1 .more{padding-top:10px;display:block}
+
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.js
===================================================================
--- trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.js (rev 0)
+++ trunk/mapbender/http/extensions/jqueryEasyAccordion/jquery.easyAccordion.js 2010-12-20 15:00:52 UTC (rev 7343)
@@ -0,0 +1,183 @@
+/*
+ * easyAccordion 0.1 - jQuery plugin
+ * written by Andrea Cima Serniotti
+ * http://www.madeincima.eu
+ *
+ * Copyright (c) 2010 Andrea Cima Serniotti (http://www.madeincima.eu)
+ * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+ * Built for jQuery library http://jquery.com
+ */
+
+(function(jQuery) {
+ jQuery.fn.easyAccordion = function(options) {
+
+ var defaults = {
+ slideNum: true,
+ autoStart: false,
+ slideInterval: 3000
+ };
+
+ this.each(function() {
+
+ var settings = jQuery.extend(defaults, options);
+ jQuery(this).find('dl').addClass('easy-accordion');
+
+
+ // -------- Set the variables ------------------------------------------------------------------------------
+
+ jQuery.fn.setVariables = function() {
+ dlWidth = jQuery(this).width();
+ dlHeight = jQuery(this).height();
+ dtWidth = jQuery(this).find('dt').outerHeight();
+ if (jQuery.browser.msie){ dtWidth = $(this).find('dt').outerWidth();}
+ dtHeight = dlHeight - (jQuery(this).find('dt').outerWidth()-jQuery(this).find('dt').width());
+ slideTotal = jQuery(this).find('dt').size();
+ ddWidth = dlWidth - (dtWidth*slideTotal) - (jQuery(this).find('dd').outerWidth(true)-jQuery(this).find('dd').width());
+ ddHeight = dlHeight - (jQuery(this).find('dd').outerHeight(true)-jQuery(this).find('dd').height());
+ };
+ jQuery(this).setVariables();
+
+
+ // -------- Fix some weird cross-browser issues due to the CSS rotation -------------------------------------
+
+ if (jQuery.browser.safari){ var dtTop = (dlHeight-dtWidth)/2; var dtOffset = -dtTop; /* Safari and Chrome */ }
+ if (jQuery.browser.mozilla){ var dtTop = dlHeight - 20; var dtOffset = - 20; /* FF */ }
+ if (jQuery.browser.msie){ var dtTop = 0; var dtOffset = 0; /* IE */ }
+
+
+ // -------- Getting things ready ------------------------------------------------------------------------------
+
+ var f = 1;
+ jQuery(this).find('dt').each(function(){
+ jQuery(this).css({'width':dtHeight,'top':dtTop,'margin-left':dtOffset});
+ if(settings.slideNum == true){
+ jQuery('<span class="slide-number">'+0+f+'</span>').appendTo(this);
+ if(jQuery.browser.msie){
+ var slideNumLeft = parseInt(jQuery(this).find('.slide-number').css('left')) - 14;
+ jQuery(this).find('.slide-number').css({'left': slideNumLeft})
+ if(jQuery.browser.version == 6.0 || jQuery.browser.version == 7.0){
+ jQuery(this).find('.slide-number').css({'bottom':'auto'});
+ }
+ if(jQuery.browser.version == 8.0){
+ var slideNumTop = jQuery(this).find('.slide-number').css('bottom');
+ var slideNumTopVal = parseInt(slideNumTop) + parseInt(jQuery(this).css('padding-top')) - 12;
+ jQuery(this).find('.slide-number').css({'bottom': slideNumTopVal});
+ }
+ } else {
+ var slideNumTop = jQuery(this).find('.slide-number').css('bottom');
+ var slideNumTopVal = parseInt(slideNumTop) + parseInt(jQuery(this).css('padding-top'));
+ jQuery(this).find('.slide-number').css({'bottom': slideNumTopVal});
+ }
+ }
+ f = f + 1;
+ });
+
+ if(jQuery(this).find('.active').size()) {
+ jQuery(this).find('.active').next('dd').addClass('active');
+ } else {
+ jQuery(this).find('dt:first').addClass('active').next('dd').addClass('active');
+ }
+
+ jQuery(this).find('dt:first').css({'left':'0'}).next().css({'left':dtWidth});
+ jQuery(this).find('dd').css({'width':ddWidth,'height':ddHeight});
+
+
+ // -------- Functions ------------------------------------------------------------------------------
+
+ jQuery.fn.findActiveSlide = function() {
+ var i = 1;
+ this.find('dt').each(function(){
+ if(jQuery(this).hasClass('active')){
+ activeID = i; // Active slide
+ } else if (jQuery(this).hasClass('no-more-active')){
+ noMoreActiveID = i; // No more active slide
+ }
+ i = i + 1;
+ });
+ };
+
+ jQuery.fn.calculateSlidePos = function() {
+ var u = 2;
+ jQuery(this).find('dt').not(':first').each(function(){
+ var activeDtPos = dtWidth*activeID;
+ if(u <= activeID){
+ var leftDtPos = dtWidth*(u-1);
+ jQuery(this).animate({'left': leftDtPos});
+ if(u < activeID){ // If the item sits to the left of the active element
+ jQuery(this).next().css({'left':leftDtPos+dtWidth});
+ } else{ // If the item is the active one
+ jQuery(this).next().animate({'left':activeDtPos});
+ }
+ } else {
+ var rightDtPos = dlWidth-(dtWidth*(slideTotal-u+1));
+ jQuery(this).animate({'left': rightDtPos});
+ var rightDdPos = rightDtPos+dtWidth;
+ jQuery(this).next().animate({'left':rightDdPos});
+ }
+ u = u+ 1;
+ });
+ setTimeout( function() {
+ jQuery('.easy-accordion').find('dd').not('.active').each(function(){
+ jQuery(this).css({'display':'none'});
+ });
+ }, 400);
+
+ };
+
+ jQuery.fn.activateSlide = function() {
+ this.parent('dl').setVariables();
+ this.parent('dl').find('dd').css({'display':'block'});
+ this.parent('dl').find('dd.plus').removeClass('plus');
+ this.parent('dl').find('.no-more-active').removeClass('no-more-active');
+ this.parent('dl').find('.active').removeClass('active').addClass('no-more-active');
+ this.addClass('active').next().addClass('active');
+ this.parent('dl').findActiveSlide();
+ if(activeID < noMoreActiveID){
+ this.parent('dl').find('dd.no-more-active').addClass('plus');
+ }
+ this.parent('dl').calculateSlidePos();
+ };
+
+ jQuery.fn.rotateSlides = function(slideInterval, timerInstance) {
+ var accordianInstance = jQuery(this);
+ timerInstance.value = setTimeout(function(){accordianInstance.rotateSlides(slideInterval, timerInstance);}, slideInterval);
+ jQuery(this).findActiveSlide();
+ var totalSlides = jQuery(this).find('dt').size();
+ var activeSlide = activeID;
+ var newSlide = activeSlide + 1;
+ if (newSlide > totalSlides) newSlide = 1;
+ jQuery(this).find('dt:eq(' + (newSlide-1) + ')').activateSlide(); // activate the new slide
+ }
+
+
+ // -------- Let's do it! ------------------------------------------------------------------------------
+
+ function trackerObject() {this.value = null}
+ var timerInstance = new trackerObject();
+
+ jQuery(this).findActiveSlide();
+ jQuery(this).calculateSlidePos();
+
+ if (settings.autoStart == true){
+ var accordianInstance = jQuery(this);
+ var interval = parseInt(settings.slideInterval);
+ timerInstance.value = setTimeout(function(){
+ accordianInstance.rotateSlides(interval, timerInstance);
+ }, interval);
+ }
+
+ jQuery(this).find('dt').not('active').click(function(){
+ jQuery(this).activateSlide();
+ clearTimeout(timerInstance.value);
+ });
+
+ if (!(jQuery.browser.msie && jQuery.browser.version == 6.0)){
+ jQuery('dt').hover(function(){
+ jQuery(this).addClass('hover');
+ }, function(){
+ jQuery(this).removeClass('hover');
+ });
+ }
+ });
+ };
+})(jQuery);
\ No newline at end of file
Added: trunk/mapbender/http/extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css
===================================================================
--- trunk/mapbender/http/extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css (rev 0)
+++ trunk/mapbender/http/extensions/jqueryEasyAccordion/mb_jquery.easyAccordion.css 2010-12-20 15:00:52 UTC (rev 7343)
@@ -0,0 +1,40 @@
+ html{font-size:62.5%}
+ body{font-size:1.2em;color:#294f88}
+ .sample{margin:30px;border:1px solid #92cdec;background:#d7e7ff;padding:30px}
+ h1{margin:0 0 20px 0;padding:0;font-size:2em;}
+ h2{margin:40px 0 20px 0;padding:0;font-size:1.6em;}
+ .easy-accordion h2{margin:0px 0 20px 0;padding:0;font-size:1.6em;}
+ p{font-size:1.2em;line-height:170%;margin-bottom:20px}
+
+
+ /* UNLESS YOU KNOW WHAT YOU'RE DOING, DO NOT CHANGE THE FOLLOWING RULES */
+
+ .easy-accordion{display:block;position:relative;overflow:hidden;padding:0;margin:0}
+ .easy-accordion dt,.easy-accordion dd{margin:0;padding:0}
+ .easy-accordion dt,.easy-accordion dd{position:absolute}
+ .easy-accordion dt{margin-bottom:0;margin-left:0;z-index:5;/* Safari */ -webkit-transform: rotate(-90deg); /* Firefox */ -moz-transform: rotate(-90deg);-moz-transform-origin: 20px 0px; /* Internet Explorer */ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);cursor:pointer;}
+ .easy-accordion dd{z-index:1;opacity:0;overflow:hidden}
+ .easy-accordion dd.active{opacity:1;}
+ .easy-accordion dd.no-more-active{z-index:2;opacity:1}
+ .easy-accordion dd.active{z-index:3}
+ .easy-accordion dd.plus{z-index:4}
+ .easy-accordion .slide-number{position:absolute;bottom:0;left:10px;font-weight:normal;font-size:1.1em;/* Safari */ -webkit-transform: rotate(90deg); /* Firefox */ -moz-transform: rotate(90deg); /* Internet Explorer */ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);}
+
+
+ /* FEEL FREE TO CUSTOMIZE THE FOLLOWING RULES */
+ dd p{line-height:120%}
+
+ #mb_accordion_horizontal{width:800px;height:245px;padding:30px;background:#fff;border:1px solid #b5c9e8}
+ #mb_accordion_horizontal dl{width:800px;height:245px}
+ #mb_accordion_horizontal dt{height:46px;line-height:44px;text-align:right;padding:0 15px 0 0;font-size:1.1em;font-weight:bold;font-family: Tahoma, Geneva, sans-serif;text-transform:uppercase;letter-spacing:1px;background:#fff url(images/slide-title-inactive-1.jpg) 0 0 no-repeat;color:#26526c}
+ #mb_accordion_horizontal dt.active{cursor:pointer;color:#fff;background:#fff url(images/slide-title-active-1.jpg) 0 0 no-repeat}
+ #mb_accordion_horizontal dt.hover{color:#68889b;}
+ #mb_accordion_horizontal dt.active.hover{color:#fff}
+ #mb_accordion_horizontal dd{padding:25px;background:url(images/slide.jpg) bottom left repeat-x;border:1px solid #dbe9ea;border-left:0;margin-right:3px}
+ #mb_accordion_horizontal .slide-number{color:#68889b;left:10px;font-weight:bold}
+ #mb_accordion_horizontal .active .slide-number{color:#fff;}
+ #mb_accordion_horizontal a{color:#68889b}
+ #mb_accordion_horizontal dd img{float:right;margin:0 0 0 30px;}
+ #mb_accordion_horizontal h2{font-size:2.5em;margin-top:10px}
+ #mb_accordion_horizontal .more{padding-top:10px;display:block}
+
Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php 2010-12-20 13:50:49 UTC (rev 7342)
+++ trunk/mapbender/http/php/mod_showMetadata.php 2010-12-20 15:00:52 UTC (rev 7343)
@@ -157,12 +157,15 @@
$translation['statusProblem'] = 'Problem bei letzter Kontrolle';
$translation['contactTelephone'] = 'Telefon';
$translation['wmc'] = 'Web Map Context Dokument';
+ $translation['graphicUnavailable'] = 'Grahische Übersicht nicht aktiviert';
+ $translation['notMonitored'] = 'Informationen über die Qualität sind nur verfügbar, wenn das Service Monitoring aktiv ist!';
+ $translation['wmcQualityText'] = 'Für Web Map Context Dokumente entfällt die Angabe zur Qualität!';
break;
case "en":
$translation['overview'] = 'Overview';
$translation['properties'] = 'Properties';
$translation['termsOfUse'] = 'Terms Of Use';
- $translation['contact'] = 'Kontact';
+ $translation['contact'] = 'Contact';
$translation['quality'] = 'Quality';
$translation['interfaces'] = 'Interfaces';
$translation['metadata'] = 'Metadata';
@@ -212,6 +215,9 @@
$translation['statusProblem'] = 'Problem at last control';
$translation['contactTelephone'] = 'Telephon';
$translation['wmc'] = 'Web Map Context document';
+ $translation['graphicUnavailable'] = 'Graphical Overview not active';
+ $translation['notMonitored'] = 'Information about Quality is only available if the service monitoring is activated!';
+ $translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
break;
default: #to english
$translation['overview'] = 'Overview';
@@ -267,6 +273,9 @@
$translation['statusProblem'] = 'Problem at last control';
$translation['contactTelephone'] = 'Telephon';
$translation['wmc'] = 'Web Map Context document';
+ $translation['graphicUnavailable'] = 'Graphical Overview not active';
+ $translation['notMonitored'] = 'Information about Quality is only available if the service monitoring is activated!';
+ $translation['wmcQualityText'] = 'In case of Web Map Context Documents the Quality part is not applicable!';
}
//Array with infos about the different elements which are shown in the tabs
@@ -587,8 +596,11 @@
//identification information:
$html .= $t_a.$translation['contentId'].$t_b.$resourceMetadata['contentid'].$t_c;
-$html .= $t_a.$translation['serviceId'].$t_b."<a href='".$self."?resource=".$serviceType."&id=".$serviceId."&layout=".$layout."&languageCode=".$languageCode."'>".$serviceId."</a>".$t_c;
+if ($resource != 'wmc') {
+ $html .= $t_a.$translation['serviceId'].$t_b."<a href='".$self."?resource=".$serviceType."&id=".$serviceId."&layout=".$layout."&languageCode=".$languageCode."'>".$serviceId."</a>".$t_c;
+}
+
if (($resource == 'wms' or $resource == 'layer' or $resource == 'wmc' ) and isset($resourceMetadata['preview'])) {
$html .= $t_a.$translation['preview'].$t_b.$resourceMetadata['preview'];
if (isset($resourceMetadata['legend'])) {
@@ -712,6 +724,8 @@
$html .= $t_a.$translation['wgs84Bbox'].$t_b.$wgs84Bbox.$t_c;
if (defined('EXTENTSERVICEURL')) {
$html .= $t_a.$translation['wgs84BboxGraphic'].$t_b."<img src='".$getMapUrl."'>".$t_c;
+ } else {
+ $html .= $t_a.$translation['wgs84BboxGraphic'].$t_b.$translation['graphicUnavailable'].$t_c;
}
//show preview map - dynamically
@@ -815,20 +829,27 @@
}
$html .= '<p>';
$html .= $tableBegin;
-switch ($serviceQuality['last_status']) {
- case '1':
- $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/go.bmp' height='24px' width='24px' alt='".$translation['statusOK']."' title='".$translation['statusOK']."'>".$t_c;
- break;
- case '0':
- $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/wait.bmp' height='24px' width='24px' alt='".$translation['statusChanged']."' title='".$translation['statusChanged']."'>".$t_c;
- break;
- case '-1':
- $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/stop.bmp' height='24px' width='24px' alt='".$translation['statusProblem']."' title='".$translation['statusChanged']."'>".$t_c;
- break;
+if ($resource != 'wmc') {
+ switch ($serviceQuality['last_status']) {
+ case '1':
+ $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/go.bmp' height='24px' width='24px' alt='".$translation['statusOK']."' title='".$translation['statusOK']."'>".$t_c;
+ break;
+ case '0':
+ $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/wait.bmp' height='24px' width='24px' alt='".$translation['statusChanged']."' title='".$translation['statusChanged']."'>".$t_c;
+ break;
+ case '-1':
+ $html .= $t_a.$translation['status'].$t_b."<img src='../img/trafficlights/stop.bmp' height='24px' width='24px' alt='".$translation['statusProblem']."' title='".$translation['statusChanged']."'>".$t_c;
+ break;
+ }
+ if (isset($serviceQuality['availability'])) {
+ $html .= $t_a.$translation['availability'].$t_b.$serviceQuality['availability']." %".$t_c;
+ } else {
+ $html .= $t_a.$translation['availability'].$t_b.$translation['notMonitored'].$t_c;
+ }
+} else { //resource is wmc
+ $html .= $translation['wmcQualityText'];
}
-if (isset($serviceQuality['availability'])) {
- $html .= $t_a.$translation['availability'].$t_b.$serviceQuality['availability']." %".$t_c;
-}
+
$html .= $tableEnd;
$html .= '</p>';
$html .= '</div>';
@@ -854,20 +875,31 @@
$translation['inspireMetadata'] = 'INSPIRE Service Metadaten';
$translation['securedCapabilities'] = 'Secured Capabilities URL';*/
$html .= $tableBegin;
-$html .= $t_a.$translation['mapbenderCapabilities'].$t_b."<a href = '../php/wms.php?layer_id=".$layerId."&PHPSESSID=".session_id()."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
-$html .= $t_a.$translation['originalCapabilities'].$t_b."<a href = '".$resourceMetadata['wms_getcapabilities']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
-$html .= $t_a.$translation['inspireMetadata'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=". $layerId."' target=_blank ><img style='border: none;' src='../img/inspire_tr_36.png' title='".$translation['inspireMetadata']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
+if ($resource == 'wmc') {
+ $html .= $t_a.$translation['wmc'].$t_b."XML".$t_c;
+}
+if ($resource == 'wfs') {
+}
-$html .= $t_a.$translation['inspireMetadataValidation'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layerId."&validate=true' target=_blank title='".$translation['inspireMetadataValidation']."'>".$translation['showInspireMetadataValidation']."</a>".$t_c;
+if ($resource == 'wms' or $resource == 'layer'){
+ $html .= $t_a.$translation['mapbenderCapabilities'].$t_b."<a href = '../php/wms.php?layer_id=".$layerId."&PHPSESSID=".session_id()."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
+ $html .= $t_a.$translation['originalCapabilities'].$t_b."<a href = '".$resourceMetadata['wms_getcapabilities']."&REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS' target=_blank>".$translation['capabilities']."</a>".$t_c;
+ $html .= $t_a.$translation['inspireMetadata'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=". $layerId."' target=_blank ><img style='border: none;' src='../img/inspire_tr_36.png' title='".$translation['inspireMetadata']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
+ $html .= $t_a.$translation['inspireMetadataValidation'].$t_b."<a href='../php/mod_layerISOMetadata.php?SERVICE=WMS&outputFormat=iso19139&Id=".$layerId."&validate=true' target=_blank title='".$translation['inspireMetadataValidation']."'>".$translation['showInspireMetadataValidation']."</a>".$t_c;
-//if service is secured and http_auth is adjusted show secured url
-if ($resourceSecured) {
- $securedLink = HTTP_AUTH_PROXY."/".$layerId."?REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";
- $html .= $t_a.$translation['securedCapabilities'].$t_b."<a href = '".$securedLink."' target=_blank>".$translation['capabilities']."</a>".$t_c;
+ //if service is secured and http_auth is adjusted show secured url
+ if ($resourceSecured) {
+ $securedLink = HTTP_AUTH_PROXY."/".$layerId."?REQUEST=GetCapabilities&VERSION=1.1.1&SERVICE=WMS";
+ $html .= $t_a.$translation['securedCapabilities'].$t_b."<a href = '".$securedLink."' target=_blank>".$translation['capabilities']."</a>".$t_c;
+ }
+ //kml
+ $html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'><img style='border: none;' src='../img/misc/kml_icon.gif' title='".$translation['kml']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
}
-//kml
-$html .= $t_a.$translation['kml'].$t_b."<a href='../php/mod_interfaceWms4Kml.php?id=".$layerId."'><img style='border: none;' src='../img/misc/kml_icon.gif' title='".$translation['kml']."' style='width:34px;height:34px' alt='' /></a>".$t_c;
+
+
+
+
$html .= $tableEnd;
$html .= '</p>';
$html .= '</div>';
Modified: trunk/mapbender/tools/wms_extent/extent_service.conf
===================================================================
--- trunk/mapbender/tools/wms_extent/extent_service.conf 2010-12-20 13:50:49 UTC (rev 7342)
+++ trunk/mapbender/tools/wms_extent/extent_service.conf 2010-12-20 15:00:52 UTC (rev 7343)
@@ -2,5 +2,6 @@
# --------------------------------------------
# type of mapbender database
# --------------------------------------------
-DEFINE("EXTENTSERVICEURL","http://".$_SERVER['HTTP_HOST']."/cgi-bin/mapserv?map=/data/mapbender/tools/wms_extent/extents.map&");
+#DEFINE("EXTENTSERVICEURL","http://".$_SERVER['HTTP_HOST']."/cgi-bin/mapserv?map=/data/mapbender/tools/wms_extent/extents.map&");
+
?>
More information about the Mapbender_commits
mailing list