Author: ralfbecker
New Revision: 49624
URL: http://svn.stylite.de/viewvc/egroupware?rev=49624&view=rev
Log:
sort apps alphabetic and open external links with a target _blank
Modified:
trunk/admin/inc/class.admin_ui.inc.php
trunk/admin/js/app.js
Modified: trunk/admin/inc/class.admin_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/inc/class.admin_ui.inc.php?rev=49624&r1=49623&r2=49624&view=diff
— trunk/admin/inc/class.admin_ui.inc.php (original)
+++ trunk/admin/inc/class.admin_ui.inc.php Fri Nov 28 13:43:10 2014
@@ -488,7 +488,15 @@
admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;
//error_log(METHOD."(".array2string(func_get_args()).")");
}
-
return array_merge($GLOBALS['egw']->hooks->process('admin', array('admin')), self::$hook_data);
-
self::$hook_data = array_merge($GLOBALS['egw']->hooks->process('admin', array('admin')), self::$hook_data); -
// sort apps alphabetic by their title / translation of app-name -
uksort(self::$hook_data, function($a, $b) -
{ -
return strcasecmp(lang($a), lang($b)); -
}); -
return self::$hook_data;}
/**
Modified: trunk/admin/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/js/app.js?rev=49624&r1=49623&r2=49624&view=diff
— trunk/admin/js/app.js (original)
+++ trunk/admin/js/app.js Fri Nov 28 13:43:10 2014
@@ -114,6 +114,12 @@
{
this.egw.message(this.egw.lang(‘Please submit (or postpone) statistic first’), ‘info’);
return; // do not allow to leave statistics submit
-
} -
// url outside EGroupware eg. eSyncPro linking to wikipedia -
if (_url && _url.indexOf(this.egw.webserverUrl) == -1) -
{ -
window.open(_url, '_blank'); -
return; } if (_url) {
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs