Author: jmorliaguet
Date: Mon Feb 27 17:21:52 2006
New Revision: 2493
Added:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.css
(contents, props changed)
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_1.html
(contents, props changed)
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_2.html
(contents, props changed)
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
Log:
- test updates to demonstrate perspectives in perspectives
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_panel_test.html
Mon Feb 27 17:21:52 2006
@@ -16,6 +16,12 @@
margin: 2px;
border: 1px solid #999;
}
+ .selector a {
+ font: 12px Verdana, Arial;
+ padding-right: 1.5em;
+ text-decoration: none;
+ color: #069;
+ }
</style>
</head>
@@ -25,24 +31,25 @@
<div id="msg"></div>
- <div>
- <a href="javascript:CPSSkins.switchPerspective('site-designer')">
- Site designer</a>
- <a href="javascript:CPSSkins.switchPerspective('page-designer')">
- Page designer</a>
- <a href="javascript:CPSSkins.switchPerspective('layout-designer')">
- Layout designer</a>
- <a href="javascript:CPSSkins.switchPerspective('element-editor')">
- Element editor</a>
+ <div class="selector">
+ <a
href="javascript:CPSSkins.getControllerById('controller1').switchTo('perspective1')">
+ Perspective 1</a>
+ <a
href="javascript:CPSSkins.getControllerById('controller1').switchTo('perspective2')">
+ Perspective 2</a>
+ <a
href="javascript:CPSSkins.getControllerById('controller1').switchTo('perspective3')">
+ Perspective 3</a>
+
+
</div>
- <!-- perspective controller -->
+ <!-- perspective selectors -->
<ins class="controller">
- {"id": "perspective-selector1",
+ {"id": "controller1",
"type": "perspective selector"
}
</ins>
+
<table style="width:100%">
<tr style="vertical-align: top">
<td colspan="3">
@@ -79,13 +86,21 @@
}}
</ins>
+ <ins class="model">
+ {"id": "panel5",
+ "data": {
+ "url": "panel5.html",
+ "css": "panel5.css"
+ }}
+ </ins>
+
<ins class="view">
{"widget": {
"type": "panel"
},
"model": "panel1",
- "perspectives": ["page-designer", "layout-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective2", "perspective3"],
+ "controllers": ["controller1"]
}
</ins>
@@ -94,8 +109,8 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["site-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective1"],
+ "controllers": ["controller1"]
}
</ins>
@@ -110,8 +125,8 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["page-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective2"],
+ "controllers": ["controller1"]
}
</ins>
@@ -120,8 +135,8 @@
"type": "panel"
},
"model": "panel3",
- "perspectives": ["site-designer", "layout-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective1", "perspective3"],
+ "controllers": ["controller1"]
}
</ins>
@@ -133,8 +148,8 @@
"type": "panel"
},
"model": "panel3",
- "perspectives": ["page-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective2"],
+ "controllers": ["controller1"]
}
</ins>
@@ -143,11 +158,23 @@
"type": "panel"
},
"model": "panel4",
- "perspectives": ["page-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective2"],
+ "controllers": ["controller1"]
}
</ins>
+ <!-- this panel contains sub-panels -->
+ <ins class="view">
+ {"widget": {
+ "type": "panel"
+ },
+ "model": "panel5",
+ "perspectives": ["perspective1"],
+ "controllers": ["controller1"]
+ }
+ </ins>
+
+
</td>
<td style="width: 20%">
@@ -156,8 +183,8 @@
"type": "panel"
},
"model": "panel4",
- "perspectives": ["site-designer", "layout-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective1", "perspective3"],
+ "controllers": ["controller1"]
}
</ins>
@@ -166,11 +193,13 @@
"type": "panel"
},
"model": "panel2",
- "perspectives": ["site-designer"],
- "controllers": ["perspective-selector1"]
+ "perspectives": ["perspective1"],
+ "controllers": ["controller1"]
}
</ins>
+
+
</td>
</tr>
Added:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.css
==============================================================================
--- (empty file)
+++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.css
Mon Feb 27 17:21:52 2006
@@ -0,0 +1,13 @@
+
+.panel5 {
+ background-color: #fdf;
+ padding: 1em;
+ border-style: solid;
+ border-width: 2px;
+ border-color: #ccc #333 #333 #ccc;
+ color: #909;
+ margin: 1em;
+ padding: 1em;
+}
+
+
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
Mon Feb 27 17:21:52 2006
@@ -1,91 +1,56 @@
-<div class="popup">
+
+<div class="panel5">
<h2>Panel 5</h2>
- <p>This is panel 5</p>
+ <div class="selector">
+ <a
href="javascript:CPSSkins.getControllerById('controller2').switchTo('perspective1')">
+ Perspective 1</a>
+ <a
href="javascript:CPSSkins.getControllerById('controller2').switchTo('perspective2')">
+ Perspective 2</a>
+ </div>
+
- <a class="button close"
- href="javascript:CPSSkins.switchPerspective('..')">
- Close</a>
-
- <a class="button"
href="javascript:CPSSkins.switchPerspective('element-editor/1')">
- 1</a>
-
- <a class="button"
href="javascript:CPSSkins.switchPerspective('element-editor/2')">
- 2</a>
-
- <a class="button"
href="javascript:CPSSkins.switchPerspective('element-editor/3')">
- 3</a>
-
- <table style="width: 100%; padding:1em">
- <tr>
- <td>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel1",
- "show_effect": {
- "transition": "fadein"
- },
- "perspectives": ["element-editor/1"]
- }}
- </ins>
- </td>
- <td>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel2",
- "show_effect": {
- "transition": "fadein"
- },
- "perspectives": ["element-editor/1"]
- }}
- </ins>
- </td>
- <td>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel3",
- "show_effect": {
- "transition": "fadein"
- },
- "perspectives": ["element-editor/2"]
- }}
- </ins>
- </td>
- <td>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel4",
- "show_effect": {
- "transition": "fadein"
- },
- "perspectives": ["element-editor/2"]
- }}
- </ins>
- </td>
- <td>
- <ins class="view">
- {"widget": {
- "type": "panel"
- },
- "model": "panel5",
- "show_effect": {
- "transition": "fadein"
- },
- "perspectives": ["element-editor/3"]
- }
- </ins>
- </td>
- </tr>
- </table>
+ <ins class="controller">
+ {"id": "controller2",
+ "type": "perspective selector"
+ }
+ </ins>
+
+ <ins class="model">
+ {"id": "panel5_1",
+ "data": {
+ "url": "panel5_1.html"
+ }}
+ </ins>
+
+ <ins class="model">
+ {"id": "panel5_2",
+ "data": {
+ "url": "panel5_2.html"
+ }}
+ </ins>
+
+ <div class="frame">
+ <ins class="view">
+ {"widget": {
+ "type": "panel"
+ },
+ "model": "panel5_1",
+ "perspectives": ["perspective1"],
+ "controllers": ["controller2"]
+ }
+ </ins>
+
+ <ins class="view">
+ {"widget": {
+ "type": "panel"
+ },
+ "model": "panel5_2",
+ "perspectives": ["perspective2"],
+ "controllers": ["controller2"]
+ }
+ </ins>
</div>
</div>
Added:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_1.html
==============================================================================
--- (empty file)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_1.html
Mon Feb 27 17:21:52 2006
@@ -0,0 +1,8 @@
+<div class="panel5_1">
+
+ <h3>Panel 5/1</h3>
+
+ <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Curabitur
malesuada sem varius pede. Cras sodales sollicitudin dui. Donec elementum mi id
felis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
inceptos hymenaeos. Aenean malesuada, justo congue vehicula facilisis, justo
ante lacinia nulla, vel hendrerit elit mauris ut neque. Mauris nunc eros,
interdum id, ullamcorper ut, lobortis sed, lacus. Sed hendrerit augue eget
risus. Mauris tempus neque non lacus. Sed tincidunt diam in enim. Donec vel
risus quis eros accumsan imperdiet. Sed molestie, elit nec tempor auctor,
libero nibh mattis dui, at scelerisque dui odio a libero.
+ </p>
+
+</div>
Added:
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_2.html
==============================================================================
--- (empty file)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5_2.html
Mon Feb 27 17:21:52 2006
@@ -0,0 +1,8 @@
+<div class="panel5_2">
+
+ <h3>Panel 5/2</h3>
+
+ <p>Sed egestas dolor ac urna semper convallis. Donec sem leo, vulputate et,
dignissim vel, pharetra in, nisi. Sed congue tristique felis. Proin rutrum.
Nulla semper malesuada lectus. Vestibulum lectus nibh, congue et, auctor non,
tristique id, pede. Vivamus scelerisque, lorem sit amet euismod lobortis,
ligula mauris accumsan turpis, vel euismod ante tortor eu risus. Nam mattis
massa non velit. Quisque quam. Aliquam bibendum. Nunc varius sapien non nunc
vestibulum posuere. Proin viverra blandit neque. Sed sapien purus, posuere
eget, laoreet quis, sodales sit amet, dolor. Aliquam consectetuer, lectus id
lobortis ornare, mauris nisi dapibus elit, in elementum augue arcu sollicitudin
lectus. Etiam et sapien. Praesent et sem sed nibh ultricies iaculis.
+ </p>
+
+</div>
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
