[Phpgroupware-cvs] CVS: sitemgr/inc class.Categories_UI.inc.php,1.7,1.8 class.Content_SO.inc.php,1.8,1.9 class.Content_UI.inc.php,1.8,1.9 class.Outline_UI.inc.php,1.1,1.2 class.Pages_UI.inc.php,1.5,1.6

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/inc
In directory subversions:/tmp/cvs-serv30800/inc

Modified Files:
        class.Categories_UI.inc.php class.Content_SO.inc.php 
        class.Content_UI.inc.php class.Outline_UI.inc.php 
        class.Pages_UI.inc.php 
Log Message:
edit categories and pages in secondary pages without navbar
automatically create version for new blocks


Index: class.Categories_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Categories_UI.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.Categories_UI.inc.php 30 May 2003 18:49:13 -0000      1.7
--- class.Categories_UI.inc.php 30 May 2003 21:30:35 -0000      1.8
***************
*** 86,91 ****
                        }
  
-                       $this->common_ui->DisplayHeader();
- 
                        if ($cat_id)
                        {
--- 86,89 ----
***************
*** 131,138 ****
                                'lang_save' => lang('Save'),
                                'lang_state' => lang('State'),
!                               'lang_goback' => lang('Done'),
                                'lang_getparentpermissions' => lang('Fill in 
permissions from parent category? If you check this, below values will be 
ignored'),
                                'lang_applypermissionstosubs' => lang('Apply 
permissions also to subcategories?'),
-                               'goback' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Outline_UI.manage'),
                        ));
                
--- 129,135 ----
                                'lang_save' => lang('Save'),
                                'lang_state' => lang('State'),
!                               'lang_done' => lang('Done'),
                                'lang_getparentpermissions' => lang('Fill in 
permissions from parent category? If you check this, below values will be 
ignored'),
                                'lang_applypermissionstosubs' => lang('Apply 
permissions also to subcategories?'),
                        ));
                
***************
*** 296,301 ****
                        $this->t->set_var('lang_no',lang('Cancel the delete'));
                        $this->t->pfp('out','ConfirmDelete');
- 
-                       $this->common_ui->DisplayFooter();
                }
        }
--- 293,296 ----

Index: class.Content_SO.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_SO.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.Content_SO.inc.php    30 May 2003 04:01:43 -0000      1.8
--- class.Content_SO.inc.php    30 May 2003 21:30:35 -0000      1.9
***************
*** 22,26 ****
                        $sql = "INSERT INTO phpgw_sitemgr_blocks 
(area,module_id,page_id,cat_id,sort_order,viewable) VALUES ('" .
                                $block->area . "'," . $block->module_id . "," . 
$block->page_id . "," . $block->cat_id . ",0,0)";
!                       return $this->db->query($sql,__LINE__,__FILE__);
                }
  
--- 22,27 ----
                        $sql = "INSERT INTO phpgw_sitemgr_blocks 
(area,module_id,page_id,cat_id,sort_order,viewable) VALUES ('" .
                                $block->area . "'," . $block->module_id . "," . 
$block->page_id . "," . $block->cat_id . ",0,0)";
!                       $this->db->query($sql,__LINE__,__FILE__);
!                       return 
$this->db->get_last_insert_id('phpgw_sitemgr_blocks','block_id');
                }
  
***************
*** 28,32 ****
                {
                        $sql = "INSERT INTO phpgw_sitemgr_content 
(block_id,state) VALUES ($blockid," . SITEMGR_STATE_DRAFT  . ")";
!                               return $this->db->query($sql,__LINE__,__FILE__);
                }
  
--- 29,33 ----
                {
                        $sql = "INSERT INTO phpgw_sitemgr_content 
(block_id,state) VALUES ($blockid," . SITEMGR_STATE_DRAFT  . ")";
!                       return $this->db->query($sql,__LINE__,__FILE__);
                }
  

Index: class.Content_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Content_UI.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.Content_UI.inc.php    30 May 2003 04:01:43 -0000      1.8
--- class.Content_UI.inc.php    30 May 2003 21:30:35 -0000      1.9
***************
*** 118,122 ****
                                        $block->cat_id = $cat_id;
  
