Author: michiel
Date: 2010-05-15 00:57:50 +0200 (Sat, 15 May 2010)
New Revision: 42153
Added:
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/componentblocks.xml
Removed:
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml
Modified:
speeltuin/mihxil/portal/trunk/src/main/config/applications/Portal.xml
speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/framework/BlocksToDatabaseSyncer.java
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/blocks.tagx
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/page.js
Log:
blocks gives rise to conflicts (e.g. with richtext)
Modified: speeltuin/mihxil/portal/trunk/src/main/config/applications/Portal.xml
===================================================================
--- speeltuin/mihxil/portal/trunk/src/main/config/applications/Portal.xml
2010-05-14 22:39:40 UTC (rev 42152)
+++ speeltuin/mihxil/portal/trunk/src/main/config/applications/Portal.xml
2010-05-14 22:57:50 UTC (rev 42153)
@@ -8,7 +8,7 @@
<neededbuilderlist>
<builder maintainer="mmbase.org" version="1">pages</builder>
- <builder maintainer="mmbase.org" version="1">blocks</builder>
+ <builder maintainer="mmbase.org" version="1">componentblocks</builder>
<builder maintainer="mmbase.org" version="1">blockposrel</builder>
<builder maintainer="mmbase.org" version="1">cartesianrel</builder>
</neededbuilderlist>
@@ -19,7 +19,7 @@
</neededreldeflist>
<allowedrelationlist>
- <relation from="pages" to="blocks" type="blockposrel" />
+ <relation from="pages" to="componentblocks" type="blockposrel" />
</allowedrelationlist>
<datasourcelist>
Deleted: speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml
===================================================================
--- speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml
2010-05-14 22:39:40 UTC (rev 42152)
+++ speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml
2010-05-14 22:57:50 UTC (rev 42153)
@@ -1,108 +0,0 @@
-<?xml version="1.0" ?>
-<builder
- xmlns="http://www.mmbase.org/xmlns/builder";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
http://www.mmbase.org/xmlns/builder.xsd";
- name="blocks" maintainer="mmbase.org" version="1" extends="object">
- <searchage>3000</searchage>
- <names>
- <singular xml:lang="en">Webblock</singular>
- <singular xml:lang="nl">Webblok</singular>
- <plural xml:lang="en">Webblocks</plural>
- <plural xml:lang="nl">Webblokken</plural>
- </names>
-
- <descriptions>
- <description xml:lang="en">
- Building blocks for a (home)page
- </description>
- <description xml:lang="nl">
- Bouwblokken voor een (home)page
- </description>
- </descriptions>
-
- <fieldlist>
- <field name="component" state="persistent">
- <gui>
- <guiname xml:lang="nl">Component</guiname>
- <guiname xml:lang="en">Component</guiname>
- <guiname xml:lang="zh">模型</guiname>
- </gui>
- <editor>
- <positions>
- <list>1</list>
- </positions>
- </editor>
- <datatype base="components"
xmlns="http://www.mmbase.org/xmlns/datatypes"; />
- </field>
- <field name="name">
- <descriptions>
- <description xml:lang="en">Name of the webblock</description>
- <description xml:lang="nl">Naam van de webblok</description>
- </descriptions>
- <gui>
- <guiname xml:lang="en">Name</guiname>
- <guiname xml:lang="nl">Naam</guiname>
- </gui>
- <editor>
- <positions>
- <list>2</list>
- </positions>
- </editor>
- <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes"; >
- <required value="true" />
- <maxLength value="126" />
- </datatype>
- </field>
-
- <field name="description">
- <descriptions>
- <description xml:lang="en">Description</description>
- <description xml:lang="nl">Omschrijving van een webblock</description>
- </descriptions>
-
- <gui>
- <guiname xml:lang="nl">Omschrijving</guiname>
- <guiname xml:lang="en">Description</guiname>
- </gui>
- <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes"; >
- <maxLength value="2048" />
- </datatype>
- </field>
-
- <field name="windowstate">
- <gui>
- <guiname xml:lang="nl">Weergave</guiname>
- <guiname xml:lang="en">Display Type</guiname>
- </gui>
- <datatype base="windowstate"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="NORMAL" />
- </datatype>
- </field>
- <field name="refreshpolicy">
- <gui>
- <guiname xml:lang="nl">Cacherefreshpolicy</guiname>
- <guiname xml:lang="en">Cache refresh policy</guiname>
- </gui>
- <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="org.mmbase.portal.refresh.Expires" />
- <enumeration>
- <entry value="org.mmbase.portal.refresh.Always" display="always" />
- <entry value="org.mmbase.portal.refresh.Expires" display="expires" />
- <entry value="org.mmbase.portal.refresh.Never" display="never" />
- </enumeration>
- </datatype>
- </field>
- <field name="refreshpolicyparam">
- <gui>
- <guiname xml:lang="nl">Cacherefreshpolicy</guiname>
- <guiname xml:lang="en">Cache refresh policy</guiname>
- </gui>
- <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="3600" /> <!-- 1 hour -->
- </datatype>
- </field>
-
-
- </fieldlist>
-</builder>
Copied:
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/componentblocks.xml
(from rev 42067,
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml)
===================================================================
---
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/componentblocks.xml
(rev 0)
+++
speeltuin/mihxil/portal/trunk/src/main/config/builders/core/componentblocks.xml
2010-05-14 22:57:50 UTC (rev 42153)
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?>
+<builder
+ xmlns="http://www.mmbase.org/xmlns/builder";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
http://www.mmbase.org/xmlns/builder.xsd";
+ name="componentblocks" maintainer="mmbase.org" version="1"
extends="object">
+ <searchage>3000</searchage>
+ <names>
+ <singular xml:lang="en">Webblock</singular>
+ <singular xml:lang="nl">Webblok</singular>
+ <plural xml:lang="en">Webblocks</plural>
+ <plural xml:lang="nl">Webblokken</plural>
+ </names>
+
+ <descriptions>
+ <description xml:lang="en">
+ Building blocks for a (home)page
+ </description>
+ <description xml:lang="nl">
+ Bouwblokken voor een (home)page
+ </description>
+ </descriptions>
+
+ <fieldlist>
+ <field name="component" state="persistent">
+ <gui>
+ <guiname xml:lang="nl">Component</guiname>
+ <guiname xml:lang="en">Component</guiname>
+ <guiname xml:lang="zh">模型</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <list>1</list>
+ </positions>
+ </editor>
+ <datatype base="components"
xmlns="http://www.mmbase.org/xmlns/datatypes"; />
+ </field>
+ <field name="name">
+ <descriptions>
+ <description xml:lang="en">Name of the webblock</description>
+ <description xml:lang="nl">Naam van de webblok</description>
+ </descriptions>
+ <gui>
+ <guiname xml:lang="en">Name</guiname>
+ <guiname xml:lang="nl">Naam</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <list>2</list>
+ </positions>
+ </editor>
+ <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes"; >
+ <required value="true" />
+ <maxLength value="126" />
+ </datatype>
+ </field>
+
+ <field name="description">
+ <descriptions>
+ <description xml:lang="en">Description</description>
+ <description xml:lang="nl">Omschrijving van een webblock</description>
+ </descriptions>
+
+ <gui>
+ <guiname xml:lang="nl">Omschrijving</guiname>
+ <guiname xml:lang="en">Description</guiname>
+ </gui>
+ <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes"; >
+ <maxLength value="2048" />
+ </datatype>
+ </field>
+
+ <field name="windowstate">
+ <gui>
+ <guiname xml:lang="nl">Weergave</guiname>
+ <guiname xml:lang="en">Display Type</guiname>
+ </gui>
+ <datatype base="windowstate"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="NORMAL" />
+ </datatype>
+ </field>
+ <field name="refreshpolicy">
+ <gui>
+ <guiname xml:lang="nl">Cacherefreshpolicy</guiname>
+ <guiname xml:lang="en">Cache refresh policy</guiname>
+ </gui>
+ <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="org.mmbase.portal.refresh.Expires" />
+ <enumeration>
+ <entry value="org.mmbase.portal.refresh.Always" display="always" />
+ <entry value="org.mmbase.portal.refresh.Expires" display="expires" />
+ <entry value="org.mmbase.portal.refresh.Never" display="never" />
+ </enumeration>
+ </datatype>
+ </field>
+ <field name="refreshpolicyparam">
+ <gui>
+ <guiname xml:lang="nl">Cacherefreshpolicy</guiname>
+ <guiname xml:lang="en">Cache refresh policy</guiname>
+ </gui>
+ <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="3600" /> <!-- 1 hour -->
+ </datatype>
+ </field>
+
+
+ </fieldlist>
+</builder>
Modified:
speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/framework/BlocksToDatabaseSyncer.java
===================================================================
---
speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/framework/BlocksToDatabaseSyncer.java
2010-05-14 22:39:40 UTC (rev 42152)
+++
speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/framework/BlocksToDatabaseSyncer.java
2010-05-14 22:57:50 UTC (rev 42153)
@@ -36,7 +36,7 @@
public void notify(SystemEvent event) {
if (event instanceof ComponentRepository.Ready) {
Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase", "class", null);
- NodeManager blocks = cloud.getNodeManager("blocks");
+ NodeManager blocks = cloud.getNodeManager("componentblocks");
LOG.service("Syncing blocks builder with" +
ComponentRepository.getInstance());
for (Component component :
ComponentRepository.getInstance().getComponents()) {
LOG.service("Syncing component " + component);
Modified:
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/blocks.tagx
===================================================================
---
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/blocks.tagx
2010-05-14 22:39:40 UTC (rev 42152)
+++
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/blocks.tagx
2010-05-14 22:57:50 UTC (rev 42153)
@@ -18,7 +18,7 @@
/>
<mm:node id="page">
<div class="mm_portal_content">
- <mm:listrelationscontainer type="blocks" role="blockposrel">
+ <mm:listrelationscontainer type="componentblocks" role="blockposrel">
<mm:sortorder field="blockposrel.x" />
<mm:sortorder field="blockposrel.y" />
<mm:listrelations id="blockposrel">
Modified:
speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/page.js
===================================================================
--- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/page.js
2010-05-14 22:39:40 UTC (rev 42152)
+++ speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/page.js
2010-05-14 22:57:50 UTC (rev 42153)
@@ -14,8 +14,8 @@
var x = $(this).find("span.x");
var y = $(this).find("span.y");
var position = $(this).position();
- x.text("" + position.left / 150);
- y.text("" + position.top / 150);
+ x.text("" + parseInt(position.left / 150));
+ y.text("" + parseInt(position.top / 150));
}
);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
