diff --git a/applications/welcome/static/js/share.js b/applications/welcome/static/js/share.js deleted file mode 100644 index cb149880..00000000 --- a/applications/welcome/static/js/share.js +++ /dev/null @@ -1,44 +0,0 @@ -/** - - Created and copyrighted by Massimo Di Pierro - (MIT license) - - Example: - - - -**/ - -jQuery(function(){ - var script_source = jQuery('script[src*="share.js"]').attr('src'); - var params = function(name,default_value) { - var match = RegExp('[?&]' + name + '=([^&]*)').exec(script_source); - return match && decodeURIComponent(match[1].replace(/\+/g, ' '))||default_value; - } - var path = params('static','social'); - var url = encodeURIComponent(window.location.href); - var host = window.location.hostname; - var title = escape(jQuery('title').text()); - var twit = 'http://twitter.com/home?status='+title+'%20'+url; - var facebook = 'http://www.facebook.com/sharer.php?u='+url; - var gplus = 'https://plus.google.com/share?url='+url; - var tbar = '
Share
Share on TwitterShare on facebookShare on Google Plus
'; - // Add the share tool bar. - jQuery('body').append(tbar); - var st = jQuery('#socialdrawer'); - st.css({'opacity':'.7','z-index':'3000','background':'#FFF','border':'solid 1px #666','border-width':' 1px 0 0 1px','height':'20px','width':'40px','position':'fixed','bottom':'0','right':'0','padding':'2px 5px','overflow':'hidden','-webkit-border-top-left-radius':' 12px','-moz-border-radius-topleft':' 12px','border-top-left-radius':' 12px','-moz-box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)','-webkit-box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)','box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)'}); - jQuery('#socialdrawer a').css({'float':'left','width':'32px','margin':'3px 2px 2px 2px','padding':'0','cursor':'pointer'}); - jQuery('#socialdrawer span').css({'float':'left','margin':'2px 3px','text-shadow':' 1px 1px 1px #FFF','color':'#444','font-size':'12px','line-height':'1em'}); - jQuery('#socialdrawer img').hide(); - // hover - st.click(function(){ - jQuery(this).animate({height:'40px', width:'160px', opacity: 0.95}, 300); - jQuery('#socialdrawer img').show(); - }); - //leave - st.mouseleave(function(){ - st.animate({height:'20px', width: '40px', opacity: .7}, 300); - jQuery('#socialdrawer img').hide(); - return false; - } ); - }); diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index a90c54df..ab477415 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -122,7 +122,5 @@ }); {{pass}} - - diff --git a/gluon/packages/dal b/gluon/packages/dal index d4327595..64c334dd 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit d43275953d2cafa51813546c1cce163f154cdfc1 +Subproject commit 64c334ddbb6b31348b57553d96705e2cb1007dc0