[CMF-checkins] CVS: CMF/CMFDecor/skins/zpt_generic - content_byline.pt:1.6 index_html.pt:1.5 main_template.pt:1.10 roster.pt:1.4 zpt_stylesheet.css:1.10

Tres Seaver tseaver@zope.com
Sat, 6 Oct 2001 20:34:09 -0400


Update of /cvs-repository/CMF/CMFDecor/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv11983/CMFDecor/skins/zpt_generic

Modified Files:
	content_byline.pt index_html.pt main_template.pt roster.pt 
	zpt_stylesheet.css 
Log Message:


 - Cleaned up main template and stylesheet.

 - Made content views more uniform in display of "forematter"
   (title, description, byline), using the new section of the
   page next to the actions menu.

 - Moved main body of content views, forms, etc. below the
   menu (gets horizontal real estate back).

 - Exported macro from roster, to ease reuse.


=== CMF/CMFDecor/skins/zpt_generic/content_byline.pt 1.5 => 1.6 ===
-     tal:define="creator here/Creator; home_url python: here.portal_membership.getHomeUrl(creator)"
-     tal:condition="home_url">
-   			Created by <span class="Desktop"><a href="here.html" title="Here"
-			       tal:attributes="href home_url; title creator"
-				   tal:content="creator">Me</a>.</span>
-			<span tal:condition="python: not(home_url)"
-			      tal:replace="creator">Me</span>
-				  <br>
- <span tal:condition="here/ModificationDate">
-     Last modified on <span tal:content="here/ModificationDate">Today</span>
- </span>
- </div>
+<div id="ContentByline"
+     metal:define-macro="byline"
+     tal:define="creator here/Creator;
+                 home_url python: here.portal_membership.getHomeUrl(creator);
+                "
+>
+
+<p>
+   Created by <span tal:condition="home_url"
+     ><a href="." title="Here"
+         tal:attributes="href home_url;
+                         title creator;
+                        "
+         tal:content="creator">Creator</a>
+    </span><span tal:condition="not: home_url"
+                 tal:content="creator">Creator</span
+    >.  Last modified <span tal:content="here/ModificationDate"
+    >Today</span>.
+</p>
+
+</div>


=== CMF/CMFDecor/skins/zpt_generic/index_html.pt 1.4 => 1.5 ===
+<html metal:use-macro="here/main_template/macros/master"
+>
 <body>
- <div metal:fill-slot="main">
 
