new Header

This commit is contained in:
Kevin Adametz 2019-12-12 19:53:40 +01:00
parent f2be8e54b4
commit 645ea5da7d
19 changed files with 2856 additions and 323 deletions

View file

@ -15,7 +15,7 @@
{{ form_row(form.file, {label: 'Bild'}) }} {{ form_row(form.file, {label: 'Bild'}) }}
{% else %} {% else %}
<div> <div>
<img src="{{ asset('uploads/images/' ~ image_file_name) }}" alt="{{ image.description }}" style="height:250px;" > <img src="{{ asset('_uploads/images/' ~ image_file_name) }}" alt="{{ image.description }}" style="height:250px;" >
</div> </div>
{% endif %} {% endif %}
{{ form_row(form.fileName, {label: 'Name'}) }} {{ form_row(form.fileName, {label: 'Name'}) }}

View file

@ -15,7 +15,7 @@
{{ form_row(form.file, {label: 'Bild'}) }} {{ form_row(form.file, {label: 'Bild'}) }}
{% else %} {% else %}
<div> <div>
<img src="{{ asset('uploads/images/' ~ image_file_name) }}" alt="{{ image.description }}" style="width:456px;height:151px;" > <img src="{{ asset('_uploads/images/' ~ image_file_name) }}" alt="{{ image.description }}" style="width:456px;height:151px;" >
</div> </div>
{% endif %} {% endif %}
{{ form_row(form.fileName, {label: 'Name'}) }} {{ form_row(form.fileName, {label: 'Name'}) }}

View file

