# HG changeset patch # User rlm # Date 1262507781 18000 # Node ID 3298256dd45959659e0175b49501882dafcb91b8 # Parent 142054e0d572162ad429d61759acd10ff6198957 [svn r23] did much cosmetic work. diff -r 142054e0d572 -r 3298256dd459 about.php --- a/about.php Sun Jan 03 00:55:18 2010 -0500 +++ b/about.php Sun Jan 03 03:36:21 2010 -0500 @@ -5,7 +5,7 @@ Laser Kard - + diff -r 142054e0d572 -r 3298256dd459 buy.html --- a/buy.html Sun Jan 03 00:55:18 2010 -0500 +++ b/buy.html Sun Jan 03 03:36:21 2010 -0500 @@ -10,34 +10,31 @@ - + PERL-REPLACE::TOP_MENU -
+
+
PERL-REPLACE::TEMPLATES
-
-PERL-REPLACE::MATERIALS + +
+
PERL-REPLACE::DISPLAY
+
-
-PERL-REPLACE::TEMPLATES -
- -
- -
- - +
PERL-REPLACE::INPUTBOX
+
 
-
-
+ +
PERL-REPLACE::MATERIALS
+ diff -r 142054e0d572 -r 3298256dd459 buy.pl --- a/buy.pl Sun Jan 03 00:55:18 2010 -0500 +++ b/buy.pl Sun Jan 03 03:36:21 2010 -0500 @@ -88,10 +88,14 @@ $r = "
Templates:
-
-
-
- + +
+ +
+ +
+ +
"; @@ -178,11 +182,16 @@ $a =~ s/PERL-REPLACE::TOP_MENU/$b/; #equivalent to , but in perl and with more memory problems :) $b = &material("void_acrylic_clear",1); $a =~ s/PERL-REPLACE::MATERIALS/$b/; #let's do it again!!! :) -$b = &template("classic_acrylic_clear"); +$b = &template("big_acrylic_clear"); #$a =~ s/PERL-REPLACE::TEMPLATES//; $a =~ s/PERL-REPLACE::TEMPLATES/$b/; #comment out one or the other! +$b = &display("big_acrylic_clear"); +$a =~ s/PERL-REPLACE::DISPLAY/$b/; + +$b = &inputbox("big_acrylic_clear"); +$a =~ s/PERL-REPLACE::INPUTBOX/$b/; return $a diff -r 142054e0d572 -r 3298256dd459 contact.php --- a/contact.php Sun Jan 03 00:55:18 2010 -0500 +++ b/contact.php Sun Jan 03 03:36:21 2010 -0500 @@ -15,7 +15,7 @@ Contact - + diff -r 142054e0d572 -r 3298256dd459 index.php --- a/index.php Sun Jan 03 00:55:18 2010 -0500 +++ b/index.php Sun Jan 03 03:36:21 2010 -0500 @@ -5,7 +5,7 @@ Laser Kard - + diff -r 142054e0d572 -r 3298256dd459 main.css --- a/main.css Sun Jan 03 00:55:18 2010 -0500 +++ b/main.css Sun Jan 03 03:36:21 2010 -0500 @@ -13,7 +13,6 @@ } div.topbar { - background-repeat:repeat-x; height:60px; margin-top:2px; } @@ -40,6 +39,10 @@ color:#FFF; text-shadow:#222 0px 0px 8px; } + + + + div.headlinks ul { margin-top:10px; @@ -96,3 +99,15 @@ text-align: center; font: bold 32px "arial", "sans-serif"; } + + + +/*stuff to make the links show which page you're on*/ +body#buy a#buy, +body#hom a#hom, +body#about a#about, +body#contact a#contact { +color: #fff; +background: #930; +} + diff -r 142054e0d572 -r 3298256dd459 paypal/BASE.paylist --- a/paypal/BASE.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/BASE.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -68,21 +68,8 @@ - - -

PERL::TITLE

- - PERL::PAYMENT diff -r 142054e0d572 -r 3298256dd459 paypal/basic_acrylic_clear.paylist --- a/paypal/basic_acrylic_clear.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/basic_acrylic_clear.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -25,13 +25,13 @@ - + - + - + - + @@ -68,21 +68,8 @@ - - -

