[interchange-cvs] interchange - kwalsh modified 5 files

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2007-08-01 10:52:46 GMT
Modified:  code/UserTag formel.tag
Modified:  dist/standard/variables THEME_CSS
Modified:  code/SystemTag error.coretag
Modified:  .        UPGRADE
Modified:  dist/standard/products variable.txt
Log:
    * Corrected some stupidity in my last commits:

	-- Created a new CSS_CONTRAST Variable, which we'll use instead of
	   the CONTRAST variable to select the CSS class name.

	-- The CSS class now defaults to mv_contrast instead of just
	   "contrast", as "contrast" is more likely to conflict with
	   existing CSS classes.

Revision  Changes    Path
1.19      +4 -3      interchange/code/UserTag/formel.tag


rev 1.19, prev_rev 1.18
Index: formel.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/formel.tag,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- formel.tag	1 Aug 2007 06:35:02 -0000	1.18
+++ formel.tag	1 Aug 2007 10:52:44 -0000	1.19
@@ -6,11 +6,11 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: formel.tag,v 1.18 2007/08/01 06:35:02 kwalsh Exp $
+# $Id: formel.tag,v 1.19 2007/08/01 10:52:44 kwalsh Exp $
 
 UserTag formel Order   label name type size
 UserTag formel addAttr
-UserTag formel Version $Revision: 1.18 $
+UserTag formel Version $Revision: 1.19 $
 UserTag formel Routine <<EOF
 sub {
 	my ($label, $name, $type, $size, $opt) = @_;
@@ -38,7 +38,8 @@
 				sprintf($opt->{signal}, $label);
 			}
 			else {
-				qq{<span class="$::Variable->{CONTRAST}">$label</span>};
+				my $contrast = $::Variable->{CSS_CONTRAST} || 'mv_contrast';
+				qq{<span class="$contrast">$label</span>};
 			}	
 		}
 		else {      



1.7       +1 -1      interchange/dist/standard/variables/THEME_CSS


rev 1.7, prev_rev 1.6
Index: THEME_CSS
===================================================================
RCS file: /var/cvs/interchange/dist/standard/variables/THEME_CSS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- THEME_CSS	1 Aug 2007 05:42:29 -0000	1.6
+++ THEME_CSS	1 Aug 2007 10:52:44 -0000	1.7
@@ -535,7 +535,7 @@
 
 /**********End results_ component classes*/
 
-.contrast {
+.mv_contrast {
 	color: [either][var CONTRAST][or]#FF0000[/either];
 }
 



1.9       +4 -3      interchange/code/SystemTag/error.coretag


rev 1.9, prev_rev 1.8
Index: error.coretag
===================================================================
RCS file: /var/cvs/interchange/code/SystemTag/error.coretag,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- error.coretag	1 Aug 2007 05:42:29 -0000	1.8
+++ error.coretag	1 Aug 2007 10:52:45 -0000	1.9
@@ -5,14 +5,14 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.  See the LICENSE file for details.
 # 
-# $Id: error.coretag,v 1.8 2007/08/01 05:42:29 kwalsh Exp $
+# $Id: error.coretag,v 1.9 2007/08/01 10:52:45 kwalsh Exp $
 
 ### This is in package Vend::Interpolate, and may make reference
 ### to variables in that module
 UserTag error               Order        name
 UserTag error               addAttr
 UserTag error               PosNumber    1
-UserTag error               Version      $Revision: 1.8 $
+UserTag error               Version      $Revision: 1.9 $
 UserTag error               Routine      <<EOR
 sub set_error {
 	my ($error, $var, $opt) = @_;
@@ -127,8 +127,9 @@
 			$text = $::Variable->{MV_ERROR_STD_LABEL};
 		}
 		else {
+			my $contrast = $::Variable->{CSS_CONTRAST} || 'mv_contrast';
 			$text = <<EOF;
-<span class="contrast">{LABEL} <small><i>(%s)</i></small></span>
+<span class="$contrast">{LABEL} <small><i>(%s)</i></small></span>
 [else]{REQUIRED <b>}{LABEL}{REQUIRED </b>}[/else]
 EOF
 		}



2.22      +4 -1      interchange/UPGRADE


rev 2.22, prev_rev 2.21
Index: UPGRADE
===================================================================
RCS file: /var/cvs/interchange/UPGRADE,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -r2.21 -r2.22
--- UPGRADE	1 Aug 2007 09:27:42 -0000	2.21
+++ UPGRADE	1 Aug 2007 10:52:45 -0000	2.22
@@ -126,9 +126,12 @@
 The [error] and [formel] tags now make use of the following CSS class,
 that will need to be added to your CSS file:
 
-    .contrast {
+    .mv_contrast {
 	color: #FF0000;
     }
+
+The name of the class can be specified using the CSS_CONTRAST Variable,
+or will default to "mv_contrast".
 
 
 KNOWN ISSUES UPGRADING FROM 5.2.x



1.8       +1 -0      interchange/dist/standard/products/variable.txt


rev 1.8, prev_rev 1.7
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/variable.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- variable.txt	24 Jun 2006 15:46:32 -0000	1.7
+++ variable.txt	1 Aug 2007 10:52:46 -0000	1.8
@@ -17,6 +17,7 @@
 ENTRY_COD_ACCEPTED	0	Payment
 COMPANY	__MVC_COMPANY__	Company
 CONTRAST	RED	Template
+CSS_CONTRAST	mv_contrast	Template
 CREDIT_CARDS_ACCEPTED	visa mc amex discover  	Payment
 ENTRY_CREDIT_CARDS_ACCEPTED	visa mc amex discover  	Payment
 DECREMENT_INVENTORY	1	Order