- <table cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="80%">
-
- <h1> Welcome to <span tal:replace="here/title">(portal title)</span> </h1>
-
- <dl>
- <dt> Overview </dt>
- <dd tal:content="here/description"> Description here </dd>
- </dl>
-
- </td>
- <td valign="top" width="20%" tal:content="structure here/news_box">
-  News here
- </td>
- </tr>
- </table>
+ <div metal:fill-slot="header"
+      tal:define="global has_local python: 'local_html' in here.objectIds()"
+ >
+
+  <div tal:condition="not: has_local">
+
+     <h1 id="DesktopTitle"
+         tal:content="here/Title">Document Title</h1>
+
+     <div id="DesktopDescription" tal:content="here/Description">
+         Document Description goes here.
+     </div>
+
+  </div>
+
+  <div tal:condition="has_local">
+
+   <div metal:use-macro="here/local_html/macros/header">
+     'local_html' body goes here.
+   </div>
+
+  </div>
+
+ </div><!-- header slot -->
+
+ <div metal:fill-slot="main"
+ >
+
+ <div tal:condition="not: has_local"
+      tal:define="auth_filter nocall: modules/ZTUtils/LazyFilter"
+ >
+
+  <div tal:define="raw_items python: here.contentValues(
+                                            filter={'Type':( 'Document'
+                                                           , 'Image'
+                                                           , 'File'
+                                                           , 'News Item'
+                                                           ) } );
+                   items python: auth_filter( raw_items );
+                  ">
+  <div tal:condition="items">
+
+  <h4> Documents, Images, Files, and News Items </h4>
+
+  <ul>
+   <li tal:repeat="item items"> 
+    <a href="item_url" tal:attributes="href item/absolute_url"><img
+      align="middle" border="0"
+      tal:attributes="src   string:${item/portal_url}/${item/getIcon};
+                      alt   string:${item/Type};
+                      title string:${item/Type}"></a>
+    <a href="item_url" tal:attributes="href item/absolute_url"
+       tal:content="item/Title"> Title </a>
+     <blockquote tal:condition="exists: item/Description"
+                 tal:content="item/Description">
+       Description <!--fmt="structured-text'-->
+     </blockquote>
+   </li>
+  </ul>
+
+  </div>
+  </div>
+
+
+  <div tal:define="raw_items python: here.contentValues(
+                                            filter={'Type':( 'Link'
+                                                           , 'Favorite'
+                                                           , 'Topic'
+                                                           ) } );
+                   items python: auth_filter( raw_items );
+                  ">
+  <div tal:condition="items">
+  <h4> Related Resources </h4>
+
+  <ul>
+   <li tal:repeat="item items"> 
+    <a href="item_url" tal:attributes="href item/absolute_url"><img
+      align="middle" border="0"
+      tal:attributes="src   string:${item/portal_url}/${item/getIcon};
+                      alt   string:${item/Type};
+                      title string:${item/Type}"></a>
+    <a href="item_url" tal:attributes="href item/absolute_url"
+       tal:content="item/Title"> Title </a>
+     <blockquote tal:condition="exists: item/Description"
+                 tal:content="item/Description">
+       Description <!--fmt="structured-text'-->
+     </blockquote>
+   </li>
+  </ul>
+
+  </div>
+  </div>
+
+
+  <div tal:define="items python: here.contentValues(
+                                            filter={'Type':'Folder' } );
+                  ">
+  <div tal:condition="items">
+  <h4> Folders </h4>
+
+  <ul>
+   <li tal:repeat="item items"> 
+    <a href="item_url" tal:attributes="href item/absolute_url"><img
+      align="middle" border="0"
+      tal:attributes="src   string:${item/portal_url}/${item/getIcon};
+                      alt   string:${item/Type};
+                      title string:${item/Type}"></a>
+    <a href="item_url" tal:attributes="href item/absolute_url"
+       tal:content="item/Title"> Title </a>
+     <blockquote tal:condition="exists: item/Description"
+                 tal:content="item/Description">
+       Description <!--fmt="structured-text'-->
+     </blockquote>
+   </li>
+  </ul>
+
+  </div>
+  </div>
+
+ </div><!-- not: has_local -->
+
+
+ <div tal:condition="has_local">
+
+   <div metal:use-macro="here/local_html/macros/body">
+     'local_html' body goes here.
+   </div>
 
  </div>
+ </div><!-- main slot -->
+
 </body>
 </html>
 


=== CMF/CMFDecor/skins/zpt_generic/main_template.pt 1.9 => 1.10 ===
- <head>
-  <title tal:define="ob_title here/Title; portal_title here/title" tal:content="string:${portal_title}: ${ob_title}">The title</title>
+<html metal:define-macro="master"
+      tal:define="utool nocall:here/portal_url;
+                  mtool here/portal_membership;
+                  atool here/portal_actions;
+                  wtool here/portal_workflow;
+                  portal_object utool/getPortalObject;
+                  portal_title portal_object/Title;
+                  object_title here/Title;
+                  portal_url here/portal_url;
+                  member mtool/getAuthenticatedMember;
+                  isAnon mtool/isAnonymousUser;
+                  actions python: atool.listFilteredActionsFor( here );
+                  user_actions actions/user;
+                  object_actions actions/object;
+                  workflow_actions actions/workflow;
+                  folder_actions actions/folder;
+                  global_actions actions/global;
+                  wf_state python:wtool.getInfoFor(here,'review_state','');
+                 "
+>
+
+<head>
+ <title>
+   <span tal:condition="python: object_title == portal_title"
+         tal:replace="string:${portal_title}">The title</span>
+   <span tal:condition="python: object_title != portal_title"
+         tal:replace="string:${portal_title}: ${object_title}">The title</span>
+ </title>
   
-<link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
-      tal:attributes="href here/zpt_stylesheet/absolute_url">
+ <link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
+       tal:attributes="href here/zpt_stylesheet/absolute_url">
+
+</head>
+
+<body>
 
-</head> <body> 
 <div metal:define-macro="top_bar">