!                                       if (!$this->bo->addblock($block))
                                        {
                                                $this->errormsg[] = lang("You 
are not entitled to create module %1 on this scope",$inputmoduleid);
--- 118,127 ----
                                        $block->cat_id = $cat_id;
  
!                                       $newblock = $this->bo->addblock($block);
!                                       if ($newblock)
!                                       {
!                                               
$this->bo->createversion($newblock);
!                                       }
!                                       else
                                        {
                                                $this->errormsg[] = lang("You 
are not entitled to create module %1 on this scope",$inputmoduleid);
***************
*** 164,168 ****
                        }
  
!                       //if we are called with a block_id GET parameter, it is 
from sitemgr-site edit mode
                        if ($block_id)
                        {
--- 169,174 ----
                        }
  
!                       //if we are called with a block_id GET parameter, it is 
from sitemgr-site edit mode or from archiv/commit
!                       //we are shown in a separate edit window, without 
navbar. 
                        if ($block_id)
                        {
***************
*** 187,191 ****
                                        'createbutton' => lang('Create new 
version'),
                                        'standalone' => 
"<html><head></head><body>",
!                                       'donebutton' => '<input type="submit" 
onclick="opener.location.reload();self.close()" value="' . lang('Done') . '"  
/>'
                                ));
                                $this->showblock($block,True,True);
--- 193,197 ----
                                        'createbutton' => lang('Create new 
version'),
                                        'standalone' => 
"<html><head></head><body>",
!                                       'donebutton' => '<input type="reset" 
onclick="opener.location.reload();self.close()" value="' . lang('Done') . '"  
/>'
                                ));
                                $this->showblock($block,True,True);

Index: class.Outline_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Outline_UI.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.Outline_UI.inc.php    30 May 2003 18:50:12 -0000      1.1
--- class.Outline_UI.inc.php    30 May 2003 21:30:35 -0000      1.2
***************
*** 46,50 ****
                        if ($this->isadmin)
                        {
!                               $this->t->set_var('addcategory','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Categories_UI.edit').
                                        '">' . lang('Add a category') .'</a>'
                                );
--- 46,51 ----
                        if ($this->isadmin)
                        {
!                               $this->t->set_var('addcategory','<a 
target="editwindow" href="' . 
!                                       
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Categories_UI.edit').
                                        '">' . lang('Add a category') .'</a>'
                                );
***************
*** 78,82 ****
                                        $link_data['page_id'] = $page_id;
                                        $link_data['menuaction'] = 
"sitemgr.Pages_UI.edit";
!                                       $this->t->set_var('edit','<a href="' . 
$GLOBALS['phpgw']->link('/index.php',$link_data) .
                                                '">' . lang('Edit page') . 
'</a>'
                                        );
--- 79,83 ----
                                        $link_data['page_id'] = $page_id;
                                        $link_data['menuaction'] = 
"sitemgr.Pages_UI.edit";
!                                       $this->t->set_var('edit','<a 
target="editwindow" href="' . $GLOBALS['phpgw']->link('/index.php',$link_data) .
                                                '">' . lang('Edit page') . 
'</a>'
                                        );
***************
*** 100,104 ****
                                {
                                        $link_data['menuaction'] = 
"sitemgr.Categories_UI.edit";
!                                       $this->t->set_var('edit','<a href="' . 
$GLOBALS['phpgw']->link('/index.php',$link_data) .
                                                '">' . lang('Edit category') . 
'</a>');
                                        $link_data['menuaction'] = 
"sitemgr.Categories_UI.delete";
--- 101,105 ----
                                {
                                        $link_data['menuaction'] = 
"sitemgr.Categories_UI.edit";
!                                       $this->t->set_var('edit','<a 
target="editwindow" href="' . $GLOBALS['phpgw']->link('/index.php',$link_data) .
                                                '">' . lang('Edit category') . 
'</a>');
                                        $link_data['menuaction'] = 
"sitemgr.Categories_UI.delete";
***************
*** 111,115 ****
  
                                $link_data['menuaction'] = 
"sitemgr.Pages_UI.edit";
!                               $this->t->set_var('addpage','<a href="' . 
$GLOBALS['phpgw']->link('/index.php',$link_data) .
                                        '">' . lang('Add page to category') . 
'</a>');
                                $link_data['menuaction'] = 
"sitemgr.Content_UI.manage";
--- 112,116 ----
  
                                $link_data['menuaction'] = 
"sitemgr.Pages_UI.edit";
!                               $this->t->set_var('addpage','<a 
target="editwindow" href="' . $GLOBALS['phpgw']->link('/index.php',$link_data) .
                                        '">' . lang('Add page to category') . 
'</a>');
                                $link_data['menuaction'] = 
"sitemgr.Content_UI.manage";

Index: class.Pages_UI.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/inc/class.Pages_UI.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.Pages_UI.inc.php      30 May 2003 18:49:13 -0000      1.5
--- class.Pages_UI.inc.php      30 May 2003 21:30:35 -0000      1.6
***************
*** 64,75 ****
                                        $this->t->set_var('message',$error);
                                }
!                               elseif(!$page_id)
!                               {               
!                                       $page_id = 
$this->pagebo->addPage($inputcategoryid);
                                        if(!$page_id)
!                                       {
! //                                            echo lang("You don't have 
permission to write in the category");
!                                               
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Outline_UI.manage'));
!                                               return;
                                        }
                                        $page->id = $page_id;
--- 64,78 ----
                                        $this->t->set_var('message',$error);
                                }
!                               else
!                               {
                                        if(!$page_id)
!                                       {               
!                                               $page_id = 
$this->pagebo->addPage($inputcategoryid);
!                                               if(!$page_id)
!                                               {
!       //                                              echo lang("You don't 
have permission to write in the category");
!                                                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Outline_UI.manage'));
!                                                       return;
!                                               }
                                        }
                                        $page->id = $page_id;
***************
*** 94,99 ****
                        }
  
-                       $this->common_ui->DisplayHeader();
- 
                        if($page_id)
                        {
--- 97,100 ----
***************
*** 146,158 ****
                                'lang_hide' => lang('Check to hide from 
condensed site index.'),
                                'lang_required' => lang('Required Fields'),
!                               'lang_goback' => lang('Done'),
                                'lang_reset' => lang('Reset'),
                                'lang_save' => lang('Save'),
                                'lang_state' => lang('State'),
-                               'goback' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=sitemgr.Outline_UI.manage'),
                        ));
                        
                        $this->t->pfp('out','EditPage');
-                       $this->common_ui->DisplayFooter();
                }
  
--- 147,157 ----
                                'lang_hide' => lang('Check to hide from 
condensed site index.'),
                                'lang_required' => lang('Required Fields'),
!                               'lang_done' => lang('Done'),
                                'lang_reset' => lang('Reset'),
                                'lang_save' => lang('Save'),
                                'lang_state' => lang('State'),
                        ));
                        
                        $this->t->pfp('out','EditPage');
                }