[cvs] web/download header.inc, 1.4, 1.5 index.de.php, 1.7, 1.8 index.en.php, 1.19, 1.20 index.fr.php, 1.10, 1.11 index.it.php, 1.6, 1.7 index.ja.php, 1.11, 1.12 index.zh.php, 1.5, 1.6

Thu, 13 Dec 2007 11:47:52 -0800 

Update of /cvsroot/fink/web/download
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11923/download

Modified Files:
        header.inc index.de.php index.en.php index.fr.php index.it.php 
        index.ja.php index.zh.php 
Log Message:
rework the analytics stuff to use the new google analytics api, also make a 
better php api for our own use

Index: index.it.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.it.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.it.php        15 Aug 2007 21:17:02 -0000      1.6
+++ index.it.php        13 Dec 2007 19:47:09 -0000      1.7
@@ -3,10 +3,10 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include_once "../fink_version.inc";
 ?>
 
-
 <h1>Fink Downloads</h1>
 <p>
 Esistono vari metodi per installare o aggiornare Fink.
@@ -20,17 +20,12 @@
 Nuovo a Fink?  Queste istruzioni di avvio rapido sono presenti allo scopo di 
rendervi
 l'avvio rapido con le binary release.
 </p>
-<? 
-include "../fink_version.inc";
-?>
 
 <ol>
 <li><p>
 Download dell' installer disk image:<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download">Fink
