webcraftmedia/slingit.org
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slingit lang switcher problem "solved", updated system reference, fixes and cleanup

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-04-05 02:05:21 +02:00
parent cee5208e15
commit e4edef87cf
9 changed files with 31 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/system

@ -1 +1 @@
Subproject commit 49e18f1c3cf61c62952a3be957f1093a88cb1782
Subproject commit 9b300210290eb0d7234b10ce84831a9b92800b2e

6
slingit/page/default_page/css/default_page.css
View File

@ -14,10 +14,12 @@ body{}
#content {}
#footer {
#footer {
position: absolute;
height: 20px;
bottom: 0;
bottom: 0px;
left: 0;
right: 0;
text-align: center;
width: 100%;
background: whitesmoke;

17
slingit/page/default_page/default_page.php
View File

@ -1,19 +1,14 @@
<?php
class default_page extends \SYSTEM\PAGE\Page {
private function js(){
private static function js(){
return '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jquery/jquery-1.9.1.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/js/bootstrap.min.js').'"></script>'.
'<script src="'.SYSTEM\WEBPATH(new PLIB(),'webtorrent/webtorrent.min.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jqbootstrapvalidation/jqBootstrapValidation.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.md5.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.sha1.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'webtorrent/webtorrent.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="./api.php?call=files&cat=sys&id=system.js"></script>'.
'<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js').'"></script>'.
'<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/lang_switcher.js').'"></script>';
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js').'"></script>';
}
private function css(){
private static function css(){
return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">'.
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" rel="stylesheet">'.
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-theme.min.css').'" rel="stylesheet">'.
@ -22,8 +17,8 @@ class default_page extends \SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['js'] = $this->js();
$vars['css'] = $this->css();
$vars['js'] = self::js();
$vars['css'] = self::css();
$vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);

30
slingit/page/default_page/js/lang_switcher.js
View File

@ -1,30 +0,0 @@
function switchLocale(locale){
reloadWithQueryStringVars({"_lang": locale});
}
function reloadWithQueryStringVars (queryStringVars) {
var existingQueryVars = location.search ? location.search.substring(1).split("&") : [],
//currentUrl = location.search ? location.href.replace(location.search,"") : location.href,
newQueryVars = {},
newUrl = "http://www.slingit.org/?_lang="+queryStringVars._lang+"#";
if(existingQueryVars.length > 0) {
for (var i = 0; i < existingQueryVars.length; i++) {
var pair = existingQueryVars[i].split("=");
newQueryVars[pair[0]] = pair[1];
}
}
if(queryStringVars) {
for (var queryStringVar in queryStringVars) {
newQueryVars[queryStringVar] = queryStringVars[queryStringVar];
}
}
if(newQueryVars) {
for (var newQueryVar in newQueryVars) {
newUrl += newQueryVar + "=" + newQueryVars[newQueryVar] + "&";
}
newUrl = newUrl.substring(0, newUrl.length-1);
window.location.href = newUrl;
} else {
window.location.href = location.href;
}
}

4
slingit/page/default_page/tpl/default_page.tpl
View File

@ -24,8 +24,8 @@
<div id="footer">
<a href="#!about" id="about">About</a>&nbsp;
<a href="#!impressum" id="impressum">Impressum</a>&nbsp;
<a href="javascript:switchLocale('deDE');"><img src="${PATH_LOCAL_IMG}flag_germany.png" alt="Deutsch"></a>&nbsp;
<a href="javascript:switchLocale('enUS');"><img src="${PATH_LOCAL_IMG}flag_usa.png" alt="English"></a>&nbsp;
<a href="javascript:system.language('deDE');"><img src="${PATH_LOCAL_IMG}flag_germany.png" alt="Deutsch"></a>&nbsp;
<a href="javascript:system.language('enUS');"><img src="${PATH_LOCAL_IMG}flag_usa.png" alt="English"></a>&nbsp;
</div>
</body>
</html>

10
slingit/page/default_start/css/default_start.css
View File

@ -14,7 +14,7 @@
list-style-type: none;
}
#dropZone p, #pullZone p{
#dropZone p{
position:relative;
top:45%;
left:0;
@ -22,14 +22,6 @@
text-align: center;
}
#pullZone{
width: 400px;
height: 400px;
float: left;
outline: 3px solid #eee;
margin-left: 15px;
}
#link_container {
padding-top: 40px;
font-size: 8pt;

