[PC-BSD Commits] r2954 - in websites/pbidir.com/bibivu: bin etc/lang/de etc/lang/en etc/lang/es etc/lang/fr etc/lang/it etc/lang/ja etc/lang/nl etc/lang/pt etc/lang/ru etc/lang/tr tpl/css tpl/pbidir tpl/pbidir/images/download

svn at pcbsd.org svn at pcbsd.org
Fri Nov 7 20:23:09 PST 2008 

Author: fabry
Date: 2008-11-07 20:23:08 -0800 (Fri, 07 Nov 2008)
New Revision: 2954

Added:
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/Thumbs.db
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/ftplink_old.png
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/ftplinkk.png
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/httplink_old.png
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/httplinkk.png
Modified:
   websites/pbidir.com/bibivu/bin/start.php
   websites/pbidir.com/bibivu/etc/lang/de/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/en/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/es/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/fr/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/it/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/ja/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/nl/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/pt/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/ru/download.lang.php
   websites/pbidir.com/bibivu/etc/lang/tr/download.lang.php
   websites/pbidir.com/bibivu/tpl/css/pbidir.css
   websites/pbidir.com/bibivu/tpl/pbidir/download.php
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/ftplink.png
   websites/pbidir.com/bibivu/tpl/pbidir/images/download/httplink.png
Log:
 - allowing the user to automatically select a mirror.
 - substituted some icons.
 - new string that need to be translated

Modified: websites/pbidir.com/bibivu/bin/start.php
===================================================================
--- websites/pbidir.com/bibivu/bin/start.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/bin/start.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -430,12 +430,16 @@
 				return;
 			}
 			$this->display->assign('pbi_release', $pbi_release);
