From a365bbcf0ccc18cc5cee9e5cc697725279b02e53 Mon Sep 17 00:00:00 2001 From: Andreas Unterkircher Date: Sat, 14 Jul 2007 06:33:18 +0000 Subject: [PATCH] issue41, remove any trace of the javascript bubble git-svn-id: file:///var/lib/svn/phpfspot/trunk@196 fa6a889d-dae6-447d-9e79-4ba9a3039384 --- bubble.js | 334 ----------------------------------- phpfspot.class.php | 38 ---- phpfspot.js | 5 - resources/bubble_down.png | Bin 5817 -> 0 bytes resources/bubble_up.png | Bin 5786 -> 0 bytes rpc.php | 5 - stylesheet.css | 28 --- templates/bubble_details.tpl | 13 -- templates/credits.tpl | 2 - templates/header.tpl | 1 - 10 files changed, 426 deletions(-) delete mode 100644 bubble.js delete mode 100644 resources/bubble_down.png delete mode 100644 resources/bubble_up.png delete mode 100644 templates/bubble_details.tpl diff --git a/bubble.js b/bubble.js deleted file mode 100644 index d44780e..0000000 --- a/bubble.js +++ /dev/null @@ -1,334 +0,0 @@ -/* - WebSnapr - Preview Bubble Javascript - Written by Juan Xavier Larrea - http://www.websnapr.com - xavier@websnapr.com - -*/ - -// Point this variable to the correct location of the bg.png file -var bubbleImageUp = 'resources/bubble_up.png'; -var bubbleImageDown = 'resources/bubble_down.png'; - -if(typeof Array.prototype.push!="function"){ - Array.prototype.push=ArrayPush; - - function ArrayPush(_1){ - this[this.length]=_1; - } -} - -function WSR_getElementsByClassName(oElm, strTagName, oClassNames){ - var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName); - var arrReturnElements = new Array(); - var arrRegExpClassNames = new Array(); - if(typeof oClassNames == "object"){ - for(var i=0; i= get_page_height()) { - var _f=findPos(_c)[1]-363; - bubbleImage = bubbleImageUp; - } - else { - var _f=findPos(_c)[1]+17; - bubbleImage = bubbleImageDown; - } - } - else { - var _e=findPos(_c)[0]+5; - var _f=findPos(_c)[1]+129; - bubbleImage = bubbleImageDown; - } - if (BrowserDetect.browser == 'Explorer') { - _10.style.width="275px"; - _10.style.height="275px"; - _10.style.position="absolute"; - _10.style.top=_f; - _10.style.zIndex=99999; - _10.style.left=_e; - _10.style.textAlign="left"; - _10.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + bubbleImage + "',sizingMethod='image')"; - } else if (BrowserDetect.browser == 'Safari' || BrowserDetect.browser == 'Konqueror' ) { - _10.setAttribute("style","text-align: center; z-index: 99999; position: absolute; top: "+ _f +"px ; left: "+ _e +"px ; background: url("+ bubbleImage +") no-repeat; width: 275px; height: 275px; padding: 0; margin: 0;"); - } else { - _10.setAttribute("style","text-align: center; z-index: 99999; position: absolute; top: "+_f+"px ; left: "+ _e +"px ; background: url("+ bubbleImage +") no-repeat; width: 275px; height: 275px; padding: 0; margin: 0;"); - } - - if(cur_height >= get_page_height()) - showBubbleDetails(_10, _c.id, 'up'); - else - showBubbleDetails(_10, _c.id, 'down'); - -} - -function detachBubble(_12){ - lbActions=WSR_getElementsByClassName(document,"div","bubble"); - for(i=0;i \"" + value + "\"\n"; - } - } - } else { //Stings/Chars/Numbers etc. - dumped_text = "===>"+arr+"<===("+typeof(arr)+")"; - } - return dumped_text; - -}//end function var_dump - -function get_page_height() -{ - var myHeight = 0; - if( typeof( window.innerHeight ) == 'number' ) { - //Non-IE - myHeight = window.innerHeight; - } else if( document.documentElement && document.documentElement.clientHeight ) { - //IE 6+ in 'standards compliant mode' - myHeight = document.documentElement.clientHeight; - } else if( document.body && document.body.clientHeight ) { - //IE 4 compatible - myHeight = document.body.clientHeight; - } - - return myHeight; -} - -function get_scroll_position() -{ - if (typeof window.pageYOffset != 'undefined') { - return window.pageYOffset; - } - else { - if (typeof document.compatMode != 'undefined' && - document.compatMode != 'BackCompat' && - typeof window.scrollTop != 'undefined') - return window.scrollTop; - else { - if(typeof document.documentElement.scrollTop != 'undefined') - return document.documentElement.scrollTop; - else { - if (typeof document.body.scrollTop != 'undefined') - return document.body.scrollTop; - } - } - } - - return 0; - -} - -BrowserDetect.init(); diff --git a/phpfspot.class.php b/phpfspot.class.php index 5e25f21..8fe0f77 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -635,43 +635,6 @@ class PHPFSPOT { } // showPhotoIndex() - public function showBubbleDetails($photo, $direction) - { - if($direction == "up") - $direction = "bubbleimg_up"; - else - $direction = "bubbleimg_down"; - - $details = $this->get_photo_details($photo); - $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name']; - - $image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width; - - $filesize = filesize($orig_path); - $filesize = rand($filesize/1024, 2); - - if(!file_exists($orig_path)) { - $this->_warning("Photo ". $orig_path ." does not exist!
\n"); - return; - } - - if(!is_readable($orig_path)) { - $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."
\n"); - return; - } - - $img = getimagesize($orig_path); - - $this->tmpl->assign('file_size', $filesize); - $this->tmpl->assign('width', $img[0]); - $this->tmpl->assign('height', $img[1]); - $this->tmpl->assign('file_name', $details['name']); - $this->tmpl->assign('image_id', $direction); - $this->tmpl->assign('image_url', $image_url); - $this->tmpl->show("bubble_details.tpl"); - - } // showBubbleDetails() - public function showCredits() { $this->tmpl->assign('version', $this->cfg->version); @@ -849,7 +812,6 @@ class PHPFSPOT { $resolutions = Array( $this->cfg->thumb_width, - $this->cfg->bubble_width, $this->cfg->photo_width, $this->cfg->mini_width, ); diff --git a/phpfspot.js b/phpfspot.js index 9204f32..be15455 100644 --- a/phpfspot.js +++ b/phpfspot.js @@ -66,11 +66,6 @@ function showPhotoIndex(begin_with) HTML_AJAX.replace(document.getElementById("content"), encodeURI('rpc.php?action=show_photo_index&begin_with=' + begin_with)); } -function showBubbleDetails(object, id, direction) -{ - HTML_AJAX.replace(object, encodeURI('rpc.php?action=showbubbledetails&id=' + id + '&direction=" + direction')); -} - // if photo index is currently shown, refresh it function refreshPhotoIndex() { diff --git a/resources/bubble_down.png b/resources/bubble_down.png deleted file mode 100644 index a6b00828d0f8a0b877bc1a939f23b46e98b98422..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5817 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 OKK`EtZ8+=0%lbE?n<|a~ diff --git a/resources/bubble_up.png b/resources/bubble_up.png deleted file mode 100644 index c1799dfcb65d0e1a30dab7abb4b385f0efa3305a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5786 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 diff --git a/rpc.php b/rpc.php index 4bbf4d5..49d1930 100644 --- a/rpc.php +++ b/rpc.php @@ -84,11 +84,6 @@ class PHPFSPOT_RPC { $fspot->showPhotoIndex(); break; - case 'showbubbledetails': - - $fspot->showBubbleDetails($_GET['id'], $_GET['direction']); - break; - case 'showcredits': $fspot->showCredits(); diff --git a/stylesheet.css b/stylesheet.css index 0f09bdc..0fe527e 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -60,34 +60,6 @@ img { img.thumb { } -img.bubbleimg_up { - padding-top: 0; - padding-left: 0; - padding-right: 0; - padding-bottom: 0; - margin-top: 39px; - margin-left: 36px; - margin-bottom: 0; - margin-right: 0; - border: 0; - width: 202px; - height: 152px; -} - -img.bubbleimg_down { - padding-top: 0; - padding-left: 0; - padding-right: 0; - padding-bottom: 0; - margin-top: 34px; - margin-left: 36px; - margin-bottom: 0; - margin-right: 0; - border: 0; - width: 202px; - height: 152px; -} - a { font-size: 14px; color: #008200; diff --git a/templates/bubble_details.tpl b/templates/bubble_details.tpl deleted file mode 100644 index 53cd168..0000000 --- a/templates/bubble_details.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - -
- -
- {$file_name}
- {$file_size}kb, {$width}x{$height} -
diff --git a/templates/credits.tpl b/templates/credits.tpl index b15127e..44c4800 100644 --- a/templates/credits.tpl +++ b/templates/credits.tpl @@ -14,8 +14,6 @@ by Andreas Unterkircher
{mailto address="unki@netshadow.at"}
- Bubble base JavaScript by WebSnapr -
HTML_AJAX
PHP tag-cloud code by Jenny Ferenc. diff --git a/templates/header.tpl b/templates/header.tpl index caac87c..acef8eb 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -6,7 +6,6 @@ - -- 2.34.1