From b9e669ca22d65eb0493f219b8772e2ca578b2bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=AA=20Ho=C3=A0ng=20Ph=C6=B0=C6=A1ng?= Date: Mon, 16 Sep 2013 14:15:44 +0700 Subject: [PATCH] change default configs: + main layout: Component-Sidebar/8-4 + other positions: 3-3-3-3 + no responsive also update some parts of the config layout in back-end --- core/dz.class.php | 2 +- dz.php | 2 +- language/en-GB.tpl_dz.ini | 6 +-- layouts/default.php | 2 +- layouts/dz.php | 2 +- templateDetails.xml | 80 +++++++++++++++++++-------------------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/core/dz.class.php b/core/dz.class.php index 50e61ca..a9680c1 100644 --- a/core/dz.class.php +++ b/core/dz.class.php @@ -381,7 +381,7 @@ public function displayModules($position, $span = 0, $force = false, $style = "d public function displayModulesRow($prefix, $class = "", $style = "dz", $forceoverride = null) { $html = ''; - list($rowlayout, $force) = explode(',', $this->get($prefix.'layout', '2-2-2-2-2-2,0')); + list($rowlayout, $force) = explode(',', $this->get($prefix.'layout', '3-3-3-3,0')); $rowspans = explode('-', $rowlayout); foreach ($rowspans as $i => $span) { diff --git a/dz.php b/dz.php index a81812b..97c15b6 100644 --- a/dz.php +++ b/dz.php @@ -68,7 +68,7 @@ function dz_displayMain() dz_import('core.dzconfig'); $html = ''; - list($maincfg, $mainlayout, $force, $expandMain) = explode(',',$dz->get('mainlayout', '4,2-6-3-3,0,0')); + list($maincfg, $mainlayout, $force, $expandMain) = explode(',',$dz->get('mainlayout', '12,8-4,0,0')); $mainlayout = explode('-', $mainlayout); switch ($maincfg) { diff --git a/language/en-GB.tpl_dz.ini b/language/en-GB.tpl_dz.ini index 935140e..8cb9e0a 100644 --- a/language/en-GB.tpl_dz.ini +++ b/language/en-GB.tpl_dz.ini @@ -127,9 +127,9 @@ DZ_FIELD_VARIABLE_LINKCOLOR="@linkColor" DZ_FIELD_VARIABLE_LINKCOLORHOVER="@linkColorHover" DZ_FIELDS_RESPONSIVE_OPTIONS_LABEL="

Responsive

" -DZ_FIELD_RESPONSIVE_767MAX_LABEL = "Narrow tablets and below (<767px)" -DZ_FIELD_RESPONSIVE_768-979_LABEL = "Tablets to desktop (767-979px)" -DZ_FIELD_RESPONSIVE_1200MIN_LABEL = "Large desktop (>1200px)" +DZ_FIELD_RESPONSIVE_767MAX_LABEL = "Small devices (<767px)" +DZ_FIELD_RESPONSIVE_768-979_LABEL = "Medium devices (767-979px)" +DZ_FIELD_RESPONSIVE_1200MIN_LABEL = "Large devices (>1200px)" DZ_FIELDS_EXTRA_LESSLABEL="

Extra components

" DZ_FIELDS_EXTRA_SELECT_LABEL="Components" diff --git a/layouts/default.php b/layouts/default.php index 36b01ef..dff8801 100644 --- a/layouts/default.php +++ b/layouts/default.php @@ -13,7 +13,7 @@ $color = $dz->get('colorizeCSS', -1); if ($color != -1) $dz->addStyle($dz->templateUrl.'/css/colors/'.$color, true); -if ($dz->get('responsive', 1)) +if ($dz->get('responsive', 0)) $dz->addStyle($dz->templateUrl.'/css-compiled/responsive.css', true); // Add scripts diff --git a/layouts/dz.php b/layouts/dz.php index f643122..bc11a5b 100644 --- a/layouts/dz.php +++ b/layouts/dz.php @@ -7,7 +7,7 @@ $color = $dz->get('colorizeCSS', -1); if ($color != -1) $dz->addStyle($dz->templateUrl.'/css/colors/'.$color, true); -if ($dz->get('responsive', 1)) +if ($dz->get('responsive', 0)) $dz->addStyle($dz->templateUrl.'/css-compiled/responsive.css', true); diff --git a/templateDetails.xml b/templateDetails.xml index 8d40ed0..45582b8 100644 --- a/templateDetails.xml +++ b/templateDetails.xml @@ -104,7 +104,7 @@ label="DZ_FIELD_OTHER_RESPONSIVE_LABEL" description="DZ_FIELD_OTHER_RESPONSIVE_DESC" type="radio" class="btn-group" - default="1"> + default="0"> @@ -138,77 +138,77 @@ name="fixedtoplayout" type="rowlayout" label="DZ_FIELD_LAYOUT_FIXEDTOP_LABEL" - default="2-2-2-2-2-2,0" + default="3-3-3-3,0" description="DZ_FIELD_LAYOUT_FIXEDTOP_DESC" /> @@ -262,32 +262,7 @@ type="text" size="40" label="DZ_FIELD_VARIABLE_LINKCOLORHOVER" /> - - - - - - - - - - - - - - + DZ_FIELDS_OPTION_LESS_CAROUSEL - + + + + + + + + + + + + + +