summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMarco Nassabain <marco.nassabain@hotmail.com>2021-03-14 22:36:31 +0100
committerSean Molenaar <SMillerDev@users.noreply.github.com>2021-04-08 23:17:31 +0200
commit996197d7ae3df5201db24af771729347b9990314 (patch)
tree42e8b1c90887201b5e5a258328ff4b4199275fa9 /templates
parent2e316f8f641f2cd48511ee57ffa9d031db34af39 (diff)
🔀 Fix latest broken merge
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/part.content.php129
1 files 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">