Commit 0038cab0 authored by Christophe Dumez's avatar Christophe Dumez

2006-06-22 chris

* erp5Subversion is now XHTML Strict compliant
* erp5Subversion works with erp5_xhtml_style

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8144 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ff66e9b1
......@@ -67,10 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
</list>
</value>
......@@ -79,22 +76,8 @@
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<value>
<list>
<string>title_orphan</string>
</list>
</value>
</item>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -104,13 +87,9 @@
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
<list>
<string>title_orphan</string>
</list>
</value>
</item>
</dictionary>
......
......@@ -61,9 +61,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
</list>
</value>
......@@ -74,30 +71,12 @@
<dictionary>
<item>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -72,11 +72,6 @@
from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
\n
if "changelog" in context.REQUEST.keys() and context.REQUEST["changelog"].strip()!=\'\':\n
changelog=context.REQUEST["changelog"]\n
else:\n
changelog=None\n
\n
commit_non_recurs = added\n
if commit_non_recurs != \'\' and commit_non_recurs != \'none\':\n
if modified != \'\' and modified != \'none\':\n
......@@ -92,12 +87,12 @@ if removed != \'\' and removed != \'none\':\n
else:\n
commit_recurs = removed\n
\n
if \'changelog\' not in context.REQUEST.keys() :\n
if not changelog :\n
context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
\n
if not changelog :\n
if changelog.strip() == \'\' :\n
context.REQUEST.set(\'portal_status_message\', "Error: Changelog Message can\'t be empty.")\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
......@@ -110,11 +105,11 @@ try:\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n
return context.asContext(added=added, modified=modified, removed=removed, changelog=changelog, trust_dict = error.getTrustDict(), caller=\'commit\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed, caller=\'commit\', realm = error1.getRealm(), changelog=changelog, username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
return context.asContext(added=added, modified=modified, removed=removed, changelog=changelog, caller=\'commit\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n
context.REQUEST.set(\'portal_status_message\', \'Files commited successfully.\')\n
context.REQUEST.set(\'do_extract\', \'False\')\n
......@@ -135,7 +130,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>added=\'\',modified=\'\',removed=\'\',**kw</string> </value>
<value> <string>added=\'\',modified=\'\',removed=\'\', changelog=None, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -155,7 +150,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>3</int> </value>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
......@@ -164,16 +159,15 @@ return context.BusinessTemplate_viewSvnStatus()\n
<string>added</string>
<string>modified</string>
<string>removed</string>
<string>changelog</string>
<string>kw</string>
<string>Products.ERP5Subversion.SubversionClient</string>
<string>SubversionSSLTrustError</string>
<string>SubversionLoginError</string>
<string>commit_non_recurs</string>
<string>_getattr_</string>
<string>context</string>
<string>_getitem_</string>
<string>changelog</string>
<string>None</string>
<string>commit_non_recurs</string>
<string>context</string>
<string>commit_recurs</string>
<string>False</string>
<string>True</string>
......@@ -194,6 +188,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
<string></string>
<string></string>
<string></string>
<none/>
</tuple>
</value>
</item>
......
......@@ -61,9 +61,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>right</string>
<string>left</string>
<string>center</string>
<string>bottom</string>
</list>
</value>
......@@ -73,31 +70,13 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -61,8 +61,8 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>hidden</string>
<string>left</string>
<string>right</string>
</list>
</value>
</item>
......@@ -71,7 +71,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_changelog</string>
......@@ -83,7 +83,7 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>right</string> </key>
<value>
<list>
<string>my_modified</string>
......
......@@ -48,35 +48,50 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n
"DTD/xhtml1-strict.dtd">\n
<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
<link rel="STYLESHEET" type="text/css" href="css/movableMenu.css">\n
<tal:block tal:replace="nothing"\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
<!--\n
Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
Christophe Dumez <christophe@nexedi.com>\n
\n
<tal:block metal:use-macro="here/view_master/macros/master">\n
<tal:block metal:fill-slot="main">\n
This program is Free Software; you can redistribute it and/or\n
modify it under the terms of the GNU General Public License\n
as published by the Free Software Foundation; either version 2\n
of the License, or (at your option) any later version.\n
\n
This program is distributed in the hope that it will be useful,\n
but WITHOUT ANY WARRANTY; without even the implied warranty of\n
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n
GNU General Public License for more details.\n
\n
You should have received a copy of the GNU General Public License\n
along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n
</tal:block>\n
<tal:block tal:define="css_list python: [\'css/movableMenu.css\',];\n
js_list python: [\'js/menuico.js\', \'js/movableMenu.js\', \'js/BusinessTemplate_doCreateJavaScriptDiff\']">\n
<tal:block metal:use-macro="here/document/macros/master">\n
<tal:block metal:fill-slot="main">\n
<!-- Form Hidden : Selected files -->\n
<input type=\'hidden\' name=\'removed\' tal:attributes="value python:context.REQUEST[\'removed\']"/>\n
<input type=\'hidden\' name=\'added\' tal:attributes="value python:context.REQUEST[\'added\']"/>\n
<input type=\'hidden\' name=\'modified\' tal:attributes="value python:context.REQUEST[\'modified\']"/>\n
<!-- End Hidden -->\n
<script src="js/movableMenu.js"></script>\n
<script src="js/menuico.js"></script>\n
<tal:js replace="structure \n
here/BusinessTemplate_doCreateJavaScriptDiff">JavaScript here</tal:js>\n
<tal:py replace="structure \n
here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
<center>\n
<script>\n
\n
<script type="text/javascript">\n
// Menu Customization\n
var MenuToolBar=new CreateToolBarMenu("#dae6e6", "#ffffff", "#b1bbbb", "#6699ff", "font-family:verdana;font-size:11px;color:black;font-weight:bold", 16, 16)\n
MenuToolBar.Add("imgs/revertoff.png", "imgs/reverton.png", "Back", "#", "goBack()");\n
MenuToolBar.Add("imgs/captionoff.png", "imgs/captionon.png", "Show Legend", "#", "winList[\'captionWindow\'].open();");\n
MenuToolBar.Add("imgs/execoff.png", "imgs/execon.png", "Commit Changes", "#", "doCommit(document.main_form);");\n
MenuToolBar.Add("imgs/execoff.png", "imgs/execon.png", "Commit Changes", "#", "doCommit(document.getElementById(\'main_form\'));");\n
// Menu Display\n
MenuToolBar.Display();\n
</script>\n
</center>\n
\n
<div id="captionWindow" class="window" style="right:20px;left:auto;top:180px;width:120px;background-color:#dae6e6;border-color:#ebf8f8 #c0caca #c0caca #c0caca;">\n
<div class="titleBar" style="background-color:#dae6e6;color:black;">\n
......@@ -88,27 +103,27 @@ here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
<area shape="rect" coords="34,0,49,13" href="" alt="" title="Close" onclick="this.parentWindow.close();return false;" />\n
</map>\n
</div>\n
<div class="clientArea" style="height:80px; background-color:#fffdfd;color:#806040;border-color:#c0caca #c0caca #c0caca #c0caca;">\n
<b><font color="black"><center>Legend</center></font></b><hr/>\n
<center><table style="border: 1px solid gray;" width="80%" cellpadding="0" cellspacing="0">\n
<div class="clientArea" style="background-color:#fffdfd;color:#806040;border-color:#c0caca #c0caca #c0caca #c0caca;text-align:center;">\n
<span style="font-weight: bold; color: black;">Legend</span><hr/>\n
<table cellpadding="0" cellspacing="0" style="margin-left:auto; margin-right:auto;width:80%; border: 1px solid gray;">\n
<tbody>\n
<tr height="18">\n
<tr>\n
<td style="text-align: center; background-color: rgb(253, 117, 74);">Removed</td>\n
<td>&nbsp;</td>\n
</tr>\n
<tr height="18">\n
<tr>\n
<td colspan="2" style="text-align: center; background-color: rgb(253, 228, 6);">Changed</td>\n
</tr>\n
<tr height="18">\n
<tr>\n
<td>&nbsp;</td>\n
<td style="text-align: center; background-color: rgb(83, 253, 74);">Added</td>\n
</tr>\n
</tbody>\n
</table></center>\n
</table>\n
</div>\n
</div>\n
\n
<script>\n
<script type="text/javascript">\n
winInit();\n
if (winList[\'captionWindow\']){\n
winList[\'captionWindow\'].open();\n
......@@ -118,7 +133,7 @@ here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
\n
</tal:block>\n
</tal:block>\n
</tal:block>
]]></string> </value>
</item>
......
......@@ -61,10 +61,9 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>right</string>
<string>left</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
......@@ -77,24 +76,19 @@
<value>
<list>
<string>listbox</string>
<string>listbox_message</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>hidden</string> </key>
<value>
<list/>
<list>
<string>listbox_message</string>
</list>
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
......
......@@ -61,8 +61,8 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>4</string>
<string>left</string>
<string>right</string>
</list>
</value>
</item>
......@@ -71,25 +71,25 @@
<value>
<dictionary>
<item>
<key> <string>4</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_changelog</string>
<string>my_realm_hidden</string>
<string>my_added</string>
<string>my_modified</string>
<string>my_removed</string>
<string>my_realm</string>
<string>my_user</string>
<string>my_password</string>
</list>
</value>
</item>
<item>
<key> <string>Default</string> </key>
<key> <string>right</string> </key>
<value>
<list>
<string>my_realm</string>
<string>my_user</string>
<string>my_password</string>
<string>my_added</string>
<string>my_modified</string>
<string>my_removed</string>
<string>my_caller</string>
<string>my_changelog</string>
<string>my_realm_hidden</string>
</list>
</value>
</item>
......
......@@ -283,7 +283,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/changelog</string> </value>
<value> <string>here/REQUEST/changelog</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -61,8 +61,8 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>hidden</string>
<string>left</string>
<string>right</string>
</list>
</value>
</item>
......@@ -71,7 +71,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_valid_until</string>
......@@ -85,21 +85,21 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>right</string> </key>
<value>
<list>
<string>my_caller</string>
<string>my_added</string>
<string>my_modified</string>
<string>my_removed</string>
<string>my_valid_until_hidden</string>
<string>my_valid_from_hidden</string>
<string>my_realm_hidden</string>
<string>my_hostname_hidden</string>
<string>my_failures_hidden</string>
<string>my_changelog</string>
<string>my_finger_print_hidden</string>
<string>my_issuer_dname_hidden</string>
<string>my_caller</string>
<string>my_added</string>
<string>my_modified</string>
<string>my_removed</string>
<string>my_changelog</string>
</list>
</value>
</item>
......
......@@ -124,7 +124,9 @@
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -267,4 +269,23 @@
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/REQUEST/changelog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
......@@ -48,160 +48,123 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">\n
<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
<tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
editable_mode request/editable_mode | nothing;\n
global ignore_layout request/ignore_layout | nothing;\n
global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
default_layout string:view_master;\n
layout_id layout_form/pt | default_layout;">\n
<tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<tal:block metal:fill-slot="main">\n
<tal:block tal:replace="nothing"\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
<!--\n
Copyright (c) 2006 Nexedi SARL and Contributors. All Rights Reserved.\n
Christophe Dumez <christophe@nexedi.com>\n
\n
<link rel="STYLESHEET" type="text/css" href="css/dhtmlXTree.css">\n
<link rel="STYLESHEET" type="text/css" href="css/movableMenu.css">\n
This program is Free Software; you can redistribute it and/or\n
modify it under the terms of the GNU General Public License\n
as published by the Free Software Foundation; either version 2\n
of the License, or (at your option) any later version.\n
\n
<script src="js/dhtmlXCommon.js"></script>\n
<script src="js/dhtmlXTree.js"></script>\n
<script src="js/menuico.js"></script>\n
<script src="js/movableMenu.js"></script>\n
<noscript>\n
<font color="red">Please activate javascript in your web browser or this module won\'t work.</font>\n
</noscript>\n
<!-- Form Hidden : Selected files -->\n
<input type="hidden" name="removed" value=""/>\n
<input type="hidden" name="added" value=""/>\n
<input type="hidden" name="modified" value=""/>\n
<input type="hidden" name="files" value=""/>\n
<!-- End Hidden -->\n
This program is distributed in the hope that it will be useful,\n
but WITHOUT ANY WARRANTY; without even the implied warranty of\n
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n
GNU General Public License for more details.\n
\n
<div id="menudiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000;" onmouseover="javascript:overpopupmenu=true;" onmouseout="javascript:overpopupmenu=false;">\n
<table width="82px" cellspacing="1" cellpadding="0" bgcolor="lightgray">\n
<tr><td>\n
<table width="80" cellspacing="0" cellpadding="0">\n
<tr>\n
<td id="item1" bgcolor="#ffffff" width="80" height="16" onMouseOver="this.style.backgroundColor=\'#efefef\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="ls()"><center>Infos</center></td>\n
</tr>\n
<tr>\n
<td id="item2" bgcolor="#ffffff" width="80" height="16" onMouseOver="this.style.backgroundColor=\'#efefef\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="viewDiff(1,document.main_form)"><center>Diff</center></td>\n
</tr>\n
<tr>\n
<td id="item3" bgcolor="#ffffff" width="80" height="16" onMouseOver="this.style.backgroundColor=\'#efefef\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="log()"> <center>History</center></td>\n
</tr>\n
<tr>\n
<td id="item4" bgcolor="#ffffff" width="80" height="16" onMouseOver="this.style.backgroundColor=\'#efefef\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="commit(1,document.main_form)"> <center>Commit</center></td>\n
</tr>\n
<tr>\n
<td id="item5" bgcolor="#ffffff" width="80" height="16" onMouseOver="this.style.backgroundColor=\'#efefef\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="revert(1,document.main_form)"> <center>Revert</center></td>\n
</tr>\n
</table>\n
</td></tr>\n
</table>\n
</div>\n
\n
<tal:js replace="structure \n
here/BusinessTemplate_doCreateJavaScriptStatus">javascript here</tal:js><br/>\n
<span tal:define="repos_url python:context.getPortalObject()[\'portal_subversion\'].info(context)[\'url\']">\n
<font color="black"><b>Repository URL :</b> <a tal:attributes="href repos_url"><b tal:content="repos_url">repository url</b>\n
</a></font>\n
</span><br/><br/>\n
<button type="BUTTON" onclick="treeTaller()">Taller</button>\n
<button type="BUTTON" onclick="treeShorter()">Shorter</button>\n
<center><table width="100%">\n
\t<tr>\n
\t\t<td id="MainTreeTD" height="300px">\n
<div id="splashScreen" style="position:absolute;z-index:5;top:40%;left:35%;">\n
\t\t\t<table bgcolor="#000000" border="1" bordercolor="#000000" cellpadding="0" cellspacing="0" height="200" width="300">\n
\t\t\t\t<tr>\n
\t\t\t\t\t<td width="100%" height="100%" bgcolor="#cccccc" align="center" valign="middle">\n
\t\t\t\t\t\t<font face="Helvetica,Verdana,Arial" size="3" color="#000066"><b><center>Checking for changes.</center><br/> <center>Please wait...</center></b></font> \n
\t\t\t\t\t\t&nbsp; &nbsp; <br/> \n
\t\t\t\t\t</td>\n
\t\t\t\t</tr>\n
\t\t\t</table>\n
\t\t</div>\n
\t\t<div \n
\t\t\tid="treebox1" \n
\t\t\tstyle="width:98%; height:98%;background-color:#f5f5f5;border :1px solid Silver;overflow:auto;">\n
\t\t</div>\n
\t\t</td>\n
\t</tr>\n
</table>\n
<div id="captionWindow" class="window" style="right:20px;left:auto;top:140px;width:120px;background-color:#dae6e6;border-color:#ebf8f8 #c0caca #c0caca #c0caca;">\n
<div class="titleBar" style="background-color:#dae6e6;color:black;">\n
<span class="titleBarText">Legend -- SVN</span>\n
<img class="titleBarButtons" alt="" src="imgs/altbuttons.gif" longdesc="imgs/altbuttonslow.gif" usemap="#sampleMap3" />\n
<map id="sampleMap3" name="sampleMap3">\n
<area shape="rect" coords="0,0,15,13" href="" alt="" title="Minimize" onclick="this.parentWindow.minimize();return false;" />\n
<area shape="rect" coords="16,0,31,13" href="" alt="" title="Restore" onclick="this.parentWindow.restore();return false;" />\n
<area shape="rect" coords="34,0,49,13" href="" alt="" title="Close" onclick="this.parentWindow.close();return false;" />\n
</map>\n
</div>\n
<div class="clientArea" style="height:100px; background-color:#fffdfd;color:#806040;border-color:#c0caca #c0caca #c0caca #c0caca;">\n
<b><font color="black"><center>Legend</center></font></b><hr/>\n
<p><font color="green">Added files</font><br/>\n
<font color="orange">Modified files</font><br/>\n
<font color="red">Removed files</font><br/>\n
<font color="grey">Conflicted files</font><br/>\n
<font color=\'black\'>Unmodified files</font><br/>\n
</p>\n
</div>\n
</div>\n
\n
<script>\n
winInit();\n
if (winList[\'captionWindow\']){\n
winList[\'captionWindow\'].open();\n
}\n
</script>\n
</center>\n
<input name="showUnmodified" value="showUnmodified" type="checkbox" onclick="showNormalFiles()"/> <font color="black">Show unmodified files</font>\n
<center>\n
<script>\n
// Menu Customization\n
var MenuToolBar=new CreateToolBarMenu("#dae6e6", "#ffffff", "#b1bbbb", "#6699ff", "font-family:verdana;font-size:11px;color:black;font-weight:bold", 16, 16)\n
MenuToolBar.Add("imgs/captionoff.png", "imgs/captionon.png", "Show Legend", "#", "winList[\'captionWindow\'].open();");\n
MenuToolBar.Add("imgs/expandoff.png", "imgs/expandon.png", "Expand / Collapse", "#", "expandCollapse();");\n
MenuToolBar.Add("imgs/diffoff.png", "imgs/diffon.png", "View Diff", "#", "viewDiff(0,document.main_form);");\n
MenuToolBar.Add("imgs/execoff.png", "imgs/execon.png", "Commit Changes", "#", "commit(0,document.main_form);");\n
MenuToolBar.Add("imgs/revertoff.png", "imgs/reverton.png", "Revert Changes", "#", "revert(0,document.main_form);");\n
// Menu Display\n
MenuToolBar.Display();\n
</script>\n
\n
</center>\n
<script>\n
if(upLevel) {\n
var splash = document.getElementById("splashScreen");\n
} else if(ns4) {\n
var splash = document.splashScreen;\n
} else if(ie4) {\n
var splash = document.all.splashScreen;\n
}\n
\n
function showObject() {\n
\t if (ns4) {\n
\t splash.visibility = "visible";\n
\t }\n
\t if (ie4 || upLevel) {\n
\t splash.style.visibility = "visible";\n
}\n
You should have received a copy of the GNU General Public License\n
along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n
</tal:block>\n
<tal:block tal:define="css_list python: [\'css/dhtmlXTree.css\', \'css/movableMenu.css\'];\n
js_list python: [\'js/dhtmlXCommon.js\', \'js/dhtmlXTree.js\', \'js/menuico.js\', \'js/movableMenu.js\', \'js/BusinessTemplate_doCreateJavaScriptStatus\']">\n
<tal:block metal:use-macro="here/document/macros/master">\n
<tal:block metal:fill-slot="main">\n
<noscript>\n
<h3 class="error">Please activate javascript in your web browser or this module won\'t work.</h3>\n
</noscript>\n
<!-- Form Hidden : Selected files -->\n
<input type="hidden" name="removed" value="" />\n
<input type="hidden" name="added" value="" />\n
<input type="hidden" name="modified" value="" />\n
<input type="hidden" name="files" value="" />\n
<!-- End Hidden -->\n
\n
<div id="menudiv" style="opacity: 0.85; position:absolute; display:none; top:0px; left:0px;z-index:10000;" onmouseover="javascript:overpopupmenu=true;" onmouseout="javascript:overpopupmenu=false;">\n
<table cellspacing="1" cellpadding="0" style="width:82px;background-color:#ffffff; border-style: solid; border-width: 1px;">\n
<tr><td>\n
<table style="width: 80px;" cellspacing="0" cellpadding="0">\n
<tr>\n
<td id="item1" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="ls()">Infos</td>\n
</tr>\n
<tr>\n
<td id="item2" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="viewDiff(1,document.getElementById(\'main_form\'))">Diff</td>\n
</tr>\n
<tr>\n
<td id="item3" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="log()"> History</td>\n
</tr>\n
<tr>\n
<td id="item4" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="commit(1,document.getElementById(\'main_form\'))">Commit</td>\n
</tr>\n
<tr>\n
<td id="item5" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="revert(1,document.getElementById(\'main_form\')">Revert</td>\n
</tr>\n
</table>\n
</td></tr>\n
</table>\n
</div>\n
\n
<br/>\n
<div style="color: black; font-weight: bold;" tal:define="repos_url python:context.getPortalObject()[\'portal_subversion\'].info(context)[\'url\']">\n
Repository URL: <a tal:attributes="href repos_url" tal:content="repos_url"></a>\n
</div><br/>\n
<button type="button" onclick="treeTaller()">Taller</button>\n
<button type="button" onclick="treeShorter()">Shorter</button>\n
<div id="splashScreen" style="position:absolute;z-index:5;top:40%;left:35%; width: 300px; background-color: #cccccc; opacity: 0.6; border-style: solid; vertical-align: middle; text-align: center; color: #000066; font-weight: bold; border-width: 1px;">\n
<br/><br/><br/>\n
Checking for changes.<br/><br/>\n
Please wait...<br/><br/><br/><br/>\n
</div>\n
<div \n
id="treebox1" \n
style="width:98%; height: 300px;background-color:#f5f5f5;border :1px solid Silver;overflow:auto;">\n
</div>\n
<div id="captionWindow" class="window" style="right:20px;left:auto;top:140px;width:120px;background-color:#dae6e6;border-color:#ebf8f8 #c0caca #c0caca #c0caca;">\n
<div class="titleBar" style="background-color:#dae6e6;color:black;">\n
<span class="titleBarText">Legend -- SVN</span>\n
<img class="titleBarButtons" alt="" src="imgs/altbuttons.gif" longdesc="imgs/altbuttonslow.gif" usemap="#sampleMap3" />\n
<map id="sampleMap3" name="sampleMap3">\n
<area shape="rect" coords="0,0,15,13" href="" alt="" title="Minimize" onclick="this.parentWindow.minimize();return false;" />\n
<area shape="rect" coords="16,0,31,13" href="" alt="" title="Restore" onclick="this.parentWindow.restore();return false;" />\n
<area shape="rect" coords="34,0,49,13" href="" alt="" title="Close" onclick="this.parentWindow.close();return false;" />\n
</map>\n
</div>\n
<div class="clientArea" style="background-color:#fffdfd;color:#806040;border-color:#c0caca #c0caca #c0caca #c0caca;text-align:center;">\n
<div style="font-weight: bold; color: black; text-align: center;">Legend</div><hr/>\n
<div style="color: green">Added files</div>\n
<div style="color: orange">Modified files</div>\n
<div style="color: red">Removed files</div>\n
<div style="color: grey">Conflicted files</div>\n
<div style="color: black">Unmodified files</div>\n
</div>\n
</div>\n
\n
<script type="text/javascript">\n
winInit();\n
if (winList[\'captionWindow\']){\n
winList[\'captionWindow\'].open();\n
}\n
\n
function hideObject() {\n
\t if (ns4) {\n
\t splash.visibility = "hide";\n
\t }\n
\t if (ie4 || upLevel) {\n
\t splash.style.visibility = "hidden";\n
}\n
\t}\n
\n
</script>\n
<input name="showUnmodified" value="showUnmodified" type="checkbox" onclick="showNormalFiles()"/> <span style="color: black;">Show unmodified files</span>\n
<script type="text/javascript">\n
// Menu Customization\n
var MenuToolBar=new CreateToolBarMenu("#dae6e6", "#ffffff", "#b1bbbb", "#6699ff", "font-family:verdana;font-size:11px;color:black;font-weight:bold", 16, 16)\n
MenuToolBar.Add("imgs/captionoff.png", "imgs/captionon.png", "Show Legend", "#", "winList[\'captionWindow\'].open();");\n
MenuToolBar.Add("imgs/expandoff.png", "imgs/expandon.png", "Expand / Collapse", "#", "expandCollapse();");\n
MenuToolBar.Add("imgs/diffoff.png", "imgs/diffon.png", "View Diff", "#", "viewDiff(0,document.getElementById(\'main_form\'));");\n
MenuToolBar.Add("imgs/execoff.png", "imgs/execon.png", "Commit Changes", "#", "commit(0,document.getElementById(\'main_form\'));");\n
MenuToolBar.Add("imgs/revertoff.png", "imgs/reverton.png", "Revert Changes", "#", "revert(0,document.getElementById(\'main_form\'));");\n
// Menu Display\n
MenuToolBar.Display();\n
doOnLoad();\n
</script>\n
</tal:block>\n
</tal:block>\n
</script>\n
</tal:block>\n
</tal:block>\n
</tal:block>
]]></string> </value>
......
......@@ -61,9 +61,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>right</string>
<string>left</string>
<string>center</string>
<string>bottom</string>
</list>
</value>
......@@ -73,31 +70,13 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>right</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -61,7 +61,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>left</string>
</list>
</value>
</item>
......@@ -70,7 +70,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_preferred_subversion_user_name</string>
......
......@@ -68,21 +68,14 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
return \'\'\'<script>\n
\n
function doCommit(form){\n
submitAction(form,\'%(absURL)s/BusinessTemplate_doSvnCommit\');\n
<value> <string>return \'\'\'function doCommit(form){\n
submitAction(form,\'BusinessTemplate_doSvnCommit\');\n
}\n
\n
function goBack(){\n
open(\'%(absURL)s/BusinessTemplate_viewSvnStatus?do_extract=False\', \'_self\');\n
} \n
</script>\'\'\'% {\'absURL\' : context.absolute_url(), }\n
]]></string> </value>
open(\'BusinessTemplate_viewSvnStatus?do_extract=False\', \'_self\');\n
}\'\'\'\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
......@@ -92,7 +85,7 @@ return \'\'\'<script>\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff</string> </value>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_svn/js/BusinessTemplate_doCreateJavaScriptDiff</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -121,10 +114,7 @@ return \'\'\'<script>\n
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
</tuple>
<tuple/>
</value>
</item>
</dictionary>
......
......@@ -80,8 +80,7 @@ if "files" in context.REQUEST.keys():\n
else:\n
files = None\n
\n
print \'\'\'\n
<script>\n
return \'\'\'\n
var tree = null;\n
var business_template;\n
var is_expanded=false;\n
......@@ -101,6 +100,36 @@ print \'\'\'\n
} else if(document.all) {\n
var ie4 = true;\n
}\n
\n
function showObject() {\n
if (ns4) {\n
var splash = document.splashScreen;\n
\tsplash.visibility = "visible";\n
}\n
if (ie4) {\n
var splash = document.all.splashScreen;\n
\tsplash.style.visibility = "visible";\n
}\n
if (upLevel){\n
var splash = document.getElementById("splashScreen");\n
splash.style.visibility = "visible";\n
}\n
}\n
\n
function hideObject() {\n
if (ns4) {\n
var splash = document.splashScreen;\n
\t splash.visibility = "hide";\n
}\n
if (ie4) {\n
var splash = document.all.splashScreen;\n
\t splash.style.visibility = "hidden";\n
}\n
if (upLevel){\n
var splash = document.getElementById("splashScreen");\n
splash.style.visibility = "hidden";\n
}\n
}\n
\n
function preLoadImages(){\n
var imSrcAr = new \n
......@@ -114,6 +143,7 @@ print \'\'\'\n
\n
function doOnLoad(){\n
preLoadImages();\n
\n
tree=new dhtmlXTreeObject(document.getElementById(\'treebox1\'),\'100%%\',\'100%%\',0);\n
tree.setImagePath(\'imgs/\');\n
tree.setDragHandler();\n
......@@ -210,7 +240,7 @@ print \'\'\'\n
if (nbRemoved==0 && nbAdded==0 && nbModified==0) {\n
alert(\'Nothing to commit !\');\n
} else {\n
submitAction(form,\'%(absURL)s/BusinessTemplate_doSvnCommit\');\n
submitAction(form,\'BusinessTemplate_doSvnCommit\');\n
}\n
}\n
\n
......@@ -264,7 +294,7 @@ print \'\'\'\n
alert("Nothing to revert !");\n
} else {\n
if(confirm(\'Are you sure you want to revert changes?\')){\n
submitAction(form,\'%(absURL)s/BusinessTemplate_doSvnRevert\');\n
submitAction(form,\'BusinessTemplate_doSvnRevert\');\n
}\n
}\n
}\n
......@@ -317,7 +347,7 @@ print \'\'\'\n
if (nbRemoved==0 && nbAdded==0 && nbModified==0) {\n
alert(\'Nothing to diff !\');\n
} else {\n
submitAction(form,\'%(absURL)s/BusinessTemplate_viewSvnDiff\');\n
submitAction(form,\'BusinessTemplate_viewSvnDiff\');\n
}\n
}\n
\n
......@@ -369,46 +399,43 @@ print \'\'\'\n
document.onmousemove = getMouse;\n
\n
function update(){\n
open(\'%(absURL)s/BusinessTemplate_doSvnUpdate\', \'_self\');\n
open(\'BusinessTemplate_doSvnUpdate\', \'_self\');\n
}\n
\n
function infos(){\n
open(\'%(absURL)s/BusinessTemplate_doSvnInfo\', \'_self\');\n
open(\'BusinessTemplate_doSvnInfo\', \'_self\');\n
}\n
\n
function cleanup(){\n
open(\'%(absURL)s/BusinessTemplate_doSvnCleanup\', \'_self\');\n
open(\'BusinessTemplate_doSvnCleanup\', \'_self\');\n
}\n
\n
function log(){\n
//hide popup\n
document.getElementById(\'menudiv\').style.display = "none";\n
open(\'%(absURL)s/BusinessTemplate_doSvnLog?added=\'+tree.getSelectedItemId(), \'_self\');\n
open(\'BusinessTemplate_doSvnLog?added=\'+tree.getSelectedItemId(), \'_self\');\n
}\n
\n
function ls(){\n
//hide popup\n
document.getElementById(\'menudiv\').style.display = "none";\n
open(\'%(absURL)s/BusinessTemplate_doSvnLs?added=\'+tree.getSelectedItemId(), \'_self\');\n
open(\'BusinessTemplate_doSvnLs?added=\'+tree.getSelectedItemId(), \'_self\');\n
}\n
\n
function treeTaller(){\n
if(curHeight < 1000){\n
curHeight += 100;\n
document.getElementById(\'MainTreeTD\').style.height = curHeight+"px";\n
document.getElementById(\'treebox1\').style.height = curHeight+"px";\n
}\n
}\n
\n
function treeShorter(){\n
if(curHeight > 200){\n
curHeight -= 100;\n
document.getElementById(\'MainTreeTD\').style.height = curHeight+"px";\n
document.getElementById(\'treebox1\').style.height = curHeight+"px";\n
}\n
}\n
</script>\n
\'\'\'% {\'btId\' : context.getId(), \'absURL\' : context.absolute_url(), \'extract\' : do_extract}\n
\n
return printed\n
\'\'\'% {\'btId\' : context.getId(), \'extract\' : do_extract}\n
]]></string> </value>
......@@ -421,7 +448,7 @@ return printed\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus</string> </value>
<value> <string>Script (Python):/nexedi/portal_skins/erp5_svn/js/BusinessTemplate_doCreateJavaScriptStatus</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -451,8 +478,6 @@ return printed\n
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_print_</string>
<string>_print</string>
<string>_getattr_</string>
<string>context</string>
<string>do_extract</string>
......
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts45550322.52</string> </value>
<value> <string>ts50974111.7</string> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
......@@ -62,15 +62,15 @@
\n
function DisplayToolBarMenu() {\n
if (document.getElementById || document.all) {\n
var Z="<TABLE border=0 cellpadding=1 cellspacing=1><TR>";\n
var Z="<div style=\'text:align: center;\'><table cellpadding=\'1\' cellspacing=\'1\' style=\'border:0;margin-left:auto; margin-right:auto;\'><tr>";\n
for (var i=0; i<this.nb; i++) {\n
Z+="<TD onMouseOver=\'DisplayToolBarMenuOver(this,"+i+")\' onMouseOut=\'DisplayToolBarMenuOut(this,"+i+")\' onMouseDown=\'DisplayToolBarMenuDown(this,"+i+")\' onClick=\'DisplayToolBarMenuClick(this,"+i+")\' style=\'border-style:solid;border-width:1px;border-color:"+this.colBackground+";"+this.style+";cursor:pointer\'><IMG name=\'MenuToolBarIMG"+i+"\' src=\'"+this[i].imgOff+"\' border=0 width="+this.width+" height="+this.height+" align=top>&nbsp;"+this[i].text+"</TD>";\n
Z+="<td onMouseOver=\'DisplayToolBarMenuOver(this,"+i+")\' onMouseOut=\'DisplayToolBarMenuOut(this,"+i+")\' onMouseDown=\'DisplayToolBarMenuDown(this,"+i+")\' onClick=\'DisplayToolBarMenuClick(this,"+i+")\' style=\'border-style:solid;border-width:1px;border-color:"+this.colBackground+";"+this.style+";cursor:pointer\'><img name=\'MenuToolBarIMG"+i+"\' src=\'"+this[i].imgOff+"\' border=0 width="+this.width+" height="+this.height+" align=top>&nbsp;"+this[i].text+"</TD>";\n
}\n
Z+="</TR></TABLE>";\n
Z+="</tr></table></div";\n
} else {\n
var Z="| &nbsp;";\n
for (var i=0; i<this.nb; i++) {\n
Z+="<A href=\'"+this[i].url+"\' style=\'"+this.style+"\'><IMG name=\'MenuToolBarIMG"+i+"\' src=\\""+this[i].imgOff+"\\" border=0 width="+this.width+" height="+this.height+" align=top>&nbsp;"+this[i].text+"</A>&nbsp;|&nbsp;";\n
Z+="<a href=\'"+this[i].url+"\' style=\'"+this.style+"\'><img name=\'MenuToolBarIMG"+i+"\' src=\\""+this[i].imgOff+"\\" border=0 width="+this.width+" height="+this.height+" align=top>&nbsp;"+this[i].text+"</a>&nbsp;|&nbsp;";\n
}\n
}\n
document.write(Z);\n
......@@ -131,7 +131,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>3561</int> </value>
<value> <int>3648</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
2006-06-22 chris
* erp5Subversion is now XHTML Strict compliant
* erp5Subversion works with erp5_xhtml_style
2006-06-12 chris
* added Shorted/Taller buttons to adjust tree height
......
0.8.0
\ No newline at end of file
0.8.1
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment