diff options
Diffstat (limited to 'app/views/helpers')
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 10 | ||||
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 16 |
2 files changed, 17 insertions, 9 deletions
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 0ecdc1bca..3d7c8a98f 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -19,6 +19,8 @@ echo ',shortcuts={', 'go_website:"', $s['go_website'], '",', 'prev_entry:"', $s['prev_entry'], '",', 'next_entry:"', $s['next_entry'], '",', + 'first_entry:"', $s['first_entry'], '",', + 'last_entry:"', $s['last_entry'], '",', 'collapse_entry:"', $s['collapse_entry'], '",', 'load_more:"', $s['load_more'], '",', 'auto_share:"', $s['auto_share'], '"', @@ -30,7 +32,13 @@ if (Minz_Request::param ('output') === 'global') { $authType = Minz_Configuration::authType(); if ($authType === 'persona') { - echo 'current_user_mail="' . Minz_Session::param ('mail', '') . '",'; + // If user is disconnected, current_user_mail MUST be null + $mail = Minz_Session::param ('mail', false); + if ($mail) { + echo 'current_user_mail="' . $mail . '",'; + } else { + echo 'current_user_mail=null,'; + } } echo 'authType="', $authType, '",', diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index 7b7faccee..ae93b627c 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -147,49 +147,49 @@ if (!empty($this->entries)) { <ul class="dropdown-menu"> <li class="dropdown-close"><a href="#close">❌</a></li> <?php if ($shaarli) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="<?php echo $shaarli . '?post=' . $link . '&title=' . $title . '&source=FreshRSS'; ?>"> <?php echo Minz_Translate::t ('shaarli'); ?> </a> </li> <?php } if ($wallabag) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="<?php echo $wallabag . '?action=add&url=' . base64_encode (urldecode($link)); ?>"> <?php echo Minz_Translate::t ('wallabag'); ?> </a> </li> <?php } if ($diaspora) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="<?php echo $diaspora . '/bookmarklet?url=' . $link . '&title=' . $title; ?>"> <?php echo Minz_Translate::t ('diaspora'); ?> </a> </li> <?php } if ($twitter) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="https://twitter.com/share?url=<?php echo $link; ?>&text=<?php echo $title; ?>"> <?php echo Minz_Translate::t ('twitter'); ?> </a> </li> <?php } if ($google_plus) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="https://plus.google.com/share?url=<?php echo $link; ?>"> <?php echo Minz_Translate::t ('g+'); ?> </a> </li> <?php } if ($facebook) { ?> - <li class="item"> + <li class="item share"> <a target="_blank" href="https://www.facebook.com/sharer.php?u=<?php echo $link; ?>&t=<?php echo $title; ?>"> <?php echo Minz_Translate::t ('facebook'); ?> </a> </li> <?php } if ($email) { ?> - <li class="item"> + <li class="item share"> <a href="mailto:?subject=<?php echo urldecode($title); ?>&body=<?php echo $link; ?>"> <?php echo Minz_Translate::t ('by_email'); ?> </a> </li> <?php } if ($print) { ?> - <li class="item"> + <li class="item share"> <a href="#" class="print-article"> <?php echo Minz_Translate::t ('print'); ?> </a> |