Index: WAeUP_SRP/trunk/skins/waeup_default/online_payment.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/online_payment.pt	(revision 1060)
+++ WAeUP_SRP/trunk/skins/waeup_default/online_payment.pt	(revision 1067)
@@ -5,12 +5,14 @@
             action="http://www.wemaonlinepayments.biz/payment.aspx" 
             id="Form1">
-        <div>
-          <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE" value="/wEPDwUJLTkzNjMzMjc5D2QWAgIBD2QWAgIZDw9kFgIeB29uY2xpY2sFbGphdmFzY3JpcHQ6cmV0dXJuIGZuUG9zdEJhY2tCZXR3ZWVuUGFnZXMoJ2RvY3VtZW50LkZvcm0xJywnaHR0cDovL3d3dy53ZW1hb25saW5lcGF5bWVudHMuYml6L3BheW1lbnQuYXNweCcpO2RkeyluJQkYEPTlhLbbxO4d41Wpexo=" />
-        </div>
           <table>
             <tr>
             <td >Site ID</td>
             <td >Code that represents the portal within the payment gateway.&nbsp; This is assigned to the portal by Wema Bank</td>
-            <td><input name="x_SiteID" type="text" id="x_SiteID" size="33" value="8000" /></td>
+            <td><input name="x_SiteID" 
+                       type="text" 
+                       id="x_SiteID" 
+                       size="33" 
+                       value="8000" />
+            </td>
           </tr>
           <tr>
@@ -34,5 +36,5 @@
                      type="text" 
                      id="x_PayDesc"
-                     value=" School Fees for 2006/2007 Session " 
+                     value="School Fees for 2006/2007 Session" 
                      />
             </td>
@@ -48,5 +50,5 @@
                      type="text" 
                      id="x_Billto" 
-                     value=" John Pedro " />
+                     value="John Pedro" />
             </td>
           </tr>
@@ -59,5 +61,5 @@
               <input name="x_Shipto" type="text" 
                      id="x_Shipto" 
-                     value=" Recipient Address" 
+                     value="Recipient Address" 
                      />
             </td>
@@ -70,6 +72,5 @@
                      type="text" 
                      id="x_PayerID" 
-                     style="WIDTH: 268px; HEIGHT: 22px" 
-                     value=" CS960307087 " 
+                     value="CS960307087 " 
                      />
             </td>
@@ -81,5 +82,5 @@
                        type="text" 
                        id="x_PayerNames" 
-                       value=" John Pedro" 
+                       value="John Pedro" 
                        />
             </td>
@@ -91,5 +92,5 @@
               <input name="x_PayerEmail" 
                      type="text" id="x_PayerEmail" 
-                     value=" abc@yahoo.co.uk" /></td>
+                     value="abc@yahoo.co.uk" /></td>
           </tr>
           <tr>
@@ -111,5 +112,5 @@
                        type="text" 
                        id="x_amt" 
-                       value=" 7500" 
+                       value="7500" 
                        />
             </td>
@@ -135,5 +136,4 @@
                      type="text" 
                      id="x_Redirect_url" 
-                     style="WIDTH: 264px; HEIGHT: 22px" size="38" 
                      value="http://uniben.waeup.org/callback" 
                      />
@@ -150,11 +150,4 @@
           </tr>
         </table>
-        <div>
-          <input type="hidden" 
-                 name="__EVENTVALIDATION" 
-                 id="__EVENTVALIDATION"
-                 value="/wEWDgKlt8BZApCJ0bMKApmj0YAKAoHTk+8HAsSt4qICArKX2q0FAvne2eQLAoiz43kC8Nfy2gkCl5uJ6AsC39WuxgoCyoCWrgMCj8y3rQgCya6ThwXqaVrYsmCB2RtXWJb/sBMQi/Vhfw==" 
-                 />
-        </div>
       </form>
     </metal:main>
Index: WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 1060)
+++ WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 1067)
@@ -2,23 +2,15 @@
 <tal:block define="item nocall:options/context_obj;
                    item_info item/getContentInfo;
-                   student_info item/getStudentInfo;
-                   base_url python: request.get('cpsskins_base_url');
-                   states_not_shown python: ('work',);">
-
-
-<span tal:condition="python:path('item_info/review_state') not in states_not_shown ">                   
-                   
-  <span tal:condition="student_info">
-    <span tal:content="student_info/review_state" />  
-    <span tal:condition="python:item_info['review_state']!=student_info['review_state']"> 
+                   review_state item/getStudentReviewState;"
+                   >
+    <span tal:condition="review_state">
+    <span tal:content="review_state" />  
+    <span tal:condition="python:item_info['review_state']!= review_state"> 
        / <span tal:content="item_info/review_state" />
     </span>
   </ span>
-
-  <span tal:condition="not: student_info">
+  <span tal:condition="not: review_state">
     <span tal:content="item_info/review_state" />
   </span>
-
-</span>
 </tal:block>
 </metal:block>
