From 6cd7be6abcaf6b6be33beb21490ca2796c50371a Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Fri, 26 Nov 2021 13:05:23 +0000 Subject: [PATCH] [UI][CONTROLLER][ENTITY][DOCS] Refactor term 'timeline' into 'feed' --- DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md | 2 +- bin/configure | 2 +- components/Left/templates/left/view.html.twig | 2 +- docs/administrator/src/install/no_docker_shell.md | 2 +- docs/user/src/SUMMARY.md | 2 +- docs/user/src/{timelines.md => feeds.md} | 2 +- docs/user/src/what_is.md | 2 +- plugins/Directory/css/directory/actors.css | 6 +++--- plugins/Directory/css/directory/groups.css | 6 +++--- .../Directory/templates/directory/groups.html.twig | 4 ++-- plugins/Favourite/Controller/Favourite.php | 4 ++-- plugins/Poll/Poll.php | 2 +- public/components/Left/assets/css/view.css | 12 ++++++------ src/Controller/Network.php | 8 ++++---- src/Entity/ActorCircle.php | 8 +++++--- templates/actor/view.html.twig | 4 ++-- templates/base.html.twig | 2 +- templates/cards/navigation/view.html.twig | 10 +++++----- templates/doc/faq/faq.html.twig | 4 ++-- templates/doc/faq/tags.html.twig | 2 +- templates/network/feed.html.twig | 4 ++-- 21 files changed, 46 insertions(+), 44 deletions(-) rename docs/user/src/{timelines.md => feeds.md} (98%) diff --git a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md index 09d5651f77..6a9d117d6f 100644 --- a/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md +++ b/DOCUMENTATION/SYSTEM_ADMINISTRATORS/CONFIGURE.md @@ -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 diff --git a/bin/configure b/bin/configure index 5d36c6d6b1..8dfe527ec6 100755 --- a/bin/configure +++ b/bin/configure @@ -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 $? diff --git a/components/Left/templates/left/view.html.twig b/components/Left/templates/left/view.html.twig index afca56c7e9..adf479b5c7 100644 --- a/components/Left/templates/left/view.html.twig +++ b/components/Left/templates/left/view.html.twig @@ -16,7 +16,7 @@ {% endif %} - {{ block("timeline", "cards/navigation/view.html.twig") }} + {{ block("feeds", "cards/navigation/view.html.twig") }} {{ block("footer", "cards/navigation/view.html.twig") }} diff --git a/docs/administrator/src/install/no_docker_shell.md b/docs/administrator/src/install/no_docker_shell.md index 2ca9eb0e73..1117a2f21a 100644 --- a/docs/administrator/src/install/no_docker_shell.md +++ b/docs/administrator/src/install/no_docker_shell.md @@ -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 diff --git a/docs/user/src/SUMMARY.md b/docs/user/src/SUMMARY.md index af27f68c30..a69c9b3100 100644 --- a/docs/user/src/SUMMARY.md +++ b/docs/user/src/SUMMARY.md @@ -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) diff --git a/docs/user/src/timelines.md b/docs/user/src/feeds.md similarity index 98% rename from docs/user/src/timelines.md rename to docs/user/src/feeds.md index 11798441b3..d3cc89b99a 100644 --- a/docs/user/src/timelines.md +++ b/docs/user/src/feeds.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. diff --git a/docs/user/src/what_is.md b/docs/user/src/what_is.md index dadec02e74..26d561541a 100644 --- a/docs/user/src/what_is.md +++ b/docs/user/src/what_is.md @@ -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. diff --git a/plugins/Directory/css/directory/actors.css b/plugins/Directory/css/directory/actors.css index 09ab42f46b..10ab1d7eff 100644 --- a/plugins/Directory/css/directory/actors.css +++ b/plugins/Directory/css/directory/actors.css @@ -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; -} \ No newline at end of file +} diff --git a/plugins/Directory/css/directory/groups.css b/plugins/Directory/css/directory/groups.css index bdc1fa6a50..be613f7fce 100644 --- a/plugins/Directory/css/directory/groups.css +++ b/plugins/Directory/css/directory/groups.css @@ -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; -} \ No newline at end of file +} diff --git a/plugins/Directory/templates/directory/groups.html.twig b/plugins/Directory/templates/directory/groups.html.twig index 75a02dc595..646d092b6f 100644 --- a/plugins/Directory/templates/directory/groups.html.twig +++ b/plugins/Directory/templates/directory/groups.html.twig @@ -3,7 +3,7 @@ {% block title %}Groups{% endblock %} {% block body %} -
+
{% if groups is defined and groups is not empty %} {% for group in groups %} @@ -14,4 +14,4 @@ {% endif %}
-{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/plugins/Favourite/Controller/Favourite.php b/plugins/Favourite/Controller/Favourite.php index 030edc849b..b23293010f 100644 --- a/plugins/Favourite/Controller/Favourite.php +++ b/plugins/Favourite/Controller/Favourite.php @@ -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.', ]; } diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php index 8ec30771d7..c830ac31f2 100644 --- a/plugins/Poll/Poll.php +++ b/plugins/Poll/Poll.php @@ -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 * diff --git a/public/components/Left/assets/css/view.css b/public/components/Left/assets/css/view.css index 4478fb2c8a..87f9c30f27 100644 --- a/public/components/Left/assets/css/view.css +++ b/public/components/Left/assets/css/view.css @@ -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); } diff --git a/src/Controller/Network.php b/src/Controller/Network.php index 98b11b0141..e382845780 100644 --- a/src/Controller/Network.php +++ b/src/Controller/Network.php @@ -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', ]; } } diff --git a/src/Entity/ActorCircle.php b/src/Entity/ActorCircle.php index 1e8f23c0b1..f8ecefac64 100644 --- a/src/Entity/ActorCircle.php +++ b/src/Entity/ActorCircle.php @@ -1,5 +1,7 @@ '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 diff --git a/templates/actor/view.html.twig b/templates/actor/view.html.twig index 31d5e472ba..bb5d32778d 100644 --- a/templates/actor/view.html.twig +++ b/templates/actor/view.html.twig @@ -5,7 +5,7 @@ {% block body %} {% block profile_view %}{% include 'cards/profile/view.html.twig' %}{% endblock profile_view %} -
+
{% if notes is defined and notes is not empty %} {% for conversation in notes %} @@ -17,4 +17,4 @@ {% endif %}
-{% endblock body %} \ No newline at end of file +{% endblock body %} diff --git a/templates/base.html.twig b/templates/base.html.twig index 1acca691ee..28fc7c2e7c 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -72,7 +72,7 @@ {{ block("leftpanel", "stdgrid.html.twig") }} - +

{{ icon('logo', 'icon icon-logo') | raw }}{{ config('site', 'name') }}

 diff --git a/templates/cards/navigation/view.html.twig b/templates/cards/navigation/view.html.twig index 9d6760a9d1..e3d11e47bc 100644 --- a/templates/cards/navigation/view.html.twig +++ b/templates/cards/navigation/view.html.twig @@ -1,7 +1,7 @@ -{% block timeline %} +{% block feeds %}
-

{{ icon('logo', 'icon icon-logo') | raw }} Timeline

-
-{% endblock timeline %} +{% endblock feeds %} {% block group %}

{{ icon('logo', 'icon icon-logo') | raw }} Group

-