Index: trunk/admin/include/sections.php =================================================================== diff -u -r13 -r34 --- trunk/admin/include/sections.php (.../sections.php) (revision 13) +++ trunk/admin/include/sections.php (.../sections.php) (revision 34) @@ -461,9 +461,11 @@ $node = $this->GetCurrentSection(); if(is_object($node)) { - $helpURL = $adminURL."/help/help.php?env=$envar§ion=".$node->Get("key"); + $helpURL = $adminURL."/help/help.php?env=$envar&dstform=popup"; + $node_key = $node->Get('key'); $o = ""; //background="'.$imagesURL.'/tabnav_left.jpg" + $o .= '
'; $o .= ''; $o .= '"; + $o .= ""; $o .= "
'; @@ -497,7 +499,7 @@ $o .= "::".$navbar.""; $o .= ""; - $o .= "
"; } return $o; Index: trunk/kernel/startup.php =================================================================== diff -u -r13 -r34 --- trunk/kernel/startup.php (.../startup.php) (revision 13) +++ trunk/kernel/startup.php (.../startup.php) (revision 34) @@ -130,7 +130,7 @@ $adminDir = 'admin'; } -if (strstr($_SERVER['SCRIPT_FILENAME'], $adminDir) && !$_GET['logout'] && !strstr($_SERVER['SCRIPT_FILENAME'], "install") && !strstr($_SERVER['SCRIPT_FILENAME'], "index")) { +if (strstr($_SERVER['SCRIPT_FILENAME'], $adminDir) && !GetVar('logout') && !strstr($_SERVER['SCRIPT_FILENAME'], "install") && !strstr($_SERVER['SCRIPT_FILENAME'], "index")) { //echo "test
"; if (!admin_login()) { Index: trunk/admin/include/mainscript.php =================================================================== diff -u -r13 -r34 --- trunk/admin/include/mainscript.php (.../mainscript.php) (revision 13) +++ trunk/admin/include/mainscript.php (.../mainscript.php) (revision 34) @@ -416,6 +416,16 @@ return window.open(url,window_name,'width=750,height=400,status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no'); } +function ShowHelp(section) +{ + var frm = document.getElementById('help_form'); + frm.section.value = section; + frm.method = 'POST'; + CreatePopup('HelpPopup'); + frm.target = 'HelpPopup'; + frm.submit(); +} + function ExtractParams(get_str) { // extract params into associative array Index: trunk/admin/include/style.css =================================================================== diff -u -r13 -r34 --- trunk/admin/include/style.css (.../style.css) (revision 13) +++ trunk/admin/include/style.css (.../style.css) (revision 34) @@ -423,3 +423,8 @@ .tableborder_full_a { BORDER-RIGHT: #000000 1px solid; BORDER-LEFT: #000000 1px solid; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: Arial, Helvetica, sans-serif } + +.link +{ + cursor: hand; +} \ No newline at end of file Index: trunk/admin/listview/listview.js =================================================================== diff -u -r13 -r34 --- trunk/admin/listview/listview.js (.../listview.js) (revision 13) +++ trunk/admin/listview/listview.js (.../listview.js) (revision 34) @@ -1,5 +1,8 @@ var lcp = 0; var cbContainers = new Array(); + +getEventSrcElement = window.event ? function(e){var targ=e.target;return targ.nodeType==1?targ:targ.parentNode} : function() {return event.srcElement} + function initSelectiorContainers() { var selectorType; @@ -209,17 +212,29 @@ alert(e.which); } -d = document.getElementById('ListSearchWord'); -if(d) +// Event Handling Stuff Cross-Browser + +getEvent = window.Event +? function(e){return e} +: function() {return event} + +getEventSrcElement = window.Event +? function(e){var targ=e.target;return targ.nodeType==1?targ:targ.parentNode} +: function() {return event.srcElement} + +function getKeyCode(e){return e.charCode||e.keyCode} + +function getKey(eMoz) { - d.onkeyup = function(event) + var e = getEvent(eMoz) + var keyCode = getKeyCode(e) + + if(keyCode == 13) { - if(window.event.keyCode==13) - { - var el = document.getElementById('imgSearch'); - el.onclick(); - } + var el = document.getElementById('imgSearch'); + el.onclick(); } } - +d = document.getElementById('ListSearchWord'); +if(d) d.onkeyup = getKey