Mercurial > laserkard
changeset 18:2f537455ebf7 laserkard
[svn r19] lots o changes
line wrap: on
line diff
1.1 --- a/buy.html Sat Jan 02 17:41:29 2010 -0500 1.2 +++ b/buy.html Sun Jan 03 00:26:19 2010 -0500 1.3 @@ -15,29 +15,29 @@ 1.4 PERL-REPLACE::TOP_MENU 1.5 1.6 1.7 -<div class="whole"> 1.8 1.9 1.10 -<div id="materials" onmouseover="pokedex(['args__materials'],['pokedex']);"> 1.11 -PERL-REPLACE::MATERIALS 1.12 -</div> 1.13 1.14 1.15 -<div id="templates" > 1.16 -PERL-REPLACE::TEMPLATES 1.17 -</div> 1.18 1.19 -<div id="display" onmouseover="pokedex(['args__display'],['pokedex']);"></div> 1.20 1.21 -<div id="inputbox" ></div> 1.22 1.23 +<div id="templates" >PERL-REPLACE::TEMPLATES</div> 1.24 1.25 1.26 -</div> 1.27 +<div id="display" onmouseover="pokedex(['args__display'],['pokedex']);">PERL-REPLACE::DISPLAY</div> 1.28 1.29 +<div id="inputbox" >PERL-REPLACE::INPUTBOX</div> 1.30 1.31 -<div id="pokedex"> 1.32 -</div> 1.33 + 1.34 + 1.35 + 1.36 + 1.37 + 1.38 +<div id="pokedex"></div> 1.39 +<div id="materials" onmouseover="pokedex(['args__materials'],['pokedex']);">PERL-REPLACE::MATERIALS</div> 1.40 + 1.41 + 1.42 1.43 </body> 1.44
2.1 --- a/buy.pl Sat Jan 02 17:41:29 2010 -0500 2.2 +++ b/buy.pl Sun Jan 03 00:26:19 2010 -0500 2.3 @@ -88,9 +88,9 @@ 2.4 2.5 2.6 $r = "<div id = \"i_templates\">Templates:<br> 2.7 - <input TYPE=\"image\" src = \"./images/templates/classic_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__classic\'],[\'pokedex\']);\" onclick=\"display([\'template1\'], [\'display\']); inputbox([\'template1\'], [\'inputbox\']);material([\'template1\'], [\'materials\']);\" ID=\"template1\" NAME=\"template1\" VALUE=\"classic_$materialcolor\" ><br> 2.8 + <input TYPE=\"image\" src = \"./images/templates/classic_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__classic\'],[\'pokedex\']);\" onclick=\"display([\'template1\'], [\'display\']); inputbox([\'template1\'], [\'inputbox\']);material([\'template1\'], [\'materials\']);\" ID=\"template1\" NAME=\"template1\" VALUE=\"classic_$materialcolor\" > 2.9 <input TYPE=\"image\" src = \"./images/templates/big_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__big\'],[\'pokedex\']);\" onclick=\"display([\'template2\'], [\'display\']); inputbox([\'template2\'], [\'inputbox\']);material([\'template2\'], [\'materials\']);\" ID=\"template2\" NAME=\"template2\" VALUE=\"big_$materialcolor\" > <br> 2.10 - <input TYPE=\"image\" src = \"./images/templates/basic_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__basic\'],['pokedex\']);\" onclick=\"display([\'template3\'], [\'display\']); inputbox([\'template3\'], [\'inputbox\']);material([\'template3\'], [\'materials\']);\" ID=\"template3\" NAME=\"template3\" VALUE=\"basic_$materialcolor\" ><br> 2.11 + <input TYPE=\"image\" src = \"./images/templates/basic_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__basic\'],['pokedex\']);\" onclick=\"display([\'template3\'], [\'display\']); inputbox([\'template3\'], [\'inputbox\']);material([\'template3\'], [\'materials\']);\" ID=\"template3\" NAME=\"template3\" VALUE=\"basic_$materialcolor\" > 2.12 <input TYPE=\"image\" src = \"./images/templates/lines_$materialcolor.jpg\" onmouseover=\"pokedex([\'args__lines\'],[\'pokedex\']);\" onclick=\"display([\'template4\'], [\'display\']); inputbox([\'template4\'], [\'inputbox\']);material([\'template4\'], [\'materials\']);\" ID=\"template4\" NAME=\"template4\" VALUE=\"lines_$materialcolor\" > 2.13 </div> 2.14 2.15 @@ -184,6 +184,11 @@ 2.16 $a =~ s/PERL-REPLACE::TEMPLATES/$b/; #comment out one or the other! 2.17 2.18 2.19 +$b = &display("classic_acrylic_clear"); 2.20 +$a =~ s/PERL-REPLACE::DISPLAY/$b/; #let's do it again!!! :) 2.21 + 2.22 +$b = &inputbox("classic_acrylic_clear"); 2.23 +$a =~ s/PERL-REPLACE::INPUTBOX/$b/; #let's do it again!!! :) 2.24 2.25 return $a 2.26
3.1 Binary file images/display/basic_acrylic_blue.jpg has changed
4.1 Binary file images/display/basic_acrylic_clear.jpg has changed
5.1 Binary file images/display/basic_acrylic_green.jpg has changed
6.1 Binary file images/display/basic_acrylic_orange.jpg has changed
7.1 Binary file images/display/basic_acrylic_pink.jpg has changed
8.1 Binary file images/display/basic_acrylic_red.jpg has changed
9.1 Binary file images/display/basic_acrylic_yellow.jpg has changed
10.1 Binary file images/display/basic_aluminum_black.jpg has changed
11.1 Binary file images/display/basic_aluminum_blue.jpg has changed
12.1 Binary file images/display/basic_aluminum_green.jpg has changed
13.1 Binary file images/display/basic_aluminum_red.jpg has changed
14.1 Binary file images/display/big_acrylic_blue.jpg has changed
15.1 Binary file images/display/big_acrylic_clear.jpg has changed
16.1 Binary file images/display/big_acrylic_green.jpg has changed
17.1 Binary file images/display/big_acrylic_orange.jpg has changed
18.1 Binary file images/display/big_acrylic_pink.jpg has changed
19.1 Binary file images/display/big_acrylic_red.jpg has changed
20.1 Binary file images/display/big_acrylic_yellow.jpg has changed
21.1 Binary file images/display/big_aluminum_black.jpg has changed
22.1 Binary file images/display/big_aluminum_blue.jpg has changed
23.1 Binary file images/display/big_aluminum_green.jpg has changed
24.1 Binary file images/display/big_aluminum_red.jpg has changed
25.1 Binary file images/display/classic_acrylic_blue.jpg has changed
26.1 Binary file images/display/classic_acrylic_clear.jpg has changed
27.1 Binary file images/display/classic_acrylic_green.jpg has changed
28.1 Binary file images/display/classic_acrylic_orange.jpg has changed
29.1 Binary file images/display/classic_acrylic_pink.jpg has changed
30.1 Binary file images/display/classic_acrylic_red.jpg has changed
31.1 Binary file images/display/classic_acrylic_yellow.jpg has changed
32.1 Binary file images/display/classic_aluminum_black.jpg has changed
33.1 Binary file images/display/classic_aluminum_blue.jpg has changed
34.1 Binary file images/display/classic_aluminum_green.jpg has changed
35.1 Binary file images/display/classic_aluminum_red.jpg has changed
36.1 Binary file images/display/lines_acrylic_blue.jpg has changed
37.1 Binary file images/display/lines_acrylic_clear.jpg has changed
38.1 Binary file images/display/lines_acrylic_green.jpg has changed
39.1 Binary file images/display/lines_acrylic_orange.jpg has changed
40.1 Binary file images/display/lines_acrylic_pink.jpg has changed
41.1 Binary file images/display/lines_acrylic_red.jpg has changed
42.1 Binary file images/display/lines_acrylic_yellow.jpg has changed
43.1 Binary file images/display/lines_aluminum_black.jpg has changed
44.1 Binary file images/display/lines_aluminum_blue.jpg has changed
45.1 Binary file images/display/lines_aluminum_green.jpg has changed
46.1 Binary file images/display/lines_aluminum_red.jpg has changed
47.1 Binary file images/templates/basic_acrylic_blue.jpg has changed
48.1 Binary file images/templates/basic_acrylic_clear.jpg has changed
49.1 Binary file images/templates/basic_acrylic_green.jpg has changed
50.1 Binary file images/templates/basic_acrylic_orange.jpg has changed
51.1 Binary file images/templates/basic_acrylic_pink.jpg has changed
52.1 Binary file images/templates/basic_acrylic_red.jpg has changed
53.1 Binary file images/templates/basic_acrylic_yellow.jpg has changed
54.1 Binary file images/templates/basic_aluminum_black.jpg has changed
55.1 Binary file images/templates/basic_aluminum_blue.jpg has changed
56.1 Binary file images/templates/basic_aluminum_green.jpg has changed
57.1 Binary file images/templates/basic_aluminum_red.jpg has changed
58.1 Binary file images/templates/big_acrylic_blue.jpg has changed
59.1 Binary file images/templates/big_acrylic_clear.jpg has changed
60.1 Binary file images/templates/big_acrylic_green.jpg has changed
61.1 Binary file images/templates/big_acrylic_orange.jpg has changed
62.1 Binary file images/templates/big_acrylic_pink.jpg has changed
63.1 Binary file images/templates/big_acrylic_red.jpg has changed
64.1 Binary file images/templates/big_acrylic_yellow.jpg has changed
65.1 Binary file images/templates/big_aluminum_black.jpg has changed
66.1 Binary file images/templates/big_aluminum_blue.jpg has changed
67.1 Binary file images/templates/big_aluminum_green.jpg has changed
68.1 Binary file images/templates/big_aluminum_red.jpg has changed
69.1 Binary file images/templates/classic_acrylic_blue.jpg has changed
70.1 Binary file images/templates/classic_acrylic_clear.jpg has changed
71.1 Binary file images/templates/classic_acrylic_green.jpg has changed
72.1 Binary file images/templates/classic_acrylic_orange.jpg has changed
73.1 Binary file images/templates/classic_acrylic_pink.jpg has changed
74.1 Binary file images/templates/classic_acrylic_red.jpg has changed
75.1 Binary file images/templates/classic_acrylic_yellow.jpg has changed
76.1 Binary file images/templates/classic_aluminum_black.jpg has changed
77.1 Binary file images/templates/classic_aluminum_blue.jpg has changed
78.1 Binary file images/templates/classic_aluminum_green.jpg has changed
79.1 Binary file images/templates/classic_aluminum_red.jpg has changed
80.1 Binary file images/templates/lines_acrylic_blue.jpg has changed
81.1 Binary file images/templates/lines_acrylic_clear.jpg has changed
82.1 Binary file images/templates/lines_acrylic_green.jpg has changed
83.1 Binary file images/templates/lines_acrylic_orange.jpg has changed
84.1 Binary file images/templates/lines_acrylic_pink.jpg has changed
85.1 Binary file images/templates/lines_acrylic_red.jpg has changed
86.1 Binary file images/templates/lines_acrylic_yellow.jpg has changed
87.1 Binary file images/templates/lines_aluminum_black.jpg has changed
88.1 Binary file images/templates/lines_aluminum_blue.jpg has changed
89.1 Binary file images/templates/lines_aluminum_green.jpg has changed
90.1 Binary file images/templates/lines_aluminum_red.jpg has changed
91.1 --- a/index.php Sat Jan 02 17:41:29 2010 -0500 91.2 +++ b/index.php Sun Jan 03 00:26:19 2010 -0500 91.3 @@ -14,7 +14,7 @@ 91.4 91.5 91.6 <div class="center"> 91.7 - <a href="."><img src="./images/wt_sm.jpg" name="but" border="0"></a> 91.8 + <a href="./buy.pl"><img src="./images/wt_sm.jpg" name="but" border="0"></a> 91.9 <div class="text"> 91.10 <p>Competition is tough. 91.11 <br>Everyone wants that next job, that next opportunity.
92.1 --- a/laserkard_source_images/convert.pl Sat Jan 02 17:41:29 2010 -0500 92.2 +++ b/laserkard_source_images/convert.pl Sun Jan 03 00:26:19 2010 -0500 92.3 @@ -13,11 +13,13 @@ 92.4 $name = $1; 92.5 92.6 92.7 -print "convert", " $name.png -resize 582x360\! ../images/display/$name.jpg\n"; 92.8 -`convert $name.png -resize 582x360\! ../images/display/$name.jpg`; 92.9 -print "convert", " $name.png -resize 210x130\! ../images/templates/$name.jpg\n"; 92.10 -`convert $name.png -resize 210x130\! ../images/templates/$name.jpg` 92.11 +$cmd1 = "convert $name.png -resize 518x ../images/display/$name.jpg"; 92.12 +$cmd2 = "convert $name.png -resize 250x ../images/templates/$name.jpg"; 92.13 92.14 +print "$cmd1\n"; 92.15 +`$cmd1`; 92.16 +print "$cmd2\n"; 92.17 +`$cmd2`; 92.18 92.19 92.20
93.1 --- a/main.css Sat Jan 02 17:41:29 2010 -0500 93.2 +++ b/main.css Sun Jan 03 00:26:19 2010 -0500 93.3 @@ -31,13 +31,13 @@ 93.4 div.headlinks a 93.5 { 93.6 text-decoration:none; 93.7 - color:#666; 93.8 + color:#bbbbbb; 93.9 text-shadow:#555 0px 0px 5px; 93.10 } 93.11 div.headlinks a:hover 93.12 { 93.13 text-decoration:none; 93.14 - color:#333; 93.15 + color:#FFF; 93.16 text-shadow:#222 0px 0px 8px; 93.17 } 93.18 div.headlinks ul 93.19 @@ -49,16 +49,16 @@ 93.20 text-align:center; 93.21 display: inline; 93.22 list-style-type: none; 93.23 - padding-left: 90px; 93.24 - padding-right: 90px; 93.25 + padding-left: 4.9%; 93.26 + padding-right: 4.9%; 93.27 } 93.28 attn 93.29 { 93.30 - color:#777; 93.31 + color:#bbb; 93.32 } 93.33 attn:hover 93.34 { 93.35 - color:#444; 93.36 + color:#FFF; 93.37 } 93.38 div.center 93.39 { 93.40 @@ -87,3 +87,12 @@ 93.41 margin:0; 93.42 padding:0; 93.43 } 93.44 + 93.45 +h1 93.46 +{ 93.47 +font-size:; 93.48 +color: white; 93.49 +background-color:#000000; 93.50 +text-align: center; 93.51 +font: bold 32px "arial", "sans-serif"; 93.52 +}
94.1 --- a/sexy.css Sat Jan 02 17:41:29 2010 -0500 94.2 +++ b/sexy.css Sun Jan 03 00:26:19 2010 -0500 94.3 @@ -1,43 +1,17 @@ 94.4 94.5 94.6 -h1 94.7 -{ 94.8 -font-size:; 94.9 -color: white; 94.10 -background-color:#000000; 94.11 -text-align: center; 94.12 -font: bold 32px "arial", "sans-serif"; 94.13 -} 94.14 - 94.15 -div.whole 94.16 -{ 94.17 - width: 1150px ; 94.18 - margin-left: auto ; 94.19 - margin-right: auto ; 94.20 -} 94.21 94.22 94.23 - 94.24 -div#i_materials 94.25 +div#templates 94.26 { 94.27 -display: none; 94.28 -padding:5px; 94.29 -border-style:solid; 94.30 -border-color:#79797b; 94.31 -border-width:1px; 94.32 + float: left; 94.33 + width: 34%; 94.34 + margin-left: 33%; 94.35 + display: inline; 94.36 94.37 -width:auto; 94.38 -float:left; 94.39 -margin:15px; 94.40 -/*position:absolute; 94.41 -left:15px; 94.42 -top:80px;*/ 94.43 -background-color:#000000; 94.44 -} 94.45 - 94.46 -div#i_templates 94.47 -{ 94.48 -font-size:; 94.49 + 94.50 + 94.51 + 94.52 color: white; 94.53 background-color:#000000; 94.54 text-align: left; 94.55 @@ -48,33 +22,64 @@ 94.56 border-color:#79797b; 94.57 border-width:1px; 94.58 94.59 -float: left; 94.60 -width: auto; 94.61 - 94.62 -margin:5px; 94.63 - 94.64 -/* 94.65 -position:absolute; 94.66 -left:15px; 94.67 -bottom:15px; 94.68 -*/ 94.69 } 94.70 94.71 94.72 94.73 div#display 94.74 { 94.75 -float:left; 94.76 -margin:5px; 94.77 -/* 94.78 -position:absolute; 94.79 -left:200px; 94.80 -top:80px; 94.81 -*/ 94.82 + float: left; 94.83 + width: 33%; 94.84 + margin-left: -67%; 94.85 + display: inline; 94.86 + 94.87 + 94.88 background-color:#FEE2F9; 94.89 } 94.90 94.91 94.92 + 94.93 + 94.94 +div#inputbox 94.95 +{ 94.96 + float: left; 94.97 + width: 33%; 94.98 + display: inline; 94.99 + 94.100 + 94.101 +font: bold 14px "helvetica","arial", "sans-serif"; 94.102 +color: white; 94.103 +background-color:#000000; 94.104 +} 94.105 + 94.106 + 94.107 + 94.108 + 94.109 + 94.110 + 94.111 + 94.112 + 94.113 + 94.114 + 94.115 + 94.116 + 94.117 + 94.118 + 94.119 + 94.120 + 94.121 + 94.122 + 94.123 + 94.124 +div#i_inputbox 94.125 +{ 94.126 +padding:7px; 94.127 +border-style:solid; 94.128 +border-color:#79797b; 94.129 +border-width:1px; 94.130 +} 94.131 + 94.132 + 94.133 + 94.134 input#template1,input#template2,input#template3,input#template4, input#clear_acr, input#green_acr 94.135 { 94.136 padding:3px; 94.137 @@ -84,29 +89,11 @@ 94.138 } 94.139 94.140 94.141 -div#i_inputbox 94.142 + 94.143 +div#materials 94.144 { 94.145 -padding:7px; 94.146 -border-style:solid; 94.147 -border-color:#79797b; 94.148 -border-width:1px; 94.149 - 94.150 -font: bold 14px "helvetica","arial", "sans-serif"; 94.151 -color: white; 94.152 - 94.153 -float:left; 94.154 -width:280px; 94.155 -margin:5px; 94.156 - 94.157 -/* 94.158 -position:absolute; 94.159 -left:1260px; 94.160 -top:80px; 94.161 -*/ 94.162 - 94.163 -background-color:#000000; 94.164 -} 94.165 - 94.166 +display: none; 94.167 +} 94.168 94.169 div#pokedex 94.170 { 94.171 @@ -115,3 +102,5 @@ 94.172 bottom:20px; 94.173 background-color:#B3DF15; 94.174 } 94.175 + 94.176 +