Commit a81f3485 authored by Christophe Dumez's avatar Christophe Dumez

2006-05-24 chris

* XHTML compliant

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7482 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4a81e103
......@@ -70,12 +70,11 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
#params modified,added,removed\n
modified=context.REQUEST["modified"]\n
added=context.REQUEST["added"]\n
removed=context.REQUEST["removed"]\n
\n
print "<br><font color=\'black\'>"\n
print \'<br/><font color="black">\'\n
tab_Modified=modified.split(\',\')\n
tab_Added=added.split(\',\')\n
tab_Removed=removed.split(\',\')\n
......@@ -87,7 +86,7 @@ if modified != \'none\':\n
edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n
if(edit_path != \'#\'):\n
print "<a href=\'"+edit_path+"\'><img src=\'imgs/edit.png\' border=\'0\'></a>"\n
print \'<br><hr></font></b>\'\n
print \'</font></b><br/><hr/>\'\n
print context.getPortalObject()["portal_subversion"].diffHTML(f, context)\n
\n
if added != \'none\':\n
......@@ -97,8 +96,8 @@ if added != \'none\':\n
edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n
if(edit_path != \'#\'):\n
print "<a href=\'"+edit_path+"\'><img src=\'imgs/edit.png\' border=\'0\'></a>"\n
print \'<br><hr></font></b>\'\n
print "<font color=\'green\'>File Added</font><br><br>"\n
print \'</font></b><br/><hr/>\'\n
print \'<font color="green">File Added</font><br/><br/>\'\n
\n
if removed != \'none\':\n
for f in tab_Removed:\n
......@@ -107,8 +106,8 @@ if removed != \'none\':\n
edit_path = context.getPortalObject()["portal_subversion"].editPath(context, f)\n
if(edit_path != \'#\'):\n
print "<a href=\'"+edit_path+"\'><img src=\'imgs/edit.png\' border=\'0\'></a>"\n
print \'<br><hr></font></b>\'\n
print "<font color=\'red\'>File Removed</font><br><br>"\n
print \'</font></b><br/><hr/>\'\n
print "<font color=\'red\'>File Removed</font><br/><br/>"\n
\n
print \'</font>\'\n
return printed\n
......
......@@ -84,7 +84,7 @@ if not log_list:\n
\n
object_list = []\n
for my_dict in log_list:\n
my_dict[\'message\']=\'<br>\'.join(my_dict[\'message\'].split(\'\\n\'))\n
my_dict[\'message\']=\'<br/>\'.join(my_dict[\'message\'].split(\'\\n\'))\n
my_dict[\'uid\']=my_dict[\'revision\']\n
temp_object = newTempBase(folder=context.getPortalObject(), id=\'1234\')\n
temp_object.edit(**my_dict)\n
......
......@@ -98,7 +98,7 @@ if not log_list:\n
\n
object_list = []\n
for my_dict in log_list:\n
my_dict[\'message\']=\'<br>\'.join(my_dict[\'message\'].split(\'\\n\'))\n
my_dict[\'message\']=\'<br/>\'.join(my_dict[\'message\'].split(\'\\n\'))\n
my_dict[\'uid\']=my_dict[\'revision\']\n
temp_object = newTempBase(folder=context.getPortalObject(), id=\'1234\')\n
temp_object.edit(**my_dict)\n
......
......@@ -84,8 +84,8 @@ if len(revisions_list) != 2:\n
\n
revisions_list.sort()\n
\n
diff = "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file, context)+"\'>"+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file, context)+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
diff += \'<hr></b>\'\n
diff = "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file, context)+"\'>"+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file, context)+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br/>"\n
diff += \'<hr/></b>\'\n
diff += context.getPortalObject()["portal_subversion"].diffHTML(file, context, revision1=revisions_list[0], revision2=revisions_list[1])\n
diff += \'</font>\'\n
return context.asContext(diff=diff).BusinessTemplate_viewSvnMultiDiff()\n
......
......@@ -55,9 +55,9 @@
<tal:block metal:use-macro="here/view_master/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
<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
<tal:js replace="structure \n
here/BusinessTemplate_doCreateJavaScriptDiff">JavaScript here</tal:js>\n
......
......@@ -48,18 +48,17 @@
<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
<!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
\n
<tal:block metal:use-macro="here/view_master/macros/master">\n
<tal:block metal:fill-slot="main">\n
\n
<tal:block tal:define="dict context/entry_dict">\n
<font color=\'black\'>\n
<br>\n
<center><h1>Working Copy Informations</h1></center><br>\n
<center><table width=\'60%%\' border=\'1\'>\n
<font color="black">\n
<br/>\n
<center><h1>Working Copy Informations</h1></center><br/>\n
<center><table width="60%%" border="1">\n
<tr height="18px"><td><b>Repository URL</b></td><td tal:content="python:dict[\'url\']">url</td></tr>\n
<tr height="18px"><td><b>Repository UUID</b></td><td tal:content="python:dict[\'uuid\']">uuid</td></tr>\n
<tr height="18px"><td><b>Revision</b></td><td tal:content="python:dict[\'revision\']">revision</td></tr>\n
......@@ -69,7 +68,7 @@
<tr height="18px"><td><b>Last Commit Time</b></td><td tal:content="python:dict[\'commit_time\']">last time</td></tr>\n
</table></center>\n
</font>\n
<br><br>\n
<br/><br/>\n
<center><button onclick="history.back()" value="back" name="back" type="button">Back</button>\n
</center>\n
</tal:block>\n
......
......@@ -77,7 +77,7 @@ context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\
\n
root = context.getPortalObject().portal_subversion.getModifiedTree(context, show_unmodified)\n
if not root:\n
return \'\'\'<?xml version=\'1.0\' encoding=\'iso-8859-1\'?>\n
return \'\'\'<?xml version=\'1.0\' encoding=\'UTF-8\'?>\n
<tree id=\'0\'></tree>\'\'\'\n
\n
return context.getPortalObject().portal_subversion.treeToXML(root, context)\n
......
2006-05-24 chris
* XHTML compliant
2006-05-23 chris
* do not extract business template anymore when going back from diff
......
This diff is collapsed.
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