diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 4eeba8c64..d6e3e1c7e 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -37,7 +37,6 @@ install_DATA = extensions.txt \ Y_Filemgr_Edit.yhtm \ Y_Info_Help.yhtm \ Y_Info_Menue.yhtm \ - Y_Info_Updates.yhtm \ Y_Live_EPG.yhtm \ Y_Live_EPG_Info.yhtm \ Y_Main.css \ diff --git a/data/y-web/Y_About_yWeb.yhtm b/data/y-web/Y_About_yWeb.yhtm index 774a7c91c..699a770b2 100644 --- a/data/y-web/Y_About_yWeb.yhtm +++ b/data/y-web/Y_About_yWeb.yhtm @@ -1,5 +1,17 @@ -{=var-set:cancache=yPConf=} {=include-block:Y_Blocks.txt;head=} +{=include-block:Y_Blocks.txt;js_jquery=} + + {=include-block:Y_Blocks.txt;head_close=} {=var-set:alt_httpd={=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.override_directory;%(PUBLIC_HTTPDDIR)=}=} {=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=} @@ -8,24 +20,47 @@
{=var-set:menu={=L:info.about_yweb=}=}{=include-block:Y_Blocks.txt;work_menu=}
- +
- + @@ -33,7 +68,7 @@ diff --git a/data/y-web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm index 09eb71ca2..fbfd87c48 100644 --- a/data/y-web/Y_Info_Menue.yhtm +++ b/data/y-web/Y_Info_Menue.yhtm @@ -22,11 +22,6 @@ function init(){
  • {=L:info.about_yweb=}
  • -
  • - {=var-set:m_link_href=Y_Info_Updates.yhtm=} - {=var-set:m_link_text={=L:info.check_for_updates=}=} - {=include-block:Y_Blocks.txt;management_link=} -
  • {=L:info.help=}
  • diff --git a/data/y-web/Y_Info_Updates.yhtm b/data/y-web/Y_Info_Updates.yhtm deleted file mode 100644 index 3c80772d0..000000000 --- a/data/y-web/Y_Info_Updates.yhtm +++ /dev/null @@ -1,48 +0,0 @@ -{=include-block:Y_Blocks.txt;head=} - - -{=include-block:Y_Blocks.txt;head_close=} - -
    -
    - {=var-set:menu={=L:info.check_for_updates=}=}{=include-block:Y_Blocks.txt;work_menu=}
    -
    -
    yWeb by yjogol
      - v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};info=} -

    + + + + + +
    + {=L:info.your_version=} +

    + v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=}
    + {=ini-get:{=var-get:vf=};info=} +

    +
    + {=if-file-exists:/tmp/version.txt~ + {=L:info.actual_version=} +

    + v{=ini-get:/tmp/version.txt;version=} - {=ini-get:/tmp/version.txt;date=}
    + {=ini-get:/tmp/version.txt;info=} +

    + ~ +
    +

    + +

    + =} +
    COPYRIGHTS - yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.
    + yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.
    http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -

    +

    yWeb uses Icons from famfamfam (http://www.famfamfam.com) which are licensed under Creative Common Attribution License 2.5
    IMPORTANT - Do not make yWeb accessible to untrusted networks!
    + Do not make yWeb accessible to untrusted networks!
    Otherwise someone else can access your Box.
    - - - - - -
    - {=L:info.your_version=} -

    - {=ini-get:Y_Version.txt;version=}
    - {=ini-get:Y_Version.txt;date=}
    -
    - {=ini-get:Y_Version.txt;info=}
    -

    -
    - {=L:info.actual_version=} -

    - {=ini-get:/tmp/version.txt;version=}
    - {=ini-get:/tmp/version.txt;date=}
    -
    - {=ini-get:/tmp/version.txt;info=}
    - {=if-empty:{=ini-get:/tmp/version.txt;url=}~~ - {=L:download=}
    - =} -

    -
    -
    - - - - diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 6ebc3bb50..7bc7301ed 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.54 -date=05.03.2023 +version=3.0.55 +date=06.03.2023 info=NI-Neutrino-Webinterface