Skip to content

Commit

Permalink
moved home, privacy and terms to custom route
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardteach42 committed Dec 3, 2018
1 parent 7dcf1f7 commit 53015cd
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 228 deletions.
12 changes: 5 additions & 7 deletions dappur/contact.twig
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
<div class="info">
<h3 class="title">ONLINE</h3>
<p><i aria-hidden="true" class="fa fa-envelope"></i> &nbsp; {{pageConfig['contact-email']}}<br>
<p><i aria-hidden="true" class="fa fa-envelope"></i> &nbsp; {{config['contact-email']}}<br>
<br>
<i aria-hidden="true" class="fa fa-globe"></i> &nbsp; {{config['domain']}}</p>
</div>
Expand All @@ -81,9 +81,7 @@
</div>
<div class="info">
<h3 class="title">PHONE</h3>
<p><i aria-hidden="true" class="fa fa-phone"></i> &nbsp; {{pageConfig['contact-phone']}}<br>
<br>
<i aria-hidden="true" class="fa fa-mobile"></i> &nbsp; (+91)-7567065254</p>
<p><i aria-hidden="true" class="fa fa-phone"></i> &nbsp; {{config['contact-phone']}}<br></p>
</div>
</div>
<div class="space"></div>
Expand All @@ -98,9 +96,9 @@
<div class="info">
<h3 class="title">ADDRESS</h3>
<p><i aria-hidden="true" class="fa fa-map-marker"></i> &nbsp;
{{pageConfig['site-name']}} <br />
{{pageConfig['contact-street']}}<br />
{{pageConfig['contact-city']}}, {{pageConfig['contact-state']}}, {{pageConfig['contact-zip']}}
{{config['site-name']}} <br />
{{config['contact-street']}}<br />
{{config['contact-city']}}, {{config['contact-state']}}, {{config['contact-zip']}}
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion dappur/custom-route.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

{% block body %}
<div class="container-fluid">
{{ route.content|raw }}
{{ include(template_from_string(route.content)) }}
</div>
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion dappur/errors/404.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.twig' %}
{% extends 'errors/base.twig' %}

{% block title %}
{{config['site-name']}}
Expand Down
2 changes: 1 addition & 1 deletion dappur/errors/405.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.twig' %}
{% extends 'errors/base.twig' %}

{% block title %}
{{config['site-name']}}
Expand Down
2 changes: 1 addition & 1 deletion dappur/errors/500-php.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.twig' %}
{% extends 'errors/base.twig' %}

{% block title %}
{{config['site-name']}}
Expand Down
2 changes: 1 addition & 1 deletion dappur/errors/500.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.twig' %}
{% extends 'errors/base.twig' %}

{% block title %}
{{config['site-name']}}
Expand Down
107 changes: 107 additions & 0 deletions dappur/errors/base.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

{% block seo %}
<title>{{ seo.title }}</title>
<meta name="page-title" content="{{ seo.title }}" />
<meta name="description" content="{{ seo.description }}" />
<meta name="author" content="{{ config['site-name'] }}"/>

{# Open Graph #}
<meta property="og:title" content="{{ seo.title }}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="https://{{ config['domain'] }}{{ currentRoute }}" />
<meta property="og:image" content="{{ seo.image }}" />
<meta property="og:description" content="{{ seo.description }}" />
<meta property="og:site_name" content="{{ config['site-name'] }}" />
{% if seo.video and seo.video != "" %}<meta property="og:video" content="{{ seo.video }}" />{% endif %}

{# Twitter Card #}
<meta name="twitter:card" content="{% if seo.video and seo.video != "" %}player{% else %}summary_large_image{% endif %}">
<meta name="twitter:title" content="{{ seo.title }}">
<meta name="twitter:description" content="{{ seo.description }}">
<meta name="twitter:image" content="{{ seo.image }}">
{% if seo.video and seo.video != "" %}
<meta property="twitter:player" content="{{ seo.video }}" />
<meta property="twitter:player:stream" content="{{ seo.video }}" />
<meta property="twitter:player:height" content="450" />
<meta property="twitter:player:width" content="800" />
{% endif %}

{# Google+ #}
<meta itemprop="name" content="{{ seo.title }}">
<meta itemprop="description" content="{{ seo.description }}">
<meta itemprop="image" content="{{ seo.image }}">
{% endblock %}

{# Facebook #}
{% if config['fb-app-id'] and config['fb-app-id'] != "" %}<meta property="fb:app_id" content="{{ config['fb-app-id'] }}" />{% endif %}
{% if config['fb-admins'] and config['fb-admins'] != "" %}<meta property="fb:admins" content="{{ config['fb-admins'] }}" />{% endif %}
{% if config['fb-page-id'] and config['fb-page-id'] != "" %}<meta property="fb:page_id" content="{{ config['fb-page-id'] }}" />{% endif %}

{# Twitter Authorship #}
{% if config['tw-publisher'] and config['tw-publisher'] != "" %}<meta name="twitter:site" content="{{ config['tw-publisher'] }}">{% endif %}
{% if config['tw-author'] and config['tw-author'] != "" %} <meta name="twitter:creator" content="{{ config['tw-author'] }}">{% endif %}

{# Bootstrap #}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/{{config['bootswatch']}}/bootstrap.min.css" crossorigin="anonymous">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />

{# Minified Custom CSS #}
<link rel="stylesheet" href="{{ asset('dappur/css/custom.min.css') }}">

{% block stylesheets %}{% endblock %}

{# HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries
WARNING: Respond.js doesn't work if you view the page via file://#}
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

{# Google Analytics #}
{% if config.ga is not empty %}
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ config.ga }}', 'auto');
ga('send', 'pageview');
{% if auth.user %}ga('set', 'userId', {{auth.user.id}});{% endif %}
</script>
{% endif %}
{# End Google Analytics #}

</head>
<body style="margin-top: 65px;">

{% block flash %}
{% include 'inc/flash.twig' %}
{% endblock %}

{% block body %}{% endblock %}


<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.nicescroll/3.7.5/jquery.nicescroll.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/limonte-sweetalert2/6.6.6/sweetalert2.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>

{# Ajax CSRF #}
<script src="{{ asset('dappur/js/csrf.min.js') }}"></script>
<script type="text/javascript">DappurCSRF.csrfUrl = "/csrf";</script>

{# Custom JS #}
<script src="{{ asset('dappur/js/custom.min.js') }}"></script>

{% block javascript %}{% endblock %}
</body>
</html>
2 changes: 1 addition & 1 deletion dappur/errors/csrf.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'base.twig' %}
{% extends 'errors/base.twig' %}

{% block title %}
{{config['site-name']}}
Expand Down
20 changes: 0 additions & 20 deletions dappur/home.twig

This file was deleted.

79 changes: 0 additions & 79 deletions dappur/privacy.twig

This file was deleted.

0 comments on commit 53015cd

Please sign in to comment.