[UI][CONTROLLER][ENTITY][DOCS] Refactor term 'timeline' into 'feed'

oauth1
Hugo Sales 2 years ago
parent 283820a4a5
commit 6cd7be6abc
No known key found for this signature in database
GPG Key ID: 7D0C7EAFC9D835A0

@ -491,7 +491,7 @@ For configuring the public stream.
some kind of automated poster, testing bots, etc.
* `exclude_sources` (array, default []): Sources of notices that should be kept off of
the public timeline (because they're from automatic posters, for instance).
the public feed (because they're from automatic posters, for instance).
throttle

2
bin/configure vendored

@ -226,7 +226,7 @@ PROFILE=$(${WHIPTAIL} --title 'GNU social site profile' --clear --backtitle 'GNU
public 'Make this node publicly accessible, with open registration' \
community 'Make this node publicly accessible, but with invite-only registration' \
isolated 'Make this node publicly accessible, with open registration but do not federate' \
private 'Make this node publicly accessible, but with invite-only registration, only registered users can see timelines' \
private 'Make this node publicly accessible, but with invite-only registration, only registered users can see feeds' \
single_user 'Like public, but only allows registering one user' \
3>&1 1>&2 2>&3)
validate_exit $?

@ -16,7 +16,7 @@
</section>
{% endif %}
{{ block("timeline", "cards/navigation/view.html.twig") }}
{{ block("feeds", "cards/navigation/view.html.twig") }}
{{ block("footer", "cards/navigation/view.html.twig") }}
</aside>

@ -156,7 +156,7 @@ especially if you've previously installed PHP packages.
{{#include bin-configure.md}}
7. You should now be able to navigate to your social site's main directory
and see the "Public Timeline", which will probably be empty. You can
and see the "Public Feed", which will probably be empty. You can
now register new user, post some notices, edit your profile, etc.
### Fancy URLs

@ -2,7 +2,7 @@
- [What is GNU social](./what_is.md)
- [The IndieWeb](./indieweb.md)
- [Timelines](./timelines.md)
- [Feeds](./feeds.md)
- [Getting Started]()
- [Choosing an instance](./getting_started/choosing_an_instance.md)
- [Registering an account](./getting_started/register.md)

@ -1,4 +1,4 @@
# Timelines
# Feeds
Communication became cheap. Everyone wants to share information.
However, people aren't interested in consuming everyone's information.

@ -2,7 +2,7 @@
GNU social is a social network platform for communities. It enables you to publish
short notes including URLs and pictures. If you're interested in what someone has
to say you can subscribe them. When you log in to your account you see a timeline
to say you can subscribe them. When you log in to your account you see a feed
containing all the notes from people, groups and tags you subscribed.
You can have a conversation with another person by replying to each other's notes.

@ -4,13 +4,13 @@
flex-wrap: wrap;
}
.nav-content .timeline .actors > div {
.nav-content .feed .actors > div {
margin: var(--unit-size) var(--unit-size) 0 var(--unit-size);
border-radius: var(--unit-size);
width: 100%;
}
.nav-content .timeline .actors > div:last-child {
.nav-content .feed .actors > div:last-child {
margin: var(--unit-size) var(--unit-size) var(--unit-size) var(--unit-size);
}
@ -48,4 +48,4 @@
display: flex;
flex-wrap: wrap;
justify-content: right;
}
}

@ -8,13 +8,13 @@
padding: var(--unit-size);
}
.nav-content .timeline .groups > div {
.nav-content .feed .groups > div {
margin: var(--unit-size) var(--unit-size) 0 var(--unit-size);
border-radius: var(--unit-size);
width: 100%;
}
.nav-content .timeline .groups > div:last-child {
.nav-content .feed .groups > div:last-child {
margin: var(--unit-size) var(--unit-size) var(--unit-size) var(--unit-size);
}
@ -52,4 +52,4 @@
display: flex;
flex-wrap: wrap;
justify-content: right;
}
}

@ -3,7 +3,7 @@
{% block title %}Groups{% endblock %}
{% block body %}
<div class="timeline">
<div class="feed">
<div class="groups">
{% if groups is defined and groups is not empty %}
{% for group in groups %}
@ -14,4 +14,4 @@
{% endif %}
</div>
</div>
{% endblock body %}
{% endblock body %}

@ -180,7 +180,7 @@ class Favourite extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Favourites timeline.',
'page_title' => 'Favourites feed.',
];
}
@ -214,7 +214,7 @@ class Favourite extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes,
'page_title' => 'Reverse favourites timeline.',
'page_title' => 'Reverse favourites feed.',
];
}

@ -91,7 +91,7 @@ class Poll extends NoteHandlerPlugin
}
/**
* Output our note content to the timeline
* Output our note content to the feed
*
* @param array $otherContent content
*

@ -21,25 +21,25 @@
}
/* TIMELINE NAVIGATION / PLUGINS */
.timeline-nav {
/* FEED NAVIGATION / PLUGINS */
.feed-nav {
margin-bottom: var(--medium);
}
.timeline-nav a {
.feed-nav a {
display: flex;
}
.timeline-nav hr {
.feed-nav hr {
flex: 1;
background: linear-gradient(90deg, var(--accent), transparent);
}
.timeline-nav a {
.feed-nav a {
color: var(--foreground);
}
.timeline-nav .active {
.feed-nav .active {
color: var(--foreground);
}

@ -65,7 +65,7 @@ class Network extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Public timeline',
'page_title' => 'Public feed',
];
}
@ -110,7 +110,7 @@ class Network extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Home timeline',
'page_title' => 'Home feed',
];
}
@ -124,7 +124,7 @@ class Network extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Network timeline',
'page_title' => 'Network feed',
];
}
@ -143,7 +143,7 @@ class Network extends Controller
return [
'_template' => 'network/feed.html.twig',
'notes' => $notes_out,
'page_title' => 'Replies timeline',
'page_title' => 'Replies feed',
];
}
}

