# HG changeset patch # User rlm # Date 1262496379 18000 # Node ID 2f537455ebf773f4f6f28df56bb5d641b71b1ba5 # Parent 1481aa25c3c797907baaadf1f63734ce7cd4e447 [svn r19] lots o changes diff -r 1481aa25c3c7 -r 2f537455ebf7 buy.html --- a/buy.html Sat Jan 02 17:41:29 2010 -0500 +++ b/buy.html Sun Jan 03 00:26:19 2010 -0500 @@ -15,29 +15,29 @@ PERL-REPLACE::TOP_MENU -
-
-PERL-REPLACE::MATERIALS -
-
-PERL-REPLACE::TEMPLATES -
-
-
+
PERL-REPLACE::TEMPLATES
-
+
PERL-REPLACE::DISPLAY
+
PERL-REPLACE::INPUTBOX
-
-
+ + + + + +
+
PERL-REPLACE::MATERIALS
+ + diff -r 1481aa25c3c7 -r 2f537455ebf7 buy.pl --- a/buy.pl Sat Jan 02 17:41:29 2010 -0500 +++ b/buy.pl Sun Jan 03 00:26:19 2010 -0500 @@ -88,9 +88,9 @@ $r = "
Templates:
-
+
-
+
@@ -184,6 +184,11 @@ $a =~ s/PERL-REPLACE::TEMPLATES/$b/; #comment out one or the other! +$b = &display("classic_acrylic_clear"); +$a =~ s/PERL-REPLACE::DISPLAY/$b/; #let's do it again!!! :) + +$b = &inputbox("classic_acrylic_clear"); +$a =~ s/PERL-REPLACE::INPUTBOX/$b/; #let's do it again!!! :) return $a diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_blue.jpg Binary file images/display/basic_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_clear.jpg Binary file images/display/basic_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_green.jpg Binary file images/display/basic_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_orange.jpg Binary file images/display/basic_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_pink.jpg Binary file images/display/basic_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_red.jpg Binary file images/display/basic_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_acrylic_yellow.jpg Binary file images/display/basic_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_aluminum_black.jpg Binary file images/display/basic_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_aluminum_blue.jpg Binary file images/display/basic_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_aluminum_green.jpg Binary file images/display/basic_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/basic_aluminum_red.jpg Binary file images/display/basic_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_blue.jpg Binary file images/display/big_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_clear.jpg Binary file images/display/big_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_green.jpg Binary file images/display/big_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_orange.jpg Binary file images/display/big_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_pink.jpg Binary file images/display/big_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_red.jpg Binary file images/display/big_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_acrylic_yellow.jpg Binary file images/display/big_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_aluminum_black.jpg Binary file images/display/big_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_aluminum_blue.jpg Binary file images/display/big_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_aluminum_green.jpg Binary file images/display/big_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/big_aluminum_red.jpg Binary file images/display/big_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_blue.jpg Binary file images/display/classic_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_clear.jpg Binary file images/display/classic_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_green.jpg Binary file images/display/classic_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_orange.jpg Binary file images/display/classic_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_pink.jpg Binary file images/display/classic_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_red.jpg Binary file images/display/classic_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_acrylic_yellow.jpg Binary file images/display/classic_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_aluminum_black.jpg Binary file images/display/classic_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_aluminum_blue.jpg Binary file images/display/classic_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_aluminum_green.jpg Binary file images/display/classic_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/classic_aluminum_red.jpg Binary file images/display/classic_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_blue.jpg Binary file images/display/lines_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_clear.jpg Binary file images/display/lines_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_green.jpg Binary file images/display/lines_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_orange.jpg Binary file images/display/lines_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_pink.jpg Binary file images/display/lines_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_red.jpg Binary file images/display/lines_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_acrylic_yellow.jpg Binary file images/display/lines_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_aluminum_black.jpg Binary file images/display/lines_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_aluminum_blue.jpg Binary file images/display/lines_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_aluminum_green.jpg Binary file images/display/lines_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/display/lines_aluminum_red.jpg Binary file images/display/lines_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_blue.jpg Binary file images/templates/basic_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_clear.jpg Binary file images/templates/basic_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_green.jpg Binary file images/templates/basic_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_orange.jpg Binary file images/templates/basic_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_pink.jpg Binary file images/templates/basic_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_red.jpg Binary file images/templates/basic_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_acrylic_yellow.jpg Binary file images/templates/basic_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_aluminum_black.jpg Binary file images/templates/basic_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_aluminum_blue.jpg Binary file images/templates/basic_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_aluminum_green.jpg Binary file images/templates/basic_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/basic_aluminum_red.jpg Binary file images/templates/basic_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_blue.jpg Binary file images/templates/big_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_clear.jpg Binary file images/templates/big_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_green.jpg Binary file images/templates/big_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_orange.jpg Binary file images/templates/big_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_pink.jpg Binary file images/templates/big_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_red.jpg Binary file images/templates/big_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_acrylic_yellow.jpg Binary file images/templates/big_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_aluminum_black.jpg Binary file images/templates/big_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_aluminum_blue.jpg Binary file images/templates/big_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_aluminum_green.jpg Binary file images/templates/big_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/big_aluminum_red.jpg Binary file images/templates/big_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_blue.jpg Binary file images/templates/classic_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_clear.jpg Binary file images/templates/classic_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_green.jpg Binary file images/templates/classic_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_orange.jpg Binary file images/templates/classic_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_pink.jpg Binary file images/templates/classic_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_red.jpg Binary file images/templates/classic_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_acrylic_yellow.jpg Binary file images/templates/classic_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_aluminum_black.jpg Binary file images/templates/classic_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_aluminum_blue.jpg Binary file images/templates/classic_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_aluminum_green.jpg Binary file images/templates/classic_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/classic_aluminum_red.jpg Binary file images/templates/classic_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_blue.jpg Binary file images/templates/lines_acrylic_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_clear.jpg Binary file images/templates/lines_acrylic_clear.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_green.jpg Binary file images/templates/lines_acrylic_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_orange.jpg Binary file images/templates/lines_acrylic_orange.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_pink.jpg Binary file images/templates/lines_acrylic_pink.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_red.jpg Binary file images/templates/lines_acrylic_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_acrylic_yellow.jpg Binary file images/templates/lines_acrylic_yellow.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_aluminum_black.jpg Binary file images/templates/lines_aluminum_black.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_aluminum_blue.jpg Binary file images/templates/lines_aluminum_blue.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_aluminum_green.jpg Binary file images/templates/lines_aluminum_green.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 images/templates/lines_aluminum_red.jpg Binary file images/templates/lines_aluminum_red.jpg has changed diff -r 1481aa25c3c7 -r 2f537455ebf7 index.php --- a/index.php Sat Jan 02 17:41:29 2010 -0500 +++ b/index.php Sun Jan 03 00:26:19 2010 -0500 @@ -14,7 +14,7 @@
- +

