[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Onlinehelp refactoring changes

[Roger Ineichen]

Log message for revision 29185:
  Onlinehelp refactoring changes
  Remove dependency to rotterdam skin

Changed:
  U   Zope3/trunk/src/zope/app/authentication/configure.zcml
  U   Zope3/trunk/src/zope/app/rotterdam/configure.zcml
  U   Zope3/trunk/src/zope/app/rotterdam/onlinehelp.js
  U   Zope3/trunk/src/zope/app/rotterdam/template.pt
  U   Zope3/trunk/src/zope/app/rotterdam/zope3.js

-=-
Modified: Zope3/trunk/src/zope/app/authentication/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/configure.zcml	2005-02-17 20:49:07 UTC (rev 29184)
+++ Zope3/trunk/src/zope/app/authentication/configure.zcml	2005-02-17 20:51:06 UTC (rev 29185)
@@ -70,6 +70,7 @@
   <include file="principalplugins.zcml" />
   <include file="authenticationplugins.zcml" />
   <include file="groupfolder.zcml" />
+  <include file="help.zcml" />
 
   <include package=".browser" />
 

Modified: Zope3/trunk/src/zope/app/rotterdam/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/configure.zcml	2005-02-17 20:49:07 UTC (rev 29184)
+++ Zope3/trunk/src/zope/app/rotterdam/configure.zcml	2005-02-17 20:51:06 UTC (rev 29185)
@@ -30,7 +30,8 @@
       name="xmltree.js" 
       file="xmltree.js" 
       layer="zope.app.rotterdam.rotterdam" />
-  
+
+  <!-- depricated file, methods moved to zope3.js -->
   <browser:resource 
       name="onlinehelp.js" 
       file="onlinehelp.js" 

Modified: Zope3/trunk/src/zope/app/rotterdam/onlinehelp.js
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/onlinehelp.js	2005-02-17 20:49:07 UTC (rev 29184)
+++ Zope3/trunk/src/zope/app/rotterdam/onlinehelp.js	2005-02-17 20:51:06 UTC (rev 29185)
@@ -1,5 +1,9 @@
-// popup for to open the OnlinHelp in a new window
+//----------------------------------------------------------------------------
+// depricated file use zope3.js instead
+//----------------------------------------------------------------------------
 function popup(page, name, settings) {
+  var message = 'file onlinehelp.js is depricated use Method popup() in zope3.js';
+  window.alert(message);
   win = window.open(page, name, settings);
   win.focus();
 }
\ No newline at end of file

Modified: Zope3/trunk/src/zope/app/rotterdam/template.pt
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/template.pt	2005-02-17 20:49:07 UTC (rev 29184)
+++ Zope3/trunk/src/zope/app/rotterdam/template.pt	2005-02-17 20:51:06 UTC (rev 29185)
@@ -32,11 +32,6 @@
             tal:attributes="src string:${context/++resource++zope3.js}" >
     </script>
 
-    <!-- Popup script for the OnlineHelp -->
-    <script type="text/javascript" src="onlinehelp.js"
-            tal:attributes="src string:${context/++resource++onlinehelp.js}" >
-    </script>
-
     <metal:tree use-macro="context/@@standard_macros/navigation_tree_js" />
 
     <link rel="icon" type="image/png"
@@ -88,18 +83,6 @@
         </div>
       </tal:block>
 
-      <!-- Tree of the help topics that appears on the help namespace -->
-      <div class="box" id="help" metal:define-slot="online_help"
-           tal:condition="not:python:request.getURL().find('++help++')==-1">
-        <h4 i18n:translate="">Online Help - TOC</h4>
-        <div class="body">
-          <div tal:content="structure view/getTopicTree|nothing"
-               tal:omit-tag="">content of topicTree</div>
-          <br />
-        </div>
-
-      </div>
-
     </div>
     </metal:slot>
 
@@ -151,8 +134,8 @@
           <a href="#"
                tal:define="url string:'${view/__name__}/${help_info/action}';
                            name string:'OnlineHelp';
-                           settings string:'height=400
-                                           ,width=700
+                           settings string:'height=500
+                                           ,width=950
                                            ,resizable=1
                                            ,scrollbars=yes
                                            ,location=no

Modified: Zope3/trunk/src/zope/app/rotterdam/zope3.js
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/zope3.js	2005-02-17 20:49:07 UTC (rev 29184)
+++ Zope3/trunk/src/zope/app/rotterdam/zope3.js	2005-02-17 20:51:06 UTC (rev 29185)
@@ -11,6 +11,14 @@
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
+// popup window with settings 
+//----------------------------------------------------------------------------
+function popup(page, name, settings) {
+  win = window.open(page, name, settings);
+  win.focus();
+}
+
+//----------------------------------------------------------------------------
 // guess browser version, feel free to enhance it if needed.
 //----------------------------------------------------------------------------
 var ie = document.all != null;