[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
index.html: 1.1586 -> 1.1587
以下のページの更新をしました。ツッコミをお願いします。
index.html: 1.1586 -> 1.1587
> revision 1.1587
> date: 2009/02/24 15:32:46; author: mishka; state: Exp; lines: +111 -25
> Deploy the NetBSD donation stuff:
> - we can now use excellent Google Checkout for donations
> - the Platinum Donors policy is requiring Donor logos rotated on the main page
> (logos should be placed into images/donors and recorded at
> donations/donors.js database)
木曜日までに異議がなければ、 commit します。
以下、訳と原文それぞれの新旧の差分です。
--- index.html.orig 2009-02-25 22:47:52.000000000 +0900
+++ index.html 2009-02-25 22:47:52.000000000 +0900
@@ -14,6 +14,35 @@
<meta name="DESCRIPTION" content="PowerPC, Alpha, SPARC, MIPS, SH3, StrongARM, HP PA-RISC, i386, m68k, VAX: Of course it runs NetBSD. もちろんNetBSDです。">
<meta name="KEYWORDS" content="NetBSD, BSD, 4.4BSD, acorn26, acorn32, algor, algorithmics, alpha, amiga, amigappc, arc, arm26, arm32, atari, bebox, cats, cesfic, cobalt, evbarm, evbmips, evbppc, evbsh3, ews4800, hp300, hp700, hpcarm, hpcmips, hpcsh, hppa, i386, ibmnws, iyonix, luna68k, m68k, mac68k, macppc, mips, mmeye, mvme68k, mvmeppc, netwinder, news68k, newsmips, next68k, mipsco, ofppc, pica, pmax, pmppc, prep, powerpc, sandpoint, sbmips, sgimips, sh3, shark, sparc, sparc64, sun2, sun3, sun3x, ultrasparc, vax, walnut, x68k, x86-64, amd64, xen, linux, freebsd, hp-ux, sunos, osf/1, ultrix, svr4, solaris, sco, iBCS2, IPv6, embedded, open source, opteron, open source, BSD">
<!-- meta name="verify-v1" content="guJT5SZUh4XMF/emgSnXZPc6GkWkhP7PvMdYBc/auJI=" -->
+
+ <script type="text/javascript">
+ <!--
+ /* function: validate donation amount, for Google Checkout */
+ function validateAmount(amount){
+ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+ return true;
+ }else{
+ alert('金額を正しい形式で入力してください。');
+ amount.focus();
+ return false;
+ }
+ }
+
+ /* pseudo class: platinum donor */
+ function Donor(URL, Img) {
+ this.URL = URL;
+ this.Img = Img;
+ }
+
+ var now = new Date();
+
+ var dindex;
+ var di = 0;
+ var donors = new Array();
+ // -->
+ </script>
+ <!-- donors data -->
+ <script type="text/javascript" src="donations/donors.js"></script>
</head>
@@ -166,20 +195,36 @@
<a href="gallery/devotionalia.html">
<img border="0" src="../images/links/cafepress.png" alt="[Cafepress]"/>
</a>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <form action="https://checkout.google.com/cws/v2/Donations/150990749831378/checkoutForm"
+ id="donateGoogle" method="post" name="BB_BuyButtonForm"
+ onSubmit="return validateAmount(this.item_price_1)">
+ <input name="item_name_1" type="hidden" value="Donation for The NetBSD Foundation, Inc."/>
+ <input name="item_description_1" type="hidden" value="Help improve the NetBSD operating system."/>
+ <input name="item_quantity_1" type="hidden" value="1"/>
+ <input name="item_currency_1" type="hidden" value="USD"/>
+ <input name="item_is_modifiable_1" type="hidden" value="true"/>
+ <input name="item_min_price_1" type="hidden" value="10.0"/>
+ <input name="item_max_price_1" type="hidden" value="25000.0"/>
+ <input name="_charset_" type="hidden" value="utf-8"/>
+ $<input id="item_price_1" name="item_price_1"
+ onfocus="this.style.color='black'; this.value='';"
+ size="11" style="color:grey;" type="text" value="金額を入力">
+ <br>
+ <input type="image" alt="[Google 経由での寄附]"
+ src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=150990749831378&w=115&h=50&style=white&variant=text&loc=en_US"/>
+ </form>
+ <div>— OR —</div>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post"
+ id="donatePaypal">
+ <!-- input type="hidden" name="amount" value="1234"/ -->
<input type="hidden" name="cmd" value="_xclick"/>
<input type="hidden" name="business" value="paypal@NetBSD.org"/>
<input type="hidden" name="item_name" value="The NetBSD Foundation"/>
<input type="hidden" name="no_shipping" value="1"/>
<input type="hidden" name="return" value="http://www.NetBSD.org/"/>
<input type="hidden" name="cancel_return" value="http://www.NetBSD.org/"/>
- <input type="image" src="../images/links/paypal.gif" name="submit" alt="PayPal 経由での寄附"/>
+ <input type="image" src="../images/links/paypal.gif" name="submit" alt="[PayPal 経由での寄附]"/>
</form>
- <a href="http://www.isc.org/">
- <img src="../images/hosted-isc.png" alt="www.NetBSD.org is hosted at ISC"
- hspace="6" border="0" width="84" height="41"/>
- </a>
-
</div>
</div>
</div>
@@ -199,13 +244,13 @@
NetBSD パッケージコレクション (pkgsrc) を使って簡単に利用可能です。
<span class="more"><a href="about/features.html">» もっと詳しく</a></span>
</p>
+
<p>
<span class="more"><a href="releases/formal-4/NetBSD-4.0.1.html">» 最新リリース: NetBSD 4.0.1</a></span>
</p>
<div class="iconsRight">
-
<!-- Fundraising last month box
<div id="warnBox">
@@ -332,7 +377,7 @@
-->
</div>
</div>
- </div>
+ </div> <!-- mainContent -->
<div id="news">
@@ -356,7 +401,43 @@
</span>
</li>
</ul>
-
+
+<!-- XXX: no platinum donors at the moment
+ <h3>プラチナスポンサー</h3>
+ <div id="platinumDonorLogo">
+ <noscript>
+ <a href="http://www.NetBSD.org/cgi-bin/pdonor.cgi?url=get">
+ <img src="http://www.NetBSD.org/cgi-bin/pdonor.cgi?image=get"
+ alt="[プラチナスポンサーのサイトへ]">
+ </a>
+ </noscript>
+ </div>
+ <script type="text/javascript">
+-->
+ <!--
+ dindex = Math.floor(now.getTime() / 1000 / ROT_INTERVAL);
+ dindex = dindex % di;
+
+ var div = document.getElementById('platinumDonorLogo');
+ var anchor = document.createElement('a');
+ var image = document.createElement('img');
+
+ image.setAttribute('src', donors[dindex].Img);
+ image.setAttribute('alt', "[プラチナスポンサーのサイトへ]");
+ anchor.setAttribute('href', donors[dindex].URL);
+
+ anchor.appendChild(image);
+ div.appendChild(anchor);
+ // -->
+<!-- XXX: no platinum donors at the moment
+ </script>
+ <ul>
+ <li>
+ <a href="donations/">» NetBSD スポンサーシップについて</a>
+ </li>
+ </ul>
+-->
+
<h3>これからのイベント</h3>
<ul>
@@ -376,32 +457,37 @@
</span>
</li>
</ul>
-
-
</div>
</div>
</div>
<!-- ##### Footer ##### -->
- <!-- $NetBSD: index.html,v 1.1586 2009/02/22 04:34:33 jun Exp $ -->
+ <!-- $NetBSD: index.html,v 1.1587 2009/02/24 15:32:46 mishka Exp $ -->
<!-- Based on english version: -->
- <!-- NetBSD: index.html,v 1.1586 2009/02/22 04:34:33 jun Exp -->
+ <!-- NetBSD: index.html,v 1.1587 2009/02/24 15:32:46 mishka Exp -->
<div class="rowOfBoxes">
<div id="footer">
- <span class="footfeed">
- <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">
- 連絡</a> |
- </span>
- <span class="footcopy"><a href="about/disclaimer.html">
- 免責事項</a> |
- <span class="copyright">
- Copyright © 1994-2009 The NetBSD Foundation, Inc.
+ <div id="footerLogo">
+ <a href="http://www.isc.org/"><img src="../images/hosted-isc.png"
+ alt="www.NetBSD.org is hosted at ISC"
+ border="0" width="84" height="41"/></a>
+ </div>
+ <div id="footerContent">
+ <span class="footfeed">
+ <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">
+ 連絡</a> |
</span>
- ALL
- RIGHTS RESERVED. <br /> NetBSD<sup>®</sup> は
- The NetBSD Foundation, Inc. の登録商標です。
- </span>
+ <span class="footcopy"><a href="about/disclaimer.html">
+ 免責事項</a> |
+ <span class="copyright">
+ Copyright © 1994-2009 The NetBSD Foundation, Inc.
+ </span>
+ ALL
+ RIGHTS RESERVED. <br /> NetBSD<sup>®</sup> は
+ The NetBSD Foundation, Inc. の登録商標です。
+ </span>
+ </div>
</div>
</div>
</body>
Index: index.html
===================================================================
RCS file: /cvsroot/htdocs/index.html,v
retrieving revision 1.1586
retrieving revision 1.1587
diff -u -r1.1586 -r1.1587
--- index.html 22 Feb 2009 04:34:33 -0000 1.1586
+++ index.html 24 Feb 2009 15:32:46 -0000 1.1587
@@ -14,6 +14,35 @@
<meta name="DESCRIPTION" content="PowerPC, Alpha, SPARC, MIPS, SH3, StrongARM, HP PA-RISC, i386, m68k, VAX: Of course it runs NetBSD.">
<meta name="KEYWORDS" content="NetBSD, BSD, 4.4BSD, acorn26, acorn32, algor, algorithmics, alpha, amiga, amigappc, arc, arm26, arm32, atari, bebox, cats, cesfic, cobalt, evbarm, evbmips, evbppc, evbsh3, ews4800, hp300, hp700, hpcarm, hpcmips, hpcsh, hppa, i386, ibmnws, iyonix, luna68k, m68k, mac68k, macppc, mips, mmeye, mvme68k, mvmeppc, netwinder, news68k, newsmips, next68k, mipsco, ofppc, pica, pmax, pmppc, prep, powerpc, sandpoint, sbmips, sgimips, sh3, shark, sparc, sparc64, sun2, sun3, sun3x, ultrasparc, vax, walnut, x68k, x86-64, amd64, xen, linux, freebsd, hp-ux, sunos, osf/1, ultrix, svr4, solaris, sco, iBCS2, IPv6, embedded, open source, opteron, open source, BSD">
<meta name="verify-v1" content="guJT5SZUh4XMF/emgSnXZPc6GkWkhP7PvMdYBc/auJI=">
+
+ <script type="text/javascript">
+ <!--
+ /* function: validate donation amount, for Google Checkout */
+ function validateAmount(amount){
+ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+ return true;
+ }else{
+ alert('You must enter a valid donation.');
+ amount.focus();
+ return false;
+ }
+ }
+
+ /* pseudo class: platinum donor */
+ function Donor(URL, Img) {
+ this.URL = URL;
+ this.Img = Img;
+ }
+
+ var now = new Date();
+
+ var dindex;
+ var di = 0;
+ var donors = new Array();
+ // -->
+ </script>
+ <!-- donors data -->
+ <script type="text/javascript" src="donations/donors.js"></script>
</head>
@@ -167,20 +196,36 @@
<a href="gallery/devotionalia.html">
<img border="0" src="images/links/cafepress.png" alt="[Cafepress]"/>
</a>
- <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+ <form action="https://checkout.google.com/cws/v2/Donations/150990749831378/checkoutForm"
+ id="donateGoogle" method="post" name="BB_BuyButtonForm"
+ onSubmit="return validateAmount(this.item_price_1)">
+ <input name="item_name_1" type="hidden" value="Donation for The NetBSD Foundation, Inc."/>
+ <input name="item_description_1" type="hidden" value="Help improve the NetBSD operating system."/>
+ <input name="item_quantity_1" type="hidden" value="1"/>
+ <input name="item_currency_1" type="hidden" value="USD"/>
+ <input name="item_is_modifiable_1" type="hidden" value="true"/>
+ <input name="item_min_price_1" type="hidden" value="10.0"/>
+ <input name="item_max_price_1" type="hidden" value="25000.0"/>
+ <input name="_charset_" type="hidden" value="utf-8"/>
+ $<input id="item_price_1" name="item_price_1"
+ onfocus="this.style.color='black'; this.value='';"
+ size="11" style="color:grey;" type="text" value="Enter amount">
+ <br>
+ <input type="image" alt="[Donate using Google]"
+ src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=150990749831378&w=115&h=50&style=white&variant=text&loc=en_US"/>
+ </form>
+ <div>— OR —</div>
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post"
+ id="donatePaypal">
+ <!-- input type="hidden" name="amount" value="1234"/ -->
<input type="hidden" name="cmd" value="_xclick"/>
<input type="hidden" name="business" value="paypal@NetBSD.org"/>
<input type="hidden" name="item_name" value="The NetBSD Foundation"/>
<input type="hidden" name="no_shipping" value="1"/>
<input type="hidden" name="return" value="http://www.NetBSD.org/"/>
<input type="hidden" name="cancel_return" value="http://www.NetBSD.org/"/>
- <input type="image" src="images/links/paypal.gif" name="submit" alt="Donate using PayPal"/>
+ <input type="image" src="images/links/paypal.gif" name="submit" alt="[Donate using PayPal]"/>
</form>
- <a href="http://www.isc.org/">
- <img src="images/hosted-isc.png" alt="www.NetBSD.org is hosted at ISC"
- hspace="6" border="0" width="84" height="41"/>
- </a>
-
</div>
</div>
</div>
@@ -200,13 +245,13 @@
pkgsrc, the NetBSD Packages Collection.
<span class="more"><a href="about/features.html">» Learn more</a></span>
</p>
+
<p>
<span class="more"><a href="releases/formal-4/NetBSD-4.0.1.html">» Latest release: NetBSD 4.0.1</a></span>
</p>
<div class="iconsRight">
-
<!-- Fundraising last month box
<div id="warnBox">
@@ -331,7 +376,7 @@
-->
</div>
</div>
- </div>
+ </div> <!-- mainContent -->
<div id="news">
@@ -355,7 +400,43 @@
</span>
</li>
</ul>
-
+
+<!-- XXX: no platinum donors at the moment
+ <h3>Platinum Donor</h3>
+ <div id="platinumDonorLogo">
+ <noscript>
+ <a href="http://www.NetBSD.org/cgi-bin/pdonor.cgi?url=get">
+ <img src="http://www.NetBSD.org/cgi-bin/pdonor.cgi?image=get"
+ alt="[Platinum Donor Logo]">
+ </a>
+ </noscript>
+ </div>
+ <script type="text/javascript">
+-->
+ <!--
+ dindex = Math.floor(now.getTime() / 1000 / ROT_INTERVAL);
+ dindex = dindex % di;
+
+ var div = document.getElementById('platinumDonorLogo');
+ var anchor = document.createElement('a');
+ var image = document.createElement('img');
+
+ image.setAttribute('src', donors[dindex].Img);
+ image.setAttribute('alt', "[Platinum Donor Logo]");
+ anchor.setAttribute('href', donors[dindex].URL);
+
+ anchor.appendChild(image);
+ div.appendChild(anchor);
+ // -->
+<!-- XXX: no platinum donors at the moment
+ </script>
+ <ul>
+ <li>
+ <a href="donations/">» About NetBSD sponsorship</a>
+ </li>
+ </ul>
+-->
+
<h3>Upcoming Events</h3>
<ul>
@@ -375,30 +456,35 @@
</span>
</li>
</ul>
-
-
</div>
</div>
</div>
<!-- ##### Footer ##### -->
- <!-- $NetBSD: index.html,v 1.1586 2009/02/22 04:34:33 jun Exp $ -->
+ <!-- $NetBSD: index.html,v 1.1587 2009/02/24 15:32:46 mishka Exp $ -->
<div class="rowOfBoxes">
<div id="footer">
- <span class="footfeed">
- <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">
- Contact</a> |
- </span>
- <span class="footcopy"><a href="about/disclaimer.html">
- Disclaimer</a> |
- <span class="copyright">
- Copyright © 1994-2009 The NetBSD Foundation, Inc.
+ <div id="footerLogo">
+ <a href="http://www.isc.org/"><img src="images/hosted-isc.png"
+ alt="www.NetBSD.org is hosted at ISC"
+ border="0" width="84" height="41"/></a>
+ </div>
+ <div id="footerContent">
+ <span class="footfeed">
+ <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">
+ Contact</a> |
</span>
- ALL
- RIGHTS RESERVED. <br /> NetBSD<sup>®</sup> is a registered
- trademark of The NetBSD Foundation, Inc.
- </span>
+ <span class="footcopy"><a href="about/disclaimer.html">
+ Disclaimer</a> |
+ <span class="copyright">
+ Copyright © 1994-2009 The NetBSD Foundation, Inc.
+ </span>
+ ALL
+ RIGHTS RESERVED. <br /> NetBSD<sup>®</sup> is a registered
+ trademark of The NetBSD Foundation, Inc.
+ </span>
+ </div>
</div>
</div>
</body>