Changeset 9848

Timestamp:

03/30/09 01:35:41 (3 years ago)

Author:

Sergey Zotov

Message:

 

Location:

trunk

Files:

• cache (modified) (1 prop)
• inc/admin.inc.php (modified) (1 diff)
• inc/js/functions.js (modified) (3 diffs)
• inc/js/jquery.dolPopup.js (added)
• inc/params.inc.php (modified) (1 diff)
• short_profile_info.php (modified) (1 diff)
• templates/base/_header.html (modified) (2 diffs)
• templates/tmpl_uni/thumbnail_couple.html (modified) (1 diff)
• templates/tmpl_uni/thumbnail_single.html (modified) (1 diff)

trunk/cache

@@ -1 +1 @@
 tiny_mce_*.gz
-user*.php
+*.php
 *.inc

@@ -1 +1 @@
 tiny_mce_*.gz
-user*.php
+*.php
 *.inc

trunk/inc/admin.inc.php

@@ -52 +52 @@
                         </div>
                         
-                        <img src="$sCloseImg" class="login_ajx_close" onclick="$('#login_div').hide();return false;" />
+                        <img src="$sCloseImg" class="login_ajx_close" />
                     </div>
 BLAH;
                 
-                $sMemberLoginFormAjx = '
-                    <div id="login_div" class="login_ajax">' .
-                        $GLOBALS['oFunctions']->transBox(
-                            DesignBoxContent(_t('_Member Login'), $sFormCode, 1, $sCaptionItem),
-                            true
-                        ) .
-                    '</div>
-                ';
+                $sMemberLoginFormAjx = $GLOBALS['oFunctions']->transBox(
+                    DesignBoxContent(_t('_Member Login'), $sFormCode, 1, $sCaptionItem),
+                    true
+                );
                 
                 echo $sMemberLoginFormAjx;

trunk/inc/js/functions.js

@@ -750 +750 @@
         return false;
     
-    //alert( ('#page_block_' + iBlockID + ' .boxContent') + ' ' + $('#page_block_' + iBlockID + ' .boxContent').length );
-    
     getHtmlData($('#page_block_' + iBlockID), (sUrl + '&pageBlock=' + iBlockID));
     
@@ -794 +792 @@
 }
 
-function showPopupLoginForm() {
+function showPopupLoginFormOld() {
     if ($('#login_div').length) {
         //alert(1);
@@ -838 +836 @@
 }
 
+function showPopupLoginForm() {
+    var oPopupOptions = {
+        fog: {color: '#fff', opacity: .7},
+    };
+    
+    if ($('#login_div').length)
+        $('#login_div').dolPopup(oPopupOptions);
+    else {
+        $('<div id="login_div" style="display: none;"></div>').prependTo('body').load(
+            site_url + 'member.php',
+            {
+                action: 'show_login_form',
+                relocate: String(window.location)
+            },
+            function() {
+                $(this).dolPopup(oPopupOptions);
+            }
+        );
+    }
+}
+
+function showFloatUserInfo(iId, oEv) {
+    var oEv = oEv || window.event;
+    
+    if (!$('#short_profile_info').length) {
+        $('<div id="short_profile_info" style="display: none;"></div>').prependTo('body');
+    }
+    
+    $('#short_profile_info').load(
+        site_url + 'short_profile_info.php?ID=' + iId,
+        function() {
+            $(this).dolPopup({position: oEv});
+        }
+    );
+}
+
+
 function setDivToCenter(el) {
-    var el = (typeof el == 'object') ? el : this;
-    
-    if (el == window)
+    var $el = $(el || this);
+    
+    if ($el.length == 0 || $el[0] == window)
         return false;
     
-    var iTop  = ((window.innerHeight ? window.innerHeight : screen.height) - $(el).width())  / 2;
-    var iLeft = ((window.innerWidth  ? window.innerWidth  : screen.width)  - $(el).height()) / 2;
-    
+    var iLeft = ((window.innerWidth  ? window.innerWidth  : screen.width)  - $el.height()) / 2;
+    var iTop  = ((window.innerHeight ? window.innerHeight : screen.height) - $el.width())  / 2;
+    
+    iLeft = iLeft > 0 ? iLeft : 0;
     iTop  = iTop  > 0 ? iTop  : 0;
-    iLeft = iLeft > 0 ? iLeft : 0;
-    
-    $(el).css({
+    
+    $el.css({
         position: 'fixed',
-        top:  iTop,
-        left: iLeft
+        left: iLeft,
+        top:  iTop
     });
 }

trunk/inc/params.inc.php

@@ -50 +50 @@
     'login.js',
     'ie7_flash_fix.js',
-    'BxDolVoting.js'
+    'BxDolVoting.js',
+    'jquery.dolPopup.js'
 ));
 

trunk/short_profile_info.php

@@ -47 +47 @@
     ?>
         <div class="reduce">
-            <img src="<?= $sCloseIcon ?>" class="login_ajx_close" onclick="$('#short_profile_info').animate({opacity:'hide'}, 400); return false;" />
+            <img src="<?= $sCloseIcon ?>" class="login_ajx_close" />
         </div>
     <?
     $sClose = ob_get_clean();
     $sClose = str_replace('__site_images__', $site['images'], $sClose);
-    echo
-        '<div id="short_profile_info">'.
-            $oFunctions->transBox(
-                $sClose . $oSysTemplate->parseHtmlByName($sTemplate, $aUnit)
-            ).
-        '</div>';   
+    echo $oFunctions->transBox(
+        $sClose . $oSysTemplate->parseHtmlByName($sTemplate, $aUnit)
+    );
 }
 

trunk/templates/base/_header.html

@@ -25 +25 @@
     __dol_images__
     __dol_lang__
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript" language="javascript">
         var site_url = '<bx_url_root />';
         
@@ -31 +31 @@
             $( 'div.RSSAggrCont' ).dolRSSFeed();
         } );
