From eb8323853bb97de2837cbb4f319908b1324273cc Mon Sep 17 00:00:00 2001 From: nipos Date: Sat, 23 Jun 2018 16:58:06 +0200 Subject: [PATCH] Added full who to follow page and some bug fixes --- .htaccess | 4 +++ Caddyfile | 4 +++ README.md | 7 ++-- assets/css/style.css | 8 ++--- assets/js/halcyon/halcyonFunctions.js | 12 +++---- assets/js/halcyon/halcyonUI.js | 4 ++- login/login.php | 22 ++++++------ login/terms.php | 2 +- nginx.conf | 1 + search_hash_tag.php | 10 +++++- user.php | 4 +-- user_include_replies.php | 4 +-- user_only_media.php | 4 +-- version.txt | 2 +- who_to_follow.php | 52 +++++++++++++++++++++++++++ widgets/side_who_to_follow.php | 5 ++- 16 files changed, 110 insertions(+), 35 deletions(-) create mode 100644 who_to_follow.php diff --git a/.htaccess b/.htaccess index 9eb886e..4f377a1 100644 --- a/.htaccess +++ b/.htaccess @@ -26,6 +26,10 @@ RewriteRule ^federated/?$ federated\.php [NC,L] RewriteBase /notifications RewriteRule ^notifications/?$ notifications\.php [NC,L] +# Who to follow +RewriteBase /whotofollow +RewriteRule ^whotofollow/?$ who_to_follow\.php [NC,L] + # Search RewriteBase /search RewriteRule ^search/?$ search_hash_tag\.php [NC,L,QSA] diff --git a/Caddyfile b/Caddyfile index 8407cbc..1c9030f 100644 --- a/Caddyfile +++ b/Caddyfile @@ -47,6 +47,10 @@ r ^/notifications/?$ to /notifications.php } rewrite { +r ^/whotofollow/?$ +to /who_to_follow.php +} +rewrite { r ^/search/?$ to /search_hash_tag.php } diff --git a/README.md b/README.md index 208a9de..fea7c3e 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Follow our Mastodon account and never miss an important update: [@halcyon@social ## Instances These instances are publicly accessible and usable by everyone, no matter which Mastodon instance you use. -- https://social.dev-wiki.de - 1.1.6 -- https://halcyon.toromino.de - 1.2.0 -- https://itter.photog.social - 1.2.0 +- https://social.dev-wiki.de - 1.2.1 +- https://halcyon.toromino.de - 1.2.1 +- https://itter.photog.social - 1.2.1 - https://halcyon.bka.li - 1.1.7 - https://halcyon.tilde.team - 1.1.7 - https://halcyon.distsn.org - 1.1.6 @@ -21,6 +21,7 @@ These instances are publicly accessible and usable by everyone, no matter which You have your own Halcyon instance and want it to be listed here? Create an issue with the link and we will add it to the list. ## Blog +- Release of Version 1.2.1 - New who to follow page with more recommendations,bugfix at search,profiles now ignore "show replies" setting,small login page changes - [Release of Version 1.2.0 - The next big step and a view into future](https://nikisoft.myblog.de/nikisoft/art/11626391/Halcyon-1-2-0-The-next-big-step-and-a-view-into-future) - [Our move from Github to NotABug](https://nikisoft.myblog.de/nikisoft/art/11626163/Our-move-from-Github-to-NotABug) - Release of Version 1.1.7 - Fixed some bugs in compatibility with Pleroma,text fields now autoresizable,stopped undefined socket tries on profile pages diff --git a/assets/css/style.css b/assets/css/style.css index cdebfab..4bc0a0c 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1277,20 +1277,20 @@ color: #66757F; font-size: 16px; font-weight: 300; } -.side_widget.stream_options .form_title{ +.side_widget.with_button .form_title{ display: flex; align-items: baseline; } -.side_widget.stream_options .form_title h2 { -margin-bottom: 0; +.side_widget.with_button .form_title h2 { flex-grow: 1; } -.side_widget.stream_options .form_title button { +.side_widget.with_button .form_title .headerbtn { cursor: pointer; flex-grow: 1; font-size: 12px; color: #189EFC; text-align: right; +text-decoration:none; } .side_widget form.pulldown_form { overflow: hidden; diff --git a/assets/js/halcyon/halcyonFunctions.js b/assets/js/halcyon/halcyonFunctions.js index 74cae25..9e0cf7d 100644 --- a/assets/js/halcyon/halcyonFunctions.js +++ b/assets/js/halcyon/halcyonFunctions.js @@ -123,27 +123,27 @@ var posted_time_original = posted_time, posted_time = getConversionedDate(null, posted_time_original).getTime(), elapsedTime = Math.ceil((current_time-posted_time)/1000); if (elapsedTime < 60) { -const datetime ="・" + elapsedTime + "s"; +const datetime ="・" + elapsedTime + "s"; return datetime; } else if (elapsedTime < 120) { -const datetime ="・1m"; +const datetime ="・1m"; return datetime; } else if (elapsedTime < (60*60)) { -const datetime ="・" + (Math.floor(elapsedTime / 60) < 10 ? " " : "") + Math.floor(elapsedTime / 60) + "m"; +const datetime ="・" + (Math.floor(elapsedTime / 60) < 10 ? " " : "") + Math.floor(elapsedTime / 60) + "m"; return datetime; } else if (elapsedTime < (120*60)) { -const datetime ="・1h"; +const datetime ="・1h"; return datetime; } else if (elapsedTime < (24*60*60)) { -const datetime ="・" + (Math.floor(elapsedTime / 3600) < 10 ? " " : "") + Math.floor(elapsedTime / 3600) + "h"; +const datetime ="・" + (Math.floor(elapsedTime / 3600) < 10 ? " " : "") + Math.floor(elapsedTime / 3600) + "h"; return datetime; } else { -const datetime ="・" + calendar[posted_time_original.getMonth()] + " " + posted_time_original.getDate(); +const datetime ="・" + calendar[posted_time_original.getMonth()] + " " + posted_time_original.getDate(); return datetime; } } diff --git a/assets/js/halcyon/halcyonUI.js b/assets/js/halcyon/halcyonUI.js index b0d9799..b00d259 100644 --- a/assets/js/halcyon/halcyonUI.js +++ b/assets/js/halcyon/halcyonUI.js @@ -152,8 +152,10 @@ $('.header_my_account_nav').addClass('invisible'); $('.expand_menu').addClass('invisible'); }); }); -function setTimeline(level,load_options) { +function setTimeline(level,load_options,show_replies) { +if(show_replies === undefined) { var show_replies = localStorage.setting_show_replies; +} let isSyncing = true; if(load_options === undefined) { var load_options = []; diff --git a/login/login.php b/login/login.php index 52300c2..49f2a0d 100644 --- a/login/login.php +++ b/login/login.php @@ -65,7 +65,7 @@ location.href = "/"; News - +
  • Source
    • @@ -112,7 +112,7 @@ or     create an account @@ -121,26 +121,26 @@ I agree with the Terms

    What is Halcyon

    -Halcyon is standard Twitter like client of Mastodon, And you can use it just by login to your instance. Let's Toot like a tweet. +Halcyon is a webclient for Mastodon and Pleroma which aims to recreate the simple and beautiful user interface of Twitter while keeping all advantages of decentral networks in focus.

      -
    • halcyon_screenshot
      • -
    • halcyon_screenshot
      • -
    • halcyon_screenshot
      • +
    • halcyon_screenshot
      • +
    • halcyon_screenshot
      • +
    • halcyon_screenshot

    Contact / Feedback

    -Mastodon: ï¼ halcyon@social.csswg.org
    -Email: Use my contact form
    -Github: halcyon-suite/halcyon +Mastodon: ＠halcyon@social.csswg.org
    +Email: Use my contact form
    +Git repository: halcyon-suite/halcyon

    Help us

    -Bitcoin: 1D6GThQqHQYnruKYrKyW9JC86ZGWxjt1hK
    +Bitcoin: 1D6GThQqHQYnruKYrKyW9JC86ZGWxjt1hK

    @@ -173,7 +173,7 @@ window.cookieconsent.initialise({ + diff --git a/widgets/side_who_to_follow.php b/widgets/side_who_to_follow.php index 0e04d75..87a2775 100644 --- a/widgets/side_who_to_follow.php +++ b/widgets/side_who_to_follow.php @@ -21,8 +21,11 @@ Halcyon needs to connect to an external server to get a list of users which have
    -