Merged mgmt interface quick fix branch

Draft.py

@@ -88,7 +88,7 @@
 from OFS import SimpleItem
 from string import rfind
 
-manage_addPrincipiaDraftForm=Globals.HTMLFile('draftAdd',globals())
+manage_addPrincipiaDraftForm=Globals.HTMLFile('dtml/draftAdd',globals())
 def manage_addPrincipiaDraft(self, id, baseid, PATH_INFO, REQUEST=None):
     "Add a draft object"
     self._setObject(id, Draft(id, baseid, PATH_INFO))
@@ -176,7 +176,7 @@ def nonempty(self):
             # ZODB 3
             return not db.versionEmpty(self._version)
 
-    manage_approve__draft__=Globals.HTMLFile('draftApprove', globals())
+    manage_approve__draft__=Globals.HTMLFile('dtml/draftApprove', globals())
 
     def manage_Save__draft__(self, remark, REQUEST=None):
         """Make version changes permanent"""

Version.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Version object"""
 
-__version__='$Revision: 1.46 $'[11:-2]
+__version__='$Revision: 1.47 $'[11:-2]
 
 import Globals, time
 from AccessControl.Role import RoleManager
@@ -99,7 +99,7 @@
 
 class VersionException(BeforeDeleteException): pass
 
-manage_addVersionForm=Globals.HTMLFile('versionAdd', globals())
+manage_addVersionForm=Globals.HTMLFile('dtml/versionAdd', globals())
 
 def manage_addVersion(self, id, title, REQUEST=None):
     """ """
@@ -144,9 +144,9 @@ def __init__(self, id, title, REQUEST):
         self.id=id
         self.title=title
 
-    manage_main=Globals.HTMLFile('version', globals())
-    manage_end=Globals.HTMLFile('versionEnd', globals())
-    manage_editForm   =Globals.HTMLFile('versionEdit', globals())
+    manage_main=Globals.HTMLFile('dtml/version', globals())
+    manage_end=Globals.HTMLFile('dtml/versionEnd', globals())
+    manage_editForm   =Globals.HTMLFile('dtml/versionEdit', globals())
 
     def title_and_id(self):
         r=Version.inheritedAttribute('title_and_id')(self)

dtml/draftAdd.dtml

@@ -0,0 +1,62 @@
+<dtml-var manage_page_header>
+
+<dtml-var "manage_form_title(this(), _,
+           form_title='Add Draft Object',
+	   )">
+
+<p class="form-help">
+A Draft allows you to make a working copy of a Zope object. 
+After you change the Draft, you can commit the changes to
+the original object.
+</p>
+
+<form action="manage_addPrincipiaDraft" method="post">
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Id
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="id" size="40" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-optional">
+    Base Object
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <select name="baseid" size="7">
+  <dtml-in objectValues sort=title_or_id>
+    <dtml-unless "meta_type in ('Version', 'Principia Draft', 'User Folder')">
+      <option value="<dtml-var id html_quote>">
+      <dtml-if title>
+	<dtml-var title size="25"> (<dtml-var id>)
+      <dtml-else>
+	<dtml-var id>
+      </dtml-if>
+      </option>
+    </dtml-unless>
+  </dtml-in>
+    </select>
+  </div>
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value=" Add " /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</form>
+
+<dtml-var manage_page_footer>

dtml/draftApprove.dtml

@@ -0,0 +1,37 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<dtml-if nonempty>
+<form action="manage_Save__draft__" method="post">
+<h3>Approve</h3>
+
+<p class="form-text">
+You can make work done in <dtml-var id> (<dtml-var title>) permanent by 
+entering a remark in the space below and then clicking on the <em>approve</em> 
+button.
+<br />
+<textarea name=remark rows=10 cols=50></textarea>
+<br />
+<input type=submit value="Approve">
+</form>
+
+<form action="manage_Discard__draft__" method="post">  
+<h3>Discard</h3>
+
+<p class="form-text">
+You can throw away work done in <dtml-var id> (<dtml-var title>) by 
+clicking on the <em>discard</em> button.
+<br />
+<input type=submit value="Discard">
+</form>
+
+<dtml-else>
+
+<p class="form-text">
+No changes have been made to this object.
+</p>
+</dtml-if>
+
+<dtml-var manage_page_footer>
+
+

dtml/version.dtml

@@ -0,0 +1,70 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<dtml-if Zope-Version>
+
+  <dtml-if expr="_vars['Zope-Version'] != cookie">
+  <h3>Another version is active!</h3>
+
+  <p class="form-text">
+  You cannot start working in this version while another version, 
+  <strong><dtml-var Zope-Version></strong> is active. 
+  Leave <strong><dtml-var Zope-Version></strong> first and then 
+  you may work in this version.
+  </p>
+
+  <div class="form-element">
+  <form action="leave_another" method="post">
+  <input class="form-element" type="submit" name="submit" 
+   value="Quit working in <dtml-var Zope-Version html_quote>">
+  </form>
+  </div>
+
+  <dtml-else>
+  <h3>Active Version Operations</h3>
+
+  <p class="form-text">
+  You <strong>are</strong> currently working in the
+  <dtml-var Zope-Version> version. 
+  </p>
+
+  <div class="form-element">
+  <form action="leave" method="post">
+  <input class="form-element" type="submit" name="submit" 
+   value="Quit working in <dtml-var Zope-Version html_quote>">
+  </form>
+  </div>
+  </dtml-if>
+
+<dtml-else>
+  <h3>Inactive Version Operations</h3>
+
+  <p class="form-text">
+  You <strong>are not</strong> currently working in the
+  <dtml-var title_and_id>
+  version.
+  </p>
+
+  <div class="form-element">
+  <form action="enter" method="POST">      
+  <input class="form-element" type="submit" name="submit" 
+   value="Start working in <dtml-var title_or_id html_quote>">
+    </form>
+  </div>
+
+</dtml-if>
+
+<dtml-var manage_page_footer>
+
+
+
+
+
+
+
+
+
+
+
+
+

dtml/versionAdd.dtml

@@ -0,0 +1,49 @@
+<dtml-var manage_page_header>
+
+<dtml-var "manage_form_title(this(), _,
+           form_title='Add Version',
+           help_product='OFSP',
+           help_topic='Version-Add.stx'
+	   )">
+
+<p class="form-help">
+A Version allows you to make changes to Zope in a private session. After 
+you review the changes you can make them live.
+</p>
+
+<form action="manage_addVersion" method="post">
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Id
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="id" size="40" value="" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-optional">
+    Title
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="title" size="40" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value=" Add " /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</form>
+
+<dtml-var manage_page_footer>

dtml/versionEdit.dtml

@@ -0,0 +1,42 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<form action="manage_edit" method="post">
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Id
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <div class="form-text">
+    <dtml-var id>
+    </div>
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-optional">
+    Title
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="title" size="40" 
+     value="<dtml-var title html_quote>" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value="Save Changes" /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</form>
+
+<dtml-var manage_page_footer>