diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 6159282fb..3950eccb8 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -1677,11 +1677,11 @@ class MenuBlock extends DisplayBlock { if (array_key_exists('down', $aRelationInfo)) { - $aActions[$sRelationCode.'_down'] = array ('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams; + $aActions[$sRelationCode.'_down'] = array ('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams; } if (array_key_exists('up', $aRelationInfo)) { - $aActions[$sRelationCode.'_up'] = array ('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams; + $aActions[$sRelationCode.'_up'] = array ('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams; } } } diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index f50b04a0a..1c6e2c9f0 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -89,7 +89,6 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage $this->add_linked_script("../js/jquery-ui-timepicker-addon-i18n.min.js"); $this->add_linked_script("../js/jquery.blockUI.js"); $this->add_linked_script("../js/utils.js"); - $this->add_linked_script("../js/swfobject.js"); $this->add_linked_script("../js/ckeditor/ckeditor.js"); $this->add_linked_script("../js/ckeditor/adapters/jquery.js"); $this->add_linked_script("../js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js"); diff --git a/images/charts.swf b/images/charts.swf deleted file mode 100644 index 69617526a..000000000 Binary files a/images/charts.swf and /dev/null differ diff --git a/images/charts_library/arno.swf b/images/charts_library/arno.swf deleted file mode 100644 index 8e5fc1844..000000000 Binary files a/images/charts_library/arno.swf and /dev/null differ diff --git a/images/charts_library/arst.swf b/images/charts_library/arst.swf deleted file mode 100644 index bbe113b00..000000000 Binary files a/images/charts_library/arst.swf and /dev/null differ diff --git a/images/charts_library/brfl.swf b/images/charts_library/brfl.swf deleted file mode 100644 index 4abc11695..000000000 Binary files a/images/charts_library/brfl.swf and /dev/null differ diff --git a/images/charts_library/brno.swf b/images/charts_library/brno.swf deleted file mode 100644 index c5fb27ac5..000000000 Binary files a/images/charts_library/brno.swf and /dev/null differ diff --git a/images/charts_library/brst.swf b/images/charts_library/brst.swf deleted file mode 100644 index ebf09957b..000000000 Binary files a/images/charts_library/brst.swf and /dev/null differ diff --git a/images/charts_library/cl3d.swf b/images/charts_library/cl3d.swf deleted file mode 100644 index 663644ab9..000000000 Binary files a/images/charts_library/cl3d.swf and /dev/null differ diff --git a/images/charts_library/clfl.swf b/images/charts_library/clfl.swf deleted file mode 100644 index 9839c5189..000000000 Binary files a/images/charts_library/clfl.swf and /dev/null differ diff --git a/images/charts_library/clno.swf b/images/charts_library/clno.swf deleted file mode 100644 index cbbbc778c..000000000 Binary files a/images/charts_library/clno.swf and /dev/null differ diff --git a/images/charts_library/clp3.swf b/images/charts_library/clp3.swf deleted file mode 100644 index 4e28ea4f6..000000000 Binary files a/images/charts_library/clp3.swf and /dev/null differ diff --git a/images/charts_library/cls3.swf b/images/charts_library/cls3.swf deleted file mode 100644 index 1f97c5500..000000000 Binary files a/images/charts_library/cls3.swf and /dev/null differ diff --git a/images/charts_library/clst.swf b/images/charts_library/clst.swf deleted file mode 100644 index fc6936515..000000000 Binary files a/images/charts_library/clst.swf and /dev/null differ diff --git a/images/charts_library/cnno.swf b/images/charts_library/cnno.swf deleted file mode 100644 index f8ec7eee7..000000000 Binary files a/images/charts_library/cnno.swf and /dev/null differ diff --git a/images/charts_library/lnno.swf b/images/charts_library/lnno.swf deleted file mode 100644 index 3a1d6f998..000000000 Binary files a/images/charts_library/lnno.swf and /dev/null differ diff --git a/images/charts_library/mxno.swf b/images/charts_library/mxno.swf deleted file mode 100644 index 44d71e648..000000000 Binary files a/images/charts_library/mxno.swf and /dev/null differ diff --git a/images/charts_library/pi3d.swf b/images/charts_library/pi3d.swf deleted file mode 100644 index 678e60934..000000000 Binary files a/images/charts_library/pi3d.swf and /dev/null differ diff --git a/images/charts_library/pino.swf b/images/charts_library/pino.swf deleted file mode 100644 index db384d91e..000000000 Binary files a/images/charts_library/pino.swf and /dev/null differ diff --git a/images/charts_library/pono.swf b/images/charts_library/pono.swf deleted file mode 100644 index 0f2a2fe06..000000000 Binary files a/images/charts_library/pono.swf and /dev/null differ diff --git a/images/charts_library/scno.swf b/images/charts_library/scno.swf deleted file mode 100644 index ec98ec113..000000000 Binary files a/images/charts_library/scno.swf and /dev/null differ diff --git a/images/open-flash-chart.swf b/images/open-flash-chart.swf deleted file mode 100644 index 3a01e52ae..000000000 Binary files a/images/open-flash-chart.swf and /dev/null differ diff --git a/js/swfobject.js b/js/swfobject.js deleted file mode 100644 index 08fb27000..000000000 --- a/js/swfobject.js +++ /dev/null @@ -1,5 +0,0 @@ -/* SWFObject v2.1 - Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis - This software is released under the MIT License -*/ -var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("