It is starting to look like this may actually work after all. Listview is the only one left i think, although the bar tests are still giving me trouble. TODO: add to the collection actions a truncate action. should be useful

23 files changed, 309 insertions, 72 deletions

diff --git a/share/skin/default/layout/action_form b/share/skin/default/layout/action_form
index fbbeb17..0e18a36 100644
--- a/share/skin/default/layout/action_form
+++ b/share/skin/default/layout/action_form
@@ -13,6 +13,10 @@
 
 =for layout fields
 
+<p> [% content %] </p>
+
+=for layout field
+
 [% content %] <br />
 
 =for layout buttons
diff --git a/share/skin/default/layout/display_field/boolean b/share/skin/default/layout/display_field/boolean
index dae2f22..74e02e4 100644
--- a/share/skin/default/layout/display_field/boolean
+++ b/share/skin/default/layout/display_field/boolean
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong > [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/collection b/share/skin/default/layout/display_field/collection
index bea7fa5..3bc65a9 100644
--- a/share/skin/default/layout/display_field/collection
+++ b/share/skin/default/layout/display_field/collection
@@ -5,16 +5,16 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong > [% content | html %]: </strong>
 
 =for layout list
 
 <ul>
-[% item %]
+[% content %]
 </ul>
 
 =for layout item
 
-<li>[% content %]</li>
+<li>[% content | html %]</li>
 
 =cut
diff --git a/share/skin/default/layout/display_field/date_time b/share/skin/default/layout/display_field/date_time
index e531148..1fcad1a 100644
--- a/share/skin/default/layout/display_field/date_time
+++ b/share/skin/default/layout/display_field/date_time
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong> [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
diff --git a/share/skin/default/layout/display_field/list b/share/skin/default/layout/display_field/list
index e000875..2b049b5 100644
--- a/share/skin/default/layout/display_field/list
+++ b/share/skin/default/layout/display_field/list
@@ -5,16 +5,16 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong > [% content | html %]: </strong>
 
 =for layout list
 
 <ul>
-[% item %]
+[% content %]
 </ul>
 
 =for layout item
 
-<li>[% content %]</li>
+<li>[% content | html %]</li>
 
 =cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/number b/share/skin/default/layout/display_field/number
index e531148..1fcad1a 100644
--- a/share/skin/default/layout/display_field/number
+++ b/share/skin/default/layout/display_field/number
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong> [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
diff --git a/share/skin/default/layout/display_field/related_object b/share/skin/default/layout/display_field/related_object
index e531148..1fcad1a 100644
--- a/share/skin/default/layout/display_field/related_object
+++ b/share/skin/default/layout/display_field/related_object
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong> [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
diff --git a/share/skin/default/layout/display_field/string b/share/skin/default/layout/display_field/string
index dae2f22..831cad4 100644
--- a/share/skin/default/layout/display_field/string
+++ b/share/skin/default/layout/display_field/string
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong> [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
\ No newline at end of file
diff --git a/share/skin/default/layout/display_field/text b/share/skin/default/layout/display_field/text
index dae2f22..831cad4 100644
--- a/share/skin/default/layout/display_field/text
+++ b/share/skin/default/layout/display_field/text
@@ -4,10 +4,10 @@
 
 =for layout label
 
-<strong > [ % content %]: </strong>
+<strong> [% content | html %]: </strong>
 
 =for layout value
 
-[% content %]
+[% content | html %]
 
 =cut
\ No newline at end of file
diff --git a/share/skin/default/layout/field/boolean b/share/skin/default/layout/field/boolean
index 2ee1da2..73b817e 100644
--- a/share/skin/default/layout/field/boolean
+++ b/share/skin/default/layout/field/boolean
@@ -18,15 +18,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/choose_many b/share/skin/default/layout/field/choose_many
index 8781021..1479de8 100644
--- a/share/skin/default/layout/field/choose_many
+++ b/share/skin/default/layout/field/choose_many
@@ -44,7 +44,7 @@
 
 =for layout action_buttons
 
-<input type="submit" value="&gt;&gt;" name="[% viewport.event_id_for('add_all_values') | html %]" />
+<input type="submit" value="&gt;&gt;" name="[% viewport.event_id_for('add_all_values') | html %]" /> <br />
 <input type="submit" value="&gt;" name="[% viewport.event_id_for('do_add_values') | html %]" /> <br />
 <input type="submit" value="&lt;" name="[% viewport.event_id_for('do_remove_values') | html %]" /> <br />
 <input type="submit" value="&lt;&lt;" name="[% viewport.event_id_for('remove_all_values') | html %]" /> <br />
@@ -52,15 +52,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span> <br />
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/choose_one b/share/skin/default/layout/field/choose_one
index 2378ff5..2fd39d6 100644
--- a/share/skin/default/layout/field/choose_one
+++ b/share/skin/default/layout/field/choose_one
@@ -26,15 +26,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/date_time b/share/skin/default/layout/field/date_time
index b8dd3ea..4dbd294 100644
--- a/share/skin/default/layout/field/date_time
+++ b/share/skin/default/layout/field/date_time
@@ -10,15 +10,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/file b/share/skin/default/layout/field/file
index 4c95907..7d323d8 100644
--- a/share/skin/default/layout/field/file
+++ b/share/skin/default/layout/field/file
@@ -9,15 +9,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/number b/share/skin/default/layout/field/number
index eaa9593..201220f 100644
--- a/share/skin/default/layout/field/number
+++ b/share/skin/default/layout/field/number
@@ -10,15 +10,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
-=cut
\ No newline at end of file
+=cut
diff --git a/share/skin/default/layout/field/password b/share/skin/default/layout/field/password
index ec42e2a..e29029a 100644
--- a/share/skin/default/layout/field/password
+++ b/share/skin/default/layout/field/password
@@ -10,15 +10,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
-=cut
\ No newline at end of file
+=cut
diff --git a/share/skin/default/layout/field/string b/share/skin/default/layout/field/string
index a17c243..40f3789 100644
--- a/share/skin/default/layout/field/string
+++ b/share/skin/default/layout/field/string
@@ -10,15 +10,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/text b/share/skin/default/layout/field/text
index 0c6118a..b68ce67 100644
--- a/share/skin/default/layout/field/text
+++ b/share/skin/default/layout/field/text
@@ -12,15 +12,17 @@
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field/time_range b/share/skin/default/layout/field/time_range
index 7b3bb6b..954c40b 100644
--- a/share/skin/default/layout/field/time_range
+++ b/share/skin/default/layout/field/time_range
@@ -9,15 +9,17 @@ TODO
 =for layout label
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <label for="[% id | html %]"> [% content | html %]: </label>
-[% END %]
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <label> [% content_str | html %]: </label>
+[% END; %]
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
-[% IF content %]
-  <span> [% content | html %] </span>
+[% content_str = GET content; %]
+[% IF content_str.length; %]
+  <span> [% content_str | html %] </span> <br />
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/index b/share/skin/default/layout/index
new file mode 100644
index 0000000..9a9bc9c
--- /dev/null
+++ b/share/skin/default/layout/index
@@ -0,0 +1,5 @@
+=for layout widget
+
+<p>I hate programming.</p>
+
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/layout b/share/skin/default/layout/layout
new file mode 100644
index 0000000..af59032
--- /dev/null
+++ b/share/skin/default/layout/layout
@@ -0,0 +1,56 @@
+=for layout widget
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+  <title>Component UI Test Title</title>
+  
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" type="text/css" href="/static/componentui-basic.css" />
+
+</head>
+
+<body>
+  <div id="container">
+    <div id="header">
+     [% header %]
+    </div>
+
+    <div id="nav">
+       [% menu %]
+    </div>
+
+    <div id="contents">
+      <div id="wrapper">
+        [% sidebar %]
+        [% main_content %]
+      </div>
+      <div class="spacer"></div>
+    </div>
+  </div>
+</body>
+
+</html>
+
+=for layout main_content
+
+    [% content %]
+
+=for layout header
+
+<h1>Component UI Header</h1>
+
+=for layout sidebar
+        <div class="sidebar">
+          [% content %]
+        </div>
+
+=for layout menu
+        <ul class="menu">
+          <li> <a href="/testmodel/foo">Foo</a> </li>
+          <li> <a href="/testmodel/bar">Bar</a> </li>
+          <li> <a href="/testmodel/baz">Baz</a> </li>
+        </ul>
+=cut
\ No newline at end of file
diff --git a/share/skin/default/layout/object_view b/share/skin/default/layout/object_view
index 41a16e8..4e6e1b3 100644
--- a/share/skin/default/layout/object_view
+++ b/share/skin/default/layout/object_view
@@ -4,6 +4,12 @@
 
 =for layout fields
 
-  [% content %]<br>
+ <p> [% content %] </p>
+
+=cut
+
+=for layout field
+
+  [% content %] <br>
 
 =cut
diff --git a/share/skin/default/web/componentui-basic.css b/share/skin/default/web/componentui-basic.css
new file mode 100644
index 0000000..a22dbdf
--- /dev/null
+++ b/share/skin/default/web/componentui-basic.css
@@ -0,0 +1,146 @@
+html {
+        min-width: 915px;
+} /*IE7*/
+
+body {
+        color: #393733;
+        margin: 0;
+        padding: 0 20px;
+        text-align: center;
+        background: #DDDDDD;
+}
+
+img {
+        border: none;
+}
+
+p {
+        line-height: 1.4;
+}
+
+input{
+        line-height: 1;
+}
+
+#container {
+        text-align: left;
+        margin: 0 auto;
+        max-width: 1200px;
+        position: relative;
+}
+
+#wrapper {
+        padding: 15px 0 0 19px;
+        min-height: 500px;
+} /*IE6*/
+
+#contents {
+        clear: both;
+        padding: 0 15px 30px 0;
+        margin-top: 7px;
+        background: #FFFFFF;
+}
+
+.spacer{ clear: both; }
+.sidebar {
+        float: right;
+        width: 300px;
+        clear: both;
+        margin: 0 0 2em 0;
+        min-height: 500px;
+}
+.sidebar_section {
+        margin: 1em 0 1em 0;
+        min-height: 100px;
+}
+
+.sidebar_section h2{
+        border-bottom: 2px solid #036;
+        padding: 0 1em 0 0em;
+        font-size: 120%;
+        text-align: right;
+}
+
+#header {
+        background: #036;
+        color: #fff;
+        float: left;
+        width: 100%;
+        margin-bottom: 0px;
+        border-bottom: 1px solid white;
+        position: relative;
+        text-align: left;
+}
+
+#header h1 {
+        font-size: 150%;
+        padding: .2em;
+        margin: .2em;
+}
+
+#nav {
+        background: #036;
+        color: #fff;
+        float: left;
+        width: 100%;
+        margin-bottom: 5px;
+        position: relative;
+        text-align: right;
+}
+
+#nav .menu {
+    display: inline
+    width:   75%;
+    float:   left; 
+    margin:  0px;
+    padding: 0px;
+    list-style-type: none;
+    color: #FFFFFF;
+    background: #036
+}
+
+#nav .menu li {
+    display: inline;
+}
+
+#nav .menu li a {
+    float: left;
+    width: 7em;
+    color: #FFFFFF;
+    background:color #036;
+    padding: 0.2em .2em;
+    text-decoration: none;
+    border-right: 1px solid #fff;
+    text-align: center;
+    font-size: 105%;
+    font-weight: bold;
+}
+
+#nav .menu li a:hover {
+    background-color: #369;
+    color: #fff;
+}
+
+#login-status{
+   padding: .2em 1em 0 0;
+   font-size: 80%;
+}
+
+#search{
+        float: right;
+        width: 300;
+        padding: 1em;
+}
+#searchbox{
+        line-height: 1.4;
+        font-size: 90%;
+        border: 2px solid #FFF;
+        padding-left: 3px;
+}
+#searchsub{
+        background-color: #036;
+        font-weight: bold;
+        font-size: 90%;
+        color: white;
+        border: 2px solid #369;
+}
\ No newline at end of file