-			if($this->uri->get_num(5)>0){
+			$preferred_mirror = load_library('cookies')->get('preferred_mirror','');
+			if($this->uri->get_num(5)>0 || $preferred_mirror>0){
+				if($preferred_mirror<=0){
+					$preferred_mirror = $this->uri->get_num(5);
+				}
 				$filters = array();
 				$filters[] = array('field'=>'active', 'operator'=>'=', 'value'=>'y');
-				$filters[] = array('field'=>'id', 'operator'=>'=', 'value'=>$this->uri->get_num(5));
+				$filters[] = array('field'=>'id', 'operator'=>'=', 'value'=>$preferred_mirror);
 				$mirror = $this->table_prototype->get_record($filters, 'mirror')->get_info();
-				if(!isset($mirror['id']) || $mirror['id']!=$this->uri->get_num(5)){
+				if(!isset($mirror['id']) || $mirror['id']!=$preferred_mirror){
 					//package doesn't exists
 					$this->display->assign('message', 'Mirror not found!');
 					$this->display('message');
@@ -450,6 +454,8 @@
 				$this->display->assign('mirror', $mirror);
 		
 				$this->display->assign('title', 'Downloading '.$pbi['name']);
+				//need to save this mirror as the preferred mirror
+				load_library('cookies')->set('preferred_mirror',$mirror['id']);
 				$this->display('download');
 			} else {
 				//have to choose the mirror to use

Modified: websites/pbidir.com/bibivu/etc/lang/de/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/de/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/de/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Klicken Sie hier';
 $lang['mirror_home'] = 'Besuchen Sie die Mirror Home Page';
 $lang['return_pbi'] = 'Zurück zum PBI';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/en/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/en/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/en/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Click Here';
 $lang['mirror_home'] = 'Visit Mirror Home Page';
 $lang['return_pbi'] = 'Return to the pbi';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/es/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/es/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/es/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -1,10 +1,12 @@
-<?php
-//download messages strings
-$lang['downloading'] = 'Descargando';
-$lang['using'] = 'Usando el mirror';
-$lang['choose_mirror'] = 'Por favor, escoja un mirror:';
-$lang['nostart'] = 'Si la descarga no comienza automaticamente,';
-$lang['clickhere'] = 'cliquee aquí';
-$lang['mirror_home'] = 'Visite la página principal del mirror';
-$lang['return_pbi'] = 'Volver al pbi';
+<?php
+//download messages strings
+$lang['downloading'] = 'Descargando';
+$lang['using'] = 'Usando el mirror';
+$lang['choose_mirror'] = 'Por favor, escoja un mirror:';
+$lang['nostart'] = 'Si la descarga no comienza automaticamente,';
+$lang['clickhere'] = 'cliquee aquí';
+$lang['mirror_home'] = 'Visite la página principal del mirror';
+$lang['return_pbi'] = 'Volver al pbi';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/fr/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/fr/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/fr/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Cliquez ici';
 $lang['mirror_home'] = 'Voir la page d\'accueil du mirroir';
 $lang['return_pbi'] = 'Retour au pbi';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/it/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/it/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/it/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Clicca qui';
 $lang['mirror_home'] = 'Visita il sito del Mirror';
 $lang['return_pbi'] = 'Ritorna al pbi';
+$lang['ftp_download'] = 'Per scaricare il file, clicca on il tasto destro e scegli "salva come"';
+$lang['change_mirror'] = 'Per scegliere un Mirror diverso'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/ja/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/ja/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/ja/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -1,27 +1,12 @@
 <?php
 //download messages strings
-
-#$lang['downloading'] = 'Downloading';
-# "Downloading Foobar v1.2.3" と表示される。
 $lang['downloading'] = 'ダウンロード';
-
-#$lang['using'] = 'using';
-# using は現在選択されているミラーサーバーを表す。例: using Japan - allbsd.org
 $lang['using'] = '選択済み';
-
-#$lang['choose_mirror'] = 'Please select your download location:';
 $lang['choose_mirror'] = 'ダウンロード先を選択してください:';
-
-# この2つはセット: If the download doesn't start automatically <a>Click Here</a>
-#$lang['nostart'] = 'If the download doesn\'t start automatically';
 $lang['nostart'] = 'ダウンロードが自動的に始まらない時には';
-#$lang['clickhere'] = 'Click Here';
 $lang['clickhere'] = 'こちらをクリックしてください';
-
-# どこで使ってるんだ?
-#$lang['mirror_home'] = 'Visit Mirror Home Page';
 $lang['mirror_home'] = 'ミラーサイトを訪問する';
-
-#$lang['return_pbi'] = 'Return to the pbi';
 $lang['return_pbi'] = 'pbiパッケージの説明に戻る';
-?>
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
+?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/nl/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/nl/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/nl/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Klik hier';
 $lang['mirror_home'] = 'Bezoek de mirror homepage';
 $lang['return_pbi'] = 'Keer terug naar de pbi';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/pt/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/pt/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/pt/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -1,10 +1,12 @@
-<?php
-//download messages strings
-$lang['downloading'] = 'Downloading';
-$lang['using'] = 'utilizando';
-$lang['choose_mirror'] = 'Seleccione o local para download:';
-$lang['nostart'] = 'Se o download não começar automaticamente';
-$lang['clickhere'] = 'Clique aqui';
-$lang['mirror_home'] = 'Visite a Página Inicial Mirror';
-$lang['return_pbi'] = 'Regressar a pbi';
+<?php
+//download messages strings
+$lang['downloading'] = 'Downloading';
+$lang['using'] = 'utilizando';
+$lang['choose_mirror'] = 'Seleccione o local para download:';
+$lang['nostart'] = 'Se o download não começar automaticamente';
+$lang['clickhere'] = 'Clique aqui';
+$lang['mirror_home'] = 'Visite a Página Inicial Mirror';
+$lang['return_pbi'] = 'Regressar a pbi';
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
 ?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/ru/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/ru/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/ru/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Щелкните сюда';
 $lang['mirror_home'] = 'Посетить домашнюю станичку зеркала';
 $lang['return_pbi'] = 'Возврат к pbi';
-?>
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
+?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/etc/lang/tr/download.lang.php
===================================================================
--- websites/pbidir.com/bibivu/etc/lang/tr/download.lang.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/etc/lang/tr/download.lang.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -7,4 +7,6 @@
 $lang['clickhere'] = 'Buraya T&#305;klay&#305;n';
 $lang['mirror_home'] = 'Yans&#305;t&#305;c&#305; Ana Sayfay&#305; Ziyaret Edin';
 $lang['return_pbi'] = 'pbi\'ye dön';
-?>
+$lang['ftp_download'] = 'To download please right click and choose "save link as".';
+$lang['change_mirror'] = 'To choose another mirror'; //To choose another mirror <a>click here</a>
+?>
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/tpl/css/pbidir.css
===================================================================
--- websites/pbidir.com/bibivu/tpl/css/pbidir.css	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/tpl/css/pbidir.css	2008-11-08 04:23:08 UTC (rev 2954)
@@ -30,7 +30,7 @@
 	background-color:#EEE;
 	border:1px solid #DDD;
 	width:354px;
-	height:25px;
+	height:20px;
 }
 .mirrors li:hover {
 	background-color:#FEFEFE;
@@ -380,6 +380,7 @@
 div.downlinks li {
 	padding: 0.2em 0;
 	margin: 0;
+	font-size:15px;
 }
 
 /*			Admin			*/
@@ -747,4 +748,5 @@
 .link_image_small{
 	padding-right:2px;
 	width:25px;
+	float:left;
 }
\ No newline at end of file

Modified: websites/pbidir.com/bibivu/tpl/pbidir/download.php
===================================================================
--- websites/pbidir.com/bibivu/tpl/pbidir/download.php	2008-11-06 21:06:23 UTC (rev 2953)
+++ websites/pbidir.com/bibivu/tpl/pbidir/download.php	2008-11-08 04:23:08 UTC (rev 2954)
@@ -17,11 +17,19 @@
 	if($pbi_release['md5']!=''){
 		?><br/><?=load_library('lang')->get('md5')?>: <?=$pbi_release['md5']?><br /><br /><?php
 	}
-	?><br/><?=load_library('lang')->get('download_nostart')?> <a href="<?=$uri?>"><?=load_library('lang')->get('download_clickhere')?></a><br /><br /><?php
+	?><br/><?php
+	if($key!='ftp'){
+		?><?=load_library('lang')->get('download_nostart')?><?php
+	} else {
+		?><?=load_library('lang')->get('download_ftp_download')?><?php
+	} ?> <a href="<?=$uri?>"><?=load_library('lang')->get('download_clickhere')?></a><br /><br /><?php
 }
 ?>
 <a href="<?=$pbi_uri?>/<?=$pbi['id']?>"><?=load_library('lang')->get('download_return_pbi')?></a><br /><br />
-<script type="text/javascript" language="javascript"><!-- 
+<?=load_library('lang')->get('download_change_mirror')?> <a href="<?=$download_uri?>/<?=$pbi['id']?>/<?=$pbi_release['id']?>"><?=load_library('lang')->get('download_clickhere')?></a>
+<?php
+if($key!='ftp'){
+	?><script type="text/javascript" language="javascript"><!-- 
 setTimeout("redirect_bibivu();",<?=($timeout*1000)?>);
 function redirect_bibivu(){
 	window.location.replace="<?=$uri?>";
@@ -29,4 +37,6 @@
 	window.location="<?=$uri?>";
 }
 // -->
-</script>
+</script><?php
+}
+?>


Property changes on: websites/pbidir.com/bibivu/tpl/pbidir/images/download/Thumbs.db
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: websites/pbidir.com/bibivu/tpl/pbidir/images/download/ftplink_old.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: websites/pbidir.com/bibivu/tpl/pbidir/images/download/ftplinkk.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: websites/pbidir.com/bibivu/tpl/pbidir/images/download/httplink_old.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: websites/pbidir.com/bibivu/tpl/pbidir/images/download/httplinkk.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

More information about the Commits mailing list