mirror of
https://github.com/sorenpeter/timeline.git
synced 2025-12-15 10:57:01 +00:00
saveing whatever i was doing last
This commit is contained in:
parent
9f50a5e6a4
commit
1c0b2230c1
5 changed files with 30 additions and 18 deletions
|
|
@ -86,6 +86,10 @@ header img.avatar {
|
||||||
vertical-align: sub;
|
vertical-align: sub;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
header a span {
|
||||||
|
padding-left: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
header p a,
|
header p a,
|
||||||
header p a:visited {
|
header p a:visited {
|
||||||
/* font-weight: bold;*/
|
/* font-weight: bold;*/
|
||||||
|
|
@ -134,6 +138,7 @@ img.avatar {
|
||||||
height: 2.5rem;
|
height: 2.5rem;
|
||||||
width: 2.5rem;
|
width: 2.5rem;
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.author {
|
a.author {
|
||||||
|
|
|
||||||
|
|
@ -408,9 +408,9 @@ function getTwtsFromTwtxtString($url) {
|
||||||
// that's why I leave the UTF-8 representation for future reference
|
// that's why I leave the UTF-8 representation for future reference
|
||||||
$twtContent = str_replace("\u{2028}", "\n<br>\n", $twtContent);
|
$twtContent = str_replace("\u{2028}", "\n<br>\n", $twtContent);
|
||||||
|
|
||||||
//$twtContent = replaceMarkdownLinksFromTwt($twtContent);
|
$twtContent = replaceMarkdownLinksFromTwt($twtContent);
|
||||||
//$twtContent = replaceImagesFromTwt($twtContent);
|
$twtContent = replaceImagesFromTwt($twtContent);
|
||||||
$twtContent = Slimdown::render($twtContent);
|
//$twtContent = Slimdown::render($twtContent);
|
||||||
$twtContent = replaceLinksFromTwt($twtContent); // TODO:
|
$twtContent = replaceLinksFromTwt($twtContent); // TODO:
|
||||||
|
|
||||||
// Get and remove the hash
|
// Get and remove the hash
|
||||||
|
|
|
||||||
|
|
@ -40,20 +40,20 @@ $profile = getTwtsFromTwtxtString($config['public_txt_url']);
|
||||||
<?php //if ($validSession) { // TODO: Make login seqcure ?>
|
<?php //if ($validSession) { // TODO: Make login seqcure ?>
|
||||||
<?php if( isset($_SESSION['password'])) { /*
|
<?php if( isset($_SESSION['password'])) { /*
|
||||||
if($_SESSION['password']=="$password") {*/ // Hacky login ?>
|
if($_SESSION['password']=="$password") {*/ // Hacky login ?>
|
||||||
<li><a href="<?= $baseURL ?>/refresh?url=<?= $url ?>"><i class="fa fa-refresh"> </i><span>Refresh</span></a></li>
|
<li><a href="<?= $baseURL ?>/refresh?url=<?= $url ?>"><i class="fa fa-refresh"></i><span>Refresh</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>"><i class="fa fa-comments-o"> </i><span>Timeline</span></a></li>
|
<li><a href="<?= $baseURL ?>"><i class="fa fa-comments-o"></i><span>Timeline</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/profile"><i class="fa fa-user-circle"> </i><span>Profile</span></a></li>
|
<li><a href="<?= $baseURL ?>/profile"><i class="fa fa-user-circle"></i><span>Profile</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/gallery?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-picture-o"> </i><span>Gallery</span></a></li>
|
<li><a href="<?= $baseURL ?>/gallery?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-picture-o"></i><span>Gallery</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/following"><i class="fa fa-users"> </i><span>Following <?php // echo count($twtFollowingList); ?></span></a></li>
|
<li><a href="<?= $baseURL ?>/following"><i class="fa fa-users"></i><span>Following <?php // echo count($twtFollowingList); ?></span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/add"><i class="fa fa-user-plus"> </i><span>Add feed</span></a></li>
|
<li><a href="<?= $baseURL ?>/add"><i class="fa fa-user-plus"></i><span>Add feed</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/logout"><i class="fa fa-sign-out"> </i><span>Log Out</span></a></li>
|
<li><a href="<?= $baseURL ?>/logout"><i class="fa fa-sign-out"></i><span>Log Out</span></a></li>
|
||||||
<li><?php // include 'partials/lists.php'; ?></li>
|
<li><?php // include 'partials/lists.php'; ?></li>
|
||||||
<?php /*}*/ } else { ?>
|
<?php /*}*/ } else { ?>
|
||||||
<li><a href="<?= $baseURL ?>/profile"><i class="fa fa-user-circle"> </i><span>Profile</span></a></li>
|
<li><a href="<?= $baseURL ?>/profile"><i class="fa fa-user-circle"></i><span>Profile</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/gallery?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-picture-o"> </i><span>Gallery</span></a></li>
|
<li><a href="<?= $baseURL ?>/gallery?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-picture-o"></i><span>Gallery</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/following"><i class="fa fa-users"> </i><span>Following <?php // echo count($twtFollowingList); ?></span></a></li>
|
<li><a href="<?= $baseURL ?>/following"><i class="fa fa-users"></i><span>Following <?php // echo count($twtFollowingList); ?></span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-comments-o"> </i><span>Timeline</span></a></li>
|
<li><a href="<?= $baseURL ?>?url=<?= $config['public_txt_url'] ?>"><i class="fa fa-comments-o"></i><span>Timeline</span></a></li>
|
||||||
<li><a href="<?= $baseURL ?>/login" class="secondary"><i class="fa fa-sign-in"> </i><span>Log in</span></a></li>
|
<li><a href="<?= $baseURL ?>/login" class="secondary"><i class="fa fa-sign-in"></i><span>Log in</span></a></li>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,10 @@ $title = "Conversation: ".$id." - ".$title;
|
||||||
include_once 'partials/header.php';
|
include_once 'partials/header.php';
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
<center>
|
||||||
<h2>Conversation</h2>
|
<h2>Conversation</h2>
|
||||||
|
<p>Recent posts in reply to <a href="<?= $baseURL ?>/post/<?= $id ?>">#<?= $id ?></a></p>
|
||||||
<p>Recent twts in reply to <a href="<?= $baseURL ?>/post/<?= $id ?>">#<?= $id ?></a></p>
|
</center>
|
||||||
|
|
||||||
<!-- PHP: GET TIMELINE --><?php include_once 'partials/timeline.php'?>
|
<!-- PHP: GET TIMELINE --><?php include_once 'partials/timeline.php'?>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,12 @@ include_once 'partials/header.php';
|
||||||
|
|
||||||
if (isset($_SESSION['password'])) {
|
if (isset($_SESSION['password'])) {
|
||||||
include 'views/new_twt.php'; // TODO: Split up new_twt into a view and a partial
|
include 'views/new_twt.php'; // TODO: Split up new_twt into a view and a partial
|
||||||
|
} else {
|
||||||
|
|
||||||
|
echo '<center><h2>Timeline</h2>';
|
||||||
|
|
||||||
|
echo '<p>Recent posts from feeds followed by <a href="./profile">
|
||||||
|
<strong>'.$config['public_nick'].'</strong>@'. parse_url($profile->mainURL, PHP_URL_HOST).'</a></p></center>';
|
||||||
}
|
}
|
||||||
|
|
||||||
include_once 'partials/timeline.php';
|
include_once 'partials/timeline.php';
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue