rdelaage
/
castopod
mirror of https://code.castopod.org/adaures/castopod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: clean interactive rebase conflicts

This commit is contained in:
Yassine Doghri 2020-10-15 15:24:16 +00:00
parent d5f22fbb38
commit 96b39002eb
4 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Views/_message_block.php
View File

@ -11,19 +11,10 @@
<?php endif; ?>
<?php if (session()->has('errors')): ?>
<<<<<<< HEAD
<ul class="px-4 py-2 mb-4 font-semibold text-red-900 bg-red-200 border border-red-700">
<?php foreach (session('errors') as $error): ?>
<li><?= $error ?></li>
<?php endforeach; ?>
</ul>
<?php endif;
?>
=======
<ul class="px-4 py-2 mb-4 font-semibold text-red-900 bg-red-200 border border-red-700">
<?php foreach (session('errors') as $error): ?>
<li><?= $error ?></li>
<?php endforeach; ?>
</ul>
<?php endif; ?>
>>>>>>> ef31ffe... refactor: add php_codesniffer to define castopod's coding style based on psr-1
<?php endif;
?>

26
app/Views/episode.php
View File

@ -105,29 +105,6 @@
</div>
</header>
<<<<<<< HEAD
<a class="underline hover:no-underline" href="<?= route_to(
'podcast',
$podcast->name
) ?>">< <?= lang('Episode.back_to_podcast') ?></a>
<h1 class="text-2xl font-semibold"><?= $episode->title ?></h1>
<img src="<?= $episode->image_url ?>" alt="Episode cover" class="object-cover w-40 h-40 mb-6" />
<audio controls preload="none" class="mb-12">
<source src="<?= $episode->enclosure_url ?>" type="<?= $episode->enclosure_type ?>">
Your browser does not support the audio tag.
</audio>
<<<<<<< HEAD
<?= $this->endSection()
?>
=======
<section class="prose">
<?= $episode->description_html ?>
</section>
<?= $this->endSection() ?>
>>>>>>> 240f1d4... feat: enhance ui using javascript in admin area
=======
<section class="w-full max-w-3xl px-2 py-6 mx-auto prose md:px-6">
<?= $episode->description_html ?>
</section>
@ -144,5 +121,4 @@
</div>
</div>
</footer>
</body>
>>>>>>> ecc68b2... feat(public-ui): adapt wireframes to public podcast and episode pages
</body>

20
app/Views/episodes/view.php
View File

@ -1,20 +0,0 @@
<?= $this->extend('layouts/default') ?>
<?= $this->section('content') ?>
<h1 class="text-2xl font-semibold"><?= $episode->title ?></h1>
<img src="<?= media_url(
$episode->image ? $episode->image : $podcast->image
) ?>" alt="Episode cover" class="object-cover w-40 h-40 mb-6" />
<audio controls preload="none">
<source src="<?= podcast_url(
$episode->podcast_id,
$episode->id,
$podcast->name,
$episode->enclosure_url
) ?>" type="<?= $episode->enclosure_type ?>">
Your browser does not support the audio tag.
</audio>
<?= $this->endSection()
?>

6
app/Views/podcast.php
View File

@ -79,11 +79,6 @@
</div>
</header>
<<<<<<< HEAD
<?= $this->endSection()
?>
=======
<section class="flex flex-col">
<nav class="inline-flex justify-center px-4 bg-gray-100 border-b">
<?php foreach ($episodesNav as $link): ?>
@ -176,4 +171,3 @@
</div>
</footer>
</body>
>>>>>>> ecc68b2... feat(public-ui): adapt wireframes to public podcast and episode pages