From 04161beec52277d13e752c9ca995c03c6f26cc8b Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 1 Mar 2015 16:46:04 +0100 Subject: 404-page --- assets/css/_structure.less | 17 +++++ assets/img/missing-cat.svg | 162 +++++++++++++++++++++++++++++++++++---------- pages/room.php | 3 + template/404.phtml | 4 +- template/page.phtml | 2 +- 5 files changed, 151 insertions(+), 37 deletions(-) diff --git a/assets/css/_structure.less b/assets/css/_structure.less index 65c9898..c5e7760 100644 --- a/assets/css/_structure.less +++ b/assets/css/_structure.less @@ -5,6 +5,8 @@ @img: '../img/'; +@grid-float-breakpoint: 0; + @jumbo-font-size: 52px; @jumbo-line-height: 45px; @@ -50,3 +52,18 @@ body.overview { body.room { @import "_room.less"; } + +body.e404 { + > .container { + text-align: center; + h1 { + font-size: @jumbo-font-size; + margin: 50px 0 50px 0; + } + + img { + background-color: @brand-primary; + max-width: 80%; + } + } +} diff --git a/assets/img/missing-cat.svg b/assets/img/missing-cat.svg index 30b5d99..d50a9ca 100644 --- a/assets/img/missing-cat.svg +++ b/assets/img/missing-cat.svg @@ -13,8 +13,8 @@ height="270.39172" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" - sodipodi:docname="Nackte-Winkekatze.svg" + inkscape:version="0.48.5 r10040" + sodipodi:docname="missing-cat.svg" inkscape:export-filename="/home/peter/AAA-VOC/voc-frontends/31c3/assets/img/missing-cat.png" inkscape:export-xdpi="133.14017" inkscape:export-ydpi="133.14017"> @@ -30,13 +30,13 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="109.70387" - inkscape:cy="114.70334" + inkscape:cx="152.61692" + inkscape:cy="221.67262" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="993" + inkscape:window-height="1014" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -86,112 +86,111 @@ inkscape:groupmode="layer" id="layer1" transform="translate(-268.54284,-353.89904)"> + + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"> + inkscape:connector-curvature="0" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#d87500;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + + + + + diff --git a/pages/room.php b/pages/room.php index 18bbe7f..abd764d 100644 --- a/pages/room.php +++ b/pages/room.php @@ -7,6 +7,9 @@ $room = $_GET['room']; $language = $_GET['language']; $selection = $_GET['selection']; +if(!has("ROOMS.$room")) + return include('404.php'); + $formats = get("ROOMS.$room.FORMATS"); $has_translation = get("ROOMS.$room.TRANSLATION"); diff --git a/template/404.phtml b/template/404.phtml index e5afa34..583ddc4 100644 --- a/template/404.phtml +++ b/template/404.phtml @@ -1,5 +1,5 @@ -
+

404 Winkekatze Not Found

- Die Sendung mit der Winkekatze + 404 Winkekatze Not Found
diff --git a/template/page.phtml b/template/page.phtml index bebc64b..498036a 100644 --- a/template/page.phtml +++ b/template/page.phtml @@ -51,7 +51,7 @@ - + -- cgit v1.2.3