From f718efcc958c9894ce0a48f5828ae953e2ae54ab Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 14 Aug 2018 15:12:44 -0600 Subject: [PATCH] Frontend ui refactor (#379) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Make followers list flush on mobile * Make followers list flush on mobile * Add message for no saved posts Signed-off-by: Marcin Mikołajczak * add MySQL version req to README.md * adding back example file, deleted accidentally * and remove extra empty line, no need to cause a change in the repo * make clear which version of MySQL is supported * Unsquish tag-page avatars Fix #374 * Fix usernames escaping div and make images link to users * Fix Nginx config --- README.md | 2 +- contrib/nginx.conf | 2 +- resources/assets/sass/custom.scss | 4 ++++ resources/lang/en/profile.php | 1 + resources/lang/pl/navmenu.php | 1 + resources/lang/pl/notification.php | 8 ++++---- resources/lang/pl/profile.php | 3 ++- resources/views/profile/followers.blade.php | 6 +++--- resources/views/profile/following.blade.php | 6 +++--- resources/views/profile/show.blade.php | 6 +++++- resources/views/status/show.blade.php | 16 ++++++++-------- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index fe8ad87a8..d2679abce 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ testing and development. ## Requirements - PHP >= 7.1.3 (7.2+ recommended for stable version) - - MySQL, Postgres (MariaDB and sqlite are not supported yet) + - MySQL >= 5.7, Postgres (MariaDB and sqlite are not supported yet) - Redis - Composer - GD or ImageMagick diff --git a/contrib/nginx.conf b/contrib/nginx.conf index c39103d5a..850d6ed20 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -7,7 +7,7 @@ server { root /var/www/html/public; location / { - try_files $uri $uri/ /index.php; + try_files $uri $uri/ /$is_args$args; } location ~ \.php$ { diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index cb6394607..5aa67fb47 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -294,3 +294,7 @@ details summary::-webkit-details-marker { .details-animated[open] > summary { display: none!important; } + +.profile-avatar img { + object-fit: cover; +} diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php index 01c79be62..9fb9d10db 100644 --- a/resources/lang/en/profile.php +++ b/resources/lang/en/profile.php @@ -4,5 +4,6 @@ return [ 'emptyTimeline' => 'This user has no posts yet!', 'emptyFollowers' => 'This user has no followers yet!', 'emptyFollowing' => 'This user is not following anyone yet!', + 'emptySaved' => 'You haven’t saved any post yet!', 'savedWarning' => 'Only you can see what you’ve saved', ]; diff --git a/resources/lang/pl/navmenu.php b/resources/lang/pl/navmenu.php index 07a94950d..dda1fbdd9 100644 --- a/resources/lang/pl/navmenu.php +++ b/resources/lang/pl/navmenu.php @@ -9,5 +9,6 @@ return [ 'settings' => 'Ustawienia', 'admin' => 'Administrator', 'logout' => 'Wyloguj się', + 'directMessages' => 'Wiadomości bezpośrednie', ]; diff --git a/resources/lang/pl/notification.php b/resources/lang/pl/notification.php index 7e453397f..d24e0b9e0 100644 --- a/resources/lang/pl/notification.php +++ b/resources/lang/pl/notification.php @@ -2,9 +2,9 @@ return [ - 'likedPhoto' => 'polubił Twoje zdjęcie.', - 'startedFollowingYou' => 'zaczął Cię obserwować.', - 'commented' => 'skomentował Twój wpis', - 'mentionedYou' => 'wspomniał o Tobie.' + 'likedPhoto' => 'polubił(a) Twoje zdjęcie.', + 'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.', + 'commented' => 'skomentował(a) Twój wpis', + 'mentionedYou' => 'wspomniał(a) o Tobie.' ]; diff --git a/resources/lang/pl/profile.php b/resources/lang/pl/profile.php index cdd0d56ae..74dd75da0 100644 --- a/resources/lang/pl/profile.php +++ b/resources/lang/pl/profile.php @@ -4,5 +4,6 @@ return [ 'emptyTimeline' => 'Ten użytkownik nie opublikował jeszcze niczego!', 'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!', 'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!', - 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś', + 'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!', + 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)', ]; diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 670a2c7e7..aa6ef39aa 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -5,11 +5,11 @@ @include('profile.partial.user-info')
-
+
@if($followers->count() !== 0) -
    +
      @foreach($followers as $user) -
    • +
    • diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 5ea9553ea..623accf6f 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -5,11 +5,11 @@ @include('profile.partial.user-info')
      -
      +
      @if($following->count() !== 0) -
        +
          @foreach($following as $user) -
        • +
        • diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 8c402e094..fa502ae1a 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -56,7 +56,11 @@
          -

          {{ __('profile.emptyTimeline') }}

          + @if($owner && request()->is('*/saved')) +

          {{ __('profile.emptySaved') }}

          + @else +

          {{ __('profile.emptyTimeline') }}

          + @endif
          diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index cf9b9db55..a6068a9ae 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -6,14 +6,14 @@
          -
          +
          - +
          - {{$user->username}} + {{$user->username}}
          -
          +
          @if($status->is_nsfw && $status->media_count == 1) @@ -61,14 +61,14 @@
          -
          +
          - +
          - {{$user->username}} + {{$user->username}}
          -
          +