diff options
| -rw-r--r-- | inc/render.inc.php | 2 | ||||
| -rw-r--r-- | templates/download-complete.html | 1 | ||||
| -rw-r--r-- | templates/download-error.html | 1 | ||||
| -rw-r--r-- | templates/download-overwrite.html | 4 | ||||
| -rw-r--r-- | templates/download-progress.html | 6 | ||||
| -rw-r--r-- | templates/txt-ipxeconfig.html | 7 | ||||
| -rw-r--r-- | templates/txt-pxeconfig.html | 75 |
7 files changed, 1 insertions, 95 deletions
diff --git a/inc/render.inc.php b/inc/render.inc.php index 6853acde..4fe9d002 100644 --- a/inc/render.inc.php +++ b/inc/render.inc.php @@ -32,7 +32,7 @@ class Render public static function output() { Header('Content-Type: text/html; charset=utf-8'); - $zip = (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false); + $zip = isset($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false); if ($zip) ob_start(); echo '<!DOCTYPE html> diff --git a/templates/download-complete.html b/templates/download-complete.html deleted file mode 100644 index 619f2551..00000000 --- a/templates/download-complete.html +++ /dev/null @@ -1 +0,0 @@ -<div class="alert alert-success">Download von {{file}} abgeschlossen</div> diff --git a/templates/download-error.html b/templates/download-error.html deleted file mode 100644 index 70826234..00000000 --- a/templates/download-error.html +++ /dev/null @@ -1 +0,0 @@ -<div class="alert alert-danger">Downloading {{file}} {{#remote}} from {{remote}} {{/remote}} failed! ({{code}})</div> diff --git a/templates/download-overwrite.html b/templates/download-overwrite.html deleted file mode 100644 index eccad5d0..00000000 --- a/templates/download-overwrite.html +++ /dev/null @@ -1,4 +0,0 @@ -<div class="alert alert-warning"> - {{file}} ist bereits lokal vorhanden. Soll die lokale Version überschrieben werden? - <a class="btn btn-danger" href="#" onclick="this.style.display='none';loadContent('#{{id}}', '{{query}}&exec=1')">Überschreiben</a> -</div> diff --git a/templates/download-progress.html b/templates/download-progress.html deleted file mode 100644 index 81b31901..00000000 --- a/templates/download-progress.html +++ /dev/null @@ -1,6 +0,0 @@ -<div class="progress progress-striped active"> - <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%"> - <span class="sr-only">{{percent}}% Complete</span> - </div> - <script> setTimeout(function() { $('#{{id}}').load('api.php?do=download&progress={{progress}}&file={{file}}&id={{id}}&pid={{pid}}'); }, 2000); // </script> -</div> diff --git a/templates/txt-ipxeconfig.html b/templates/txt-ipxeconfig.html deleted file mode 100644 index df8fb90f..00000000 --- a/templates/txt-ipxeconfig.html +++ /dev/null @@ -1,7 +0,0 @@ -#!ipxe -set use-cached 1 -dhcp net0 -set net0.dhcp/next-server {{{SERVER}}} -set net0.dhcp/filename ipxelinux.0 -imgload pxelinux.0 -boot pxelinux.0 diff --git a/templates/txt-pxeconfig.html b/templates/txt-pxeconfig.html deleted file mode 100644 index 571671b4..00000000 --- a/templates/txt-pxeconfig.html +++ /dev/null @@ -1,75 +0,0 @@ -DEFAULT vesamenu.c32 - -NOESCAPE 1 -PROMPT 0 - -MENU BACKGROUND openslx.png -MENU WIDTH 78 -MENU MARGIN 9 -MENU PASSWORDMARGIN 9 -MENU ROWS 10 -MENU TABMSGROW 16 -MENU CMDLINEROW 16 -MENU ENDROW -1 -MENU PASSWORDROW 16 -MENU TIMEOUTROW 20 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW -1 -MENU HSHIFT 0 -MENU VSHIFT 7 - -menu color screen 37;40 #80ffffff #00000000 std -menu color border 37;40 #40000000 #ff8093a1 std -menu color title 1;37;40 #ffff8b00 #ff8093a1 std -menu color unsel 37;40 #fff0f0f0 #ff8093a1 std -menu color hotkey 1;37;40 #ffff8b00 #ff8093a1 std -menu color sel 7;37;40 #ff1c2a33 #667799bb all -menu color hotsel 1;7;37;40 #ffff8b00 #667799bb all -menu color disabled 1;37;40 #ffff8b00 #ff8093a1 std -menu color scrollbar 37;40 #40000000 #ee000000 std -menu color tabmsg 37;40 #ffff8b00 #ff8093a1 std -menu color cmdmark 1;37;40 #ffff8b00 #ff8093a1 std -menu color cmdline 37;40 #fff0f0f0 #ff8093a1 std -menu color pwdborder 37;40 #40000000 #ff8093a1 std -menu color pwdheader 37;40 #ffff8b00 #ff8093a1 std -menu color pwdentry 37;40 #ffff8b00 #ff8093a1 std -menu color timeout_msg 37;40 #fff0f0f0 #ff8093a1 std -menu color timeout 1;37;40 #ffff8b00 #ff8093a1 std -menu color help 37;40 #ff1c2a33 #00000000 none -MENU MSGCOLOR #ff1c2a33 #00000000 none - - -TIMEOUT 100 -TOTALTIMEOUT 1200 -MENU TITLE bwLehrpool ALPHA VERSION -MENU CLEAR -ONTIMEOUT {{{DEFAULT}}} - - -LABEL shutdown - MENU HIDE - KERNEL kernel-shutdown - APPEND initrd=initramfs-shutdown quiet - - -LABEL hddboot - MENU LABEL ^Lokales System starten - LOCALBOOT 0 - {{{hddboot}}} - - -LABEL openslx - MENU LABEL ^Virtuelles Labor starten - KERNEL http://{{{SERVER}}}/boot/default/kernel - INITRD http://{{{SERVER}}}/boot/default/initramfs-stage31 - APPEND slxsrv={{{SERVER}}} slxbase=boot/default vga=current quiet splash - IPAPPEND 3 - {{{openslx}}} - -LABEL openslx-debug - MENU LABEL ^Virtuelles Labor starten (nosplash) - KERNEL http://{{{SERVER}}}/boot/default/kernel - INITRD http://{{{SERVER}}}/boot/default/initramfs-stage31 - APPEND slxsrv={{{SERVER}}} slxbase=boot/default - IPAPPEND 3 - |