Browse Source

Added new share option 'link'.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
f56aa92579
  1. 3
      src/styles/components/_social.scss
  2. 2
      static/css/main.min.css
  3. 8
      static/js/directives/socialshare.js
  4. 11
      static/partials/socialshare.html

3
src/styles/components/_social.scss

@ -20,6 +20,9 @@ @@ -20,6 +20,9 @@
*/
.#{$fa-css-prefix} {
&.link {
color: $social-email-color;
}
&.email {
color: $social-email-color;
}

2
static/css/main.min.css vendored

File diff suppressed because one or more lines are too long

8
static/js/directives/socialshare.js

@ -31,7 +31,7 @@ define(['text!partials/socialshare.html'], function(template) { @@ -31,7 +31,7 @@ define(['text!partials/socialshare.html'], function(template) {
};
// socialShare
return ["$window", "translation", "rooms", function($window, translation, rooms) {
return ["$window", "translation", "rooms", "alertify", function($window, translation, rooms, alertify) {
var title = $window.encodeURIComponent($window.document.title);
var makeUrl = function(nw, target) {
@ -55,6 +55,7 @@ define(['text!partials/socialshare.html'], function(template) { @@ -55,6 +55,7 @@ define(['text!partials/socialshare.html'], function(template) {
$scope.roomlink = null;
});
$element.find("a").on("click", function(event) {
event.preventDefault();
var nw = event.currentTarget.getAttribute("data-nw");
var url = makeUrl(nw, $scope.roomlink);
if (url) {
@ -64,6 +65,11 @@ define(['text!partials/socialshare.html'], function(template) { @@ -64,6 +65,11 @@ define(['text!partials/socialshare.html'], function(template) {
} else {
$window.open(url, "social_" + nw, "menubar=no,toolbar=no,resizable=yes,width=600,height=600,scrollbars=yes");
}
} else {
if (nw === "link") {
//$window.alert("Room link: " + $scope.roomlink);
alertify.dialog.notify(translation._("Room link"), '<a href="'+$scope.roomlink+'" rel="external" target="_blank">'+$scope.roomlink+'</a>');
}
}
});
}

11
static/partials/socialshare.html

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
<div class="socialshare btn-group" ng-show="roomlink">
<a title="{{_('Share by Email')}}" class="btn btn-link btn-sm" data-nw="email"><i class="fa fa-envelope fa-lg email"></i></a>
<a title="{{_('Share on Facebook')}}" class="btn btn-link btn-sm" data-nw="facebook"><i class="fa fa-facebook fa-lg facebook"></i></a>
<a title="{{_('Share on Twitter')}}" class="btn btn-link btn-sm" data-nw="twitter"><i class="fa fa-twitter fa-lg twitter"></i></a>
<a title="{{_('Share on Google Plus')}}" class="btn btn-link btn-sm" data-nw="google"><i class="fa fa-google-plus fa-lg google"></i></a>
<a title="{{_('Share on XING')}}" class="btn btn-link btn-sm" data-nw="xing"><i class="fa fa-xing fa-lg xing"></i></a>
<a title="{{_('Room link')}}" target="_blank" rel="external" href="{{roomlink}}" class="btn btn-link btn-sm" data-nw="link"><i class="fa fa-link fa-lg link"></i></a>
<a title="{{_('Invite by Email')}}" class="btn btn-link btn-sm" data-nw="email"><i class="fa fa-envelope fa-lg email"></i></a>
<a title="{{_('Invite with Facebook')}}" class="btn btn-link btn-sm" data-nw="facebook"><i class="fa fa-facebook fa-lg facebook"></i></a>
<a title="{{_('Invite with Twitter')}}" class="btn btn-link btn-sm" data-nw="twitter"><i class="fa fa-twitter fa-lg twitter"></i></a>
<a title="{{_('Invite with Google Plus')}}" class="btn btn-link btn-sm" data-nw="google"><i class="fa fa-google-plus fa-lg google"></i></a>
<a title="{{_('Invite with XING')}}" class="btn btn-link btn-sm" data-nw="xing"><i class="fa fa-xing fa-lg xing"></i></a>
</div>
Loading…
Cancel
Save