- <!-- Top bar -->
+
+ <!-- hack around netscape 4.x to ensure table is solid -->
  <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td colspan="3" witdth="100%">
- <!-- hack around netscape 4.x to ensure top table is solid black -->
- <table class="Masthead" cellspacing="0" cellpadding="0" border="0" width="100%">
- <tr class="Masthead">
-
-            <form action="search" method="GET"
-       tal:define="portal_url here/portal_url"
-       tal:attributes="action string:${portal_url}/search">
-	          <td class="PortalLogo" align="left" valign="middle" width="7%" height="32"> 
-                <a href="." tal:attributes="href here/portal_url"><img src="../zpt_images/Zope_logo.gif" alt="Zope Logo" border="0" width="87" height="38"
-																																	 tal:attributes="src string:Zope_logo.gif"></a> 
-              </td>
-
-              <td class="PortalTitle" width="43%" align="left" valign="middle" height="32"> 
-                <span tal:define="portal_title here/title" tal:content="string:${portal_title}">Site 
-                Title</span> </td>
-
-              <td class="NavBar" align="right" valign="middle" width="50%" wrap="no" height="32" NOWRAP> 
-                <a href="." tal:attributes="href portal_url">home</a>&nbsp; <a href="roster"
-    tal:attributes="href string:${portal_url}/Members">members</a>&nbsp; <a href="recent_news"
-    tal:attributes="href string:${portal_url}/recent_news">news</a>&nbsp; <a href="search_form"
-    tal:attributes="href string:${portal_url}/search_form">search</a> 
-                <input name="SearchableText" size="16">
-                <input border="0" type="image" name="go" src="../../../CMFDefault/skins/Images/go.gif" align="middle" width="20" height="20"
-				       tal:attributes="src string:go.gif">
-                 &nbsp;
+ <tr>
+ <td>
+
+ <!-- Top bar -->
+ <table id="Masthead"
+        width="100%" cellpadding="0" cellspacing="0" border="0">
+
+  <tr>
+
+  <form action="search" method="GET"
+        tal:attributes="action string:${portal_url}/search">
+
+   <td id="PortalLogo">
+    <a href="." tal:attributes="href portal_url"
+    ><img src="Zope_logo.gif" alt="Zope Logo"
+          border="0" width="87" height="38"
+          tal:attributes="src string:${portal_url}/Zope_logo.gif"></a> 
+   </td>
+
+   <td id="PortalTitle">
+    <span tal:content="string:${portal_title}">Site Title</span>
+   </td>
+
+   <td id="NavBar">
+    <a href="." tal:attributes="href portal_url">home</a>&nbsp;
+    <a href="roster"
+       tal:attributes="href string:${portal_url}/Members">members</a>&nbsp;
+    <a href="recent_news"
+       tal:attributes="href string:${portal_url}/recent_news">news</a>&nbsp;
+    <a href="search_form"
+       tal:attributes="href string:${portal_url}/search_form">search</a> 
+
+    <input name="SearchableText" size="16">
+    <input border="0" type="image" name="go" value="go" src="go.gif"
+           align="middle" width="20" height="20"
+           tal:attributes="src string:go.gif"> &nbsp;
+   </td>
+
+  </form>
+
+  </tr>
+
+ </table>
+ <!-- end topbar -->
+
  </td>
-    </form>
  </tr>
  </table>
- </td></tr></table>
+ <!-- end NS4 hack -->
+
+<!-- end top_bar-->
 </div>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td colspan="4">
