[interchange-cvs] interchange - jon modified 10 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Mon Apr 29 16:14:00 2002
User: jon
Date: 2002-04-29 20:13:13 GMT
Modified: dist Tag: STABLE_4_8-branch catalog_before.cfg
Modified: dist/foundation/pages Tag: STABLE_4_8-branch aboutus.html
Modified: contact.html
Modified: dist/foundation/products Tag: STABLE_4_8-branch variable.txt
Modified: dist/foundation/templates/foundation/regions Tag:
Modified: STABLE_4_8-branch LEFTONLY_BOTTOM LEFTRIGHT_BOTTOM
Modified: NOLEFT_BOTTOM
Modified: dist/lib/UI/pages/admin Tag: STABLE_4_8-branch help.html
Modified: dist/lib/UI/pages/include Tag: STABLE_4_8-branch
Modified: wizard_checklist
Modified: dist/lib/UI/vars Tag: STABLE_4_8-branch UI_STD_FOOTER
Log:
Templatize IC URL and email address, as done in development trunk.
Simplify check to [if variable MV_DEMO_MODE].
Revision Changes Path
No revision
No revision
2.2.2.2 +5 -2 interchange/dist/catalog_before.cfg
rev 2.2.2.2, prev_rev 2.2.2.1
Index: catalog_before.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/catalog_before.cfg,v
retrieving revision 2.2.2.1
retrieving revision 2.2.2.2
diff -u -u -r2.2.2.1 -r2.2.2.2
--- catalog_before.cfg 13 Dec 2001 20:15:40 -0000 2.2.2.1
+++ catalog_before.cfg 29 Apr 2002 20:13:12 -0000 2.2.2.2
@@ -12,9 +12,12 @@
Variable UI_LOCKING 1
endif
+Variable INTERCHANGE_EMAIL interchange@redhat.com
+Variable INTERCHANGE_URL http://interchange.redhat.com/
+
ifdef @UI
-Variable UI_ABOUT_LOGIN_URL http://www.redhat.com/ecommerce
-Variable UI_ABOUT_NORMAL_URL http://www.redhat.com/ecommerce
+Variable UI_ABOUT_LOGIN_URL http://interchange.redhat.com/
+Variable UI_ABOUT_NORMAL_URL http://interchange.redhat.com/
Variable UI_ACCESS_TABLE access
Variable UI_BOTTOMIMG poweredby.gif
Variable UI_C_ALINK #FF3333
No revision
No revision
2.0.2.1 +2 -2 interchange/dist/foundation/pages/aboutus.html
rev 2.0.2.1, prev_rev 2.0
Index: aboutus.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/aboutus.html,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -u -r2.0 -r2.0.2.1
--- aboutus.html 18 Jul 2001 02:21:14 -0000 2.0
+++ aboutus.html 29 Apr 2002 20:13:12 -0000 2.0.2.1
@@ -54,11 +54,11 @@
<p>
This is a demo store. If you would like further information on how
you can build a store or how you can get custom services, please
- <a href="http://www.redhat.com/ecommerce">visit our web site</a>.
+ <a href="__INTERCHANGE_URL__">visit our web site</a>.
</p>
<p>
- Or send an e-mail to: <a href="mailto:interchange@redhat.com">interchange@redhat.com</a>.
+ Or send an e-mail to: <a href="mailto:__INTERCHANGE_EMAIL__">__INTERCHANGE_EMAIL__</a>.
</p>
</td>
</tr>
2.0.2.1 +2 -3 interchange/dist/foundation/pages/contact.html
rev 2.0.2.1, prev_rev 2.0
Index: contact.html
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/pages/contact.html,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -u -r2.0 -r2.0.2.1
--- contact.html 18 Jul 2001 02:21:14 -0000 2.0
+++ contact.html 29 Apr 2002 20:13:12 -0000 2.0.2.1
@@ -67,10 +67,9 @@
<hr>
<p>If you would like further information on constructing a store
- like this, please contact Red Hat E-Business Solutions:</p>
+ like this, please see the Interchange website:</p>
- <p><a href="http://www.redhat.com/ecommerce">http://www.redhat.com/ecommerce</a><br>
- e-mail: <a href="mailto:interchange@redhat.com">interchange@redhat.com</a></p>
+ <p><a href="__INTERCHANGE_URL__">__INTERCHANGE_URL__</a></p>
</td>
</tr>
No revision
No revision
2.6.2.1 +2 -3 interchange/dist/foundation/products/variable.txt
rev 2.6.2.1, prev_rev 2.6
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/products/variable.txt,v
retrieving revision 2.6
retrieving revision 2.6.2.1
diff -u -u -r2.6 -r2.6.2.1
--- variable.txt 8 Aug 2001 21:46:14 -0000 2.6
+++ variable.txt 29 Apr 2002 20:13:12 -0000 2.6.2.1
@@ -13,7 +13,6 @@
SHIP_DEFAULT_MODE upsg Shipping
DECREMENT_INVENTORY 1 Order
DEFAULT_FONT __MVC_DEFAULTFONT__ Template
-DEFAULT_FONT __MVC_DEFAULTFONT__ Template
DOCROOT __MVC_DOCUMENTROOT__ Directories and Paths
EMAIL_INFO __MVC_EMAILINFO__ Company
EMAIL_SERVICE __MVC_EMAILSERVICE__ Company
@@ -49,8 +48,8 @@
SHIP_FLAT_INTL_RATE 10 Shipping
SHIP_FLAT_DOM_RATE 5 Shipping
TOLLFREE __MVC_TOLLFREE__ Company
-UI_ABOUT_LOGIN_URL http://www.redhat.com/ecommerce Admin layout
-UI_ABOUT_NORMAL_URL http://www.redhat.com/ecommerce Admin layout
+UI_ABOUT_LOGIN_URL http://interchange.redhat.com/ Admin layout
+UI_ABOUT_NORMAL_URL http://interchange.redhat.com/ Admin layout
UI_ADMIN_TABLES mv_metadata locale variable dict icmenu ichelp route access Admin control
UI_BOTTOMIMG poweredby.gif Admin layout
UI_HELP_HEIGHT 480 Admin layout
No revision
No revision
2.0.2.1 +2 -2 interchange/dist/foundation/templates/foundation/regions/LEFTONLY_BOTTOM
rev 2.0.2.1, prev_rev 2.0
Index: LEFTONLY_BOTTOM
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/foundation/regions/LEFTONLY_BOTTOM,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -u -r2.0 -r2.0.2.1
--- LEFTONLY_BOTTOM 18 Jul 2001 02:21:38 -0000 2.0
+++ LEFTONLY_BOTTOM 29 Apr 2002 20:13:12 -0000 2.0.2.1
@@ -1,8 +1,8 @@
[include file="templates/components/[control component none]" group=content][control]
<center>
- <p><a href="http://www.redhat.com/ecommerce"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
- [if type=explicit compare="__MV_DEMO_MODE__"]
+ <p><a href="__INTERCHANGE_URL__"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
2.0.2.1 +2 -2 interchange/dist/foundation/templates/foundation/regions/LEFTRIGHT_BOTTOM
rev 2.0.2.1, prev_rev 2.0
Index: LEFTRIGHT_BOTTOM
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/foundation/regions/LEFTRIGHT_BOTTOM,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -u -r2.0 -r2.0.2.1
--- LEFTRIGHT_BOTTOM 18 Jul 2001 02:21:38 -0000 2.0
+++ LEFTRIGHT_BOTTOM 29 Apr 2002 20:13:12 -0000 2.0.2.1
@@ -1,8 +1,8 @@
[include file="templates/components/[control component none]" group=content][control]
<center>
- <p><a href="http://www.redhat.com/ecommerce"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
- [if type=explicit compare="__MV_DEMO_MODE__"]
+ <p><a href="__INTERCHANGE_URL__"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
2.0.2.1 +2 -2 interchange/dist/foundation/templates/foundation/regions/NOLEFT_BOTTOM
rev 2.0.2.1, prev_rev 2.0
Index: NOLEFT_BOTTOM
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/foundation/regions/NOLEFT_BOTTOM,v
retrieving revision 2.0
retrieving revision 2.0.2.1
diff -u -u -r2.0 -r2.0.2.1
--- NOLEFT_BOTTOM 18 Jul 2001 02:21:38 -0000 2.0
+++ NOLEFT_BOTTOM 29 Apr 2002 20:13:12 -0000 2.0.2.1
@@ -1,6 +1,6 @@
<center>
- <p><a href="http://www.redhat.com/ecommerce"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
- [if type=explicit compare="__MV_DEMO_MODE__"]
+ <p><a href="__INTERCHANGE_URL__"><img src="__THEME_IMG_DIR__poweredby.gif" border="0"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
No revision
No revision
2.1.2.3 +2 -2 interchange/dist/lib/UI/pages/admin/help.html
rev 2.1.2.3, prev_rev 2.1.2.2
Index: help.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/help.html,v
retrieving revision 2.1.2.2
retrieving revision 2.1.2.3
diff -u -u -r2.1.2.2 -r2.1.2.3
--- help.html 18 Sep 2001 22:10:46 -0000 2.1.2.2
+++ help.html 29 Apr 2002 20:13:12 -0000 2.1.2.3
@@ -137,8 +137,8 @@
<hr noshade size=2 width="100%">
<p><font face="[scratch fontface]" size=1>
-<b><a href="http://www.redhat.com/ecommerce" target="_new">Interchange</a> -
-<a href="http://www.redhat.com/" target="_new">© 2001 Red Hat, Inc.</a></b>
+<b><a href="__INTERCHANGE_URL__" target="_new">Interchange</a> -
+<a href="http://www.redhat.com/" target="_new">© 1996-2002 Red Hat, Inc.</a></b>
</font></p>
</td>
No revision
No revision
2.0.2.3 +1 -1 interchange/dist/lib/UI/pages/include/wizard_checklist
rev 2.0.2.3, prev_rev 2.0.2.2
Index: wizard_checklist
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/wizard_checklist,v
retrieving revision 2.0.2.2
retrieving revision 2.0.2.3
diff -u -u -r2.0.2.2 -r2.0.2.3
--- wizard_checklist 23 Nov 2001 12:57:28 -0000 2.0.2.2
+++ wizard_checklist 29 Apr 2002 20:13:13 -0000 2.0.2.3
@@ -91,7 +91,7 @@
"][L]Retrieve saved values[/L]</A>
[/if]
</p>
-[if type=explicit compare="__MV_DEMO_MODE__"]
+[if variable MV_DEMO_MODE]
<p>(For testing convenience:)<br>
[page __UI_BASE__/wizard/demo_init][L]Set some starting values[/L]</A><br>
[page __UI_BASE__/wizard/demo_zero][L]Zero the values[/L]</A></p>
No revision
No revision
2.0.2.5 +2 -2 interchange/dist/lib/UI/vars/UI_STD_FOOTER
rev 2.0.2.5, prev_rev 2.0.2.4
Index: UI_STD_FOOTER
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/vars/UI_STD_FOOTER,v
retrieving revision 2.0.2.4
retrieving revision 2.0.2.5
diff -u -u -r2.0.2.4 -r2.0.2.5
--- UI_STD_FOOTER 19 Feb 2002 09:47:47 -0000 2.0.2.4
+++ UI_STD_FOOTER 29 Apr 2002 20:13:13 -0000 2.0.2.5
@@ -21,7 +21,7 @@
<td valign="top" align="left" nowrap>
<table cellpadding="0" cellspacing="0">
<tr><td nowrap>
- <font size="1"> <a href="http://interchange.redhat.com/"><font size="1"><b>Red Hat Interchange™</b></font></a><font size="1"><b> - © 2000-2002 Red Hat, Inc.</font></font>
+ <font size="1"> <a href="__INTERCHANGE_URL__"><font size="1"><b>Interchange</b></font></a><font size="1"><b> - © 2000-2002 Red Hat, Inc.</font></font>
</td></tr>
<tr><td nowrap>
<font size="1"> [msg]Username[/msg]: [either][data session username][or](none)[/either] [msg]StoreID[/msg]: <A HREF="[scratch ui_catalog_url]">[calc]$Config->{CatalogName}[/calc] </b></a></font>
@@ -44,7 +44,7 @@
<A href="[area __UI_BASE__/login]"><small>[msg]Log out[/msg]</small></A>
</td>
<td valign="top" align="right" nowrap>
- <a href="http://www.redhat.com/ecommerce"><img border="0" src="poweredby.gif" align="top"></a>
+ <a href="__INTERCHANGE_URL__"><img border="0" src="poweredby.gif" align="top"></a>
</td>
</tr>
</table>