Clarity LaserKard Basic Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
@@ -120,23 +107,23 @@
-Line 1:   - +Line 1 (James Bond):   +

-Line 2:   - +Line 2 (MI6):   +

-Line 3:   - +Line 3 (Secret Agent):   +

-Line 4:   - +Line 4 (jbond@mi6.co.uk):   +
@@ -144,6 +131,10 @@ +
+ +Add a penny! ^__^ +

Total Cost:    diff -r 142054e0d572 -r 3298256dd459 paypal/basic_acrylic_green.paylist --- a/paypal/basic_acrylic_green.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/basic_acrylic_green.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -68,21 +68,8 @@ - - -

Vitality LaserKard Basic Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
diff -r 142054e0d572 -r 3298256dd459 paypal/big_acrylic_clear.paylist --- a/paypal/big_acrylic_clear.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/big_acrylic_clear.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -25,9 +25,9 @@ - + - + @@ -68,21 +68,8 @@ - - -

Clarity LaserKard BIG Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
@@ -120,13 +107,13 @@
-Line 1:   - +Line 1 (James Bond):   +

-Line 2:   - +Line 2 (jbond@mi6.co.uk):   +
@@ -134,10 +121,6 @@ -
- -Add a penny! ^__^ -

Total Cost:    diff -r 142054e0d572 -r 3298256dd459 paypal/big_acrylic_green.paylist --- a/paypal/big_acrylic_green.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/big_acrylic_green.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -68,21 +68,8 @@ - - -

Vitality LaserKard BIG Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
diff -r 142054e0d572 -r 3298256dd459 paypal/classic_acrylic_clear.paylist --- a/paypal/classic_acrylic_clear.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/classic_acrylic_clear.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -25,17 +25,17 @@ - + - + - + - + - + - + @@ -68,21 +68,8 @@ - - -

Clarity LaserKard Classic Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
@@ -120,33 +107,33 @@
-Line 1:   - +Line 1 (jbond@mi6.co.uk):   +

-Line 2:   - +Line 2 (123.456.7890):   +

-Line 3:   - +Line 3 (James Bond):   +

-Line 4:   - +Line 4 (MI6):   +

-Line 5:   - +Line 5 (Secret Agent):   +

