diff options
| author |   Alex Legler <alex@a3li.li> | 2014-09-21 02:17:23 +0200 |
|---|---|---|
| committer | Alex Legler <alex@a3li.li> | 2014-09-21 02:17:23 +0200 |
| commit | e6cae50a783c6fd6a4b90185c60ebb59b4cce519 (patch) | |
| tree | 61dba251ec2a426ba709cc2974928bea04d5053b | |
| parent | Use httpdate which uses GMT instead of +0000 (diff) | |
| download | infra-status-e6cae50a783c6fd6a4b90185c60ebb59b4cce519.tar.gz infra-status-e6cae50a783c6fd6a4b90185c60ebb59b4cce519.tar.bz2 infra-status-e6cae50a783c6fd6a4b90185c60ebb59b4cce519.zip | |
Goodbye sharing
| -rw-r--r-- | public/assets/js/infra-status.js | 15 | ||||
| -rw-r--r-- | views/notice.erb | 5 |
2 files changed, 3 insertions, 17 deletions
diff --git a/public/assets/js/infra-status.js b/public/assets/js/infra-status.js index 5b31df8..c675aed 100644 --- a/public/assets/js/infra-status.js +++ b/public/assets/js/infra-status.js @@ -28,7 +28,6 @@ jQuery.fn.shake = function (steps, duration, amount, vertical) { jQuery(function($) { $('.has-tooltip').tooltip(); - $('.share-btn').popover({html: true, placement: 'left', title: 'Share'}); $('a.notice-link').click(function() { if ($(this).hasClass('active')) { @@ -65,16 +64,4 @@ jQuery(function($) { }); }); -InfraStatus = { - share: function(obj) { - var url = $(obj).parents('.notice').data('url'); - - if ($(obj).hasClass('btn-facebook')) { - window.open('https://www.facebook.com/sharer/sharer.php?u=' + url); - } else if ($(obj).hasClass('btn-google-plus')) { - window.open('https://plus.google.com/share?url=' + url); - } else if ($(obj).hasClass('btn-twitter')) { - window.open('https://twitter.com/home?status=' + url); - } - } -};
\ No newline at end of file +InfraStatus = {};
\ No newline at end of file diff --git a/views/notice.erb b/views/notice.erb index 378c95b..9e2e8bf 100644 --- a/views/notice.erb +++ b/views/notice.erb @@ -26,10 +26,9 @@ <% else %> <div class="col-sm-4"></div> <% end %> - <div class="col-sm-4"> - <button class="btn btn-default pull-right btn-xs share-btn" data-toggle="popover" data-content="<button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-facebook'><i class='fa fa-facebook'></i></button> <button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-google-plus'><i class='fa fa-google-plus'></i></button> <button onclick='InfraStatus.share(this);' class='btn btn-default btn-sm btn-twitter'><i class='fa fa-twitter'></i></button>"><span class="fa fa-share"></span></button> + <div class="col-sm-4 has-tooltip" data-toggle="tooltip" data-placement="top" title="Estimated time of service recovery"> <span class="glyphicon glyphicon-ok pull-left" title="Estimated time of service recovery"></span> - <div style="margin-left: 1.25em;" class="has-tooltip" data-toggle="tooltip" data-placement="top" title="Estimated time of service recovery"> + <div style="margin-left: 1.25em;"> <% if notice.has_key? 'eta' %> <em><%= date_format notice['eta'] %></em> (estimated) <% else %> |