Changeset 2478

Timestamp:

04/12/10 10:30:47 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoNews? não realize reload de página.

Location:

trunk

Files:

• news_admin/inc/class.uiacl.inc.php (modified) (1 diff)
• news_admin/inc/class.uinews.inc.php (modified) (5 diffs)
• news_admin/index.php (modified) (1 diff)
• phpgwapi/js/tools/xlink.js (modified) (1 diff)

trunk/news_admin/inc/class.uiacl.inc.php

@@ -50 +50 @@
                         }
 
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                        echo parse_navbar();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
+                        //echo parse_navbar();
 
                         if ($_POST['btnSave'])

trunk/news_admin/inc/class.uinews.inc.php

@@ -98 +98 @@
                         $this->template->set_block('main','row_empty');
 
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                        echo parse_navbar();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
+                        //echo parse_navbar();
                         $this->template->set_block('main','category');
                         $var['lang_read'] = lang('Read');
@@ -325 +325 @@
                         $news_id = $_POST['news_id'] ? $_POST['news_id'] : $_GET['news_id'];
 
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                        echo parse_navbar();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
+                        //echo parse_navbar();
                         $this->template->set_file(array(
                                 'form' => 'admin_delete.tpl'
@@ -407 +407 @@
 
                 function modify($type = 'edit')
-                {                        
-                        include_once("fckeditor.php");                                                
-                        $this->news_data['is_html'] = ($type == 'add' ? '1' : $this->news_data['is_html'] ); 
+                {
+                        include_once("fckeditor.php");
+                        $this->news_data['is_html'] = ($type == 'add' ? '1' : $this->news_data['is_html'] );
                         $options = $this->bo->get_options($this->news_data);
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                        echo parse_navbar();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
+                        //echo parse_navbar();
 
                         $this->template->set_file(array(
@@ -441 +441 @@
                         
                         $oFCKeditor = new FCKeditor('news[content]') ;                        
-                        $oFCKeditor->BasePath = 'news_admin/templates/' . ($GLOBALS['phpgw_info']['server']['template_set'] ? $GLOBALS['phpgw_info']['server']['template_set'] : 'default') . '/fckeditor/';
+                        $oFCKeditor->BasePath = $GLOBALS[ 'phpgw' ] -> link( '/news_admin/templates/' . ($GLOBALS['phpgw_info']['server']['template_set'] ? $GLOBALS['phpgw_info']['server']['template_set'] : 'default') . '/fckeditor/' );
                         $oFCKeditor->ToolbarSet = 'ExpressoLivre';
                         $oFCKeditor->Value = $this->news_data['content'];                                        
@@ -482 +482 @@
                         $this->template->set_block('main','row_empty');
 
-                        $GLOBALS['phpgw']->common->phpgw_header();
-                        echo parse_navbar();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
+                        //echo parse_navbar();
                         
                         $category_list = $this->selectlist('write', (int)$this->news_data['category']);

trunk/news_admin/index.php

@@ -17 +17 @@
         $GLOBALS['phpgw_info']['flags'] = array(
                 'currentapp' => 'news_admin',
-                'noheader' => True,
-                'nonavbar' => True,
+                //'noheader' => True,
+                //'nonavbar' => True,
         );
         include('../header.inc.php');

trunk/phpgwapi/js/tools/xlink.js

@@ -14 +14 @@
                 a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
                 */
-                var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 );
+                var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( 'admin.' ) > 0 );
                 a = ( a || action.indexOf( 'home' ) > 0 );
                 a = ( a || action.indexOf( 'contactcenter' ) > 0 );