Index: eUP_SRP/branches/regebro-noskins/skins/waeup_design/main_template_orig.pt
===================================================================
--- /WAeUP_SRP/branches/regebro-noskins/skins/waeup_design/main_template_orig.pt	(revision 1554)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<metal:block define-macro="master"
-  tal:define="showthirdcol showthirdcol|python:1;
-              emptybody emptybody|request/emptybody|nothing;
-              mtool here/portal_membership;
-              can_raise python:mtool.assertViewable(here);
-              utool nocall:here/portal_url;
-              atool here/portal_actions;
-              ttool here/portal_trees;
-              wtool here/portal_workflow;
-              context_url python:here.getContextUrl(utool=utool);
-              here_url here/absolute_url;
-              base_url here/getBaseUrl;
-              member mtool/getAuthenticatedMember;
-              isAnon mtool/isAnonymousUser;
-              isHomeless python:isAnon or member.getProperty('homeless', 0);
-              isHomeless python:(isHomeless == '0' and [0] or [isHomeless])[0];
-              actions python:atool.listFilteredActionsFor(here);
-              wf_state python:wtool.getInfoFor(here,'review_state','');
-              uname python: isAnon and 'Guest' or member.getUserName();
-              checkPerm nocall: mtool/checkPermission;
-              cpsmcat nocall:here/translation_service;
-              locale here/translation_service/getSelectedLanguage;
-              in_ws here/isInWorkspace;
-">
-<metal:block define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></metal:block>
-  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"
-   tal:attributes="lang locale;
-                   xml:lang locale">
-    <head>
-      <metal:block use-macro="here/header_lib_header/macros/header|here/header_lib/macros/header">
-        <metal:block fill-slot="base"><metal:block define-slot="base"><base
-         href="" tal:attributes="href string:${here_url}/"
-        /></metal:block></metal:block>
-        <metal:block fill-slot="head_slot"><metal:block define-slot="head_slot"
-        /></metal:block>
-        <metal:block fill-slot="style_slot"><metal:block define-slot="style_slot"
-        /></metal:block>
-        <metal:block fill-slot="javascript_head_slot"><metal:block
-        define-slot="javascript_head_slot"
-        /></metal:block>
-      </metal:block>
-    </head>
-    <body tal:condition="emptybody"
-    tal:attributes="onload here/getOnLoad|string:setFocus();">
-      <metal:block define-slot="body" />
-      <metal:block define-slot="main" />
-    </body>
-    <body tal:condition="not:emptybody"
-    tal:attributes="onload here/getOnLoad|string:setFocus();">
-
-      <metal:block
-        use-macro="here/generic_lib_portal_message/macros/portal_message|here/generic_lib/macros/portal_message" />
-      <metal:block define-slot="header" />
-      <metal:block define-slot="main" />
-      <metal:block define-slot="sub" />
-      
-      <div id="portlets"
-        tal:define="ptool context/portal_cpsportlets;
-                    slots python:ptool.getProperty('default_slots');
-                    slots python:slots or ptool.listPortletSlots();">
-        <div tal:repeat="slot slots"
-          tal:attributes="id slot">
-          <div style="color:red" tal:content="slot"/>
-          <div tal:repeat="portlet python:ptool.getPortlets(context=context, slot=slot)">
-            <div style="color:blue" tal:content="portlet/absolute_url"/>
-            <p tal:content="structure python:portlet.render(context_obj=context, portlet=portlet, boxedit=None)"/>
-          </div>
-        </div>
-      </div>
-      
-    </body>
-  </html>
-</metal:block>
