Permalink
Browse files

Merge branch 'develop' of github.com:LotarProject/dokuwiki-template-b…

…ootstrap3 into develop
  • Loading branch information...
LotarProject committed Apr 20, 2018
2 parents 55709b7 + 56b149b commit b3f459554672f51d717ab29b4c733e576489c46a
Showing with 14 additions and 3 deletions.
  1. +1 −1 conf/default.php
  2. +1 −1 conf/metadata.php
  3. +2 −1 css/template.less
  4. +5 −0 js/template.js
  5. +5 −0 tpl_page_icons.php
View
@@ -73,7 +73,7 @@
$conf['sidebarOnNavbar'] = 0;
$conf['sidebarPosition'] = 'left';
$conf['sidebarShowPageTitle'] = 1;
$conf['socialShareProviders'] = 'facebook,google-plus,linkedin,pinterest,whatsapp,twitter,telegram';
$conf['socialShareProviders'] = 'facebook,google-plus,linkedin,pinterest,whatsapp,twitter,telegram,yammer';
$conf['tableFullWidth'] = 1;
$conf['tableStyle'] = 'striped,condensed,responsive';
$conf['tagsOnTop'] = 1;
View
@@ -108,7 +108,7 @@
$meta['pageInfoDateFormat'] = array('multichoice', '_choices' => array('dformat', 'human'));
$meta['showPageIcons'] = array('onoff');
$meta['pageIcons'] = array('multicheckbox', '_choices' => array('social-share', 'feed', 'send-mail', 'permalink', 'print', 'help'));
$meta['socialShareProviders'] = array('multicheckbox', '_choices' => array('facebook', 'google-plus', 'linkedin', 'pinterest', 'whatsapp', 'twitter', 'telegram'));
$meta['socialShareProviders'] = array('multicheckbox', '_choices' => array('facebook', 'google-plus', 'linkedin', 'pinterest', 'whatsapp', 'twitter', 'telegram', 'yammer'));
$meta['tagsOnTop'] = array('onoff');
$meta['useAnchorJS'] = array('onoff');
$meta['collapsibleSections'] = array('onoff');
View
@@ -534,7 +534,8 @@ header {
.share-whatsapp i.fa { color: #43D854; }
.share-pinterest i.fa { color: #BD081C; }
.share-telegram i.fa { color: #0088CC; }
.share-yammer i.fa { color: #5AA8BF; }
}
View
@@ -695,6 +695,7 @@ jQuery(document).on('bootstrap3:page-icons', function(event) {
'pinterest' : (function(){ return [ 'https://pinterest.com/pin/create/button/?url=', url, '&description=', title ].join(''); })(),
'telegram' : (function(){ return [ 'https://telegram.me/share/url?url=', url ].join(''); })(),
'whatsapp' : (function(){ return [ 'whatsapp://send?text=', title, ': ', url ].join(''); })(),
'yammer' : (function(){ return [ 'https://www.yammer.com/messages/new?login=true&trk_event=yammer_share&status=', url, '#/Messages/bookmarklet'].join(''); })(),
'send-mail' : (function(){ return [ 'mailto:?subject=', document.title, '&body=', document.URL ].join(''); })(),
};
@@ -721,6 +722,10 @@ jQuery(document).on('bootstrap3:page-icons', function(event) {
$dw_page_icons.find('.share-telegram').on('click', function() {
window.open(share_to.telegram, 'Share to Telegram', window_options);
});
$dw_page_icons.find('.share-yammer').on('click', function() {
window.open(share_to.yammer, 'Share to Yammer', window_options);
});
$dw_page_icons.find('.send-mail').on('click', function(e) {
e.preventDefault();
View
@@ -106,6 +106,11 @@
<li>
<a href="whatsapp://send?text=" class="share-whatsapp" title="<?php echo tpl_getLang('share_on') ?> Whatsapp" data-action="share/whatsapp/share"><i class="fa fa-fw fa-lg fa-whatsapp"></i> Whatsapp</a>
</li>
<?php endif;
if (in_array('yammer', $social_share_providers)): ?>
<li>
<a href="#" class="share-yammer" title="<?php echo tpl_getLang('share_on') ?> Yammer"><i class="fa fa-fw fa-lg fa-yahoo"></i> Yammer</a>
</li>
<?php endif; ?>
</ul>
</div>

0 comments on commit b3f4595

Please sign in to comment.