-        function getUserInfo (eElem, iId, oEv) {
-            var sUrl = '<bx_url_root />short_profile_info.php';
-            var sCode = $.get(sUrl, {ID: iId}, function (data) {
-                showFloatDesc(data, 400);
-                moveFloatDesc(oEv);
-            } );
-        }
     </script>    
     <!--[if lt IE 7.]>

trunk/templates/tmpl_uni/thumbnail_couple.html

@@ -1 +1 @@
 <div class="thumbnail_block" style="float:__sys_thb_float__;width:__sys_thb_width__px;height:__sys_thb_height__px;">
-    <a href="__usr_profile_url__" style="cursor:pointer;" onclick="javascript: getUserInfo(this, __iProfId__, event); return false;">
+    <a href="__usr_profile_url__" style="cursor:pointer;" onclick="showFloatUserInfo(__iProfId__, event); return false;">
         <div class="thumbnail_image_couple" style="float:left;width:__sys_img_width1__px;height:__sys_img_height1__px;">
             <img src="<bx_image_url:spacer.gif />" style="float:left;background-image:url(__usr_thumb_url0__);width:__sys_cpl_img_width__px;height:__sys_cpl_img_height__px; border-top-width:2px; border-left-width:2px; border-right-width:0px; border-bottom-width:0px;" alt="__usr_thumb_title0__" title="__usr_thumb_title0__" />

trunk/templates/tmpl_uni/thumbnail_single.html

@@ -1 +1 @@
 <div class="thumbnail_block" style="float:__sys_thb_float__;width:__sys_thb_width__px;height:__sys_thb_height__px;">
     <div class="thumbnail_image" style="width:__sys_img_width1__px;height:__sys_img_height1__px;">
-        <a href="__usr_profile_url__" onclick="javascript: getUserInfo(this, __iProfId__, event); return false;">
+        <a href="__usr_profile_url__" onclick="showFloatUserInfo(__iProfId__, event); return false;">
             <img src="<bx_image_url:spacer.gif />" style="background-image:url(__usr_thumb_url0__); width:__sys_img_width__px;height:__sys_img_height__px;" alt="__usr_thumb_title0__" title="__usr_thumb_title0__" />
             <img src="__sys_status_url__" alt="__sys_status_title__" title="__sys_status_title__" class="sys-online-offline" />

@@ -1 +1 @@
 tiny_mce_*.gz
-user*.php
+*.php
 *.inc