@ -35,7 +35,7 @@
{% for image in lodgingGroup.images %} {% for image in lodgingGroup.images %}
{% if image.comp == 'pre' %} {% if image.comp == 'pre' %}
<tr> <tr>
<td><img src="{{ asset('uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="height:80px;" ></td> <td><img src="{{ asset('_uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="height:80px;" ></td>
<td>{{ image.pos }}</td> <td>{{ image.pos }}</td>
<td>{{ image.fileName }}</td> <td>{{ image.fileName }}</td>
<td>{{ image.description }}</td> <td>{{ image.description }}</td>

View file

@ -301,7 +301,7 @@
<tbody> <tbody>
{% for image in lodging.images %} {% for image in lodging.images %}
<tr> <tr>
<td><img src="{{ asset('uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="width:228px;height:75px;" ></td> <td><img src="{{ asset('_uploads/images/' ~ image.file) }}" alt="{{ image.description }}" style="width:228px;height:75px;" ></td>
<td>{{ image.pos }}</td> <td>{{ image.pos }}</td>
<td>{{ image.fileName }}</td> <td>{{ image.fileName }}</td>
<td>{{ image.description }}</td> <td>{{ image.description }}</td>

View file

@ -0,0 +1,185 @@
<header class="header fixedheader setbg sticky">
<div class="topbar">
<div class="container-fluid">
<div class="pull-right">
<ul class="topbar-drops list-inline">
<li class="nohover visible-xs visible-sm"> {{ getContextBySlug('uhrzeit-header') }} Uhr
</li>
<li class="nohover"><i class="fa fa-phone"></i> {{ getContextBySlug('telefon-header') }}</li>
<li>
<a href="/kontakt" title="Kontakt"><i class="fa fa-envelope"></i> <span class="hidden-xs">Kontakt</span></a>
</li>
<li>
<a href="/ueber-uns" title="Über uns">
<i class="fa fa-users"></i> <span class="hidden-xs">Über uns</span>
</a>
</li>
</ul>
</div>
</div><!-- end container -->
</div><!-- end topbar -->
<div class="menu-container">
<div class="container-fluid">
<div class="menu-wrapper">
<nav id="navigation" class="navbar" role="navigation" itemscope
itemtype="https://schema.org/SiteNavigationElement">
<div class="navbar-inner">
<div id="navbar-collapse" class="navbar-left navbar-collapse collapse clearfix">
<ul class="nav navbar-nav">
<li itemprop="name">
<a href="/" title="Kulturreisen" itemprop="">Kulturreisen</a>
</li>
<li itemprop="name">
<a href="/ferienwohnungen" title="Usedom Ferienwohnungen" itemprop="">
Usedom Ferienwohnungen
</a>
</li>
<li class="dropdown openClick" itemprop="name"><a itemprop="url" href="#" title=""
class="dropdown-toggle"
data-toggle="dropdown"><i
class="icon-menu27"></i></a>
<ul class="dropdown-menu" role="menu">
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/jugendreisen" title="Jugendreisen">
Jugendreisen
</a>
</li>
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reiseversicherung" title="Reiseversicherung">
Reiseversicherung
</a>
</li>
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reisefuehrer" title="Reiseführer">
Reiseführer
</a>
</li>
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reisemagazin" title="Reisemagazin">
Reisemagazin
</a>
</li>
</ul>
</li>
</ul><!-- end navbar-left -->
</div><!-- end navbar-callopse -->
<div class="navbar-header">
<button class="btn btn-mobile" data-toggle="collapse" data-target=".nav-main-collapse"
aria-label="Toggle navigation">
<i class="icon-menu27"></i> <span style="display: none">Menu</span>
</button>
<div id="brand" class="navbar-brand">
<a href="/"><img src="{{ asset('images/wlogo.png') }}" alt="Stern Tours"></a>
</div>
</div><!-- end navbar-header -->
<div id="navbar-collapse_1" class="navbar-right">
<div class="navbar-times visible-md visible-lg hidden-xs hidden-sm">
<span style="float:left; margin-top: 30pt; margin-right: 5pt; color: #e5aa30; font-size: 18px">E-Mail: <a
href="mailto:stern@sterntours.de" style="font-size: 18px; color: #777777">stern@sterntours.de</a></span>
<i class="fa fa-phone "></i>
<span>{{ getContextBySlug('uhrzeit-header')|replace({'|': "Uhr<br>"})|raw }} Uhr</span>
</div>
</div><!-- end navbar-callopse -->
</div><!-- end navbar-inner -->
<div class="clearfix"></div>
<hr class="hidden-xs">
<div id="header" class="sticky clearfix">
<!-- TOP NAV -->
<header id="topNav">
<div class="container-fluid">
<div class="navbar-collapse nav-main-collapse collapse submenu-dark">
<nav class="nav-main">
<ul id="topMain" class="nav nav-pills nav-main">
<li role="menuitem" itemprop="name" class="hidden visible-xs">
<a href="/" title="Usedom Ferienwohnungen" itemprop="">
Kulturreisen
</a>
</li>
<li role="menuitem" itemprop="name" class="hidden visible-xs">
<a href="/ferienwohnungen" title="Usedom Ferienwohnungen" itemprop="">
Usedom Ferienwohnungen
</a>
</li>
{% for nav_page in nav_pages if nav_page.country is not empty %}
{# @var nav_page \AppBundle\Entity\Page #}
<li class="dropdown">
<a class="dropdown-toggle" href="{{ nav_page.urlPath }}"
title="{{ nav_page.title }}">
{{ nav_page.title|replace({'Reisen': ''}) }}<span
class="hidden-md hidden-sm">Reisen</span>
</a>
<ul class="dropdown-menu">
<li class="first" role="menuitem" itemprop="name">
<a itemprop="url" href="{{ nav_page.urlPath }}"
title="{{ nav_page.title }}">
{{ nav_page.title }}
</a>
</li>
{% for childnav_page in nav_page.children %}
{# @var childnav_page \AppBundle\Entity\Page #}
<li role="menuitem" itemprop="name">
<a itemprop="url" href="{{ childnav_page.urlPath }}"
title="{{ childnav_page.title }}"
>
{{ childnav_page.title }}
</a>
</li>
{% endfor %}
</ul>
</li>
{% endfor %}
<li role="menuitem" itemprop="name" class="hidden visible-xs">
<a itemprop="url" href="/jugendreisen" title="Jugendreisen">
Jugendreisen
</a>
</li>
<li class="dropdown hidden visible-xs">
<a class="dropdown-toggle" href="#" title="Reiseninformationen">
Reiseninformationen
</a>
<ul class="dropdown-menu">
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reiseversicherung"
title="Reiseversicherung">
Reiseversicherung
</a>
</li>
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reisefuehrer" title="Reiseführer">
Reiseführer
</a>
</li>
<li role="menuitem" itemprop="name">
<a itemprop="url" href="/reisemagazin" title="Reisemagazin">
Reisemagazin
</a>
</li>
</ul>
</li>
</ul>
</nav>
</div>
</div>
</header>
<!-- /Top Nav -->
</div>
</nav><!-- end navigation -->
</div><!-- menu wrapper -->
</div><!-- end container -->
</div><!-- end menu-container -->
</header><!-- end header -->

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@
{% set image_url = 'uploads/travel_program/' ~ page.travelProgram.previewImage.fileNameWithExtension %} {% set image_url = 'uploads/travel_program/' ~ page.travelProgram.previewImage.fileNameWithExtension %}
{% set image_alt = page.title %} {% set image_alt = page.title %}
{% elseif page.fewoLodging is not empty and page.fewoLodging.images is not empty and page.fewoLodging.images[0] is not empty %} {% elseif page.fewoLodging is not empty and page.fewoLodging.images is not empty and page.fewoLodging.images[0] is not empty %}
{% set image_url = 'uploads/images/' ~ page.fewoLodging.images[0].file %} {% set image_url = '_uploads/images/' ~ page.fewoLodging.images[0].file %}
{% set image_alt = page.title %} {% set image_alt = page.title %}
{% else %} {% else %}
{% set image_url = asset('/bundles/app/images/no-picture.png')%} {% set image_url = asset('/bundles/app/images/no-picture.png')%}
@ -13,5 +13,5 @@
{% endif %} {% endif %}
<div class="img-background lozad" data-background-image="{{ image(image_url|trim('/')).cropResize(360).guess(70) }}" style="background-image:url({{ asset('images/placeholder-image.png') }})"></div> <div class="img-background lozad" data-background-image="{{ image(image_url|trim('/')).cropResize(360).guess(70) }}" style="background-image:url({{ asset('images/placeholder-image.png') }})"></div>
<noscript> <noscript>
<img width="234" height="180" src="{{ image(image_url|trim('/')).cropResize(360).guess(70) }}" class="img-responsiv img-responsiv-item" style=""> <img width="234" data-url="{{ image_url }}" height="180" src="{{ image(image_url|trim('/')).cropResize(360).guess(70) }}" class="img-responsiv img-responsiv-item" style="">
</noscript> </noscript>

View file

@ -718,7 +718,7 @@
<div class="well"> <div class="well">
{{ travel_program.organizer.legalRights|raw }} {{ travel_program.organizer.legalRights|raw }}
<a href="/uploads/{{ travel_program.organizer.fileFormPage }}" target="_blank"> <a href="https://v2.sterntours.de/uploads/{{ travel_program.organizer.fileFormPage }}" target="_blank">
{{ getContextBySlug('informationen-formblatt') }} {{ getContextBySlug('informationen-formblatt') }}
</a> </a>
@ -751,11 +751,11 @@
{{ getContextBySlug('reisebedingungen-check-1') }} {{ getContextBySlug('reisebedingungen-check-1') }}
{% if travel_program.isMediated %} {% if travel_program.isMediated %}
<a href="/uploads/{{ travel_program.organizer.fileName }}?t={{ travel_program.organizer.rulesUpdatedTime }}" target="_blank"> <a href="https://v2.sterntours.de/uploads/{{ travel_program.organizer.fileName }}?t={{ travel_program.organizer.rulesUpdatedTime }}" target="_blank">
{{ getContextBySlug('reisebedingungen-link-1') }} {{ getContextBySlug('reisebedingungen-link-1') }}
</a> {{ travel_program.organizer.name }} </a> {{ travel_program.organizer.name }}
{% else %} {% else %}
<a href="/uploads/{{ travel_program.organizer.formArb }}?t={{ travel_program.organizer.rulesUpdatedTime }}" target="_blank"> <a href="https://v2.sterntours.de/uploads/{{ travel_program.organizer.formArb }}?t={{ travel_program.organizer.rulesUpdatedTime }}" target="_blank">
{{ getContextBySlug('reisebedingungen-link-2') }} {{ getContextBySlug('reisebedingungen-link-2') }}
</a> {{ travel_program.organizer.name }} </a> {{ travel_program.organizer.name }}
{% endif %} {% endif %}

View file

@ -29,7 +29,7 @@
<div class="carousel-inner"> <div class="carousel-inner">
{% for lodging_image in slider_imgs %} {% for lodging_image in slider_imgs %}
<div class="item{% if loop.first %} active{% endif %}"> <div class="item{% if loop.first %} active{% endif %}">
<div class="fill" style="background-image:url({{ asset('uploads/images/' ~ lodging_image.file) }});"> <div class="fill" style="background-image:url({{ asset('_uploads/images/' ~ lodging_image.file) }});">
<span class="image-title">{{ lodging_image.fileName }}</span> <span class="image-title">{{ lodging_image.fileName }}</span>
</div> </div>
</div> </div>

View file

@ -0,0 +1,19 @@
# This file is auto-generated during the composer install
parameters:
database_host: 127.0.0.1
database_port: null
database_name: relaunch1
database_user: relaunch1
database_password: pqHg45HWz8qjaSKC
mailer_transport: smtp
mailer_host: 127.0.0.1
mailer_user: null
mailer_password: null
secret: ce1f6c5ca9688d7e0c534fac8126f839
st_cache_driver: array
locale: de_DE
base_url: 'https://www.sterntours.de'
tripodo_host: 144.76.111.241
tripodo_user: sterntours
tripodo_pass: 'UC782eg.Sa9#tRL?'
image_upload_directory: '%kernel.root_dir%/../web/_uploads/images'

View file

@ -0,0 +1,285 @@
<?php
namespace AppBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
/**
* CMSInfo
*
* @ORM\Table(name="c_m_s_infos")
* @ORM\Entity(repositoryClass="AppBundle\Entity\CMSInfoRepository")
*/
class CMSInfo
{
/**
* @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var string
*
* @ORM\Column(name="name", type="string", length=255)
*/
private $name;
/**
* @var string
*
* @ORM\Column(name="slug", type="string", length=255, unique=true)
*/
private $slug;
/**
* @var string
*
* @ORM\Column(name="type", type="string", length=10)
*/
private $type;
/**
* @var string
*
* @ORM\Column(name="text", type="string", length=255, nullable=true)
*/
private $text;
/**
* @var string
*
* @ORM\Column(name="full_text", type="text", nullable=true)
*/
private $fullText;
/**
* @var int
*
* @ORM\Column(name="integer", type="integer", nullable=true)
*/
private $integer;
/**
* @var string
*
* @ORM\Column(name="decimal", type="decimal", precision=15, scale=2, nullable=true)
*/
private $decimal;
/**
* @var string
*
* @ORM\Column(name="bool", type="boolean", nullable=true)
*/
private $bool;
/**
* Get id
*
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* Set name
*
* @param string $name
*
* @return CMSInfo
*/
public function setName($name)
{
$this->name = $name;
return $this;
}
/**
* Get name
*
* @return string
*/
public function getName()
{
return $this->name;
}
/**
* Set slug
*
* @param string $slug
*
* @return CMSInfo
*/
public function setSlug($slug)
{
$this->slug = $slug;
return $this;
}
/**
* Get slug
*
* @return string
*/
public function getSlug()
{
return $this->slug;
}
/**
* Set type
*
* @param string $type
*
* @return CMSInfo
*/
public function setType($type)
{
$this->type = $type;
return $this;
}
/**
* Get type
*
* @return string
*/
public function getType()
{
return $this->type;
}
/**
* Set text
*
* @param string $text
*
* @return CMSInfo
*/
public function setText($text)
{
$this->text = $text;
return $this;
}
/**
* Get text
*
* @return string
*/
public function getText()
{
return $this->text;
}
/**
* Set fullText
*
* @param string $fullText
*
* @return CMSInfo
*/
public function setFullText($fullText)
{
$this->fullText = $fullText;
return $this;
}
/**
* Get fullText
*
* @return string
*/
public function getFullText()
{
return $this->fullText;
}
/**
* Set integer
*
* @param integer $integer
*
* @return CMSInfo
*/
public function setInteger($integer)
{
$this->integer = $integer;
return $this;
}
/**
* Get integer
*
* @return int
*/
public function getInteger()
{
return $this->integer;
}
/**
* Set decimal
*
* @param string $decimal
*
* @return CMSInfo
*/
public function setDecimal($decimal)
{
$this->decimal = $decimal;
return $this;
}
/**
* Get decimal
*
* @return string
*/
public function getDecimal()
{
return $this->decimal;
}
/**
* Set bool
*
* @param string $bool
*
* @return CMSInfo
*/
public function setBool($bool)
{
$this->bool = $bool;
return $this;
}
/**
* Get bool
*
* @return string
*/
public function getBool()
{
return $this->bool;
}
}

View file

@ -0,0 +1,25 @@
<?php
namespace AppBundle\Entity;
/**
* CMSContentRepository
*
* This class was generated by the Doctrine ORM. Add your own custom
* repository methods below.
*/
class CMSInfoRepository extends \Doctrine\ORM\EntityRepository
{
public function findBySlug($slug)
{
$qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('c');
$qb->from('AppBundle:CMSContent', 'c');
$qb->where('c.slug = :slug');
$qb->setParameter('slug', $slug);
$qb->setMaxResults(1);
return $qb->getQuery()->getOneOrNullResult();
}
}

View file

@ -7,7 +7,7 @@
"uuidString": "B763837E-26C1-48B4-B470-F48DC26C25A9" "uuidString": "B763837E-26C1-48B4-B470-F48DC26C25A9"
} }
], ],
"creatorBuild": "29156", "creatorBuild": "31934",
"files": { "files": {
"/assets/bower.json": { "/assets/bower.json": {
"ft": 524288, "ft": 524288,
@ -2195,7 +2195,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2212,7 +2211,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2800,7 +2798,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2817,7 +2814,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2834,7 +2830,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2851,7 +2846,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2868,7 +2862,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2885,7 +2878,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2902,7 +2894,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2919,7 +2910,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2936,7 +2926,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2953,7 +2942,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2970,7 +2958,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -2987,7 +2974,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3004,7 +2990,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3021,7 +3006,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3038,7 +3022,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3055,7 +3038,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3072,7 +3054,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3089,7 +3070,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3106,7 +3086,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3123,7 +3102,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3140,7 +3118,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3157,7 +3134,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3174,7 +3150,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3191,7 +3166,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3208,7 +3182,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3225,7 +3198,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3242,7 +3214,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3259,7 +3230,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3276,7 +3246,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3293,7 +3262,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3310,7 +3278,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3327,7 +3294,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3344,7 +3310,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3361,7 +3326,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3378,7 +3342,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3395,7 +3358,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3412,7 +3374,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3429,7 +3390,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3446,7 +3406,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3463,7 +3422,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3480,7 +3438,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3497,7 +3454,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3514,7 +3470,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3531,7 +3486,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3548,7 +3502,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3565,7 +3518,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3582,7 +3534,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3599,7 +3550,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3616,7 +3566,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3633,7 +3582,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3650,7 +3598,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3667,7 +3614,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3684,7 +3630,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3701,7 +3646,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3718,7 +3662,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3735,7 +3678,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3752,7 +3694,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3769,7 +3710,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3786,7 +3726,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3803,7 +3742,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3820,7 +3758,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3837,7 +3774,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3854,7 +3790,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3871,7 +3806,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3888,7 +3822,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3905,7 +3838,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3922,7 +3854,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3939,7 +3870,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3956,7 +3886,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3973,7 +3902,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -3990,7 +3918,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4195,7 +4122,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4212,7 +4138,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4229,7 +4154,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4246,7 +4170,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4263,7 +4186,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4280,7 +4202,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4297,7 +4218,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4314,7 +4234,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4331,7 +4250,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4348,7 +4266,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4365,7 +4282,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4382,7 +4298,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4399,7 +4314,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -4416,7 +4330,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15561,7 +15474,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15578,7 +15490,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15595,7 +15506,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15612,7 +15522,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15629,7 +15538,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15646,7 +15554,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15663,7 +15570,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15680,7 +15586,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15697,7 +15602,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15714,7 +15618,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15731,7 +15634,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15748,7 +15650,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15765,7 +15666,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15782,7 +15682,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15799,7 +15698,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15816,7 +15714,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15833,7 +15730,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15850,7 +15746,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15867,7 +15762,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15884,7 +15778,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15901,7 +15794,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15918,7 +15810,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15935,7 +15826,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -15952,7 +15842,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 1, "ma": 1,
"mS": 0, "mS": 0,
@ -16097,7 +15986,7 @@
"bl": 0, "bl": 0,
"ft": 16, "ft": 16,
"ma": 0, "ma": 0,
"oA": 1, "oA": 0,
"oAP": "/public/css/header-min-min.css", "oAP": "/public/css/header-min-min.css",
"oF": 0, "oF": 0,
"oS": 3 "oS": 3
@ -16185,7 +16074,6 @@
"bl": 1, "bl": 1,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 0, "ma": 0,
"mS": 0, "mS": 0,
@ -16220,7 +16108,6 @@
"bl": 0, "bl": 0,
"eJ": 0, "eJ": 0,
"ft": 1, "ft": 1,
"ie": 1,
"iI": 0, "iI": 0,
"ma": 0, "ma": 0,
"mS": 0, "mS": 0,
@ -18602,6 +18489,7 @@
}, },
"projectSettings": { "projectSettings": {
"abortBuildOnError": 1, "abortBuildOnError": 1,
"allowInjectionReloads": 1,
"alwaysUseExternalServer": 0, "alwaysUseExternalServer": 0,
"animateCSSInjections": 1, "animateCSSInjections": 1,
"autoBuildNewItems": 1, "autoBuildNewItems": 1,
@ -18613,6 +18501,7 @@
"babelConfigType": 0, "babelConfigType": 0,
"babelCustomPluginsList": "", "babelCustomPluginsList": "",
"babelCustomPresetsList": "", "babelCustomPresetsList": "",
"babelExcludeString": "/\\/node_modules\\//, /\\/core-js\\//, /\\/bower_components\\//",
"babelInsertModuleIDs": 0, "babelInsertModuleIDs": 0,
"babelModuleID": "", "babelModuleID": "",
"babelNoComments": 0, "babelNoComments": 0,
@ -18752,6 +18641,9 @@
"modules-umd": { "modules-umd": {
"active": 0 "active": 0
}, },
"named-capturing-groups-regex": {
"active": 0
},
"new-target": { "new-target": {
"active": 0 "active": 0
}, },
@ -18785,6 +18677,9 @@
"parameters": { "parameters": {
"active": 0 "active": 0
}, },
"partial-application": {
"active": 0
},
"pipeline-operator": { "pipeline-operator": {
"active": 0 "active": 0
}, },
@ -18877,11 +18772,10 @@
} }
}, },
"babelRetainLines": 0, "babelRetainLines": 0,
"babelUseBuiltInsType": 0,
"bowerAbbreviatedPath": "bower_components", "bowerAbbreviatedPath": "bower_components",
"bowerAutoCreateInfoFile": 1, "bowerForceLatestOnConflict": 1,
"bowerInstallDevDependencies": 0, "bowerTargetDependencyListType": 1,
"bowerSaveDependencies": 1,
"bowerSaveDevDependencies": 0,
"bowerUseExactVersion": 0, "bowerUseExactVersion": 0,
"browserRefreshDelay": 0, "browserRefreshDelay": 0,
"browserslistString": ">0.2%, last 2 versions, Firefox ESR, not dead", "browserslistString": ">0.2%, last 2 versions, Firefox ESR, not dead",
@ -19026,6 +18920,7 @@
"flagValue": -1 "flagValue": -1
} }
}, },
"environmentVariablesString": "NODE_ENV:::production",
"esLintConfigFileHandlingType": 0, "esLintConfigFileHandlingType": 0,
"esLintECMAVersion": 7, "esLintECMAVersion": 7,
"esLintEnvironmentsMask": 1, "esLintEnvironmentsMask": 1,
@ -19130,6 +19025,10 @@
"active": 0, "active": 0,
"optionString": "" "optionString": ""
}, },
"default-param-last": {
"active": 0,
"optionString": ""
},
"dot-location": { "dot-location": {
"active": 0, "active": 0,
"optionString": "'object'" "optionString": "'object'"
@ -19478,6 +19377,10 @@
"active": 0, "active": 0,
"optionString": "" "optionString": ""
}, },
"no-import-assign": {
"active": 1,
"optionString": ""
},
"no-inline-comments": { "no-inline-comments": {
"active": 0, "active": 0,
"optionString": "" "optionString": ""
@ -19886,6 +19789,10 @@
"active": 0, "active": 0,
"optionString": "{'array': true, 'object': true}, {'enforceForRenamedProperties': false}" "optionString": "{'array': true, 'object': true}, {'enforceForRenamedProperties': false}"
}, },
"prefer-named-capture-group": {
"active": 0,
"optionString": ""
},
"prefer-numeric-literals": { "prefer-numeric-literals": {
"active": 0, "active": 0,
"optionString": "" "optionString": ""
@ -19898,6 +19805,10 @@
"active": 0, "active": 0,
"optionString": "{'allowEmptyReject': false}" "optionString": "{'allowEmptyReject': false}"
}, },
"prefer-regex-literals": {
"active": 0,
"optionString": ""
},
"prefer-rest-params": { "prefer-rest-params": {
"active": 0, "active": 0,
"optionString": "" "optionString": ""
@ -20506,7 +20417,6 @@
"autoOutputPathStyle": 2, "autoOutputPathStyle": 2,
"createSourceMap": 1, "createSourceMap": 1,
"enableJavascript": 0, "enableJavascript": 0,
"ieCompatibility": 1,
"mathStyle": 0, "mathStyle": 0,
"outputStyle": 0, "outputStyle": 0,
"rewriteURLStyle": 0, "rewriteURLStyle": 0,
@ -20639,8 +20549,16 @@
}, },
"languageDefaultsUserDefined": [ "languageDefaultsUserDefined": [
], ],
"npmAbbreviatedPath": "",
"npmCreatePackageLock": 1,
"npmInstallOptionalDependencies": 0,
"npmSaveExactVersion": 0,
"npmTargetDependencyListType": 1,
"overrideExternalServerCSS": 0, "overrideExternalServerCSS": 0,
"previewPathAddition": "", "previewPathAddition": "",
"rollupExternals": "",
"rollupReplacements": "process.env.NODE_ENV:::$NODE_ENV,,,ENVIRONMENT:::$NODE_ENV",
"rollupTreeshakingEnabled": 1,
"skippedFoldersString": "log, _logs, logs, _cache, cache, .idea, /storage/framework/sessions, node_modules", "skippedFoldersString": "log, _logs, logs, _cache, cache, .idea, /storage/framework/sessions, node_modules",
"sourceFolderName": "source", "sourceFolderName": "source",
"susyVersion": 3, "susyVersion": 3,

