From 7ab99a7669345e8e468b0189333cb5d3734345e9 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 1 Nov 2006 20:30:36 +0000
Subject: [PATCH] Monotone-Parent: 5b613d00457d59ba06ebed331a8e3d20d33477ea
 Monotone-Revision: 2e4c1f0cd08151845778a2d833dd35169090f1c1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-01T20:30:36
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  7 +++++++
 UI/Common/UIxPageFrame.m      |  5 +++++
 UI/Templates/UIxPageFrame.wox | 19 ++++++++++++-------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7b69dac3..5e7497c7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Common/UIxPageFrame.m ([UIxPageFrame -pageContentClasses]):
+	new method that returns "pageContent" as class, but also "popup"
+	for the DIV where the page content lies, so that we can manipulate
+	the content of popup's with CSS identifiers.
+
 2006-10-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalInlineAptView.m ([UIxCalInlineAptView
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 4d2444338..d29842ec1 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -125,6 +125,11 @@
   return isPopup;
 }
 
+- (NSString *) pageContentClasses
+{
+  return (isPopup ? @"pageContent popup" : @"pageContent");
+}
+
 /* page based JavaScript */
 
 - (NSString *) pageJavaScriptURL
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 4ef08e44e..39d0b5124 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -36,10 +36,15 @@
             var UserLogin = '<var:string value="shortUserNameForDisplay" />';
           </script>
 
-          <script type="text/javascript" rsrc:src="prototype.js"> <!-- space required --></script>
-          <script type="text/javascript" rsrc:src="generic.js"> <!-- space required --></script>
+          <script type="text/javascript" rsrc:src="prototype.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="HTMLUListElement.js"><!-- space required --></script>
+          <script type="text/javascript" rsrc:src="generic.js"><!-- space required --></script>
           <var:if condition="hasProductSpecificJavaScript"
-            ><script type="text/javascript" var:src="productJavaScriptURL"> <!-- space required --></script
+            ><script type="text/javascript" var:src="productJavaScriptURL"><!-- space required --></script
               ></var:if>
           <var:if condition="hasPageSpecificJavaScript"
             ><script type="text/javascript" var:src="pageJavaScriptURL"> <!-- space required --></script
@@ -77,10 +82,10 @@
             ><var:component className="UIxToolbar"
             />
 
-          <div class="pageContent">
-            <var:component-content
+          <div var:class="pageContentClasses"
+            ><var:component-content
               /></div>
-          <var:if condition="isUIxDebugEnabled">
+<!--          <var:if condition="isUIxDebugEnabled">
             <table border="0" style="font-size: 9pt; visibility: hidden;">
               <tr>
                 <td valign="top">clientObject:</td>
@@ -153,7 +158,7 @@
                 </td>
               </tr>
             </table>
-          </var:if>
+          </var:if> -->
           <noscript>
             <div id="noJavascriptError">
             </div>