mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: move goUrl() and goPort() away from Y_NIlib.js

Browse Source 
Origin commit data
------------------
Commit: bc15870197
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-21 (Tue, 21 Feb 2023)

Origin message was:
------------------
- yWeb: move goUrl() and goPort() away from Y_NIlib.js
This commit is contained in:
vanhofen
2023-02-21 22:52:10 +01:00
parent 197a96d3fe
commit 547997c452
14 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
data/y-web/Y_Baselib.js
View File

@@ -528,3 +528,28 @@ function saveTextAsFile(content, filename, filetype)
} }
downloadLink.click(); downloadLink.click();
} }
function goUrl(_url)
{
var res = trim(loadSyncURL(_url));
switch(res)
{
case "1": res = "on"; break;
case "0": res = "off"; break;
}
var out = document.getElementById("out");
if (out)
out.innerHTML = res;
}
function goPort(_port)
{
if (_port == "")
return;
var host = self.location.href;
var pos1 = host.indexOf('//');
var temp = host.substring(pos1 + 2, host.length);
var pos2 = temp.indexOf('/');
var host = host.substring(0, pos1 + 2 + pos2);
window.open(host + ":" + _port, "_blank");
}

1
data/y-web/Y_Blocks.txt
View File

@@ -299,7 +299,6 @@ start-block~head_ni
{=include-block:Y_Blocks.txt;js_prototype=} {=include-block:Y_Blocks.txt;js_prototype=}
{=include-block:Y_Blocks.txt;js_jquery=} {=include-block:Y_Blocks.txt;js_jquery=}
{=include-block:Y_Blocks.txt;js_jquery_ui=} {=include-block:Y_Blocks.txt;js_jquery_ui=}
<script src="/Y_Baselib.js"></script>
<script src="/Y_NIlib.js"></script> <script src="/Y_NIlib.js"></script>
<script> <script>
// Clear y-Cache in our pages // Clear y-Cache in our pages

5
data/y-web/Y_NI_About.yhtm
View File

@@ -1,5 +1,3 @@
{=include-block:Y_Blocks.txt;head_ni=}
{=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=} {=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=}
{=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=} {=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=}
@@ -19,6 +17,9 @@
{=var-set:_mem_free={=script:Y_NI_Tools get_mem_info free=}=} {=var-set:_mem_free={=script:Y_NI_Tools get_mem_info free=}=}
{=var-set:boxmodel={=func:get_boxmodel=}=} {=var-set:boxmodel={=func:get_boxmodel=}=}
{=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<script> <script>
// taken from http://www.jjam.de/JavaScript/Datum_Uhrzeit/Wochentag.html // taken from http://www.jjam.de/JavaScript/Datum_Uhrzeit/Wochentag.html
function getWeekDay(dd,mm,yyyy) { function getWeekDay(dd,mm,yyyy) {

1
data/y-web/Y_NI_Camd-control.yhtm
View File

@@ -21,6 +21,7 @@
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=} {=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<style> <style>
input[type="button"], .tools select { input[type="button"], .tools select {
width: 100%; width: 100%;

2
data/y-web/Y_NI_Infoicons-control.yhtm
View File

@@ -7,7 +7,9 @@
{=var-set:icons_flag6={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag6~cache=}=} {=var-set:icons_flag6={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag6~cache=}=}
{=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=} {=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=}
{=var-set:icons_dir=%(ICONSDIR)=} {=var-set:icons_dir=%(ICONSDIR)=}
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<script> <script>
function do_submit() function do_submit()
{ {

1
data/y-web/Y_NI_NetFS-control.yhtm
View File

@@ -17,6 +17,7 @@
{=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_is_mount=} {=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<script> <script>
function edit_popup() function edit_popup()
{ {

1
data/y-web/Y_NI_NetFS-edit.yhtm
View File

@@ -1,4 +1,5 @@
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<script> <script>
function form_init() function form_init()
{ {

1
data/y-web/Y_NI_NetFS-init.yhtm
View File

@@ -1,4 +1,5 @@
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
<script> <script>
jQuery(document).ready(function(){ jQuery(document).ready(function(){
window.document.location.href='/Y_NI_NetFS-control.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}'; window.document.location.href='/Y_NI_NetFS-control.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}';

1
data/y-web/Y_NI_PZapit-control.yhtm
View File

@@ -1,4 +1,5 @@
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
{=include-block:Y_Blocks.txt;head_close=} {=include-block:Y_Blocks.txt;head_close=}
<body> <body>
<div class="work_box"> <div class="work_box">

1
data/y-web/Y_NI_Plugin-control.yhtm
View File

@@ -9,6 +9,7 @@
{=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=} {=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=}
{=include-block:Y_Blocks.txt;head_ni=} {=include-block:Y_Blocks.txt;head_ni=}
<script src="/Y_Baselib.js"></script>
{=include-block:Y_Blocks.txt;head_close=} {=include-block:Y_Blocks.txt;head_close=}
<body onload='goUrl("/control/reloadplugins");'> <body onload='goUrl("/control/reloadplugins");'>
{=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=} {=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}

21
data/y-web/Y_NIlib.js
View File

@@ -1,27 +1,6 @@
/* yWeb NIlib by NI-Team /* yWeb NIlib by NI-Team
*/ */
// next function is taken from the original yweb
// to make them available in all of our pages
function goUrl(_url){
var res = trim(loadSyncURL(_url));
switch(res){
case "1": res="on"; break;
case "0": res="off"; break;
}
$("out").update(res);
}
function goPort(_port) {
if (_port == "") return;
var host = self.location.href;
var pos1 = host.indexOf('//');
var temp = host.substring(pos1+2,host.length);
var pos2 = temp.indexOf('/');
var host = host.substring(0,pos1+2+pos2);
window.open(host + ":" + _port,"_blank");
}
function Y_NI_Tools(_cmd, _tout){ function Y_NI_Tools(_cmd, _tout){
$("out").update(""); $("out").update("");
show_waitbox(true); show_waitbox(true);

8
data/y-web/Y_Tools_Boxcontrol.yhtm
View File

@@ -6,14 +6,6 @@
function goConfirmUrl(_meld, _url){ function goConfirmUrl(_meld, _url){
if (confirm(_meld)==true) goUrl(_url); if (confirm(_meld)==true) goUrl(_url);
} }
function goUrl(_url){
var res = trim(loadSyncURL(_url));
switch(res){
case "1": res="on"; break;
case "0": res="off"; break;
}
jQuery('#out').text(res);
}
function set_btn_standby(){ function set_btn_standby(){
var res = trim(loadSyncURL("/control/standby")); var res = trim(loadSyncURL("/control/standby"));
var color = "gray"; var color = "gray";

6
data/y-web/Y_Tools_Info_Menue.yhtm
View File

@@ -1,11 +1,5 @@
{=include-block:Y_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head=}
<script src="/Y_Baselib.js"></script> <script src="/Y_Baselib.js"></script>
<script>
function goUrl(_url){
var res = loadSyncURL(_url);
id("out").innerHTML = res;
}
</script>
{=include-block:Y_Blocks.txt;head_close=} {=include-block:Y_Blocks.txt;head_close=}
<body> <body>
<div class="work_box"> <div class="work_box">

4
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=3.0.40 version=3.0.41
date=20.02.2023 date=21.02.2023
info=NI-Neutrino-Webinterface info=NI-Neutrino-Webinterface