The OpenLayers server threw a disk, and clobbered another, resulting in a loss

of data up to our last backup. In the previous subversion repository, this was
r1694->r1777. I'm sorry to all those of you who might have checked out that 
code, as this will surely cause problems for you. We're currently working to
figure out what went wrong, and how to prevent it in the future.


git-svn-id: http://svn.openlayers.org/trunk/openlayers@1695 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

lib/OpenLayers/Popup.js

@@ -41,6 +41,13 @@ OpenLayers.Popup.prototype = {
 
     /** @type String */
     border: "",
+    
+    /** @type DOMElement */
+    contentDiv:null,
+
+    /** @type int */
+    padding: 5,
+
 
     /** this gets set in Map.js when the popup is added to the map
      * @type OpenLayers.Map */
@@ -74,6 +81,14 @@ OpenLayers.Popup.prototype = {
 
         this.div = OpenLayers.Util.createDiv(this.id, null, null, 
                                              null, null, null, "hidden");
+        this.div.className = 'olPopup';
+
+        var id = this.div.id + "_contentDiv";
+        this.contentDiv = OpenLayers.Util.createDiv(id, null, this.size.clone(), 
+                                                    null, "relative", null,
+                                                    "hidden");
+        this.contentDiv.className = 'olPopupContent';                                            
+        this.div.appendChild(this.contentDiv);
 
         this.registerEvents();
     },
@@ -219,17 +234,18 @@ OpenLayers.Popup.prototype = {
     },      
     
     /**
-    * @param {String} contentHTML
-    */
+     * @param {String} contentHTML
+     */
     setContentHTML:function(contentHTML) {
         if (contentHTML != null) {
             this.contentHTML = contentHTML;
         }
         
-        if (this.div != null) {
-            this.div.innerHTML = this.contentHTML;
+        if (this.contentDiv != null) {
+            this.contentDiv.innerHTML = this.contentHTML;
         }    
     },
+    
 
     
     /** Do this in a separate function so that subclasses can