Merge pull request #582 from openclassify/vedat

#1564
This commit is contained in:
Fatih Alp 2020-05-29 12:08:48 +03:00 committed by GitHub
commit 9304e6f2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions

View File

@ -9,11 +9,11 @@
<div class="row p-2">
{% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}
<div class="col-md-6">
<h4 class="p-2">{{ trans('theme::field.latest_ads') }}</h4>
<h4 class="p-2">{{ trans('visiosoft.theme.base::field.latest_ads') }}</h4>
</div>
<div class="col-md-6 text-right">
<a class="btn btn-outline-secondary"
href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('theme::field.show_all') }}</a>
href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('visiosoft.theme.base::field.show_all') }}</a>
</div>
{% endif %}

View File

@ -12,22 +12,22 @@
<html>
<head>
{% include "theme::partials/metadata" %}
{% include "visiosoft.theme.base::partials/metadata" %}
{% block styles %}{% endblock %}
</head>
<body>
{% include "theme::partials/header" %}
{% include "visiosoft.theme.base::partials/header" %}
{{ addBlock('layouts/default/section')|raw }}
<main id="main">
<div class="container">
{% include "theme::partials/messages" %}
{% include "visiosoft.theme.base::partials/messages" %}
{% if (request_path() == '/') %}
{% include "theme::index/default" %}
{% include "visiosoft.theme.base::index/default" %}
{% else %}
{% block content %}{% endblock %}
{% endif %}
@ -35,9 +35,9 @@
</div>
</main>
{% include "theme::partials/footer" %}
{% include "theme::partials/assets" %}
{% include "theme::partials/settings" %}
{% include "visiosoft.theme.base::partials/footer" %}
{% include "visiosoft.theme.base::partials/assets" %}
{% include "visiosoft.theme.base::partials/settings" %}
</body>
</html>

View File

@ -1,5 +1,5 @@
<header id="header">
{% include "theme::partials/navigation" %}
{% include "visiosoft.theme.base::partials/navigation" %}
</header>

View File

@ -37,7 +37,7 @@
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
</li>
<li class="nav-item">
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("visiosoft.theme.base::button.post_ad.name") }}</a>
</li>
</ul>
{% endif %}
@ -56,7 +56,7 @@
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
</li>
<li class="nav-item">
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("visiosoft.theme.base::button.post_ad.name") }}</a>
</li>
</ul>
{% endif %}