Competition is tough.
Everyone wants that next job, that next opportunity. diff -r 1481aa25c3c7 -r 2f537455ebf7 laserkard_source_images/convert.pl --- a/laserkard_source_images/convert.pl Sat Jan 02 17:41:29 2010 -0500 +++ b/laserkard_source_images/convert.pl Sun Jan 03 00:26:19 2010 -0500 @@ -13,11 +13,13 @@ $name = $1; -print "convert", " $name.png -resize 582x360\! ../images/display/$name.jpg\n"; -`convert $name.png -resize 582x360\! ../images/display/$name.jpg`; -print "convert", " $name.png -resize 210x130\! ../images/templates/$name.jpg\n"; -`convert $name.png -resize 210x130\! ../images/templates/$name.jpg` +$cmd1 = "convert $name.png -resize 518x ../images/display/$name.jpg"; +$cmd2 = "convert $name.png -resize 250x ../images/templates/$name.jpg"; +print "$cmd1\n"; +`$cmd1`; +print "$cmd2\n"; +`$cmd2`; diff -r 1481aa25c3c7 -r 2f537455ebf7 main.css --- a/main.css Sat Jan 02 17:41:29 2010 -0500 +++ b/main.css Sun Jan 03 00:26:19 2010 -0500 @@ -31,13 +31,13 @@ div.headlinks a { text-decoration:none; - color:#666; + color:#bbbbbb; text-shadow:#555 0px 0px 5px; } div.headlinks a:hover { text-decoration:none; - color:#333; + color:#FFF; text-shadow:#222 0px 0px 8px; } div.headlinks ul @@ -49,16 +49,16 @@ text-align:center; display: inline; list-style-type: none; - padding-left: 90px; - padding-right: 90px; + padding-left: 4.9%; + padding-right: 4.9%; } attn { - color:#777; + color:#bbb; } attn:hover { - color:#444; + color:#FFF; } div.center { @@ -87,3 +87,12 @@ margin:0; padding:0; } + +h1 +{ +font-size:; +color: white; +background-color:#000000; +text-align: center; +font: bold 32px "arial", "sans-serif"; +} diff -r 1481aa25c3c7 -r 2f537455ebf7 sexy.css --- a/sexy.css Sat Jan 02 17:41:29 2010 -0500 +++ b/sexy.css Sun Jan 03 00:26:19 2010 -0500 @@ -1,43 +1,17 @@ -h1 -{ -font-size:; -color: white; -background-color:#000000; -text-align: center; -font: bold 32px "arial", "sans-serif"; -} - -div.whole -{ - width: 1150px ; - margin-left: auto ; - margin-right: auto ; -} - -div#i_materials +div#templates { -display: none; -padding:5px; -border-style:solid; -border-color:#79797b; -border-width:1px; + float: left; + width: 34%; + margin-left: 33%; + display: inline; -width:auto; -float:left; -margin:15px; -/*position:absolute; -left:15px; -top:80px;*/ -background-color:#000000; -} - -div#i_templates -{ -font-size:; + + + color: white; background-color:#000000; text-align: left; @@ -48,33 +22,64 @@ border-color:#79797b; border-width:1px; -float: left; -width: auto; - -margin:5px; - -/* -position:absolute; -left:15px; -bottom:15px; -*/ } div#display { -float:left; -margin:5px; -/* -position:absolute; -left:200px; -top:80px; -*/ + float: left; + width: 33%; + margin-left: -67%; + display: inline; + + background-color:#FEE2F9; } + + +div#inputbox +{ + float: left; + width: 33%; + display: inline; + + +font: bold 14px "helvetica","arial", "sans-serif"; +color: white; +background-color:#000000; +} + + + + + + + + + + + + + + + + + + + +div#i_inputbox +{ +padding:7px; +border-style:solid; +border-color:#79797b; +border-width:1px; +} + + + input#template1,input#template2,input#template3,input#template4, input#clear_acr, input#green_acr { padding:3px; @@ -84,29 +89,11 @@ } -div#i_inputbox + +div#materials { -padding:7px; -border-style:solid; -border-color:#79797b; -border-width:1px; - -font: bold 14px "helvetica","arial", "sans-serif"; -color: white; - -float:left; -width:280px; -margin:5px; - -/* -position:absolute; -left:1260px; -top:80px; -*/ - -background-color:#000000; -} - +display: none; +} div#pokedex { @@ -115,3 +102,5 @@ bottom:20px; background-color:#B3DF15; } + +