issue41, remove any trace of the javascript bubble

git-svn-id: file:///var/lib/svn/phpfspot/trunk@196 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/bubble.js b/bubble.js
deleted file mode 100644 (file)
index d44780e..0000000
--- a/bubble.js
+++ /dev/null
@@ -1,334 +0,0 @@
-/*\r
-    WebSnapr - Preview Bubble Javascript\r
-    Written by Juan Xavier Larrea \r
-    http://www.websnapr.com - xavier@websnapr.com   \r
-    \r
-*/\r
-\r
-// Point this variable to the correct location of the bg.png file\r
-var bubbleImageUp = 'resources/bubble_up.png';\r
-var bubbleImageDown = 'resources/bubble_down.png';\r
-\r
-if(typeof Array.prototype.push!="function"){\r
-   Array.prototype.push=ArrayPush;\r
-\r
-   function ArrayPush(_1){\r
-      this[this.length]=_1;\r
-   }\r
-}\r
-\r
-function WSR_getElementsByClassName(oElm, strTagName, oClassNames){\r
-   var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName);\r
-   var arrReturnElements = new Array();\r
-   var arrRegExpClassNames = new Array();\r
-   if(typeof oClassNames == "object"){\r
-      for(var i=0; i<oClassNames.length; i++){\r
-         arrRegExpClassNames.push(new RegExp("(^|\s)" + oClassNames[i].replace(/-/g, "\-") + "(\s|$)"));\r
-      }\r
-   }\r
-   else{\r
-      arrRegExpClassNames.push(new RegExp("(^|\s)" + oClassNames.replace(/-/g, "\-") + "(\s|$)"));\r
-   }\r
-   var oElement;\r
-   var bMatchesAll;\r
-   for(var j=0; j<arrElements.length; j++){\r
-      oElement = arrElements[j];\r
-      bMatchesAll = true;\r
-      for(var k=0; k<arrRegExpClassNames.length; k++){\r
-         if(!arrRegExpClassNames[k].test(oElement.className)){\r
-            bMatchesAll = false;\r
-            break;\r
-         }\r
-      }\r
-      if(bMatchesAll){\r
-         arrReturnElements.push(oElement);\r
-      }\r
-   }\r
-   return (arrReturnElements)\r
-}\r
-/*function WSR_getElementsByClassName(_2,_3,_4){\r
-\r
-   var _5=(_3=="*"&&_2.all)?_2.all:_2.getElementsByTagName(_3);\r
-         window.alert(_5[0]);\r
-   var _6=new Array();\r
-   _4=_4.replace(/\-/g,"\\-");\r
-   var _7=new RegExp("(^|\\s)"+_4+"(\\s|$)");\r
-   var _8;\r
-   for(var i=0;i<_5.length;i++){\r
-      _8=_5[i];\r
-      if(_7.test(_8.className)){\r
-         _6.push(_8);\r
-      }\r
-   }\r
-   return (_6);\r
-}*/\r
-\r
-function bindBubbles(e){\r
-   lbActions=WSR_getElementsByClassName(document,"img","thumb");\r
-   for(i=0;i<lbActions.length;i++){\r
-      if(window.addEventListener){ // Mozilla, Firefox\r
-         lbActions[i].addEventListener("mouseover",attachBubble,false);\r
-         lbActions[i].addEventListener("mouseout",detachBubble,false);\r
-         lbActions[i].addEventListener("click",detachBubble,false);\r
-      }else if (window.attachEvent) { // IE\r
-         lbActions[i].attachEvent("onmouseover",attachBubble);\r
-         lbActions[i].attachEvent("onmouseout",detachBubble);\r
-         lbActions[i].attachEvent("onclick",detachBubble);\r
-      } else {\r
-         // it seems this browser doesn't support any eventhandling\r
-      }  \r
-   }\r
-}\r
-\r
-function attachBubble(_b){\r
-   var _c;\r
-   if(_b["srcElement"]){ // IE\r
-      _c=_b["srcElement"];\r
-   }else{ // Mozilla, Firefox\r
-      _c=_b["target"];\r
-   }\r
-   if (_c.href == undefined){\r
-      _c=_c.parentNode;\r
-   }\r
-\r
-   var _d=_c.href;\r
-\r
-   var _10=document.createElement("div");\r
-   document.getElementsByTagName("body")[0].appendChild(_10);\r
-   _10.className="bubble";\r
-\r
-   if(BrowserDetect.browser != 'Explorer') {\r
-\r
-      var _e=findPos(_c)[0]+5;\r
-      var cur_height = findPos(_c)[1]-get_scroll_position() + 283;\r
-\r
-      // should the bubble be displayed above or below the object\r
-      if(cur_height >= get_page_height()) {\r
-         var _f=findPos(_c)[1]-363;\r
-         bubbleImage = bubbleImageUp;\r
-      }\r
-      else {\r
-         var _f=findPos(_c)[1]+17;\r
-         bubbleImage = bubbleImageDown;\r
-      }\r
-   }\r
-   else {\r
-         var _e=findPos(_c)[0]+5;\r
-         var _f=findPos(_c)[1]+129;\r
-         bubbleImage = bubbleImageDown;\r
-   }\r
-   if (BrowserDetect.browser == 'Explorer') {\r
-      _10.style.width="275px";\r
-      _10.style.height="275px";\r
-      _10.style.position="absolute";\r
-      _10.style.top=_f;\r
-      _10.style.zIndex=99999;\r
-      _10.style.left=_e;\r
-      _10.style.textAlign="left";\r
-      _10.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + bubbleImage + "',sizingMethod='image')";\r
-   } else if (BrowserDetect.browser == 'Safari' || BrowserDetect.browser == 'Konqueror' ) {\r
-      _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;");\r
-   } else {\r
-      _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;");\r
-   }\r
-\r
-   if(cur_height >= get_page_height()) \r
-      showBubbleDetails(_10, _c.id, 'up');\r
-   else\r
-      showBubbleDetails(_10, _c.id, 'down');\r
-\r
-}\r
-\r
-function detachBubble(_12){\r
-   lbActions=WSR_getElementsByClassName(document,"div","bubble");\r
-   for(i=0;i<lbActions.length;i++){\r
-      lbActions[i].parentNode.removeChild(lbActions[i]);\r
-   }\r
-}\r
-\r
-function findPos(obj){\r
-   var _14=curtop=0;\r
-   if(obj.offsetParent){\r
-      _14=obj.offsetLeft;\r
-      curtop=obj.offsetTop;\r
-      while(obj=obj.offsetParent){\r
-         _14+=obj.offsetLeft;\r
-         curtop+=obj.offsetTop;\r
-      }\r
-   }\r
-   return [_14,curtop];\r
-}\r
-\r
-var BrowserDetect = {\r
-       init: function () {\r
-               this.browser = this.searchString(this.dataBrowser) || "An unknown browser";\r
-               this.version = this.searchVersion(navigator.userAgent)\r
-                       || this.searchVersion(navigator.appVersion)\r
-                       || "an unknown version";\r
-               this.OS = this.searchString(this.dataOS) || "an unknown OS";\r
-       },\r
-       searchString: function (data) {\r
-               for (var i=0;i<data.length;i++) {\r
-                       var dataString = data[i].string;\r
-                       var dataProp = data[i].prop;\r
-                       this.versionSearchString = data[i].versionSearch || data[i].identity;\r
-                       if (dataString) {\r
-                               if (dataString.indexOf(data[i].subString) != -1)\r
-                                       return data[i].identity;\r
-                       }\r
-                       else if (dataProp)\r
-                               return data[i].identity;\r
-               }\r
-       },\r
-       searchVersion: function (dataString) {\r
-               var index = dataString.indexOf(this.versionSearchString);\r
-               if (index == -1) return;\r
-               return parseFloat(dataString.substring(index+this.versionSearchString.length+1));\r
-       },\r
-       dataBrowser: [\r
-               {       string: navigator.userAgent,\r
-                       subString: "OmniWeb",\r
-                       versionSearch: "OmniWeb/",\r
-                       identity: "OmniWeb"\r
-               },\r
-               {\r
-                       string: navigator.vendor,\r
-                       subString: "Apple",\r
-                       identity: "Safari"\r
-               },\r
-               {\r
-                       prop: window.opera,\r
-                       identity: "Opera"\r
-               },\r
-               {\r
-                       string: navigator.vendor,\r
-                       subString: "iCab",\r
-                       identity: "iCab"\r
-               },\r
-               {\r
-                       string: navigator.vendor,\r
-                       subString: "KDE",\r
-                       identity: "Konqueror"\r
-               },\r
-               {\r
-                       string: navigator.userAgent,\r
-                       subString: "Firefox",\r
-                       identity: "Firefox"\r
-               },\r
-               {\r
-                       string: navigator.vendor,\r
-                       subString: "Camino",\r
-                       identity: "Camino"\r
-               },\r
-               {               // for newer Netscapes (6+)\r
-                       string: navigator.userAgent,\r
-                       subString: "Netscape",\r
-                       identity: "Netscape"\r
-               },\r
-               {\r
-                       string: navigator.userAgent,\r
-                       subString: "MSIE",\r
-                       identity: "Explorer",\r
-                       versionSearch: "MSIE"\r
-               },\r
-               {\r
-                       string: navigator.userAgent,\r
-                       subString: "Gecko",\r
-                       identity: "Mozilla",\r
-                       versionSearch: "rv"\r
-               },\r
-               {               // for older Netscapes (4-)\r
-                       string: navigator.userAgent,\r
-                       subString: "Mozilla",\r
-                       identity: "Netscape",\r
-                       versionSearch: "Mozilla"\r
-               }\r
-       ],\r
-       dataOS : [\r
-               {\r
-                       string: navigator.platform,\r
-                       subString: "Win",\r
-                       identity: "Windows"\r
-               },\r
-               {\r
-                       string: navigator.platform,\r
-                       subString: "Mac",\r
-                       identity: "Mac"\r
-               },\r
-               {\r
-                       string: navigator.platform,\r
-                       subString: "Linux",\r
-                       identity: "Linux"\r
-               }\r
-       ]\r
-\r
-};\r
-\r
-function var_dump(arr,level) {\r
-   var dumped_text = "";\r
-   if(!level) level = 0;\r
-   \r
-   //The padding given at the beginning of the line.\r
-   var level_padding = "";\r
-   for(var j=0;j<level+1;j++) level_padding += "    ";\r
-   \r
-   if(typeof(arr) == 'object') { //Array/Hashes/Objects \r
-      for(var item in arr) {\r
-         var value = arr[item];\r
-         \r
-         if(typeof(value) == 'object') { //If it is an array,\r
-            dumped_text += level_padding + "'" + item + "' ...\n";\r
-            dumped_text += dump(value,level+1);\r
-         } else {\r
-            dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";\r
-         }\r
-      }\r
-   } else { //Stings/Chars/Numbers etc.\r
-      dumped_text = "===>"+arr+"<===("+typeof(arr)+")";\r
-   }\r
-   return dumped_text;\r
-\r
-}//end function var_dump\r
-\r
-function get_page_height()\r
-{\r
-   var myHeight = 0;\r
-   if( typeof( window.innerHeight ) == 'number' ) {\r
-      //Non-IE\r
-      myHeight = window.innerHeight;\r
-   } else if( document.documentElement && document.documentElement.clientHeight  ) {\r
-      //IE 6+ in 'standards compliant mode'\r
-      myHeight = document.documentElement.clientHeight;\r
-   } else if( document.body &&  document.body.clientHeight ) {\r
-      //IE 4 compatible\r
-      myHeight = document.body.clientHeight;\r
-   }\r
-\r
-   return myHeight;\r
-}\r
-\r
-function get_scroll_position()\r
-{\r
-   if (typeof window.pageYOffset != 'undefined') {\r
-      return window.pageYOffset;\r
-   }\r
-   else {\r
-      if (typeof document.compatMode != 'undefined' &&\r
-         document.compatMode != 'BackCompat' &&\r
-         typeof window.scrollTop != 'undefined')\r
-         return window.scrollTop;\r
-      else {\r
-         if(typeof document.documentElement.scrollTop != 'undefined')\r
-            return document.documentElement.scrollTop;\r
-         else {\r
-            if (typeof document.body.scrollTop != 'undefined')\r
-               return document.body.scrollTop;\r
-         }\r
-      }\r
-   }\r
-\r
-   return 0;\r
-\r
-}\r
-\r
-BrowserDetect.init();\r

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 5e25f21b81d446d3c1097b630a44b40ba7ae978c..8fe0f77e40824092049fa1b7eb0864cd7a05ab71 100644 (file)
--- 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!<br />\n");
-         return;
-      }
-      
-      if(!is_readable($orig_path)) {
-         $this->_warning("Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\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 9204f3251c971c9f3a5462ee623e7b1cc1b32c73..be15455a107c61e0aadce75ca7b21e0cdd33fd6c 100644 (file)
--- 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 (file)
index a6b0082..0000000
Binary files a/resources/bubble_down.png and /dev/null differ

diff --git a/resources/bubble_up.png b/resources/bubble_up.png
deleted file mode 100644 (file)
index c1799df..0000000
Binary files a/resources/bubble_up.png and /dev/null differ

diff --git a/rpc.php b/rpc.php
index 4bbf4d50b1cbd84314a4be38be0062048c00efb8..49d1930def0052d59db2bbd59408146e400a1d63 100644 (file)
--- 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 0f09bdc317cb1505ddd4417586aba0423df55bfd..0fe527e2e7b7732d343aeaedc410b768817d4209 100644 (file)
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -60,34 +60,6 @@ img {
 img.thumb {\r
 }\r
 \r
-img.bubbleimg_up {\r
-   padding-top:            0;\r
-   padding-left:           0;\r
-   padding-right:          0;\r
-   padding-bottom:         0;\r
-   margin-top:             39px;\r
-   margin-left:            36px;\r
-   margin-bottom:          0;\r
-   margin-right:           0;\r
-   border:                 0;\r
-   width:                  202px;\r
-   height:                 152px;\r
-}\r
-\r
-img.bubbleimg_down {\r
-   padding-top:            0;\r
-   padding-left:           0;\r
-   padding-right:          0;\r
-   padding-bottom:         0;\r
-   margin-top:             34px;\r
-   margin-left:            36px;\r
-   margin-bottom:          0;\r
-   margin-right:           0;\r
-   border:                 0;\r
-   width:                  202px;\r
-   height:                 152px;\r
-}\r
-\r
 a {\r
    font-size:              14px;\r
    color:                  #008200;\r

diff --git a/templates/bubble_details.tpl b/templates/bubble_details.tpl
deleted file mode 100644 (file)
index 53cd168..0000000
--- a/templates/bubble_details.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<table>
- <tr>
-  <td>
-   <img class="{$image_id}" src="{$image_url}" />
-  </td>
- </tr>
- <tr>
-  <td style="text-align: center; padding-left: 36px;">
-   {$file_name}<br />
-   {$file_size}kb, {$width}x{$height}
-  </td>
- </tr>
-</table>

diff --git a/templates/credits.tpl b/templates/credits.tpl
index b15127ebef3c4186aa2470d300074e40629f6a1f..44c4800169c29866da646b47fffba43f29316e3b 100644 (file)
--- a/templates/credits.tpl
+++ b/templates/credits.tpl
@@ -14,8 +14,6 @@
       by Andreas Unterkircher<br />
       {mailto address="unki@netshadow.at"}
       <hr />
-      Bubble base JavaScript by <a href="http://www.websnapr.com/index.php?action=previewbubble">WebSnapr</a>
-      <hr />
       <a href="http://wiki.bluga.net/HTML_AJAX/HomePage">HTML_AJAX</a>
       <hr />
       PHP tag-cloud code by <a href="http://prism-perfect.net/archive/php-tag-cloud-tutorial/">Jenny Ferenc</a>.

diff --git a/templates/header.tpl b/templates/header.tpl
index caac87c4d4d4103da3de68ac2af5e44cd2026d63..acef8eb8eae31c4a186268e84705fc9e22a018c0 100644 (file)
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -6,7 +6,6 @@
   <link href="stylesheet.css" type="text/css" rel="stylesheet" />
   <script type="text/javascript" src="rpc.php?mode=init&amp;client=all"></script>
   <script type="text/javascript" src="phpfspot.js"></script>
-  <script type="text/javascript" src="bubble.js"></script>
   <link rel="shortcut icon" href="resources/gpl_16.png" type="image/png" />
   <link rel="icon" href="resources/gpl_16.png" type="image/png" />
  </head>