-Side:   - +Side (http://www.jamesbond.com):   +
diff -r 142054e0d572 -r 3298256dd459 paypal/classic_acrylic_green.paylist --- a/paypal/classic_acrylic_green.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/classic_acrylic_green.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -68,21 +68,8 @@ - - -

Vitality LaserKard Classic Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
diff -r 142054e0d572 -r 3298256dd459 paypal/lines_acrylic_clear.paylist --- a/paypal/lines_acrylic_clear.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/lines_acrylic_clear.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -25,17 +25,17 @@ - + - + - + - + - + - + @@ -68,21 +68,8 @@ - - -

Clarity LaserKard Lines Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
@@ -120,33 +107,33 @@
-Line 1:   - +Line 1 (James Bond):   +

-Line 2:   - +Line 2 (Secret Agent):   +

-Line 3:   - +Line 3 (MI6):   +

-Line 4:   - +Line 4 (123.456.7890):   +

-Line 5:   - +Line 5 (jbond@domain.com):   +

-Line 6:   - +Line 6 (www.domain.com):   +
diff -r 142054e0d572 -r 3298256dd459 paypal/lines_acrylic_green.paylist --- a/paypal/lines_acrylic_green.paylist Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/lines_acrylic_green.paylist Sun Jan 03 03:36:21 2010 -0500 @@ -68,21 +68,8 @@ - - -

Vitality LaserKard Lines Style

- - @@ -98,10 +85,10 @@ - 3 cards — $20 + 4 cards — $30
diff -r 142054e0d572 -r 3298256dd459 paypal/make.pl --- a/paypal/make.pl Sun Jan 03 00:55:18 2010 -0500 +++ b/paypal/make.pl Sun Jan 03 03:36:21 2010 -0500 @@ -1,16 +1,54 @@ use generate_paylists; + +{#big_acrylic_clear +&paylist +( +TITLE => "Clarity LaserKard BIG Style", +NAME => 'big_acrylic_clear', + +FIELDS => ["Line 1 (James Bond)", "Line 2 (jbond\@mi6.co.uk)"], +DEFAULTS => ['James Bond','jbond@mi6.co.uk'], + +COSTS_NAMES => ['40 cards — $125', '4 cards — $30'], +COSTS_CODE => ['40 cards @125.00', '4 cards @30.00'], +INITIAL_PRICE => '$125.00', + +ADD_PENNY => 0, +); +} + + +{#basic_acrylic_clear +&paylist +( +TITLE => "Clarity LaserKard Basic Style", +NAME => 'basic_acrylic_clear', + +FIELDS => ["Line 1 (James Bond)", "Line 2 (MI6)","Line 3 (Secret Agent)","Line 4 (jbond\@mi6.co.uk)"], +DEFAULTS => ['James Bond','MI6','Secret Agent','jbond@mi6.co.uk'], + +COSTS_NAMES => ['40 cards — $125', '4 cards — $30'], +COSTS_CODE => ['40 cards @125.00', '4 cards @30.00'], +INITIAL_PRICE => '$125.00', + +ADD_PENNY => 1, +); +} + + + {#classic_acrylic_clear &paylist ( TITLE => "Clarity LaserKard Classic Style", NAME => 'classic_acrylic_clear', -FIELDS => ["Line 1", "Line 2","Line 3","Line 4","Line 5","Side"], +FIELDS => ["Line 1 (jbond\@mi6.co.uk)", "Line 2 (123.456.7890)","Line 3 (James Bond)","Line 4 (MI6)","Line 5 (Secret Agent)","Side (http://www.jamesbond.com)"], DEFAULTS => ['jbond@mi6.co.uk','123.456.7890','James Bond','MI6','Secret Agent','http://www.jamesbond.com'], -COSTS_NAMES => ['40 cards — $125', '3 cards — $20'], -COSTS_CODE => ['40 cards @125.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $125', '4 cards — $30'], +COSTS_CODE => ['40 cards @125.00', '4 cards @30.00'], INITIAL_PRICE => '$125.00', ADD_PENNY => 0, @@ -18,39 +56,7 @@ } -{#big_acrylic_clear -&paylist -( -TITLE => "Clarity LaserKard BIG Style", -NAME => 'big_acrylic_clear', -FIELDS => ["Line 1", "Line 2"], -DEFAULTS => ['James Bond','jbond@mi6.co.uk'], - -COSTS_NAMES => ['40 cards — $125', '3 cards — $20'], -COSTS_CODE => ['40 cards @125.00', '3 cards @20.00'], -INITIAL_PRICE => '$125.00', - -ADD_PENNY => 1, -); -} - -{#basic_acrylic_clear -&paylist -( -TITLE => "Clarity LaserKard Basic Style", -NAME => 'basic_acrylic_clear', - -FIELDS => ["Line 1", "Line 2","Line 3","Line 4"], -DEFAULTS => ['James Bond','MI6','Secret Agent','jbond@mi6.co.uk'], - -COSTS_NAMES => ['40 cards — $125', '3 cards — $20'], -COSTS_CODE => ['40 cards @125.00', '3 cards @20.00'], -INITIAL_PRICE => '$125.00', - -ADD_PENNY => 0, -); -} {#lines_acrylic_clear &paylist @@ -58,11 +64,11 @@ TITLE => "Clarity LaserKard Lines Style", NAME => 'lines_acrylic_clear', -FIELDS => ["Line 1", "Line 2","Line 3","Line 4","Line 5","Line 6"], -DEFAULTS => ['James Bond','Secret Agent','MI6','123.456.7890','jbond@domain.com','http://www.domain.com'], +FIELDS => ["Line 1 (James Bond)", "Line 2 (Secret Agent)","Line 3 (MI6)","Line 4 (123.456.7890)","Line 5 (jbond\@domain.com)","Line 6 (www.domain.com)"], +DEFAULTS => ['James Bond','Secret Agent','MI6','123.456.7890','jbond@domain.com','www.domain.com'], -COSTS_NAMES => ['40 cards — $125', '3 cards — $20'], -COSTS_CODE => ['40 cards @125.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $125', '4 cards — $30'], +COSTS_CODE => ['40 cards @125.00', '4 cards @30.00'], INITIAL_PRICE => '$125.00', ADD_PENNY => 0, @@ -81,8 +87,8 @@ FIELDS => ["Line 1", "Line 2","Line 3","Line 4","Line 5","Side"], DEFAULTS => ['jbond@mi6.co.uk','123.456.7890','James Bond','MI6','Secret Agent','http://www.jamesbond.com'], -COSTS_NAMES => ['40 cards — $135', '3 cards — $20'], -COSTS_CODE => ['40 cards @135.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $135', '4 cards — $30'], +COSTS_CODE => ['40 cards @135.00', '4 cards @30.00'], INITIAL_PRICE => '$135.00', ADD_PENNY => 0, @@ -99,8 +105,8 @@ FIELDS => ["Line 1", "Line 2"], DEFAULTS => ['James Bond','jbond@mi6.co.uk'], -COSTS_NAMES => ['40 cards — $135', '3 cards — $20'], -COSTS_CODE => ['40 cards @135.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $135', '4 cards — $30'], +COSTS_CODE => ['40 cards @135.00', '4 cards @30.00'], INITIAL_PRICE => '$135.00', ADD_PENNY => 1, @@ -116,8 +122,8 @@ FIELDS => ["Line 1", "Line 2","Line 3","Line 4"], DEFAULTS => ['James Bond','MI6','Secret Agent','jbond@mi6.co.uk'], -COSTS_NAMES => ['40 cards — $135', '3 cards — $20'], -COSTS_CODE => ['40 cards @135.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $135', '4 cards — $30'], +COSTS_CODE => ['40 cards @135.00', '4 cards @30.00'], INITIAL_PRICE => '$135.00', ADD_PENNY => 0, @@ -133,8 +139,8 @@ FIELDS => ["Line 1", "Line 2","Line 3","Line 4","Line 5","Line 6"], DEFAULTS => ['James Bond','Secret Agent','MI6','123.456.7890','jbond@domain.com','http://www.domain.com'], -COSTS_NAMES => ['40 cards — $135', '3 cards — $20'], -COSTS_CODE => ['40 cards @135.00', '3 cards @20.00'], +COSTS_NAMES => ['40 cards — $135', '4 cards — $30'], +COSTS_CODE => ['40 cards @135.00', '4 cards @30.00'], INITIAL_PRICE => '$135.00', ADD_PENNY => 0, diff -r 142054e0d572 -r 3298256dd459 sexy.css --- a/sexy.css Sun Jan 03 00:55:18 2010 -0500 +++ b/sexy.css Sun Jan 03 03:36:21 2010 -0500 @@ -10,14 +10,18 @@ } -div.whole +div#whole { - width: 1200px ; + width: 1100px ; margin-top:25px; margin-left: auto ; margin-right: auto ; +padding:2px; +border-style:solid; +border-color:#79797b; +border-width:1px; } @@ -72,16 +76,18 @@ div#display { -float:left; -margin-left:10px; -margin-right:10px; + + /* position:absolute; left:200px; top:80px; */ -background-color:#FEE2F9; + + + +background-color:#000000; } @@ -96,17 +102,18 @@ div#i_inputbox { -padding:10px; +padding:5px; border-style:solid; border-color:#79797b; border-width:1px; + font: bold 14px "helvetica","arial", "sans-serif"; color: white; float:left; -width:280px; - +width:240px; +clear:right; /* position:absolute; @@ -118,15 +125,49 @@ } +div#centerbox +{ +float:left; +margin-top:-4px; +margin-left:10px; +margin-right:10px; +width:515px; +padding:5px; +border-style:solid; +border-color:#79797b; +border-width:1px; +margin:10px; +} + + + div#pokedex { -position:absolute; -right:25px; -bottom:20px; +clear:right; +float:none; background-color:#B3DF15; } +div#garbage +{ +float:left; +width:1000px; +} + + + +/*stuff to make the containing divs actually contain the stuff they contain.*/ + + .clearfix:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + + * html .clearfix {height: 1%;} diff -r 142054e0d572 -r 3298256dd459 top_menu.include --- a/top_menu.include Sun Jan 03 00:55:18 2010 -0500 +++ b/top_menu.include Sun Jan 03 03:36:21 2010 -0500 @@ -2,13 +2,13 @@