From 596a01a76decd54ef3198346f3ea341218c264e0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 1 Aug 2013 11:44:44 +0000 Subject: [PATCH] remove "admin_" prefix from et2 ids --- admin/inc/class.admin_ui.inc.php | 2 +- admin/js/app.js | 33 ++++++++++++++++++++++++++----- admin/templates/default/index.xet | 6 +++--- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php index 37af0ddd20..0cd743a9c1 100644 --- a/admin/inc/class.admin_ui.inc.php +++ b/admin/inc/class.admin_ui.inc.php @@ -43,7 +43,7 @@ class admin_ui $tpl = new etemplate_new('admin.index'); $content = array(); - $content['admin_nm'] = array( + $content['nm'] = array( 'get_rows' => 'admin_ui::get_users', 'no_cat' => true, 'no_filter2' => true, diff --git a/admin/js/app.js b/admin/js/app.js index 86e0278769..8b1950486f 100644 --- a/admin/js/app.js +++ b/admin/js/app.js @@ -66,10 +66,16 @@ app.admin = AppJS.extend( this.et2 = _et2.widgetContainer; - var iframe = this.iframe = this.et2.getWidgetById('admin_iframe'); - if (iframe) iframe.set_src(egw.webserverUrl+'/admin/index.php'); - - var splitter = this.splitter = this.et2.getWidgetById('admin_splitter'); + var iframe = this.iframe = this.et2.getWidgetById('iframe'); + if (iframe) + { + iframe.set_src(egw.webserverUrl+'/admin/index.php'); + var self = this; + jQuery(iframe.getDOMNode()).bind('load', function(){ + self._hide_navbar.call(self); + }); + } + var splitter = this.splitter = this.et2.getWidgetById('splitter'); if (splitter) { window.setTimeout(function(){ @@ -78,6 +84,23 @@ app.admin = AppJS.extend( } }, + /** + * Hide navbar for idots template + * + * Just a hack for old idots, not neccesary for jdots + */ + _hide_navbar: function() + { + var document = this.iframe.getDOMNode().contentDocument; + // hide navbar elements + var ids2hide = ['divLogo', 'topmenu', 'divAppIconBar', 'divStatusBar', 'tdSidebox', 'divAppboxHeader']; + for(var i=0; i < ids2hide.length; ++i) + { + var elem = document.getElementById(ids2hide[i]); + if (elem) elem.style.display = 'none'; + } + }, + /** * Set location of iframe for given _action and _sender (row) * @@ -106,7 +129,7 @@ app.admin = AppJS.extend( { this.splitter.undock(); var parts = _id.split('/'); - this.et2.getWidgetById('admin_nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''}); + this.et2.getWidgetById('nm').applyFilters({ filter: parts[2] ? parts[2] : '', search: ''}); } else if (typeof link == 'undefined') { diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet index ed883dc4ba..3f515256fb 100644 --- a/admin/templates/default/index.xet +++ b/admin/templates/default/index.xet @@ -45,9 +45,9 @@