2
slingit/page/default_start/default_start.php
View File

@ -11,7 +11,7 @@ class default_start extends SYSTEM\PAGE\Page {
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_start/css/default_start.css'));}
public function html(){
$vars = array();
$vars['hash'] = $this->hash == '${hash}' ? '' : $this->hash;
$vars['hash'] = $this->hash ? $this->hash : '';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE),
\SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_TEXT));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars);

34
slingit/page/default_start/js/default_start.js
View File

@ -1,8 +1,6 @@
var client = new WebTorrent({
rtcConfig: { iceServers:
[{url: "stun:23.21.150.121"},
{url: "stun:stun.1.google.com:19302"}]
}
rtcConfig: { iceServers: [ {url: "stun:23.21.150.121"},
{url: "stun:stun.1.google.com:19302"}]}
});
function init_start(){
@ -28,7 +26,7 @@ function init_start(){
slingit_download(client,$('#input_load_infohash').val());});
//start download if hash provided
if($('#input_load_infohash').val() != ''){
if($('#input_load_infohash').val() !== ''){
slingit_download(client,$('#input_load_infohash').val());}
}
function handleFileSelect(evt) {
@ -67,7 +65,7 @@ function log_file_start(torrent){
}
function log_file_add(torrent){
var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1)
var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1);
$('#link_container tr:last').after(
'<tr id="' + torrent.infoHash + '">' +
'<td>' +
@ -91,7 +89,7 @@ $.getScript("http://platform.twitter.com/widgets.js");
function log_file_upd(torrent){
if($('#'+torrent.infoHash).length){
var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1)
var progress = (100 * torrent.downloaded / torrent.parsedTorrent.length).toFixed(1);
$('#'+torrent.infoHash).html(
'<td>' +
progress + '%' +
@ -105,9 +103,7 @@ function log_file_upd(torrent){
'direct link: ' +
'</a>' +
'<input type="text" value="http://www.slingit.org/#!start;hash.' + torrent.infoHash + '" onClick="this.setSelectionRange(0, this.value.length)"/>' +
'&nbsp;&nbsp;&nbsp;' +
'<a class="twitter-share-button" href="https://twitter.com/share" data-via="slingtweet" data-url="http://www.slingit.org/#!start;hash.' + torrent.infoHash + '">Tweet</a>' +
'</td>')
'</td>');
} else {
log_file_add(torrent);
}
@ -147,20 +143,20 @@ function log_file_done(torrent,url,file){
'<a class="twitter-share-button" href="https://twitter.com/share" data-via="slingtweet" data-url="http://www.slingit.org/#!start;hash.' + torrent.infoHash + '">Tweet</a>' +
'</td>' +
'</tr>');
$.getScript("http://platform.twitter.com/widgets.js");
}
function slingit_upload(client,files){
log_initialize();
var fileStore = new Array();
console.log(files)
console.log(files);
for (var i=0, file; file=files[i]; i++) {
var reader = new FileReader();
reader.onload = function(e2) { // finished reading file data.
}
reader.onload = function(e2) {}; // finished reading file data.
reader.readAsDataURL(file); // start reading the file data.
fileStore.push(file);
console.log(file);
var fname = file.name
var fname = file.name;
client.seed(file,onTorrent);
}
}
@ -171,11 +167,11 @@ function onTorrent (torrent) {
torrent.swarm.on('download', function () {
log_file_upd(torrent);
})
});
torrent.swarm.on('upload', function () {
log_file_upd(torrent);
})
});
torrent.files.forEach(function (file) {
/*var extname = path.extname(file.name)
@ -191,11 +187,11 @@ function onTorrent (torrent) {
file.createReadStream().pipe(audio)
} else {*/
file.getBlobURL(function (err, url) {
if (err) throw err
if (err) throw err;
log_file_done(torrent,url,file);
})
});
//}
})
});
}
function slingit_download(client,hash){

2
slingit/page/page_slingit.php
View File

@ -6,7 +6,7 @@ class page_slingit extends \SYSTEM\API\api_default {
public static function default_page(){
return new default_page();}
public static function page_start($hash){
public static function page_start($hash = null){
return new default_start($hash);}
public static function page_about(){