[interchange-cvs] interchange - jon modified 14 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Wed Apr 17 13:56:00 2002
User: jon
Date: 2002-04-17 17:55:49 GMT
Modified: . README
Modified: dist catalog_before.cfg
Modified: dist/foundation/templates/sampledata/tools/products
Modified: products.txt
Modified: dist/lib/UI/locales README
Modified: lib/Vend MakeCat.pm
Modified: scripts newcat.PL
Modified: dist/foundation/pages aboutus.html contact.html
Modified: dist/foundation/templates/foundation/regions LEFTONLY_BOTTOM
Modified: LEFTRIGHT_BOTTOM NOLEFT_BOTTOM
Modified: dist/lib/UI/pages/admin help.html
Modified: dist/lib/UI/pages/include wizard_checklist
Modified: dist/lib/UI/vars UI_STD_FOOTER
Log:
Some fluffy changes:
* use [if variable MV_DEMO_MODE] instead of the more cumbersome
[if type=explicit compare="__MV_DEMO_MODE__"] (which I think was my
doing in the first place :)
* add global INTERCHANGE_URL and INTERCHANGE_EMAIL variables to be used
for the Interchange developer website & email contact points, instead
of hard-coded stuff
* standardize on the short form "Interchange" for the application name.
* update a few URLs, etc.
Revision Changes Path
2.7 +4 -4 interchange/README
rev 2.7, prev_rev 2.6
Index: README
===================================================================
RCS file: /var/cvs/interchange/README,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -u -r2.6 -r2.7
--- README 11 Dec 2001 03:07:02 -0000 2.6
+++ README 17 Apr 2002 17:55:48 -0000 2.7
@@ -4,7 +4,7 @@
Interchange 4.9.0
-Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
+Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
Originally based on Vend 0.2 and 0.3, copyright 1995-96 by Andrew M. Wilcox.
@@ -13,9 +13,9 @@
This program is offered without warranty of any kind. We are interested
in problems, suggestions, or comments, but do not offer free individual
support in most cases. Our professional services group offers paid
-consulting services, which are detailed at:
+consulting services. Learn more at:
-http://www.redhat.com/ecommerce
+http://interchange.redhat.com/
-----------------------------------------------------------------------------
@@ -106,7 +106,7 @@
may not be available if you are not using an SQL database such as
MySQL or PostgreSQL.
-Visit http://demo.akopia.com/ to see a live demo on our servers.
+Visit http://demo.interchange.redhat.com/ to see a live demo on our servers.
-----------------------------------------------------------------------------
2.4 +5 -2 interchange/dist/catalog_before.cfg
rev 2.4, prev_rev 2.3
Index: catalog_before.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/catalog_before.cfg,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- catalog_before.cfg 13 Dec 2001 21:10:04 -0000 2.3
+++ catalog_before.cfg 17 Apr 2002 17:55:48 -0000 2.4
@@ -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
2.2 +3 -3 interchange/dist/foundation/templates/sampledata/tools/products/products.txt
rev 2.2, prev_rev 2.1
Index: products.txt
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/sampledata/tools/products/products.txt,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- products.txt 9 Aug 2001 21:36:04 -0000 2.1
+++ products.txt 17 Apr 2002 17:55:48 -0000 2.2
@@ -13,9 +13,9 @@
os28057c 10 Penny Nails 10 Penny Nails Perfect for all situations our titanium 10 Penny nails should be a part of every project. Box count about 100 nails. os28057c_b.gif os28057c.gif 13.99 11 Hardware Nails 1 1
os28062 Electricians Plier Set Electricians Plier Set This electricians set includes heavy duty needle-nose pliers and wire cutters. The needle-nose pliers have an extended tip making them easy to get into those hard to reach places, and the cutters are equipped with spring action so they bounce back ready for the next cut. os28062_b.gif os28062.gif 24.99 19 Hand Tools Pliers 1 1 set
os28064 Mechanics Wrench Set Mechanics Wrench Set This 5 piece set is ideal for all mechanics. Available in standard and metric sizes these tools are guaranteed to cover all of your needs. os28064_b.gif os28064.gif 19.99 16 Hand Tools Wrenches 1 2 standard, metric
-os28065 Mechanics Pliers Mechanics Pliers Our Mechanics pliers are available in multiple sizes for all of your needs. From 1/4" to 3" in diameter. os28065_b.gif os28065.gif 18.99 14 Hand Tools Pliers 1 2 1/4", 1/2", 3/4", 1", 2", 3"
-os28066 Big L Carpenters Square Big L Carpenters Square The "Big L"is a must for every carpenter. Designed for ease of use this square is perfect for measuring and marking cuts, insuring that you get the right cut every time! os28066_b.gif os28066.gif 14.99 12 Measuring Tools Squares 1 1 1', 3'
-os28068a Breathe Right Face Mask Breathe Right Face Mask The unique design of our "Breathe Right" face mask is a must for all applications. Our patented micro-fiber insures that 90% of all dust and harmful materials are filtered out before you breath them in. os28068a_b.gif os28068a.gif 5.99 4 Safety Equipment Breathing Protection 1 1
+os28065 Mechanics Pliers Mechanics Pliers Our mechanics pliers are available in multiple sizes for all of your needs. From 1/4" to 3" in diameter. os28065_b.gif os28065.gif 18.99 14 Hand Tools Pliers 1 2 1/4", 1/2", 3/4", 1", 2", 3"
+os28066 Big L Carpenters Square Big L Carpenters Square The "Big L" is a must for every carpenter. Designed for ease of use, this square is perfect for measuring and marking cuts, ensuring that you get the right cut every time! os28066_b.gif os28066.gif 14.99 12 Measuring Tools Squares 1 1 1', 3'
+os28068a Breathe Right Face Mask Breathe Right Face Mask The unique design of our "Breathe Right" face mask is a must for all applications. Our patented micro-fiber insures that 90% of all dust and harmful materials are filtered out before you breathe them in. os28068a_b.gif os28068a.gif 5.99 4 Safety Equipment Breathing Protection 1 1
os28068b The Bug Eye Wear The Bug Eye Wear Nothing protects your vision like "The Bug". The unique design of these safety goggles is practically impenetrable and our special venting technology will make you forget you even have them on. os28068b_b.gif os28068b.gif 12.00 10 Safety Equipment Eye Protection 1 1
os28069 Flat Top Toolbox Flat Top Toolbox This heavy weight tool box is perfect for any handy person. The lift out top is perfect for a carry along, and there is plenty of open space for larger tool storage. os28069_b.gif os28069.gif 44.99 35 Tool Storage Toolboxes 1 2 20"x 8.5" x 9"
os28070 Electricians Tool Belt Electricians Tool Belt This tool belt is perfectly designed for the specialized tools of the electrical trade. There is even a pocket for your voltage meter in this 100% leather belt! os28070_b.gif os28070.gif 39.99 30 Tool Storage Tool Belts 1 1
1.5 +10 -8 interchange/dist/lib/UI/locales/README
rev 1.5, prev_rev 1.4
Index: README
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/locales/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- README 4 Oct 2001 19:06:45 -0000 1.4
+++ README 17 Apr 2002 17:55:48 -0000 1.5
@@ -1,17 +1,19 @@
Contact
=======
-If you have any questions concerning i18n and translations
-issues in respect to the interchange, please send them
-to the Interchange i18n mailing list (interchange-i18n@lists.akopia.com).
+If you have any questions concerning i18n and translations issues in
+respect to the interchange, please send them to the Interchange i18n
+mailing list:
+
+interchange-i18n@interchange.redhat.com
+
More information about this mailing list can be found at:
-http://lists.akopia.com/mailman/listinfo/interchange-i18n
+http://interchange.redhat.com/mailman/listinfo/interchange-i18n
-UI internationalization is mainly a project of
-Stefan Hornburg (Racke) <racke@linuxia.de>. Please keep this
-in mind before file a complaint about it to the
-Redhat's ecommerce division.
+UI internationalization is mainly a project of Stefan Hornburg (Racke)
+<racke@linuxia.de>. Please keep this in mind before filing a complaint
+about it to the Red Hat's ecommerce division.
Existing translations
=====================
2.9 +4 -4 interchange/lib/Vend/MakeCat.pm
rev 2.9, prev_rev 2.8
Index: MakeCat.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/MakeCat.pm,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -u -r2.8 -r2.9
--- MakeCat.pm 11 Jan 2002 09:45:12 -0000 2.8
+++ MakeCat.pm 17 Apr 2002 17:55:48 -0000 2.9
@@ -1,8 +1,8 @@
# Vend::MakeCat - Routines for Interchange catalog configurator
#
-# $Id: MakeCat.pm,v 2.8 2002/01/11 09:45:12 jon Exp $
+# $Id: MakeCat.pm,v 2.9 2002/04/17 17:55:48 jon Exp $
#
-# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
+# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
# This program was originally based on Vend 0.2 and 0.3
# Copyright 1995 by Andrew M. Wilcox <awilcox@world.std.com>
@@ -110,7 +110,7 @@
%Window
/;
-$VERSION = substr(q$Revision: 2.8 $, 10);
+$VERSION = substr(q$Revision: 2.9 $, 10);
$Force = 0;
$History = 0;
@@ -460,7 +460,7 @@
EOF
win_greeting => <<EOF,
-# Welcome to Red Hat Interchange!
+# Welcome to Interchange!
#
# You can now configure a working catalog.
#
2.4 +3 -3 interchange/scripts/newcat.PL
rev 2.4, prev_rev 2.3
Index: newcat.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/newcat.PL,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- newcat.PL 11 Jan 2002 09:45:12 -0000 2.3
+++ newcat.PL 17 Apr 2002 17:55:48 -0000 2.4
@@ -52,9 +52,9 @@
#
# Interchange catalog configurator with curses
#
-# $Id: newcat.PL,v 2.3 2002/01/11 09:45:12 jon Exp $
+# $Id: newcat.PL,v 2.4 2002/04/17 17:55:48 jon Exp $
#
-# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
+# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -3062,7 +3062,7 @@
init_display();
help_message(1);
-root_message('Red Hat Interchange Catalog Configurator');
+root_message('Interchange Catalog Configurator');
#
# go through screens
2.1 +2 -2 interchange/dist/foundation/pages/aboutus.html
rev 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.1
diff -u -u -r2.0 -r2.1
--- aboutus.html 18 Jul 2001 02:21:14 -0000 2.0
+++ aboutus.html 17 Apr 2002 17:55:49 -0000 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.1 +2 -2 interchange/dist/foundation/pages/contact.html
rev 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.1
diff -u -u -r2.0 -r2.1
--- contact.html 18 Jul 2001 02:21:14 -0000 2.0
+++ contact.html 17 Apr 2002 17:55:49 -0000 2.1
@@ -69,8 +69,8 @@
<p>If you would like further information on constructing a store
like this, please contact Red Hat E-Business Solutions:</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><br>
+ e-mail: <a href="mailto:@_INTERCHANGE_EMAIL_@">@_INTERCHANGE_EMAIL_@</a></p>
</td>
</tr>
2.1 +2 -2 interchange/dist/foundation/templates/foundation/regions/LEFTONLY_BOTTOM
rev 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.1
diff -u -u -r2.0 -r2.1
--- LEFTONLY_BOTTOM 18 Jul 2001 02:21:38 -0000 2.0
+++ LEFTONLY_BOTTOM 17 Apr 2002 17:55:49 -0000 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" alt="Powered by Interchange"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
2.2 +2 -2 interchange/dist/foundation/templates/foundation/regions/LEFTRIGHT_BOTTOM
rev 2.2, prev_rev 2.1
Index: LEFTRIGHT_BOTTOM
===================================================================
RCS file: /var/cvs/interchange/dist/foundation/templates/foundation/regions/LEFTRIGHT_BOTTOM,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- LEFTRIGHT_BOTTOM 16 Feb 2002 19:13:41 -0000 2.1
+++ LEFTRIGHT_BOTTOM 17 Apr 2002 17:55:49 -0000 2.2
@@ -2,8 +2,8 @@
[component comp-name="[control component none]" group=content]
<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" alt="Powered by Interchange"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
2.1 +2 -2 interchange/dist/foundation/templates/foundation/regions/NOLEFT_BOTTOM
rev 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.1
diff -u -u -r2.0 -r2.1
--- NOLEFT_BOTTOM 18 Jul 2001 02:21:38 -0000 2.0
+++ NOLEFT_BOTTOM 17 Apr 2002 17:55:49 -0000 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" alt="Powered by Interchange"></a></p>
+ [if variable MV_DEMO_MODE]
<p>[page admin/index]Admin</a></p>
[/if]
</center>
2.5 +2 -2 interchange/dist/lib/UI/pages/admin/help.html
rev 2.5, prev_rev 2.4
Index: help.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/help.html,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- help.html 8 Oct 2001 20:57:09 -0000 2.4
+++ help.html 17 Apr 2002 17:55:49 -0000 2.5
@@ -144,8 +144,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> -
+© 2000-2002 <a href="http://www.redhat.com/" target="_new">Red Hat, Inc.</a></b>
</font></p>
</td>
2.3 +1 -1 interchange/dist/lib/UI/pages/include/wizard_checklist
rev 2.3, prev_rev 2.2
Index: wizard_checklist
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/wizard_checklist,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- wizard_checklist 23 Nov 2001 13:19:40 -0000 2.2
+++ wizard_checklist 17 Apr 2002 17:55:49 -0000 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>
2.3 +2 -2 interchange/dist/lib/UI/vars/UI_STD_FOOTER
rev 2.3, prev_rev 2.2
Index: UI_STD_FOOTER
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/vars/UI_STD_FOOTER,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- UI_STD_FOOTER 19 Feb 2002 10:24:25 -0000 2.2
+++ UI_STD_FOOTER 17 Apr 2002 17:55:49 -0000 2.3
@@ -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 <a href="http://www.redhat.com/">Red Hat, Inc.</a></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>