Skip to content

Commit

Permalink
change default configs:
Browse files Browse the repository at this point in the history
+ 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
  • Loading branch information
lephuongbg committed Sep 16, 2013
1 parent 1b14833 commit b9e669c
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion core/dz.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion dz.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
6 changes: 3 additions & 3 deletions language/en-GB.tpl_dz.ini
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ DZ_FIELD_VARIABLE_LINKCOLOR="@linkColor"
DZ_FIELD_VARIABLE_LINKCOLORHOVER="@linkColorHover"

DZ_FIELDS_RESPONSIVE_OPTIONS_LABEL="<h4>Responsive</h4>"
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="<h4>Extra components</h4>"
DZ_FIELDS_EXTRA_SELECT_LABEL="Components"
Expand Down
2 changes: 1 addition & 1 deletion layouts/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion layouts/dz.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down
80 changes: 40 additions & 40 deletions templateDetails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>
Expand Down Expand Up @@ -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"
/>
<field
name="toplayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_TOP_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_TOP_DESC"
/>
<field
name="headerlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_HEADER_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_HEADER_DESC"
/>
<field
name="showcaselayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_SHOWCASE_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_SHOWCASE_DESC"
/>
<field
name="featurelayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_FEATURE_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_FEATURE_DESC" />
<field
name="maintoplayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_MAINTOP_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_MAINTOP_DESC" />
<field
name="mainlayout"
type="mainlayout"
label="DZ_FIELD_LAYOUT_MAIN_LABEL"
default="4,2-4-3-3,0,0"
default="12,8-4,0,0"
description="DZ_FIELD_LAYOUT_MAIN_DESC" />
<field
name="mainbottomlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_MAINBOTTOM_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_MAINBOTTOM_DESC" />
<field
name="bottomlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_BOTTOM_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_BOTTOM_DESC" />
<field
name="footerlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_FOOTER_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_FOOTER_DESC" />
<field
name="copyrightlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_COPYRIGHT_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_COPYRIGHT_DESC" />
<field
name="fixedbottomlayout"
type="rowlayout"
label="DZ_FIELD_LAYOUT_FIXEDBOTTOM_LABEL"
default="2-2-2-2-2-2,0"
default="3-3-3-3,0"
description="DZ_FIELD_LAYOUT_FIXEDBOTTOM_DESC"
/>

Expand Down Expand Up @@ -262,32 +262,7 @@
type="text"
size="40"
label="DZ_FIELD_VARIABLE_LINKCOLORHOVER" />
<field type="spacer" label="DZ_FIELDS_RESPONSIVE_OPTIONS_LABEL" />
<field
name="responsive-767px-max"
label="DZ_FIELD_RESPONSIVE_767MAX_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>
<field
name="responsive-768px-979px"
label="DZ_FIELD_RESPONSIVE_768-979_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>
<field
name="responsive-1200px-min"
label="DZ_FIELD_RESPONSIVE_1200MIN_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>


<field type="spacer" label="DZ_FIELDS_EXTRA_LESSLABEL" />
<field
name="components" type="list"
Expand All @@ -313,7 +288,32 @@
<option value="carousel.less">DZ_FIELDS_OPTION_LESS_CAROUSEL</option>
<option value="hero-unit.less">DZ_FIELDS_OPTION_LESS_HERO_UNIT</option>
</field>


<field type="spacer" label="DZ_FIELDS_RESPONSIVE_OPTIONS_LABEL" />
<field
name="responsive-767px-max"
label="DZ_FIELD_RESPONSIVE_767MAX_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>
<field
name="responsive-768px-979px"
label="DZ_FIELD_RESPONSIVE_768-979_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>
<field
name="responsive-1200px-min"
label="DZ_FIELD_RESPONSIVE_1200MIN_LABEL"
type="radio" class="btn-group"
default="1">
<option value="0">DZ_NO</option>
<option value="1">DZ_YES</option>
</field>

<field type="spacer" label="DZ_FIELDS_COMPILE_LESS_LABEL" />
<field
Expand Down

0 comments on commit b9e669c

Please sign in to comment.