@ -1,5 +1,7 @@
<?php
declare(strict_types = 1);
// {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social
//
@ -44,8 +46,8 @@ class ActorCircle extends Entity
private string $tag;
private ?string $description;
private ?bool $private;
private \DateTimeInterface $created;
private \DateTimeInterface $modified;
private DateTimeInterface $created;
private DateTimeInterface $modified;
public function setTagger(int $tagger): self
{
@ -120,7 +122,7 @@ class ActorCircle extends Entity
{
return [
'name' => 'actor_circle',
'description' => 'a actor can have lists of actors, to separate their timeline',
'description' => 'a actor can have lists of actors, to separate their feed',
'fields' => [
'tagger' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'many to one', 'name' => 'actor_list_tagger_fkey', 'not null' => true, 'description' => 'user making the tag'],
'tag' => ['type' => 'varchar', 'length' => 64, 'foreign key' => true, 'target' => 'ActorTag.tag', 'multiplicity' => 'many to one', 'not null' => true, 'description' => 'actor tag'], // Join with ActorTag // // so, Doctrine doesn't like that the target is not unique, even though the pair is

@ -5,7 +5,7 @@
{% block body %}
{% block profile_view %}{% include 'cards/profile/view.html.twig' %}{% endblock profile_view %}
<main class="timeline" tabindex="0" role="feed">
<main class="feed" tabindex="0" role="feed">
<div class="h-feed hfeed notes">
{% if notes is defined and notes is not empty %}
{% for conversation in notes %}
@ -17,4 +17,4 @@
{% endif %}
</div>
</main>
{% endblock body %}
{% endblock body %}

@ -72,7 +72,7 @@
{{ block("leftpanel", "stdgrid.html.twig") }}
<a id="anchor-main-page" class="anchor-hidden" title="{{ 'Press tab to access instance\'s main page.' | trans }}"></a>
<a class="accessibility-target header-instance" href="{{ path('main_public') }}" tabindex="0" title="{{ 'This instance\'s name. Access public timeline.' | trans }}">
<a class="accessibility-target header-instance" href="{{ path('main_public') }}" tabindex="0" title="{{ 'This instance\'s name. Access public feed.' | trans }}">
<h1>{{ icon('logo', 'icon icon-logo') | raw }}{{ config('site', 'name') }}</h1>
</a>

@ -1,7 +1,7 @@
{% block timeline %}
{% block feeds %}
<section class="section-widget section-widget-padded">
<h2 class="section-title">{{ icon('logo', 'icon icon-logo') | raw }} Timeline</h2>
<nav class='sec-nav' tabindex="0" title="{{ 'Navigate through each timeline.' | trans }}">
<h2 class="section-title">{{ icon('logo', 'icon icon-logo') | raw }} {{ 'Feeds' | trans }} </h2>
<nav class='sec-nav' tabindex="0" title="{{ 'Navigate through each feed.' | trans }}">
<ul>
<li>
<a href="{{ path('main_public') }}" class='{{ active('main_public') }}'>
@ -33,12 +33,12 @@
</ul>
</nav>
</section>
{% endblock timeline %}
{% endblock feeds %}
{% block group %}
<section class="section-widget section-widget-padded">
<h2 class="section-title">{{ icon('logo', 'icon icon-logo') | raw }} Group</h2>
<nav class='sec-nav' tabindex="0" title="{{ 'Navigate through each timeline.' | trans }}">
<nav class='sec-nav' tabindex="0" title="{{ 'Navigate through each feed.' | trans }}">
<ul>
<li>
<a href="{{ path('main_public') }}" class='{{ active('main_public') }}'>

@ -47,8 +47,8 @@
You can also share other types of data, like bookmarks, event invitations, polls, and questions.
If you'd like to try it out, first register a new account. Then, on the public timeline, enter your message into the text box at the top of the page, and click "Send". It will go out on the public timeline and to anyone who is subscribed to your notices.
If you'd like to try it out, first register a new account. Then, on the public feed, enter your message into the text box at the top of the page, and click "Send". It will go out on the public feed and to anyone who is subscribed to your notices.
To subscribe to other people's notifications, go to their profile page and click the "subscribe" button. They'll get a notice that you're now subscribed to their notifications.
{% endapply %}
{% endblock %}
{% endblock %}

@ -29,6 +29,6 @@
You can also send a notice "to the attention of" your subscribers whom you've marked with a particular tag (note: not people who've marked themselves with that tag). "@#family hello" will send a notice to all your subscribers you've marked with the tag 'family'.
## Private and public people tags
A private people tag is only visible to the creator, it cannot be subscribed to, but the timeline can be viewed. To create a new private prepend a '.' to the tag in the tags editing box. To set an existing public tag as private or vice-versa, go to the tag's edit page.
A private people tag is only visible to the creator, it cannot be subscribed to, but the feed can be viewed. To create a new private prepend a '.' to the tag in the tags editing box. To set an existing public tag as private or vice-versa, go to the tag's edit page.
{% endapply %}
{% endblock %}

@ -10,7 +10,7 @@
{% block body %}
{# Backwards compatibility with hAtom 0.1 #}
<main class="timeline" tabindex="0" role="feed">
<main class="feed" tabindex="0" role="feed">
<div class="h-feed hfeed notes">
{% if notes is defined and notes is not empty %}
{% for conversation in notes %}
@ -24,4 +24,4 @@
{% endif %}
</div>
</main>
{% endblock body %}
{% endblock body %}

Loading…
Cancel
Save