The branch, master has been updated via 73fb08d3d81f33edba2550ceaa1a8bfd3418f172 (commit) via 7ba944948654b6a25fa5d6d409320c1ffa76948b (commit) from a2fc059f985b681b72c4f6e43ef680c0901ed833 (commit)
- Log ----------------------------------------------------------------- commit 73fb08d3d81f33edba2550ceaa1a8bfd3418f172 Author: Michal Čihař mcihar@suse.cz Date: Thu Aug 4 14:41:29 2011 +0200
Revert "Feature idea: Collapsible navigation frame"
This reverts commit 5fb7f9cd1716ae747a6e898ee6e92c864d4da6dc.
Conflicts:
js/common.js
commit 7ba944948654b6a25fa5d6d409320c1ffa76948b Author: Michal Čihař mcihar@suse.cz Date: Thu Aug 4 14:40:57 2011 +0200
Revert "Icons for collapsible frame"
This reverts commit 05dd085aeb0334d1e9ee68037efb563866892164.
-----------------------------------------------------------------------
Summary of changes: js/common.js | 66 ------------------------------- libraries/header.inc.php | 1 - navigation.php | 1 - themes/pmahomme/css/theme_left.css.php | 7 --- themes/pmahomme/css/theme_right.css.php | 7 --- themes/pmahomme/img/frame-collapse.png | Bin 3862 -> 0 bytes themes/pmahomme/img/frame-expand.png | Bin 1130 -> 0 bytes 7 files changed, 0 insertions(+), 82 deletions(-) delete mode 100644 themes/pmahomme/img/frame-collapse.png delete mode 100644 themes/pmahomme/img/frame-expand.png
diff --git a/js/common.js b/js/common.js index 06b1609..b595108 100644 --- a/js/common.js +++ b/js/common.js @@ -14,8 +14,6 @@ var querywindow = ''; */ var query_to_load = '';
-var leftFrameWidth = -1; - /** * sets current selected db * @@ -365,67 +363,3 @@ function updateTableTitle( table_link_id, new_title ) {
return false; } - -(function($) { - $.fn.extend({ - dom: function () { - var $this = $(this); - var getDom = function(o) { - if( !o || (!o.contentWindow && !o.contentDocument) ) { - return null; - } - - var doc = (o.contentWindow || o.contentDocument); - - return doc.document || doc; - }; - - var dom = getDom($this[0]); - - return dom === null ? $this : $(dom); - } - }); -})(jQuery); - -$(document).ready(function() { - $('frame#frame_navigation').load(function() { - $('frame#frame_navigation').dom().find('div#frameCollapse').show().click(toggleNavigation); - }); - $('frame#frame_content').load(function() { - $('frame#frame_content').dom().find('div#frameExpand').click(toggleNavigation); - }); -}); - -function toggleNavigation() { - if(leftFrameWidth == -1) leftFrameWidth = $('frame#frame_navigation').width(); - - var newWidth = leftFrameWidth - $('frame#frame_navigation').width(); - var $frameset = $('frameset'); - - if(newWidth == 0) { - $('frame#frame_navigation').dom().find('body').css('width',leftFrameWidth + 'px'); - $('frame#frame_navigation').dom().find('body').css('overflow','hidden'); - } else { - $('frame#frame_content').dom().find('div#frameExpand').hide(); - } - - $('frame#frame_navigation').animate( - { width: newWidth }, - { step: function(now, fx) { - $frameset.attr('cols',fx.now + ',*'); - }, - complete: function() { - if(newWidth != 0) { - $('frame#frame_navigation').dom().find('body').css('width',''); - $('frame#frame_navigation').dom().find('body').css('overflow',''); - } else { - $('frame#frame_content').dom().find('div#frameExpand').show(); - } - } - } - ); -} - -function currentWidth() { - return $('frame#frame_navigation').width(); -} \ No newline at end of file diff --git a/libraries/header.inc.php b/libraries/header.inc.php index ff63999..a6ed8ed 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -71,7 +71,6 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { </head>
<body> - <div id="frameExpand" style="display:none;"><img src="themes/pmahomme/img/frame-expand.png"></div> <?php
// Include possible custom headers diff --git a/navigation.php b/navigation.php index f684d11..0c5668b 100644 --- a/navigation.php +++ b/navigation.php @@ -156,7 +156,6 @@ require_once './libraries/header_http.inc.php'; </head>
<body id="body_leftFrame"> -<div id="frameCollapse" style="display:none;"><img src="themes/pmahomme/img/frame-collapse.png"></div> <?php require './libraries/navigation_header.inc.php';
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index ea50e51..8ed6707 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -109,13 +109,6 @@ button { /******************************************************************************/ /* specific elements */
-div#frameCollapse { - position:absolute; - top: 50%; - right: 0; - cursor: pointer; -} - div#pmalogo { <?php //better echo $GLOBALS['cfg']['logoBGC']; ?> } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 582f9a8..f7089af 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -956,13 +956,6 @@ form.login label { /******************************************************************************/ /* specific elements */
-div#frameExpand { - position:absolute; - top: 50%; - left: 0; - cursor: pointer; -} - /* topmenu */ #topmenu a { text-shadow:0px 1px 0px #fff; diff --git a/themes/pmahomme/img/frame-collapse.png b/themes/pmahomme/img/frame-collapse.png deleted file mode 100644 index cee63be..0000000 Binary files a/themes/pmahomme/img/frame-collapse.png and /dev/null differ diff --git a/themes/pmahomme/img/frame-expand.png b/themes/pmahomme/img/frame-expand.png deleted file mode 100644 index c99c0d1..0000000 Binary files a/themes/pmahomme/img/frame-expand.png and /dev/null differ
hooks/post-receive