Author: michiel Date: 2009-11-27 13:25:16 +0100 (Fri, 27 Nov 2009) New Revision: 40007
Added: speeltuin/mihxil/portal/src/main/config/builders/portal/cartesianrel.xml speeltuin/mihxil/portal/src/main/webapp/ speeltuin/mihxil/portal/src/main/webapp/mmbase/ speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/ speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.css.jsp speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.js Modified: speeltuin/mihxil/portal/src/main/config/applications/Portal.xml speeltuin/mihxil/portal/src/main/config/builders/core/blocks.xml speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml speeltuin/mihxil/portal/test-webapp/src/main/webapp/WEB-INF/config/applications/MyNewsPortal.xml Log: introduced cartesianrel to link actual content (height and width have no significance). Some css and js. Modified: speeltuin/mihxil/portal/src/main/config/applications/Portal.xml =================================================================== --- speeltuin/mihxil/portal/src/main/config/applications/Portal.xml 2009-11-27 12:01:52 UTC (rev 40006) +++ speeltuin/mihxil/portal/src/main/config/applications/Portal.xml 2009-11-27 12:25:16 UTC (rev 40007) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE application PUBLIC "-//MMBase//DTD application config 1.1//EN" "http://www.mmbase.org/dtd/application_1_1.dtd";> -<application name="Portal" maintainer="mmbase.org" version="1" auto-deploy="true"> +<application name="Portal" maintainer="mmbase.org" version="2" auto-deploy="true"> <requirements> @@ -9,17 +9,17 @@ <neededbuilderlist> <builder maintainer="mmbase.org" version="1">pages</builder> <builder maintainer="mmbase.org" version="1">blocks</builder> - <builder maintainer="mmbase.org" version="1">blockposrel</builder> + <builder maintainer="mmbase.org" version="1">cartesianrel</builder> </neededbuilderlist> <neededreldeflist> - <reldef source="blockposrel" target="blockposrel" direction="bidirectional" guisourcename="Related" guitargetname="Related" builder="blockposrel" /> + <reldef source="blockposrel" target="blockposrel" direction="bidirectional" guisourcename="BlockPosRel" guitargetname="BlockPosRel" builder="blockposrel" /> + <reldef source="cartesianrel" target="cartesianrel" direction="bidirectional" guisourcename="Cartesianrel" guitargetname="CartesianRel" builder="cartesianrel" /> </neededreldeflist> <allowedrelationlist> <relation from="pages" to="blocks" type="blockposrel" /> - </allowedrelationlist> <datasourcelist> Modified: speeltuin/mihxil/portal/src/main/config/builders/core/blocks.xml =================================================================== --- speeltuin/mihxil/portal/src/main/config/builders/core/blocks.xml 2009-11-27 12:01:52 UTC (rev 40006) +++ speeltuin/mihxil/portal/src/main/config/builders/core/blocks.xml 2009-11-27 12:25:16 UTC (rev 40007) @@ -70,11 +70,7 @@ <guiname xml:lang="nl">Weergave</guiname> <guiname xml:lang="en">Display Type</guiname> </gui> - <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <enumeration> - <entry javaconstants="org.mmbase.framework.WindowState" /> - </enumeration> - </datatype> + <datatype base="windowstate" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> </field> Added: speeltuin/mihxil/portal/src/main/config/builders/portal/cartesianrel.xml =================================================================== --- speeltuin/mihxil/portal/src/main/config/builders/portal/cartesianrel.xml (rev 0) +++ speeltuin/mihxil/portal/src/main/config/builders/portal/cartesianrel.xml 2009-11-27 12:25:16 UTC (rev 40007) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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="cartesianrel" maintainer="mmbase.org" version="1" extends="insrel"> + <searchage>14</searchage> + <names> + <singular xml:lang="nl">XYRel</singular> + <singular xml:lang="en">XYRel</singular> + <plural xml:lang="nl">XYRels</plural> + <plural xml:lang="en">XYRels</plural> + </names> + + <descriptions> + <description xml:lang="nl">basis xy relatie</description> + <description xml:lang="en">basic xy relation</description> + </descriptions> + + <properties> + </properties> + + <fieldlist> + <field name="x"> + <descriptions> + <description xml:lang="en">Value of x-position</description> + <description xml:lang="nl">Waarde van de x-positie</description> + </descriptions> + <gui> + <guiname xml:lang="nl">Xwaarde</guiname> + <guiname xml:lang="en">Xvalue</guiname> + </gui> + <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"; > + <default value="0" /> + <required value="true" enforce="never" /> + </datatype> + </field> + <field name="y"> + <descriptions> + <description xml:lang="en">Value of y-position</description> + <description xml:lang="nl">Waarde van de y-positie</description> + </descriptions> + <gui> + <guiname xml:lang="nl">Ywaarde</guiname> + <guiname xml:lang="en">Yvalue</guiname> + </gui> + <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"; > + <default value="0" /> + <required value="true" enforce="never" /> + </datatype> + </field> + <field name="z"> + <descriptions> + <description xml:lang="en">Value of z-position</description> + <description xml:lang="nl">Waarde van de z-positie</description> + </descriptions> + <gui> + <guiname xml:lang="nl">Zwaarde</guiname> + <guiname xml:lang="en">Zvalue</guiname> + </gui> + <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"; > + <default value="0" /> + <required value="true" enforce="never" /> + </datatype> + </field> + + </fieldlist> + +</builder> Property changes on: speeltuin/mihxil/portal/src/main/config/builders/portal/cartesianrel.xml ___________________________________________________________________ Name: svn:executable + * Modified: speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml =================================================================== --- speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml 2009-11-27 12:01:52 UTC (rev 40006) +++ speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml 2009-11-27 12:25:16 UTC (rev 40007) @@ -61,6 +61,7 @@ </positions> </editor> <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="/" /> <required value="true"> <description xml:lang="nl">Pad is een verplicht veld</description> <description xml:lang="en">A path is required field</description> Added: speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.css.jsp =================================================================== --- speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.css.jsp (rev 0) +++ speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.css.jsp 2009-11-27 12:25:16 UTC (rev 40007) @@ -0,0 +1,65 @@ +/* -*- css -*- */ +<%...@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; +%><%...@taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm" +%><mm:content type="text/css" expires="0"> + +<mm:import externid="offsetx" vartype="integer">0</mm:import> +<mm:import externid="offsety" vartype="integer">0</mm:import> +<mm:import externid="height" vartype="integer">250</mm:import> +<mm:import externid="width" vartype="integer">300</mm:import> + +.content { + position: relative; + top: 2px; + width: ${width * 4}px; + height: ${height * 4}px; + margin-left: auto; + margin-right: auto; +} + +.block { + position: absolute; + border: none; + background-color: #ccc; + overflow: hidden; +} + +<c:forEach begin="1" end="2" var="i"> +.block.width${i} { + width: ${width * i}px; +} +</c:forEach> + +<c:forEach begin="1" end="2" var="i"> +.block.height${i} { + height: ${height * i}px; +} +</c:forEach> + +<c:forEach begin="0" end="3" var="i"> +.block.x${i} { + left: ${offsetx + width * i}px; +} +</c:forEach> + +<c:forEach begin="0" end="3" var="i"> +.block.y${i} { + top: ${offsety + height * i}px; +} +</c:forEach> + +a.edit { + position: absolute; + background: yellow; + right: 0px; + margin-right: 10px; + top: 0px; + z-index: 100; +} + +iframe { + width: 95%; + height: 90%; + border: none; +} +</mm:content> Added: speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.js =================================================================== --- speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.js (rev 0) +++ speeltuin/mihxil/portal/src/main/webapp/mmbase/portal/portal.js 2009-11-27 12:25:16 UTC (rev 40007) @@ -0,0 +1,52 @@ +$.ui.dialog.defaults.bgiframe = true; +$(function() { + $(".editable").each(function() { + if ($("#edit").length == 0) { + $("body").append("<div id='edit' title='Edit'></div>"); + $("#edit").dialog({ + autoOpen: false, + modal: true, + height: 0.8 * $(window).height(), + width: 0.8 * $(window).width(), + close: function() { + $("#edit").empty(); + } + }); + } + var div = this; + var classes = $(div).attr("class").split(' '); + var params = {}; + for (var i in classes) { + var cl = classes[i]; + if (cl.indexOf("mm_ea_") == 0) { + var a = cl.substring("mm_ea_".length); + var u = a.indexOf("_"); + params[a.substring(0, u)] = a.substring(u + 1); + } + } + var args = ""; + for (var a in params) { + if (args.length == 0) { + args += "?"; + } else { + args += "&"; + } + args += a + "=" + params[a]; + } + var a = $("<a class='edit'>edit</a>"); + $(a).attr("href", "/themasites/portaledit/index.jsp" + args); + + $(div).append(a); + $(a).click(function() { + try { + var iframe = $("<iframe src='" + this.href + "'> </iframe></div>"); + $("#edit").append(iframe); + $("#edit").dialog("open"); + } catch (e) { + console.log(e); + } + return false; + }); + + }); + }); Modified: speeltuin/mihxil/portal/test-webapp/src/main/webapp/WEB-INF/config/applications/MyNewsPortal.xml =================================================================== --- speeltuin/mihxil/portal/test-webapp/src/main/webapp/WEB-INF/config/applications/MyNewsPortal.xml 2009-11-27 12:01:52 UTC (rev 40006) +++ speeltuin/mihxil/portal/test-webapp/src/main/webapp/WEB-INF/config/applications/MyNewsPortal.xml 2009-11-27 12:25:16 UTC (rev 40007) @@ -13,7 +13,7 @@ </neededreldeflist> <allowedrelationlist> - <relation from="pages" to="news" type="blockposrel" /> + <relation from="pages" to="news" type="cartesianrel" /> </allowedrelationlist> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
