Permalink
Browse files

Merge pull request #143 from borazslo/master

Merge from master.
  • Loading branch information...
briff committed Mar 24, 2017
2 parents cb32ec9 + 7cb5e2f commit 1491b12b66c4e21bb48a491e47982772cf9d7de1
View
@@ -19,7 +19,7 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
-ENABLED_TRANSLATIONS=1, 2, 3, 4, 5
+ENABLED_TRANSLATIONS=1,2,3,4,5
AUDIO_DIRECTORY=hang
LOG_LEVEL=debug
SPHINX_CONFIG=/etc/sphinxsearch/sphinx.conf
@@ -32,4 +32,4 @@ TEXT_SOURCE_KG=
TEXT_SOURCE_KNB=
TEXT_SOURCE_UF=
TEXT_SOURCE_RUF=
-TEXT_SOURCE_SZIT=
+TEXT_SOURCE_SZIT=
@@ -89,6 +89,7 @@ public function showTranslatedReferenceText($translationAbbrev, $reference)
$verseContainers = $this->textService->getTranslatedVerses($canonicalRef, $translation->id);
$translations = $this->translationRepository->getAllOrderedByDenom();
return View::make('textDisplay.verses')->with([
+ 'canonicalRef' => str_replace(" ", "%20", $canonicalRef->toString()),
'verseContainers' => $verseContainers,
'translation' => $translation,
'translations' => $translations,
@@ -15,15 +15,6 @@ class MenuComposer
public function compose($view)
{
- $currentSecond = Carbon::now()->second;
- if ($currentSecond > 30) {
- $adView = "ad.simontl";
- } else {
- $adView = "ad.konyvekkonyve";
- }
-
- $view
- ->with('adview', $adView);
}
}
View
@@ -0,0 +1,22 @@
+<?php
+
+return [
+ /*
+ |--------------------------------------------------------------------------
+ | Laravel CORS
+ |--------------------------------------------------------------------------
+ |
+
+ | allowedOrigins, allowedHeaders and allowedMethods can be set to array('*')
+ | to accept any value.
+ |
+ */
+ 'supportsCredentials' => false,
+ 'allowedOrigins' => ['*'],
+ 'allowedHeaders' => ['*'],
+ 'allowedMethods' => ['*'],
+ 'exposedHeaders' => [],
+ 'maxAge' => 0,
+ 'hosts' => [],
+];
+
@@ -10,13 +10,13 @@
<meta property="fb:admins" content="1819502454" />
<meta property="fb:appId" content="{{ config_get('settings.facebookAppId') }}" />
+ <meta property="og:type" content="website" />
<meta name="description" content="{{ teaser ? teaser : 'A teljes Szentírás, azaz a Biblia magyarul az interneten: katolikus és protestáns fordításban' }}">
<meta name="keywords" content="biblia, katolikus, protestáns, szentírás, keresztény, keresztyén, református, hivatalos">
<meta name="author" content="szentiras.hu">
<meta http-equiv="cleartype" content="on">
- <meta property="og:image" content="/img/biblia.jpg">
{% block meta %}{% endblock %}
<link rel="shortcut icon" type="image/vnd.microsoft.icon" href="/favicon.ico">
@@ -1,2 +1 @@
{% include 'search.quickSearchForm' %}
-{% include adview %}
@@ -6,6 +6,7 @@
<meta property="og:url" content="{{ url('/' ~ canonicalUrl ) }}">
<meta property="og:title" content="{{ metaTitle }}">
<meta property="og:description" content="{{ teaser }}">
+ <meta property="og:image" content="{{ url('/pdf/preview/' ~ translation.id ~ '/' ~ canonicalRef ~ '?headings=true&nums=false&refs=&quantity=1') }}">
{% endblock %}
{% block content %}

0 comments on commit 1491b12

Please sign in to comment.