From b4a5eed4a21227a05dcde4b1bbf14e7686c43364 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 30 Jun 2014 04:33:01 +0200 Subject: [PATCH] friseurteam text update, style --- friseurteam/page/default_page/default_page.css | 6 +++--- friseurteam/page/default_page/default_page.php | 3 ++- friseurteam/page/default_page/friseurteam.tpl | 18 +++++++++--------- .../default_page/js/galleria/galleria-1.2.9.js | 5 ----- friseurteam/page/default_page/map.js | 6 +++--- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/friseurteam/page/default_page/default_page.css b/friseurteam/page/default_page/default_page.css index 37c1040..b5da318 100644 --- a/friseurteam/page/default_page/default_page.css +++ b/friseurteam/page/default_page/default_page.css @@ -41,8 +41,8 @@ a { background-color: rgba(249, 150, 172, 0.9); opacity: 0.95; width: 61.8%; - min-height: 400px; - max-height: 400px; + min-height: 500px; + max-height: 500px; overflow-y: scroll; border-radius: 0 0 0 5px; } @@ -142,7 +142,7 @@ a { } #galleria { - height: 400px; + height: 500px; width: 100%; } diff --git a/friseurteam/page/default_page/default_page.php b/friseurteam/page/default_page/default_page.php index 6d9512a..58bd071 100644 --- a/friseurteam/page/default_page/default_page.php +++ b/friseurteam/page/default_page/default_page.php @@ -17,7 +17,8 @@ class default_page extends SYSTEM\PAGE\Page { $vars['default_gallery'] = saimod_webcraft_gallery::getGalleryGalleria(1); $vars['default_content'] = (new default_content())->html(); $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_FRISEURTEAM_TEXT), - \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_FRISEURTEAM_PAGE)); + \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_FRISEURTEAM_PAGE), + \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_BASIC)); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_page/friseurteam.tpl'), $vars); } diff --git a/friseurteam/page/default_page/friseurteam.tpl b/friseurteam/page/default_page/friseurteam.tpl index 33355f7..4533568 100644 --- a/friseurteam/page/default_page/friseurteam.tpl +++ b/friseurteam/page/default_page/friseurteam.tpl @@ -12,17 +12,17 @@ - - + + +
@@ -41,11 +41,11 @@
-
Angebot: Haareschneiden kostenlos
+
${page_angebot}
${default_content}
${default_gallery}
diff --git a/friseurteam/page/default_page/js/galleria/galleria-1.2.9.js b/friseurteam/page/default_page/js/galleria/galleria-1.2.9.js index a29919e..1be205a 100644 --- a/friseurteam/page/default_page/js/galleria/galleria-1.2.9.js +++ b/friseurteam/page/default_page/js/galleria/galleria-1.2.9.js @@ -911,11 +911,6 @@ var undef, }, error: function() { $loader.remove(); - - // If failed, tell the dev to download the latest theme - Galleria.raise( 'Theme CSS could not load after 20 sec. ' + ( Galleria.QUIRK ? - 'Your browser is in Quirks Mode, please add a correct doctype.' : - 'Please download the latest theme at http://galleria.io/customer/.' ), true ); }, timeout: 5000 }); diff --git a/friseurteam/page/default_page/map.js b/friseurteam/page/default_page/map.js index 5940b7c..65f2831 100644 --- a/friseurteam/page/default_page/map.js +++ b/friseurteam/page/default_page/map.js @@ -4,9 +4,9 @@ var cycle; var markers; // Position und Zoomstufe der Karte -var lon = 8.672434; -var lat = 49.398752; -var zoom = 11; +var lon = 8.6109639; +var lat = 49.7273731; +var zoom = 17; var map_div = 'map'; var map_lang = 'de';