-<? print $fink_version; ?> Binary Installer (PowerPC)</a> - <? print 
$dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download">Fink
-<? print $fink_version; ?> Binary Installer (Intel)</a> - <? print 
$intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Fink " . $fink_version . " 
Binary Installer (PowerPC)", "/downloads/FinkPPC")   ?> - <?= $dmg_size ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Fink " . $fink_version . " 
Binary Installer (Intel)",   "/downloads/FinkINTEL") ?> - <?= $intel_dmg_size 
?><br>
 (10.3 users - use  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-Installer.dmg?download";>Fink
 0.7.2</a>)<br>
 (10.2 users - use  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-Installer.dmg?download";>Fink

Index: index.de.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.de.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.de.php        18 Jun 2006 18:15:32 -0000      1.7
+++ index.de.php        13 Dec 2007 19:47:08 -0000      1.8
@@ -3,10 +3,10 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include_once "../fink_version.inc";
 ?>
 
-
 <h1>Fink Download</h1>
 <p>
 Es gibt verschiedene Möglichkeiten, Fink zu installieren und zu aktualisieren.
@@ -19,17 +19,12 @@
 <p>
 Sie möchten Fink zum ersten mal installieren? Diese Quick-Start-Anleitung 
hilft Ihnen, einen schnellen Einstieg zu finden.
 </p>
-<? 
-include "../fink_version.inc";
-?>
 
 <ol>
 <li><p>
 Laden Sie sich das Installations-Disc-Image herunter:<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download">Fink
-<? print $fink_version; ?> Binary Installer (PowerPC)</a> - <? print 
$dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download">Fink
-<? print $fink_version; ?> Binary Installer (Intel)</a> - <? print 
$intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Fink " . $fink_version . " 
Binary Installer (PowerPC)", "/downloads/FinkPPC")   ?> - <?= $dmg_size ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Fink " . $fink_version . " 
Binary Installer (Intel)",   "/downloads/FinkINTEL") ?> - <?= $intel_dmg_size 
?><br>
 (10.3 Nutzer - nehmen stattdessen  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-Installer.dmg?download";>Fink
 0.7.2</a>)<br>
 (10.2 Nutzer - nehmen stattdessen  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-Installer.dmg?download";>Fink

Index: index.zh.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.zh.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.zh.php        18 Jun 2006 18:15:32 -0000      1.5
+++ index.zh.php        13 Dec 2007 19:47:10 -0000      1.6
@@ -3,10 +3,10 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include_once "../fink_version.inc";
 ?>
 
-
 <h1>下载 Fink</h1>
 <p>
 有很多办法可以安装或升级。
@@ -18,17 +18,12 @@
 <p>
 刚刚接触 
Fink？这个“快速上手”指南正是使你可以迅速用上我们的二进制发行版。
 </p>
-<? 
-include "../fink_version.inc";
-?>
 
 <ol>
 <li><p>
 下载安装程序磁盘映象：<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download">Fink
-<? print $fink_version; ?> 二进制安装包 (PowerPC)</a> - <? print 
$dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download">Fink
-<? print $fink_version; ?> 二进制安装包 (Intel)</a> - <? print 
$intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Fink " . $fink_version . " 
二进制安装包 (PowerPC)", "/downloads/FinkPPC")   ?> - <?= $dmg_size ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Fink " . $fink_version . " 
二进制安装包 (Intel)",   "/downloads/FinkINTEL") ?> - <?= $intel_dmg_size 
?><br>
 （10.3 用户 － 使用 <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-installer.dmg?download";>Fink
 0.7.2</a>）
 （10.2 用户 － 使用 <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-installer.dmg?download";>Fink

Index: header.inc
===================================================================
RCS file: /cvsroot/fink/web/download/header.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- header.inc  8 Mar 2004 00:30:12 -0000       1.4
+++ header.inc  13 Dec 2007 19:47:08 -0000      1.5
@@ -3,6 +3,12 @@
 
 $fsroot = $root = "../";
 
-include $fsroot."download/nav.inc";
-include $fsroot."header.inc";
+$skip_analytics = true;
+
+include_once $fsroot."download/nav.inc";
+include_once $fsroot."header.inc";
+include_once $fsroot."analytics.inc";
+
+analytics_print();
+
 ?>

Index: index.ja.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.ja.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.ja.php        18 Jun 2006 18:15:32 -0000      1.11
+++ index.ja.php        13 Dec 2007 19:47:10 -0000      1.12
@@ -3,7 +3,8 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include_once "../fink_version.inc";
 ?>
 
 
@@ -20,17 +21,12 @@
 初めてですか?
 
はじめの一歩では手軽にバイナリリリースをインストールする方法を解説します。
 </p>
-<? 
-include "../fink_version.inc";
-?>
 
 <ol>
 <li><p>
 インストーラディスクイメージをダウンロード:<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download">Fink
-<? print $fink_version; ?> バイナリインストーラ (PowerPC)</a> - <? 
print $dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download">Fink
-<? print $fink_version; ?> バイナリインストーラ (Intel)</a> - <? 
print $intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Fink " . $fink_version . " 
バイナリインストーラ (PowerPC)", "/downloads/FinkPPC")   ?> - <?= 
$dmg_size ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Fink " . $fink_version . " 
バイナリインストーラ (Intel)",   "/downloads/FinkINTEL") ?> - <?= 
$intel_dmg_size ?><br>
 (10.3 の場合は <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-Installer.dmg?download";>Fink
 0.7.2</a> をダウンロードして下さい)<br>
 (10.2 の場合は <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-Installer.dmg?download";>Fink

Index: index.fr.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.fr.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index.fr.php        16 Jun 2006 00:05:40 -0000      1.10
+++ index.fr.php        13 Dec 2007 19:47:09 -0000      1.11
@@ -3,7 +3,8 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include "../fink_version.inc";
 ?>
 
 
@@ -11,13 +12,10 @@
 <p>Il y a de nombreuses façons d'installer ou de mettre à niveau Fink. Nous 
conseillons aux nouveaux utilisateurs de suivre les instructions de 
téléchargement rapide figurant ci-dessous. Pour les autres, voyez les <a 
href="overview.php">généralités</a> et la <a href="upgrade.php">matrice de 
mise à niveau</a>.</p>
 <h2>Téléchargement rapide</h2>
 <p>C'est votre premier essai sous Fink ?  Ces instructions vont vous aider à 
charger rapidement la version binaire.</p>
-<? 
-include "../fink_version.inc";
-?>
 <ol>
 <li><p>Téléchargez l'image disque de l'installeur :<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download">Installeur binaire Fink <? print 
$fink_version; ?> pour PowerPC</a> - <? print $dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download">Installeur binaire Fink  <? print 
$fink_version; ?> pour Intel</a> - <? print $intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Installeur binaire Fink " . 
$fink_version . " pour PowerPC", "/downloads/FinkPPC")   ?> - <?= $dmg_size 
?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Installeur binaire Fink " . 
$fink_version . " pour Intel",   "/downloads/FinkINTEL") ?> - <?= 
$intel_dmg_size ?><br>
 Utilisateurs de la version 10.3 - utilisez  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-Installer.dmg?download";>Fink0.7.2</a><br>
 Utilisateurs de la version 10.2  - utilisez <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-Installer.dmg?download";>Fink
 0.6.4</a><br>
 Utilisateurs de la version 10.1  - utilisez <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.4.1-installer.dmg?download";>Fink0.4.1</a></p></li>

Index: index.en.php
===================================================================
RCS file: /cvsroot/fink/web/download/index.en.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- index.en.php        27 Oct 2007 01:46:03 -0000      1.19
+++ index.en.php        13 Dec 2007 19:47:09 -0000      1.20
@@ -3,10 +3,10 @@
 $cvs_author = '$Author$';
 $cvs_date = '$Date$';
 
-include "header.inc";
+include_once "header.inc";
+include_once "../fink_version.inc";
 ?>
 
-
 <h1>Fink Downloads</h1>
 <p>
 There are many ways to install or upgrade Fink.
@@ -15,26 +15,17 @@
 <a href="upgrade.php">upgrade matrix</a>.
 </p>
 
-<h2>Quick Start</h2><script src="http://www.google-analytics.com/urchin.js"; 
type="text/javascript">
-</script><script type="text/javascript">
-_uacct = "UA-305132-6";
-urchinTracker();
-</script> 
+<h2>Quick Start</h2>
 <p>
 New to Fink?  These quick start instructions are here to get you up to speed
 with the binary release.
 </p>
-<? 
-include "../fink_version.inc";
-?>
 <p><strong>Important Note for Leopard Users:</strong>  There is not currently 
a binary release for you.  Please go to the <a href="./srcdist.php">source 
release</a> page.</p>
 <ol>
 <li><p>
 Download the installer disk image:<br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-PowerPC-Installer.dmg?download" onClick="javascript:urchinTracker 
('/downloads/FinkPPC'); " >Fink
-<? print $fink_version; ?> Binary Installer (PowerPC)</a> - <? print 
$dmg_size; ?><br>
-<a href="http://prdownloads.sourceforge.net/fink/Fink-<? print $fink_version; 
?>-Intel-Installer.dmg?download" onClick="javascript:urchinTracker 
('/downloads/FinkINTEL'); ">Fink
-<? print $fink_version; ?> Binary Installer (Intel)</a> - <? print 
$intel_dmg_size; ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-PowerPC-Installer.dmg?download", "Fink " . $fink_version . " 
Binary Installer (PowerPC)", "/downloads/FinkPPC")   ?> - <?= $dmg_size ?><br>
+<? analytics_download_link("http://prdownloads.sourceforge.net/fink/Fink-"; . 
$fink_version . "-Intel-Installer.dmg?download",   "Fink " . $fink_version . " 
Binary Installer (Intel)",   "/downloads/FinkINTEL") ?> - <?= $intel_dmg_size 
?><br>
 (10.3 users - use  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.7.2-Installer.dmg?download";>Fink
 0.7.2</a>)<br>
 (10.2 users - use  <a 
href="http://prdownloads.sourceforge.net/fink/Fink-0.6.4-Installer.dmg?download";>Fink
@@ -167,4 +158,4 @@
 
 <?
 include "footer.inc";
-?>
\ No newline at end of file
+?>



-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to