-  <table width="100%" border="0" cellpadding="0" cellspacing="0" class="MemberActionBox">
-   <tr class="MemberActions"
-     tal:define="global isAnon python:here.portal_membership.isAnonymousUser();
-	 uname python: isAnon and 'Guest' or here.portal_membership.getAuthenticatedMember().getUserName();
-	 global actions python:here.portal_actions.listFilteredActionsFor(here);
-	 user_actions python:actions['user']">
-     <td class="ActionTitle"
-         tal:content="uname">
-         UserName
-     </td>
-	 <td class="MemberActionsList" align="right">
-   <span tal:repeat="action user_actions"><a href="" tal:attributes="href action/url" tal:content="action/name">Login</a> | </span>
-  </td>
-  </tr>
-  </table>
-</td></tr>
-   <tr valign="top">
-   <td class="ActionBox" width="15%" align="left" valign="top" tal:condition="python: not isAnon">
-   <span metal:use-macro="here/actions_box/macros/actions">
-   <!--everything below here is replaced, just here for view of actions_box -->
-   <table class="ActionBox" width="100%">
- <tr class="AuthClass">
-          <td class="ActionTitle"> <img src="../../../CMFDefault/skins/Images/UpFolder_icon.gif" align="left" alt="Holder Image" width="16" height="16"> 
-            ObjectID </td>
- </tr>
- <tr class="AuthClass">
-  <td> 
-    Status:  Private<br>
-    <a href="">Object Action</a><br>
-  </td>
+
+<div metal:define-macro="user_menu_bar"
+     tal:define="uname python: isAnon and 'Guest' or member.getUserName()" >
+
+ <!-- hack around netscape 4.x to ensure table is solid -->
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+
+ <!-- user_menu_bar -->
+ <table id="MemberActionsBox"
+        width="100%" border="0" cellpadding="0" cellspacing="0" >
+
+  <tr>
+
+    <td class="ActionTitle" tal:content="uname"> Guest </td>
+
+    <td class="ActionLink" align="right">
+      <span tal:repeat="action user_actions">
+       <a href="" tal:attributes="href action/url"
+                  tal:content="action/name">Login</a
+       ><span tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
+      </span>
+      <span tal:condition="nothing"><a href="join_form">Join</a></span>
+    </td>
+
+   </tr>
+
+ </table>
+ <!-- end user_menu_bar -->
+
+ </td>
  </tr>
-  </table>
-  <!--end replacement -->
-   </span>
-   </td>
-   <td width="1%">&nbsp;</td>
-   <td class="Desktop" colspan="" width="84%" valign="top" tal:attributes="colspan python: not isAnon and '2' or '3'">
-   <table cellpadding="5">
-   <tr>
-   <td width="100%">
-   <p tal:condition="request/portal_status_message|nothing" tal:content="request/portal_status_message" class="DesktopStatusBar"></p>
-   <div metal:define-slot="main"/>
-   </td>
+ </table>
+ <!-- end NS4 hack -->
+
+<!-- end user_menu_bar div-->
+</div>
+
+<div metal:define-macro="main_body">
+
+
+ <table class="Forematter"
+        width="100%" border="0" cellpadding="0" cellspacing="0" >
+ <tr>
+ <td width="20%">
+  
+  <!-- actions box -->
+  <table class="ContextActionsBox"
+         width="100%"
+         style="float: left;"
+         metal:define-macro="actions_box">
+
+   <!-- object actions -->
+   <tr class="ContextActionsRow">
+
+    <td class="ActionTitle"
+        tal:define="getIcon python:hasattr(here, 'getIcon') and here.getIcon();
+                    icon python:getIcon or getattr(here, 'icon', '');
+                    typ python:getattr(here, 'Type', '');
+                    objID python:here.truncID( here.getId(), size=15 )">
+
+     <img src="icon" align="left" title="Type" alt="[X]"
+          height="16" width="16"
+          tal:condition="icon"
+          tal:attributes="src string:${portal_url}/${icon};
+                          alt typ; " /> &nbsp;
+
+     <span tal:replace="structure objID">ID</span>
+    </td>
    </tr>
