From mihxil at codespeak.net Fri Apr 2 11:59:59 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 11:59:59 +0200 (CEST)
Subject: [kupu-checkins] r73291 - kupu/trunk/kupu/mmbase
Message-ID: <20100402095959.D403D282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 11:59:58 2010
New Revision: 73291
Modified:
kupu/trunk/kupu/mmbase/mmbase.js
Log:
just added some semicollumns
Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js (original)
+++ kupu/trunk/kupu/mmbase/mmbase.js Fri Apr 2 11:59:58 2010
@@ -17,7 +17,7 @@
};
this.remove = function(key) {
this[key] = undefined;
- }
+ };
}
@@ -67,8 +67,8 @@
} else {
// some versions of Mozilla support onbeforeunload (starting with 1.7)
// so let's try to register and if it fails fall back on onunload
- var re = /rv:([0-9\.]+)/
- var match = re.exec(navigator.userAgent)
+ var re = /rv:([0-9\.]+)/;
+ var match = re.exec(navigator.userAgent);
if (match[1] && parseFloat(match[1]) > 1.6) {
addEventHandler(window, 'beforeunload', saveOnPart);
} else {
@@ -114,7 +114,7 @@
mmb.style.display = mmb.originalDisplay;
layout.adjust();
}
- }
+ };
layout.winOnLoad();
trunkNumber = node;
@@ -219,7 +219,7 @@
}
$("#ajax-loader").css("display", "none");
}
- }
+ };
}
@@ -236,7 +236,7 @@
alert(_("Reinited ") + currentNode);
}
}
- }
+ };
}
From mihxil at codespeak.net Fri Apr 2 12:03:13 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 12:03:13 +0200 (CEST)
Subject: [kupu-checkins] r73292 - kupu/trunk/kupu/mmbase
Message-ID: <20100402100313.0F076282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 12:03:12 2010
New Revision: 73292
Modified:
kupu/trunk/kupu/mmbase/layout.js
Log:
just added some semicollumns
Modified: kupu/trunk/kupu/mmbase/layout.js
==============================================================================
--- kupu/trunk/kupu/mmbase/layout.js (original)
+++ kupu/trunk/kupu/mmbase/layout.js Fri Apr 2 12:03:12 2010
@@ -11,33 +11,33 @@
if (ele && xDef(ele.style, ele.offsetHeight)) { // another compatibility check
this.adjust();
var self = this;
- addEventHandler(window, 'resize', function() {self.winOnResize()}, window);
+ addEventHandler(window, 'resize', function() {self.winOnResize();}, window);
}
-}
+};
Layouter.prototype.winOnResize = function() {
this.adjust();
-}
+};
Layouter.prototype.maxHeight = function() {
return xClientHeight() - 20;
-}
+};
Layouter.prototype.leftWidth = function () {
return 270;
-}
+};
Layouter.prototype.rightWidth = function () {
return 201;
-}
+};
Layouter.prototype.maxWidth = function () {
return xClientWidth() - this.leftWidth() - this.rightWidth() - 4;
-}
+};
Layouter.prototype.rePosition = function(id) {
// This seems to be only necessary in Mozilla.
var el = document.getElementById(id);
el.style.position = "absolute";
el.style.left = (xClientWidth() - 202) + "px";
-}
+};
Layouter.prototype.adjustToolBoxes = function() {
var toolbox = 40;
@@ -78,21 +78,21 @@
this.rePosition("kupu-toolbox-debug");
}
-}
+};
Layouter.prototype.topHeight = function() {
return 27;
-}
+};
Layouter.prototype.adjustMMBaseExtra = function() {
var maxHeight = this.maxHeight();
xHeight('mmbase-extra', maxHeight - 3);
this.adjustMMBaseExtraElements();
-}
+};
Layouter.prototype.mmbaseExtraWidth = function() {
return this.leftWidth() - 6;
-}
+};
Layouter.prototype.adjustMMBaseExtraElements = function() {
var width = this.mmbaseExtraWidth();
var pattern = new RegExp("\\bmm_validate\\b");
@@ -108,7 +108,7 @@
xWidth(a[i], width);
}
}
-}
+};
Layouter.prototype.adjustMMBaseTools = function() {
var maxHeight = this.maxHeight();
@@ -120,7 +120,7 @@
}
xHeight("mmbase-tools", toolsHeight);
-}
+};
Layouter.prototype.adjustKupu = function () {
var maxHeight = this.maxHeight();
var maxHeightArea = maxHeight - this.topHeight();
@@ -134,12 +134,12 @@
xHeight("toolboxes", maxHeight);
xHeight("kupu-editor", maxHeightArea - 3);
xWidth("kupu-editor", maxWidth);
-}
+};
Layouter.prototype.adjustZoomed = function() {
-}
+};
Layouter.prototype.adjustUnzoomed = function() {
-}
+};
Layouter.prototype.adjust = function(zoom) {
if (zoom) {
@@ -160,5 +160,5 @@
this.adjustMMBaseTools();
this.adjustToolBoxes();
-}
+};
From mihxil at codespeak.net Fri Apr 2 12:33:26 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 12:33:26 +0200 (CEST)
Subject: [kupu-checkins] r73293 - kupu/trunk/kupu/mmbase
Message-ID: <20100402103326.6DD2B282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 12:33:24 2010
New Revision: 73293
Modified:
kupu/trunk/kupu/mmbase/flashtool.js (contents, props changed)
Log:
just some details
Modified: kupu/trunk/kupu/mmbase/flashtool.js
==============================================================================
--- kupu/trunk/kupu/mmbase/flashtool.js (original)
+++ kupu/trunk/kupu/mmbase/flashtool.js Fri Apr 2 12:33:24 2010
@@ -56,13 +56,27 @@
var result = flashel && FlashToolBox.srcRe.exec(flashel.src);
if (result) {
this.toolboxel.className = this.activeclass;
- $(this.toolboxel).find(".flashobject").load("flash.jspx?o=" + result[1]);
+ $(this.toolboxel).find(".flashobject").load("flash.jspx?o=" + result[1],
+ function() {
+ $(this).
+ ready(function() {
+ // I don't quite understand the need fo the timeout,
+ // but it doesn't work without it (in FF)
+ setTimeout(
+ function() {
+ layout.adjustToolBoxes();
+ }, 500);
+ }
+ );
+ });
} else {
this.toolboxel.className = this.plainclass;
$(this.toolboxel).find(".flashobject").empty();
+ layout.adjustToolBoxes();
+
+ }
- };
};
@@ -84,6 +98,7 @@
return this.originalUpdateState(selNode, event);
} else {
this.toolboxel.className = this.plainclass;
+ return null;
};
};
From mihxil at codespeak.net Fri Apr 2 12:59:24 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 12:59:24 +0200 (CEST)
Subject: [kupu-checkins] r73294 - kupu/trunk/kupu/common
Message-ID: <20100402105924.27AFE282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 12:59:22 2010
New Revision: 73294
Modified:
kupu/trunk/kupu/common/kupuloggers.js
Log:
made it possible to not wire a debug-div. In stead it could log to the firebug console then (or not at all)
Modified: kupu/trunk/kupu/common/kupuloggers.js
==============================================================================
--- kupu/trunk/kupu/common/kupuloggers.js (original)
+++ kupu/trunk/kupu/common/kupuloggers.js Fri Apr 2 12:59:22 2010
@@ -13,7 +13,7 @@
//----------------------------------------------------------------------------
// Loggers
//
-// Loggers are pretty simple classes, that should have 1 method, called
+// Loggers are pretty simple classes, that should have 1 method, called
// 'log'. This is called with 2 arguments, the first one is the message to
// log and the second is the severity, which can be 0 or some other false
// value for debug messages, 1 for warnings and 2 for errors (the loggers
@@ -23,7 +23,7 @@
function DebugLogger() {
/* Alert all messages */
-
+
this.log = function(message, severity) {
/* log a message */
if (severity > 1) {
@@ -41,24 +41,31 @@
this.debugel = getFromSelector(debugelid);
this.maxlength = maxlength;
-
+
this.log = function(message, severity) {
/* log a message */
if (severity > 1) {
throw message;
} else {
- if (this.maxlength) {
- if (this.debugel.childNodes.length > this.maxlength - 1) {
- this.debugel.removeChild(this.debugel.childNodes[0]);
- }
- }
- var now = new Date();
- var time = now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds();
-
- var div = document.createElement('div');
- var text = document.createTextNode(time + ' - ' + message);
- div.appendChild(text);
- this.debugel.appendChild(div);
+ var now = new Date();
+ var time = now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds();
+ var logMessage = time + ' - ' + message;
+ if (this.debugel != null) {
+ if (this.maxlength) {
+ if (this.debugel.childNodes.length > this.maxlength - 1) {
+ this.debugel.removeChild(this.debugel.childNodes[0]);
+ }
+ }
+
+ var div = document.createElement('div');
+ var text = document.createTextNode(logMessage);
+ div.appendChild(text);
+ this.debugel.appendChild(div);
+ } else {
+ if (typeof console != "undefined") {
+ console.log(logMessage);
+ }
+ }
}
};
}
From mihxil at codespeak.net Fri Apr 2 13:00:48 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 13:00:48 +0200 (CEST)
Subject: [kupu-checkins] r73295 - kupu/trunk/kupu/mmbase
Message-ID: <20100402110048.E5BA9282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 13:00:47 2010
New Revision: 73295
Modified:
kupu/trunk/kupu/mmbase/wire.kupu
Log:
don't wire the debug block any more. It'll use the firebug console in stead (if firebug enabled)
Modified: kupu/trunk/kupu/mmbase/wire.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/wire.kupu (original)
+++ kupu/trunk/kupu/mmbase/wire.kupu Fri Apr 2 13:00:47 2010
@@ -60,7 +60,9 @@
+
From mihxil at codespeak.net Fri Apr 2 15:32:49 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 2 Apr 2010 15:32:49 +0200 (CEST)
Subject: [kupu-checkins] r73299 - kupu/trunk/kupu/mmbase
Message-ID: <20100402133249.3D5C0282B9C@codespeak.net>
Author: mihxil
Date: Fri Apr 2 15:32:47 2010
New Revision: 73299
Modified:
kupu/trunk/kupu/mmbase/Makefile
Log:
as long as not released, I should deploy this stuff as SNAPSHOT
Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile (original)
+++ kupu/trunk/kupu/mmbase/Makefile Fri Apr 2 15:32:47 2010
@@ -12,10 +12,16 @@
LANGS=nl de fr it eo
-VERSION=`cat ../version.txt | awk '{print $$2}'`
+VERSIONEXTRA=$(shell U=`svn info | grep URL | grep trunk`; if [ "$${U:0:3}" == "URL" ] ; then echo -SNAPSHOT ; fi )
+VERSION=`cat ../version.txt | awk '{print $$2}'`$(VERSIONEXTRA)
+REPO=$(shell if [ "$(VERSIONEXTRA)" == "-SNAPSHOT" ] ; then echo snapshots ; else echo maven2 ; fi)
+REPOID=$(shell if [ "$(VERSIONEXTRA)" == "-SNAPSHOT" ] ; then echo mmbase-snapshots ; else echo mmbase ; fi)
+
#type in i18n: msginit -l -i messages.po
+.PHONY: messages deploy.jars deploy test
+
all: index.jspx body.jspx head.jspx mmbase-kupu-i18n.jar i18n.js/i18n.js
@@ -36,7 +42,11 @@
tar zxf i18n.js-0.1.tar.gz
-.PHONY:
+test:
+ @echo $(VERSION)
+ @echo $(REPO)
+ @echo $(REPOID)
+
messages: *.js clean
rm -f phony.js
grep -r "fmt:message" *.jspx *.kupu | sed 's/.*key="\(.*\)".*/_("\1");/g' | uniq > phony.js
@@ -69,16 +79,16 @@
( cd build ; find . -regex '.*/\.svn.*' -o -type f -print | xargs jar cf ../mmbase-kupu.war )
-.PHONY:
+
deploy.jars: $(I18N) mmbase-kupu-i18n.jar
mvn install:install-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N)
mvn install:install-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar
- mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N) -Durl=scp://mmbase.org/home/mmweb/web/maven2 -DrepositoryId=mmbase
- mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar -Durl=scp://mmbase.org/home/mmweb/web/maven2 -DrepositoryId=mmbase
+ mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N) -Durl=scp://mmbase.org/home/mmweb/web/$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
+ mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar -Durl=scp://mmbase.org/home/mmweb/web/$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
+
-.PHONY:
deploy: mmbase-kupu.war
- mvn deploy:deploy-file -DgeneratePom.description='WAR-overlay containing all necessary files to use kupu with MMBase. The mmbase-richtext component depends on this.' -DgroupId=org.oscom -DartifactId=mmbase-kupu -Dversion=$(VERSION) -Dpackaging=war -Dfile=mmbase-kupu.war -Durl=scp://mmbase.org/home/mmweb/web/maven2 -DrepositoryId=mmbase
+ mvn deploy:deploy-file -DgeneratePom.description='WAR-overlay containing all necessary files to use kupu with MMBase. The mmbase-richtext component depends on this.' -DgroupId=org.oscom -DartifactId=mmbase-kupu -Dversion=$(VERSION) -Dpackaging=war -Dfile=mmbase-kupu.war -Durl=scp://mmbase.org/home/mmweb/web/$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
clean:
From kupu-checkins at codespeak.net Thu Apr 15 09:47:37 2010
From: kupu-checkins at codespeak.net (USA © Doctor Bridgette)
Date: Thu, 15 Apr 2010 09:47:37 +0200 (CEST)
Subject: [kupu-checkins] Dear kupu-checkins@codespeak.net April 63% OFF
Message-ID: <20100415074737.AA3DB282B9C@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20100415/1b13bac2/attachment.htm
From kupu-checkins at codespeak.net Tue Apr 20 22:31:26 2010
From: kupu-checkins at codespeak.net (VIAGRA ® Official Seller)
Date: Tue, 20 Apr 2010 22:31:26 +0200 (CEST)
Subject: [kupu-checkins] kupu-checkins@codespeak.net April 68% off
Message-ID: <20100420203126.66F24282BDB@codespeak.net>
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20100420/cef251dd/attachment.htm
From kupu-checkins at codespeak.net Tue Apr 20 23:17:35 2010
From: kupu-checkins at codespeak.net (Sales time)
Date: Wed, 21 Apr 2010 00:17:35 +0300
Subject: [kupu-checkins] G'day kupu-checkins! Come in
Message-ID: <20100420211733.2620D282BD4@codespeak.net>
A painting of a woman writing sheet music by Lorenzo Lippi.
The United Kingdom has been influential in the development of cinema, with the Ealing Studios claiming to be the oldest studios in the world.
http://val.luckyglad.ru/?450cc3ba6c5-e1cfd207490b-2bef981e5de2
Notable conductors include Sir Simon Rattle, John Barbirolli and Sir Malcolm Sargent.
Electronic musician Paddy Kingsland is noted for the music style he brought to several serials of the television series Doctor Who which had until then relied mostly on stock music cues or minimal music for much of its history.
http://u.luckyglad.ru/?4d9c9370ecaf-5afbbf1a818-191158318782
Global Mammal Assessment Team (2008).
Originally an engine was a mechanical device that converted force into motion.
Martin Nadaud (1815-1898), politician.
Number 78 was formerly assigned to Seine-et-Oise.
http://syr.luckyglad.ru/?7276fb14edc-0f90bd153f-a583146318c
Regarding religious differences, it is now generally recognized that even though a number of the countries where female genital surgeries are found are predominantly Muslim, the practices are not prescribed by Islam and are, in fact, found among non-Muslim groups such as Coptic Christians of Egypt, several Christian groups in Kenya, and the Falasha Jews of Ethiopia.
In 1684, the Iroquois invaded Virginian and Illinois territory again, and unsuccessfully attacked the French fort at St.
Shannon, Iroquois Diplomacy, 25.
It includes Lough Neagh, at 388square kilometres (150sqmi), the largest body of water in the UK and Ireland.
The invention of writing systems at least 5,000 years ago allowed the preservation of language on material objects, and was a major step in cultural evolution.
http://uyl.luckyglad.ru/?2091abcfaec8-2d23dcf84d9d-cc2c402001
It includes Lough Neagh, at 388square kilometres (150sqmi), the largest body of water in the UK and Ireland.
On February 19, 2009, it was announced that the band signed with S-Curve Records, the label best known for releasing such acts as Joss Stone, Fountains of Wayne and Tom Jones.
The music is characterized by long compositions, looping sequencer patterns, and improvised lead melody lines.
http://oib.luckyglad.ru/?0f202edeb940-cd19ca99abb-21937ec396
Southern League Premier League Winners, promoted to Blue Square South.
Early humans left stone tools, pottery and jewelry that are particular to various regions and times.
http://k.duuwizaog.com/?9baacd702f-735448027e1-50dbb82af4b
http://upt.osuraawylep.com/?e2e069d9a8-b5568c2ebd69-933c1a1aef4
Jack Palmer, retrieved March 17, 2006.
In continental France (metropolitan France, excluding Corsica), the median land area of a department is 5,965km 2 (2,303sqmi), which is two-and-a-half times the median land area of a ceremonial county of England and slightly more than three-and-half times the median land area of a county of the United States.
The cornstalks grow, the bean plants climb the stalks, and the squash grow beneath, inhibiting weeds and keeping the soil moist under the shade of their broad leaves.
Archived from the original on 2007-10-01.
http://nfx.eigetiku.com/?f435b7b0a518-9c381868f3-ccf55cc0e93
http://wr.einemow.com/?fbf27eb827-97858d7c075-1ff0a8a36d
Ethnic groups are defined by linguistic, cultural, ancestral, national or regional ties.
Although being vastly more advanced than many species in cognitive abilities, most of these abilities are known in primitive form among other species.
Per cent per year in the period 1991 to 2001, and 0.
The UK is closely associated with motorsport.
It uses information processing as a framework for understanding the mind.
Cantons of the Creuse department.
http://kj.edaiz.com/?f9642c37933-e5c775e7628d-aee3f75598
http://uo.uxuiq.com/?54c6a1694e-a3915157d510-2385f768efb
For the most part, the description of African traditional religions in this way reflects more of a bias of European understanding and less of a scientifically balanced and ethnographically informed perspective.
Deliberate habitat alteration is often done with the goals of increasing material wealth, increasing thermal comfort, improving the amount of food available, improving aesthetics, or improving ease of access to resources or other human settlements.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20100421/6a89e6a0/attachment-0001.htm
From guido at codespeak.net Thu Apr 22 13:09:57 2010
From: guido at codespeak.net (guido at codespeak.net)
Date: Thu, 22 Apr 2010 13:09:57 +0200 (CEST)
Subject: [kupu-checkins] r73966 - kupu/branch/kupu-1.4-silva/common
Message-ID: <20100422110957.6F432282B9E@codespeak.net>
Author: guido
Date: Thu Apr 22 13:09:55 2010
New Revision: 73966
Modified:
kupu/branch/kupu-1.4-silva/common/kupucontentfilters.js
Log:
Fixed issue where setAttribute was called with value null (which doesn't seem
to work in IE 8, though Moz and friends do not seem to mind).
Modified: kupu/branch/kupu-1.4-silva/common/kupucontentfilters.js
==============================================================================
--- kupu/branch/kupu-1.4-silva/common/kupucontentfilters.js (original)
+++ kupu/branch/kupu-1.4-silva/common/kupucontentfilters.js Thu Apr 22 13:09:55 2010
@@ -515,7 +515,11 @@
}
this.alt = function(name, htmlnode, xhtmlnode) {
var val = htmlnode.getAttribute(name);
- if (val || xhtmlnode.tagName=='img') xhtmlnode.setAttribute(name, val);
+ if (val && xhtmlnode.tagName=='img') {
+ xhtmlnode.setAttribute(name, val);
+ } else if (xhtmlnode.tagName == 'img') {
+ xhtmlnode.removeAttribute(name);
+ };
}
this.rowspan = this.colspan = function(name, htmlnode, xhtmlnode) {
var val = htmlnode.getAttribute(name);
From mihxil at codespeak.net Fri Apr 23 12:47:27 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 23 Apr 2010 12:47:27 +0200 (CEST)
Subject: [kupu-checkins] r74007 - kupu/trunk/kupu/mmbase
Message-ID: <20100423104727.5FC96282BD4@codespeak.net>
Author: mihxil
Date: Fri Apr 23 12:47:25 2010
New Revision: 74007
Modified:
kupu/trunk/kupu/mmbase/Makefile
Log:
added missing image to the war
Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile (original)
+++ kupu/trunk/kupu/mmbase/Makefile Fri Apr 23 12:47:25 2010
@@ -65,7 +65,7 @@
webapp: all deploy.jars
mkdir -p build/mmbase/kupu/mmbase
- cp -pr *.jspx *.js *.css build/mmbase/kupu/mmbase
+ cp -pr *.jspx *.js *.css *.png build/mmbase/kupu/mmbase
cp -rpf tools build/mmbase/kupu/mmbase
cp -rpf drawers build/mmbase/kupu/mmbase
cp -rpf icons build/mmbase/kupu/mmbase
From sylvain at codespeak.net Tue Apr 27 10:22:48 2010
From: sylvain at codespeak.net (sylvain at codespeak.net)
Date: Tue, 27 Apr 2010 10:22:48 +0200 (CEST)
Subject: [kupu-checkins] r74099 - kupu/branch/kupu-1.4-silva/zope2
Message-ID: <20100427082248.D00CD282BDB@codespeak.net>
Author: sylvain
Date: Tue Apr 27 10:22:46 2010
New Revision: 74099
Modified:
kupu/branch/kupu-1.4-silva/zope2/__init__.py
Log:
Modify import to prevent deprecation warnings with Zope 2.12. This requires at least Zope 2.11.3 now.
Modified: kupu/branch/kupu-1.4-silva/zope2/__init__.py
==============================================================================
--- kupu/branch/kupu-1.4-silva/zope2/__init__.py (original)
+++ kupu/branch/kupu-1.4-silva/zope2/__init__.py Tue Apr 27 10:22:46 2010
@@ -17,7 +17,8 @@
$Id$
"""
-import Globals
+from App.class_init import InitializeClass
+
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.FileSystemSite.DirectoryView import DirectoryView
@@ -60,12 +61,12 @@
res = s.__of__(parent)
return res
-Globals.InitializeClass(KupuEditor)
+InitializeClass(KupuEditor)
class KupuEditorSurrogate(DirectoryViewSurrogate):
meta_type = "kupu editor"
-Globals.InitializeClass(KupuEditorSurrogate)
+InitializeClass(KupuEditorSurrogate)
manage_addKupuEditorForm = PageTemplateFile('addKupuEditor.pt', globals())