File diff suppressed because one or more lines are too long

View file

@ -9,7 +9,7 @@
@import (inline) './owl-carousel.css'; @import (inline) './owl-carousel.css';
@import (inline) './cookieconsent.min.css'; @import (inline) './cookieconsent.min.css';
@import (inline) './custom.css'; @import (inline) './custom.css';
@import (inline) './header-min.css'; //@import (inline) './header-min.css';
@import (inline) './booking.css'; @import (inline) './booking.css';
//@import (inline) './daterangepicker.css'; //@import (inline) './daterangepicker.css';

View file

@ -58,8 +58,8 @@ class AppExtension extends \Twig_Extension
'get_base_template' => new \Twig_SimpleFunction('get_base_template', [$this, 'getBaseTemplate']), 'get_base_template' => new \Twig_SimpleFunction('get_base_template', [$this, 'getBaseTemplate']),
'get_base_url' => new \Twig_SimpleFunction('get_base_url', [$this, 'getBaseUrl']), 'get_base_url' => new \Twig_SimpleFunction('get_base_url', [$this, 'getBaseUrl']),
'get_file_last_time' => new \Twig_SimpleFunction('get_file_last_time', [$this, 'getFileLastTime']), 'get_file_last_time' => new \Twig_SimpleFunction('get_file_last_time', [$this, 'getFileLastTime']),
'get_content_by_slug' => new \Twig_SimpleFunction('getContextBySlug', [$this, 'getContentBySlug']) 'get_content_by_slug' => new \Twig_SimpleFunction('getContextBySlug', [$this, 'getContentBySlug']),
'get_info_by_slug' => new \Twig_SimpleFunction('getInfoBySlug', [$this, 'getInfoBySlug'])
]; ];
} }
@ -110,6 +110,32 @@ class AppExtension extends \Twig_Extension
} }
public function getInfoBySlug($slug, $to = "")
{
$slug = $slug.$to;
$repo = $this->em->getRepository('AppBundle:CMSInfo');
$re = $repo->findBySlug($slug);
if($re){
switch ($re->getField()){
case 'text':
return $re->getText();
case 'full_text':
return $re->getFullText();
case 'integer':
return $re->getInteger();
case 'decimal':
return $re->getDecimal();
case 'bool':
return $re->getBool();
}
}
return "";
}
public function getBaseUrl() public function getBaseUrl()
{ {
return Util::getBaseUrl(); return Util::getBaseUrl();
@ -174,6 +200,7 @@ class AppExtension extends \Twig_Extension
$i = Image::open($i)->cropResize(848)->guess(75); $i = Image::open($i)->cropResize(848)->guess(75);
// $i = image()..; // $i = image()..;
$image->setAttribute('data-path', "/".$i);
$image->setAttribute('data-src', "/".$i); $image->setAttribute('data-src', "/".$i);
$image->setAttribute('src', 'images/placeholder-image.png'); $image->setAttribute('src', 'images/placeholder-image.png');
$image->setAttribute('class', 'lozad'); $image->setAttribute('class', 'lozad');

View file

@ -1,4 +1,4 @@
@charset "UTF-8";@font-face{font-family:Raleway;font-style:normal;font-weight:100;src:local('Raleway Thin'),local('Raleway-Thin'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptsg8zYS_SKggPNwE44TYFv.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:200;src:local('Raleway ExtraLight'),local('Raleway-ExtraLight'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwOIpWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:300;src:local('Raleway Light'),local('Raleway-Light'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwIYqWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:400;src:local('Raleway'),local('Raleway-Regular'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptug8zYS_SKggPNyC0ISg.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:500;src:local('Raleway Medium'),local('Raleway-Medium'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwN4rWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:600;src:local('Raleway SemiBold'),local('Raleway-SemiBold'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwPIsWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:700;src:local('Raleway Bold'),local('Raleway-Bold'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwJYtWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:800;src:local('Raleway ExtraBold'),local('Raleway-ExtraBold'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwIouWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:900;src:local('Raleway Black'),local('Raleway-Black'),url(https://fonts.gstatic.com/s/raleway/v13/1Ptrg8zYS_SKggPNwK4vWqZPBQ.ttf) format('truetype')}@font-face{font-family:Oswald;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/oswald/v23/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUZiYA.ttf) format('truetype')}@font-face{font-family:Oswald;font-style:normal;font-weight:700;src:url(https://fonts.gstatic.com/s/oswald/v23/TK3_WkUHHAIjg75cFRf3bXL8LICs1xZosUZiYA.ttf) format('truetype')}/*! @charset "UTF-8";@font-face{font-family:Raleway;font-style:normal;font-weight:100;src:local('Raleway Thin'),local('Raleway-Thin'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptsg8zYS_SKggPNwE44TYFv.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:200;src:local('Raleway ExtraLight'),local('Raleway-ExtraLight'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwOIpWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:300;src:local('Raleway Light'),local('Raleway-Light'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwIYqWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:400;src:local('Raleway'),local('Raleway-Regular'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptug8zYS_SKggPNyC0ISg.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:500;src:local('Raleway Medium'),local('Raleway-Medium'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwN4rWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:600;src:local('Raleway SemiBold'),local('Raleway-SemiBold'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwPIsWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:700;src:local('Raleway Bold'),local('Raleway-Bold'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwJYtWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:800;src:local('Raleway ExtraBold'),local('Raleway-ExtraBold'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwIouWqZPBQ.ttf) format('truetype')}@font-face{font-family:Raleway;font-style:normal;font-weight:900;src:local('Raleway Black'),local('Raleway-Black'),url(https://fonts.gstatic.com/s/raleway/v14/1Ptrg8zYS_SKggPNwK4vWqZPBQ.ttf) format('truetype')}@font-face{font-family:Oswald;font-style:normal;font-weight:400;src:url(https://fonts.gstatic.com/s/oswald/v29/TK3_WkUHHAIjg75cFRf3bXL8LICs1_FvsUZiYA.ttf) format('truetype')}@font-face{font-family:Oswald;font-style:normal;font-weight:700;src:url(https://fonts.gstatic.com/s/oswald/v29/TK3_WkUHHAIjg75cFRf3bXL8LICs1xZosUZiYA.ttf) format('truetype')}/*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)

File diff suppressed because one or more lines are too long

View file

@ -26,9 +26,41 @@ $(document).ready(function() {
$(".btn-booking-form .btn-booking-loading").removeClass("hide"); $(".btn-booking-form .btn-booking-loading").removeClass("hide");
} }
}); });
// STICKY
if($('#header').hasClass('sticky')) {
var _header_el = $('#header');
var _topBar_H = $("#topBar").outerHeight() || 0;
// Force fixed header on mobile to avoid "jump" effect.
if(window.width <= 992 && _topBar_H < 1) {
var _scrollTop = $(document).scrollTop();
var _header_H = _header_el.outerHeight() || 0;
_header_el.addClass('fixed');
$('body').css({"padding-top":_header_H+"px"});
}
$(window).scroll(function() {
if((window.width > 992 && _topBar_H < 1) || _topBar_H > 0) { // 992 to disable on mobile
var _scrollTop = $(document).scrollTop();
if(_scrollTop > _topBar_H) {
_header_el.addClass('fixed');
var _header_H = _header_el.outerHeight() || 0;
$('body').css({"padding-top":_header_H+"px"});
} else {
$('body').css({"padding-top":"0px"});
_header_el.removeClass('fixed');
}
}
});
}
}); });
var collapse_on_responsive = function() { /*var collapse_on_responsive = function() {
if (jQuery(document).width() < 992) { if (jQuery(document).width() < 992) {
//jQuery('.widget').find('.collapse-widget:not(.open)').addClass('collapsed'); //jQuery('.widget').find('.collapse-widget:not(.open)').addClass('collapsed');
//jQuery('.widget').find('.collapse:not(.open)').removeClass('in'); //jQuery('.widget').find('.collapse:not(.open)').removeClass('in');
@ -36,4 +68,5 @@ var collapse_on_responsive = function() {
// jQuery('.widget').find('.collapse-widget').removeClass('collapsed'); // jQuery('.widget').find('.collapse-widget').removeClass('collapsed');
// jQuery('.widget').find('.collapse').addClass('in'); // jQuery('.widget').find('.collapse').addClass('in');
} }
}; };*/