-   </table>
-  </td>
-  </tr>
+
+   <tr class="ContextActionsRow"
+       tal:condition="python: len( object_actions ) > 1"
+   >
+
+    <td class="ActionLink">
+
+     <span tal:repeat="action object_actions">
+      <a href=""
+         tal:attributes="href action/url"
+         tal:content="action/name">View</a><br>
+     </span>
+
+     <span tal:condition="nothing">
+      <a href="">Edit</a><br>
+     </span>
+
+     <span tal:condition="nothing">
+      <a href="">Metadata</a><br>
+     </span>
+
+    </td>
+   </tr>
+
+   <!-- workflow actions -->
+   <tr class="ContextActionsRow"
+       tal:condition="workflow_actions" >
+
+    <td class="ActionLink"> 
+
+      <span class="ObjectStatus">
+        Status:  <span tal:replace="wf_state">Private</span><br>
+      </span>
+
+      <span tal:repeat="action workflow_actions">
+       <a href="content_submit_form"
+          tal:attributes="href action/url"
+          tal:content="action/name">Submit</a><br>
+      </span>
+    </td>
+   </tr>
+
+   <!-- folder actions -->
+   <tr class="ContextActionsRow"
+       tal:condition="folder_actions"
+   >
+    <td class="ActionLink"> 
+      <span tal:repeat="action folder_actions">
+       <a href="../folder_contents"
+          tal:attributes="href action/url"
+          tal:content="action/name">Folder contents</a><br>
+      </span>
+    </td>
+   </tr>
+
+   <!-- global actions -->
+   <tr class="ContextActionsRow"
+       tal:condition="global_actions"
+   >
+    <td class="ActionLink">
+     <span tal:repeat="action global_actions">
+      <a href="undo_form"
+         tal:attributes="href action/url"
+         tal:content="action/name">Undo</a><br>
+     </span>
+    </td>
+   </tr>
+
   </table>
- </body>
-</html>
+  <!-- end actions_box -->
 
+ </td>
+
+ <td width="2%">
+ <br>
+ </td>
+
+ <td id="ForematterCell" width="78%">
+
+  <p id="DesktopStatusBar"
+     tal:condition="request/portal_status_message|nothing"
+     tal:content="request/portal_status_message"> Status message.</p>
+
+  <div metal:define-slot="header">
+
+    <h1 id="DesktopTitle"
+        tal:content="here/Title"> Page Title </h1>
+
+    <div id="DesktopDescription"
+        tal:content="here/Description">
+        Description of the resource goes here, perhaps even wrapping
+        lines;  this is to make it long enough to test.
+    </div>
+
+  </div>
+
+ <!-- end forematter -->
+
+ </td>
+ </tr>
+ </table>
+
+ <div id="Desktop">
+
+ <div metal:define-slot="main">
+
+ <h2> Section Header </h2>
+
+ <p> The content of the object is <a href="render">rendered</a> hre.
+     Lorem ipsum dolorem.  Nihil obstat imprimatur.  Semper ubi sub ubi.
+     Non illegitimi carborundum.  In vino veritas.  E pluribus unam.
+ </p>
+
+ <!-- end main slot -->
+ </div>
+
+ <!-- end Desktop -->
+ </div>
+
+</div>
+
+</body>
+</html>


=== CMF/CMFDecor/skins/zpt_generic/roster.pt 1.3 => 1.4 ===
      tal:define="dummy python:request.set('bs', '25')"></div>
 
-<div class="Desktop">
+<div class="Desktop"
+     metal:define-macro="roster"
+>
 
 <h3> Portal Members </h3>
 


=== CMF/CMFDecor/skins/zpt_generic/zpt_stylesheet.css 1.9 => 1.10 ===
-    background-color: #FFFFFF;
-    color: #000000;
-    font-family:  Verdana, Helvetica, sans-serif;
-    font-size:  80%;
+    background-color: White;
+    color: Black;
     margin-top: 0;
-    margin-left:0;
-    margin-right:0;
+    margin-left:2pt;
+    margin-right:2pt;
     margin-bottom:0;
 }
 
-a:link {
-    text-decoration: none;
-    color: #FFFFFF;
-}
-
-a:visited { 
-    text-decoration: none;
-    color: #FFFFFF;
-}
-
-a:active {
-    color: #FFFFFF;
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: none;
-    color: #000066;
-}
-
 p {
-    font-size: 80%;
-    background-color:  #FFFFFF;
-    color:  #000000;
-}
-
-td {
-    font-size: 100%;
-    font-family:  Verdana, Helvetica, sans-serif;
-    color:  #000000;
-    verticle-align: top;
+    font-family: serif;
 }
 
 h1 {
+    font-family:  sans-serif;
     font-size:  120%;
     font-weight:  bold;
-    color:  #000000;
 }
 
 h2 {
+    font-family:  sans-serif;
     font-size:  115%;
-    background-color: #FFFFFF;
-    color:  #000000;
 }
 
 h3 {
+    font-family:  sans-serif;
     font-size:  110%;
-    background-color: #FFFFFF;
-    color:  #000000;
 }
 
