[Mapbender-commits] r2329 - in branches/nimix_dev/http: css javascripts

[svn_mapbender at osgeo.org]

Author: nimix
Date: 2008-04-02 03:59:14 -0400 (Wed, 02 Apr 2008)
New Revision: 2329

Modified:
   branches/nimix_dev/http/css/popup.css
   branches/nimix_dev/http/javascripts/popup.js
Log:
some css rework to make client area fit into popup (still WIP)

Modified: branches/nimix_dev/http/css/popup.css
===================================================================
--- branches/nimix_dev/http/css/popup.css	2008-04-02 07:58:09 UTC (rev 2328)
+++ branches/nimix_dev/http/css/popup.css	2008-04-02 07:59:14 UTC (rev 2329)
@@ -1,6 +1,6 @@
 @CHARSET "UTF-8";
 /*fixes*/
-div.jqmNotice iframe {width:100%;height:100%;border:none;margin-top:-25px;padding-top:20px;}
+div.jqmNotice iframe {width:100%;height:100%;border:none;}
 div.jqmNotice div.scrollDiv {overflow:auto;position:relative;top:0px;left:0px;right:0px;bottom:0px;width:100%;height:100%;}
 
 div.jqmNotice {
@@ -12,9 +12,8 @@
     background:#EEEEEE url(../img/info_on.gif) 8px 8px no-repeat;
     border: 1px solid #000;
     -moz-border-radius:10px;
-    padding: 0px;
-/*    padding-bottom:30px;
-*/}
+    padding: 30px 10px 5px 10px;
+}
 
 div.jqmNotice .jqResize {
 	position: absolute; 
@@ -25,15 +24,22 @@
 	background:url(../img/resize.gif);
 }
 
-.jqmnTitle{margin: 0 30px;}
+.jqmnTitle{
+	position:absolute;
+	left:35px;
+	right:25px;
+	top:9px;
+	margin:0pt;
+	padding:0pt;
+}
   
 .jqmnTitle h1{
-  margin: 9px 0;
-  padding-left:5px;
-  width: 100%;
-  font-size:12px;
-  color:#EEEEEE;
-  background-color:#505050;
+	background-color:#505050;
+	color:#EEEEEE;
+	font-size:12px;
+	margin:0pt;
+	width:100%;
+	text-align:center;
 }
 
 div.jqmNotice .jqmClose {
@@ -44,9 +50,6 @@
 }
 
 .jqmnContent{
-  border-top:1px;
-  color:#000;
-  margin:0px 20px 25px;
 }
 
 .balloonTL{

Modified: branches/nimix_dev/http/javascripts/popup.js
===================================================================
--- branches/nimix_dev/http/javascripts/popup.js	2008-04-02 07:58:09 UTC (rev 2328)
+++ branches/nimix_dev/http/javascripts/popup.js	2008-04-02 07:59:14 UTC (rev 2329)
@@ -54,7 +54,7 @@
 			break;
 		}
 
-	this.id="popup"+String(create_pos);
+	var id="popup"+String(create_pos);
 	
 	//Set defaults
 	defaults = {
@@ -62,12 +62,13 @@
 		top:25*create_pos,
 		width:300,height:250,
 		title:"Title",
-		frameName:this.id,
-		id:this.id
+		frameName:id,
+		id:id
 	};
 		
 	if(typeof(title)!='object'){
 		this.options = defaults;
+		this.options.id = id;
 		
 		//Set vars
 		if(posx)this.options.left=posx;
@@ -87,6 +88,8 @@
 	else
 		this.options=$.extend(defaults, title);
 
+	this.id = this.options.id;
+	
 	popup_count++;
 	
 	//create dom popup
@@ -256,10 +259,16 @@
 		};
 		//override defaults
 		settings=$.extend(defaults,options)
-
+		
 		//add Styles
 		this.addClass("jqmNotice");
 		
+		if(settings.style)
+			this.css(settings.style);
+		
+		settings.height += parseInt(this.css("padding-top"))+parseInt(this.css("padding-bottom"));
+		settings.width += parseInt(this.css("padding-left"))+parseInt(this.css("padding-right"));
+		
 		//automated settings for balloon popup
 		if(settings.balloon){
 			var dim = getScrollPos();
@@ -304,9 +313,6 @@
 			opacity:settings.opacity
 			});
 		
-		if(settings.style)
-			this.css(settings.style);
-		
 		//Insert content
 		if(settings.url)
 			html = ('<iframe name="'+settings.frameName+'" src="'+settings.url+'"></iframe>');