From 996197d7ae3df5201db24af771729347b9990314 Mon Sep 17 00:00:00 2001
From: Marco Nassabain <marco.nassabain@hotmail.com>
Date: Sun, 14 Mar 2021 22:36:31 +0100
Subject: =?UTF-8?q?=F0=9F=94=80=20Fix=20latest=20broken=20merge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
---
 templates/part.content.php | 129 +++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 64 deletions(-)

diff --git a/templates/part.content.php b/templates/part.content.php
index e8c909bfc..83dcac4e6 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -90,73 +90,74 @@
                     </li>
 
                     <!-- DROPDOWN SHARE -->
-                        <li ng-controller="ShareController as Share"
-                            class="util dropdown"
-                            news-stop-propagation>
-                            <button class="icon-share share dropbtn"
-                                title="<?php p($l->t('Share')) ?>"
-                                ng-click="Content.openDropdown(item.id)">
-                            </button>
-                            <ng-container click-outside="Content.hide()">
-                                <div
-                                    ng-if="Content.showDropdown[item.id]"
-                                    style="margin-top: 2.8em;"
-                                    class="dropdown-content">
-                                    <!-- Share with users -->
-                                    <p class="label-group"><?php p($l->t('Share with users')) ?></p>
-                                    <form ng-submit=""
-                                        name="contactForm"
-                                        autocomplete="off">
-                                        <fieldset class="contact-input">
-                                            <input
-                                                ng-model="nameQuery"
-                                                ng-model-options="{debounce: 400}"
-                                                ng-change="Share.searchUsers(nameQuery)"
-                                                type="text"
-                                                placeholder="<?php p($l->t('Username')) ?>"
-                                                title="<?php p($l->t('Username')) ?>"
-                                                name="contactName"
-                                                required
-                                                style="width: 200px">
-                                                <div ng-if="App.loading.isLoading('user')"
-                                                    ng-class="{'icon-loading-small': App.loading.isLoading('user') }">
-                                                </div>
-                                        </fieldset>
-                                    </form>
-                                    <div style="margin-left: 2em; font-size: 0.85em;"
-                                        ng-if="!(Share.userList.length > 0) && nameQuery && !App.loading.isLoading('user')">
-                                        <?php p($l->t('No users found')) ?>
-                                    </div>
-                                    <a
-                                        ng-repeat="user in Share.userList"
-                                        class="icon-category-installed pr-3"
-                                        ng-click="Share.shareItem(item.id, user.value.shareWith)">
-                                        {{ user.label }}
-                                        <span class="right" style="margin-top: 0.9em; margin-right: 1em"
-                                            ng-class="{'icon-loading-small': Share.isLoading(user.value.shareWith), 'icon-checkmark': Share.isStatus(item.id, user.value.shareWith, true), 'icon-close': Share.isStatus(item.id, user.value.shareWith, false)}">
-                                        </span>
-                                    </a>
+                    <li ng-controller="ShareController as Share"
+                        class="util dropdown"
+                        news-stop-propagation>
+                        <button class="icon-share share dropbtn"
+                            title="<?php p($l->t('Share')) ?>"
+                            ng-click="Content.openDropdown(item.id)">
+                        </button>
+                        <ng-container click-outside="Content.hide()">
+                            <div
+                                ng-if="Content.showDropdown[item.id]"
+                                style="margin-top: 2.8em;"
+                                class="dropdown-content">
+                                <!-- Share with users -->
+                                <p class="label-group"><?php p($l->t('Share with users')) ?></p>
+                                <form ng-submit=""
+                                    name="contactForm"
+                                    autocomplete="off">
+                                    <fieldset class="contact-input">
+                                        <input
+                                            ng-model="nameQuery"
+                                            ng-model-options="{debounce: 400}"
+                                            ng-change="Share.searchUsers(nameQuery)"
+                                            type="text"
+                                            placeholder="<?php p($l->t('Username')) ?>"
+                                            title="<?php p($l->t('Username')) ?>"
+                                            name="contactName"
+                                            required
+                                            style="width: 200px">
+                                            <div ng-if="App.loading.isLoading('user')"
+                                                ng-class="{'icon-loading-small': App.loading.isLoading('user') }">
+                                            </div>
+                                    </fieldset>
+                                </form>
 
-                                    <p class="label-group"> <?php p($l->t('Share on social media')) ?> </p>
-                                    <div class="row">
-                                        <div ng-if="Share.isSocialAppEnabled('facebook')" class="col-4">
-                                            <a target="_blank"
-                                                class="icon-dropdown icon-facebook pr-5"
-                                                ng-href="{{Share.getFacebookUrl(item.url)}}"></a>
-                                        </div>
-                                        <div ng-if="Share.isSocialAppEnabled('twitter')" class="col-4">
-                                            <a target="_blank"
-                                                class="icon-dropdown icon-twitter pr-5"
-                                                ng-href="{{Share.getTwitterUrl(item.url)}}"></a>
-                                        </div>
-                                        <div ng-if="Share.isSocialAppEnabled('email')" class="col-4">
-                                            <a class="icon-dropdown icon-mail pr-5"
-                                                ng-href="mailto:?subject=<?php p($l->t('I wanted you to see this article')) ?>&amp;body=<?php p($l->t('Check out this article')) ?>{{ ::item.url }}"></a>
-                                        </div>
+                                <div style="margin-left: 2em; font-size: 0.85em;"
+                                    ng-if="!(Share.userList.length > 0) && nameQuery && !App.loading.isLoading('user')">
+                                    <?php p($l->t('No users found')) ?>
+                                </div>
+                                <a
+                                    ng-repeat="user in Share.userList"
+                                    class="icon-category-installed pr-3"
+                                    ng-click="Share.shareItem(item.id, user.value.shareWith)">
+                                    {{ user.label }}
+                                    <span class="right" style="margin-top: 0.9em; margin-right: 1em"
+                                        ng-class="{'icon-loading-small': Share.isLoading(user.value.shareWith), 'icon-checkmark': Share.isStatus(item.id, user.value.shareWith, true), 'icon-close': Share.isStatus(item.id, user.value.shareWith, false)}">
+                                    </span>
+                                </a>
+
+                                <p class="label-group"> <?php p($l->t('Share on social media')) ?> </p>
+                                <div class="row">
+                                    <div ng-if="Share.isSocialAppEnabled('facebook')" class="col-4">
+                                        <a target="_blank"
+                                            class="icon-dropdown icon-facebook pr-5"
+                                            ng-href="{{Share.getFacebookUrl(item.url)}}"></a>
+                                    </div>
+                                    <div ng-if="Share.isSocialAppEnabled('twitter')" class="col-4">
+                                        <a target="_blank"
+                                            class="icon-dropdown icon-twitter pr-5"
+                                            ng-href="{{Share.getTwitterUrl(item.url)}}"></a>
+                                    </div>
+                                    <div ng-if="Share.isSocialAppEnabled('email')" class="col-4">
+                                        <a class="icon-dropdown icon-mail pr-5"
+                                            ng-href="mailto:?subject=<?php p($l->t('I wanted you to see this article')) ?>&amp;body=<?php p($l->t('Check out this article')) ?>{{ ::item.url }}"></a>
                                     </div>
                                 </div>
-                            </ng-container>
-                        </li>
+                            </div>
+                        </ng-container>
+                    </li>
                     <!-- END DROPDOWN -->
 
                     <li class="util more" news-stop-propagation ng-hide="noPlugins">
-- 
cgit v1.2.3