-.invisible {
-  font-size: 80%;
-  color: #FFFFFF;
+h4 {
+    font-family:  sans-serif;
+    font-size:  110%;
+    font-style: italic;
 }
 
-.mild {
-    color: #7f7f7f;
+a:link {
+    text-decoration: none;
+    color: #336699;
+}
+
+a:visited {
+    text-decoration: none;
+    color: #336699;
 }
 
-.DesktopStatusBar{
-  font-size: 100%;
-  font-family: Arial, Verdana, Helvetica, sans-serif;
-  color: #ff0000;
+a:active {
+    color: #336699;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: none;
+    color: Blue;
 }
 
 table {
-    width: 100%;
     border: 0;
 }
 
-.Masthead {
-    background: #336699;
-    background-image: none;
+td {
+    vertical-align: top;
 }
 
-.PortalLogo {
+
+#Masthead {
+    background-color: #336699;
+    border: 1pt;
+    border-color: $336699;
+    padding: none;
+    cell-spacing: none;
+    width: 100%;
+}
+
+#PortalLogo {
     background-color: #336699;
-    text-align: left;
     vertical-align: middle;
+    width: 15%;
+    height: 32px;
 }
 
-.PortalTitle {
+#PortalTitle {
+    background-color: #336699;
+    color: White;
     text-align: left;
-    color: #FFFFFF;
     vertical-align: middle;
-    text-align: center;
+    font-family:  sans-serif;
     font-size: 120%;
     font-weight: bold;
-    margin-left: 1em;
+    width: 25%;
+    height: 32px;
 }
 
-.Navhead {
+#NavBar {
     background-color: #336699;
-}
-
-.NavBar {
     color: #FFFFFF;
-    font-size: 100%;
-    font-weight: normal;
     text-align: right;
     vertical-align: middle;
+    font-family:  sans-serif;
+    font-size: 80%;
+    width: 60%;
+    height: 32px;
 }
 
-.NavBar a:link {
-    font-size: 80%;
-    font-weight: normal;
+#NavBar a:link {
     color: #FFFFFF;
     text-decoration: none;
 }
 
-.NavBar a:visited {
-    font-size: 80%;
-    font-weight: normal;
+#NavBar a:visited {
     color: #FFFFFF;
     text-decoration: none;
 }
 
-.NavBar a:active {
-    font-size: 80%;
-    font-weight: normal;
+#NavBar a:active {
     color: #FFFFFF;
     text-decoration: none;
 }
 
-.NavBar a:hover {
-    font-size: 80%;
-    font-weight: normal;
+#NavBar a:hover {
     color: #5599CC;
     text-decoration: none;
 }
-td.SideBar {
-    width: 15%;
-    vertical-align: top;
-}
 
-table.MemberActionBox {
-    color: #000000;
-    font-family: Verdana, Helvetica, sans-serif;
+#MemberActionsBox {
+    color: White;
+    background-color: #5599CC;
     border-top: solid #AAAAAA;
     border-top-width: thin;
-    background-color: #5599CC;
-}
-
-
-table.MemberActionBox tr td {
-    color: #000000;
-    font-size: 70%;
-}
-
-table.MemberActionBox tr td.ActionTitle {
-    font-weight: bold;
-}
-
-
-table.MemberActionBox tr.MemberActions td.MemberActionsList {
-    color: #AAAAAA;
-}
-
-table.MemberActionBox tr.MemberActions td a:link {
-    color: #FFFFFF;
-    text-decoration:  none;
-}
-
-table.MemberActionBox tr.MemberActions td a:visited {
-    color: #FFFFFF;
-    text-decoration:  none;
-}
-
-table.MemberActionBox tr.MemberActions td a:active{
-    color: #FFFFFF;
-    text-decoration:  none;
-}
-
-table.MemberActionBox tr.MemberActions td a:hover{
-    color: #336699;
-    text-decoration:  none;
 }
 
-table.ActionBox {
-    font-family: Verdana, Helvetica, sans-serif;
-    border-top: solid #CCCCCC;
-    border-top-width: thick;
+#ContextActionsBox {
+    border-color: #CCCCCC;
     background-color: #CCCCCC;
+    padding: none;
 }
 
-table.ActionBox tr td {
-    font-size: 70%;
+.ContextActionsRow {
+    color: White;
+    background-color: #CCCCCC;
 }
 
-table.ActionBox tr td.ActionTitle {
-    font-weight: bold
-}
 
-table.ActionBox tr.MemberActions {
-    background-color: #CCCCCC;
-    vertical-align: top;
+.ActionTitle {
+    color: Black;
+    font-family: sans-serif;
+    font-weight: bold;
+    font-size: 90%;
 }
 
-table.ActionBox tr.MemberActions td {
-    color: #000000;
+.ActionLink {
+    color: Black;
+    font-family: sans-serif;
+    font-size: 90%;
 }
 
-table.ActionBox tr.MemberActions td a:link {
-    color: #336699;
-    text-decoration:  none;
-}
 
-table.ActionBox tr.MemberActions td a:visited {
-    color: #336699;
+.ActionLink a:link {
+    color: White;
     text-decoration:  none;
+    font-weight: bold;
 }
 
-table.ActionBox tr.MemberActions td a:active{
-    color: #336699;
+.ActionLink a:visited {
+    color: White;
     text-decoration:  none;
+    font-weight: bold;
 }
 
-table.ActionBox tr.MemberActions td a:hover{
-    color: #000066;
+.ActionLink a:active {
+    color: White;
     text-decoration:  none;
+    font-weight: bold;
 }
 
-.aTitle { font-family: Verdana, Helvetica, sans-serif; font-weight: bold; font-size: 25px; }
-
-div.Description {
-    font-size: 80%;
-    font-family: Verdana, Helvetica, sans-serif;
-    text-indent: 20px;
-    right-margin: 8px;
-}
-
-div.Desktop {
-    font-size: 80%;
-    font-family: Verdana, Helvetica, sans-serif;
-}
-
-div.Desktop p {
-    font-size: 100%;
-    margin-right: 10px;
-    font-family: Verdana, Helvetica, sans-serif;
-    text-indent: 4px;    
-}
-
-div.Desktop h1 {
-    font-size: 120%;
-    margin-right:100pt;
-    font-family: Verdana, Helvetica, sans-serif;
-}
-
-div.Desktop h2 {
-    font-size: 115%;
-    margin-right:100pt;
-    font-family: Verdana, Helvetica, sans-serif;
-}
-
-div.Desktop h3 {
-    font-size: 110%;
-    margin-right:100pt;
-    font-family: Verdana, Helvetica, sans-serif;
-}
-
-div.Desktop a:link {
-    text-decoration: none;
+.ActionLink a:hover {
     color: #336699;
+    text-decoration:  none;
+    font-weight: bold;
 }
 
-div.Desktop table tr td {
-    font-size: 80%;
-    color: #000000;
+.ObjectStatus {
+    font-style: italic;
 }
 
-div.Desktop a:visited {
-    text-decoration: none;
-    color: #336699;
+#ForematterCell {
+    margin-top: 20px;
 }
 
-div.Desktop a:active {
-    text-decoration: none;
-    color: #FF0000;
+#DesktopStatusBar {
+    color: Red;
+    background-color: White;
+    font-family: Arial, Verdana, Helvetica, sans-serif;
+    font-style: italic;
+    font-weight: bold;
+    margin-top: 8pt;
 }
 
-div.Desktop a:hover {
-    text-decoration: underline;
-    color: #000066;
+#DesktopTitle {
+    margin-top: 8pt;
 }
 
-div.AuthWarning {
-    text-align: center;
+#DesktopDescription {
     font-style: italic;
+    margin-left: 20pt;
+    margin-right: 8pt;
 }
 
-div.AuthWarning table {
-    border: 0;
-}
-
-div.AuthWarning tr.Hot {
-    color: #FF0000;
+#Desktop {
+    margin-left: 8pt;
+    margin-right: 8pt;
 }
 
-div.Error {
-    color:  #FF0000;
+#ContentByline {
+    font-size: 90%;
+    font-style: italic;
 }
 
-p.DesktopStatusBar {
-    font-size: 80%;
-    font-family: Arial, Verdana, Helvetica, sans-serif;
+#DiscussionAbove {
+    margin-left: 16pt;
+    margin-right: 8pt;
+    margin-top: 8pt;
+    margin-bottom: 8pt;
     font-style: italic;
-    font-weight: bold;
 }
 
 table.FormLayout {