[CMF-checkins] CVS: CMF - actions_box.dtml:1.7 folder_contents.dtml:1.6 folder_rename_form.dtml:1.5 search.dtml:1.5
tseaver@digicool.com
tseaver@digicool.com
Thu, 31 May 2001 22:32:23 -0400 (EDT)
Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory korak.digicool.com:/tmp/cvs-serv23433/CMFDefault/skins/generic
Modified Files:
actions_box.dtml folder_contents.dtml folder_rename_form.dtml
search.dtml
Log Message:
- Remove BASEPATH hackery from DTML Methods (use portal_url instead)
Tracker issue #259.
--- Updated File actions_box.dtml in package CMF --
--- actions_box.dtml 2001/04/09 20:21:06 1.6
+++ actions_box.dtml 2001/06/01 02:32:22 1.7
@@ -44,7 +44,7 @@
objID="obj.getId()"
>
<dtml-if icon>
- <img src="&dtml-BASEPATH1;/&dtml-icon;" align="left" alt="&dtml-typ;" />
+ <img src="&dtml-portal_url;/&dtml-icon;" align="left" alt="&dtml-typ;" />
</dtml-if>
<dtml-var objID size=15 html_quote>
</dtml-let>
--- Updated File folder_contents.dtml in package CMF --
--- folder_contents.dtml 2001/04/09 20:21:06 1.5
+++ folder_contents.dtml 2001/06/01 02:32:22 1.6
@@ -90,7 +90,7 @@
<td>
<dtml-if icon>
<a href="&dtml.url_quote-getId;&dtml-methodID;"
- ><img src="&dtml-BASEPATH1;/&dtml-icon;"
+ ><img src="&dtml-portal_url;/&dtml-icon;"
alt="&dtml-Type;" border="0"></a>
</dtml-if>
</td>
--- Updated File folder_rename_form.dtml in package CMF --
--- folder_rename_form.dtml 2001/04/09 20:21:06 1.4
+++ folder_rename_form.dtml 2001/06/01 02:32:22 1.5
@@ -5,52 +5,52 @@
<dtml-if cb_isMoveable>
<div class="Desktop">
-<H1> Rename <dtml-var meta_type> </H2>
+<h1> Rename <dtml-var meta_type> </H2>
-<FORM ACTION="folder_rename" METHOD="POST">
-<TABLE class="FormLayout">
-<TR>
- <TD ALIGN="LEFT" VALIGN="TOP">
+<form action="folder_rename" method="POST">
+<table class="FormLayout">
+<tr>
+ <td align="left" valign="top">
<dtml-let getIcon="_.hasattr(this(), 'getIcon') and getIcon()"
icon="getIcon or _.getattr(this(), 'icon', '')">
<dtml-if icon>
- <IMG SRC="&dtml-BASEPATH1;/&dtml-icon;" ALT="" BORDER="0">
+ <img src="&dtml-portal_url;/&dtml-icon;" alt="" border="0">
</dtml-if></dtml-let>
- </TD>
- <TD ALIGN="LEFT" VALIGN="TOP">
+ </td>
+ <td align="left" valign="top">
<dtml-var getId>
- </TD>
-</TR>
-<TR>
- <TD ALIGN="LEFT" VALIGN="TOP">
- <STRONG>to:</STRONG>
- </TD>
- <TD ALIGN="LEFT" VALIGN="TOP">
- <INPUT TYPE="TEXT" NAME="new_id" value="&dtml-getId;" SIZE="20">
- </TD>
-</TR>
-<TR>
-<TD></TD>
-<TD>
- <INPUT TYPE="HIDDEN" NAME="id" VALUE="&dtml-getId;">
- <INPUT TYPE="submit" VALUE=" Ok ">
-</TD>
-</TR>
-</TABLE>
-</FORM>
+ </td>
+</tr>
+<tr>
+ <td align="left" valign="top">
+ <strong>to:</strong>
+ </td>
+ <td align="left" valign="top">
+ <input type="text" name="new_id" value="&dtml-getId;" size="20">
+ </td>
+</tr>
+<tr>
+<td></td>
+<td>
+ <input type="hidden" name="id" value="&dtml-getId;">
+ <input type="submit" value=" Ok ">
+</td>
+</tr>
+</table>
+</form>
<dtml-else>
-<FORM ACTION="folder_contents" METHOD="GET">
-<p>The item <EM>&dtml-getId;</EM> does not support this operation.</P>
-<INPUT TYPE="submit" NAME="submit" VALUE=" Ok ">
-</FORM>
+<form action="folder_contents" method="get">
+<p>The item <em>&dtml-getId;</em> does not support this operation.</P>
+<input type="submit" name="submit" value=" Ok ">
+</form>
</dtml-if>
</dtml-with>
<dtml-else>
-<FORM ACTION="folder_contents" METHOD="GET">
+<form action="folder_contents" method="get">
<p>You must select an item to rename.</p>
-<INPUT TYPE="submit" NAME="submit" VALUE=" Ok ">
-</FORM>
+<input type="submit" name="submit" value=" Ok ">
+</form>
</dtml-if>
--- Updated File search.dtml in package CMF --
--- search.dtml 2001/04/09 20:21:06 1.4
+++ search.dtml 2001/06/01 02:32:22 1.5
@@ -29,7 +29,7 @@
<td>
<dtml-if getIcon>
<a href="&dtml-objURL;"><img
- src="&dtml-BASEPATH1;/&dtml-getIcon;" border="0"
+ src="&dtml-portal_url;/&dtml-getIcon;" border="0"
alt="[&dtml.missing-Type;]"
title="[&dtml.missing-Type;]"></a>
</dtml-if>