[gen] Simplified management and rendering of phases.

gen/ui/appy.css

@@ -80,12 +80,10 @@ img { border: 0; vertical-align: middle}
 .portletTitle { font-weight: bold; font-size: 110%; margin-bottom: 4px;}
 .portletCurrent { font-weight: bold; }
 .portletSep { border-top: 1px solid #5F7983; margin-top: 2px;}
-.portletPage { font-style: italic; }
-.portletGroup { font-variant: small-caps; font-weight: bold; font-style: normal;
-                margin-top: 0.1em }
+.portletPage { font-style: italic }
+.portletGroup { font-variant: small-caps; font-weight: bold; font-size: 105%;
+                margin: 0.1em 0 0.3em ; border-bottom: 1px dashed grey}
 .portletSearch { font-size: 90%; font-style: italic }
-.phase { border-style: dashed; border-width: thin; padding: 4px 0.6em 5px 1em;}
-.phaseSelected { background-color: #F4F5F6; }
 .content { padding: 14px 14px 9px 15px; background-color: #f1f1f1 }
 .grey { display: none; position: absolute; left: 0px; top: 0px;
         background:grey; opacity:0.5; -moz-opacity:0.5; -khtml-opacity:0.5;

gen/ui/page.pt

@@ -325,8 +325,8 @@
 </tal:comment>
 <metal:message define-macro="message" tal:define="messages tool/consumeMessages" tal:condition="messages">
   <div class="message">
-   <span tal:replace="structure messages"></span>
    <img tal:attributes="src python: '%s/ui/close.png' % appUrl"
         align="right" style="cursor:pointer" onClick="this.parentNode.style.display='none'"/>
+   <span tal:replace="structure messages"></span>
   </div>
 </metal:message>

gen/ui/portlet.pt

@@ -119,10 +119,7 @@
   <tal:phase repeat="phase phases">
     <tal:comment replace="nothing">The box containing phase-related information</tal:comment>
     <tr tal:define="singlePage python: len(phase['pages']) == 1">
-      <td tal:define="label python:'%s_phase_%s' % (contextObj.meta_type, phase['name']);
-                      status phase/phaseStatus;
-                      phaseCss python: (status == 'Current') and ' phaseSelected' or '';"
-          tal:attributes="class python: not singlePhase and 'phase%s' % phaseCss or ''">
+      <td tal:define="label python:'%s_phase_%s' % (contextObj.meta_type, phase['name'])">
        <tal:comment replace="nothing">The title of the phase</tal:comment>
        <div class="portletGroup" tal:condition="python: not singlePhase and not singlePage"
             tal:content="structure python: _(label)">
@@ -149,9 +146,5 @@
        </tal:page>
       </td>
     </tr>
-    <tal:comment replace="nothing">The down arrow pointing to the next phase (if any)</tal:comment>
-    <tr tal:condition="python: phase['name'] != phases[-1]['name']">
-      <td>&nbsp;&nbsp;<img tal:attributes="src string: $appUrl/ui/nextPhase.png"/></td>
-    </tr>
   </tal:phase>
 </table>

gen/ui/template.pt

@@ -72,7 +72,7 @@
   </td>
  </tr>
  <tal:comment replace="nothing">The message strip</tal:comment>
- <tr>
+ <tr valign="top">
   <td>
    <div style="position: relative">
     <metal:msg use-macro="app/ui/page/macros/message"/>