Project

General

Profile

« Previous | Next » 

Revision 1999

Added by darkviper about 11 years ago

! admin/pages/PageTree added list of sections to the tooltip of 'manage_sections'

View differences:

branches/2.8.x/CHANGELOG
11 11 
! = Update/Change
12 12 
===============================================================================
13 13 

  		




  
  14
  
    
14 Nov-2013 Build 1999 Manuela v.d.Decken(DarkViper)


  		




  
  15
  
    
! admin/pages/PageTree added list of sections to the tooltip of 'manage_sections'


  		




  14
  16
  
    
13 Nov-2013 Build 1998 Manuela v.d.Decken(DarkViper)


  		




  15
  17
  
    
+ WbDatabase added new methods fetchObject(), rewind(), seekRow(), freeResult()


  		




  16
  18
  
    
! renamed some methods and add aliases for the old names


  		












  

    
      branches/2.8.x/wb/admin/pages/PageTree.php
    
  





  172
  172
  
    
		      .        'p.`position`, '


  		




  173
  173
  
    
		      .        'p.`page_id`, p.`parent`, p.`level`, p.`language`, p.`admin_groups`, '


  		




  174
  174
  
    
		      .        'p.`admin_users`, p.`viewing_groups`, p.`viewing_users`, p.`visibility`, '


  		




  175
  
  
    
		      .        'p.`menu_title`, p.`page_title`, p.`page_trail` '


  		




  
  175
  
    
		      .        'p.`menu_title`, p.`page_title`, p.`page_trail`, '


  		




  
  176
  
    
		      .        'GROUP_CONCAT(CAST(CONCAT(s.`section_id`, \' - \', s.`module`) AS CHAR) SEPARATOR \'\n\') `section_list` '


  		




  176
  177
  
    
		      . 'FROM `'.$this->_oDb->TablePrefix.'pages` p '


  		




  177
  178
  
    
		      .    'INNER JOIN `'.$this->_oDb->TablePrefix.'sections` s '


  		




  178
  
  
    
		      .    'ON p.`page_id`=s.`page_id` ';


  		




  179
  
  
    
//		if($iParentKey) {


  		




  180
  
  
    
//


  		




  181
  
  
    
//			$sql .= 'WHERE `root_parent`='.$iParentKey.' ';


  		




  182
  
  
    
//		} else {


  		




  183
  
  
    
//	// if tree based on root is requested (parent=0)


  		




  184
  
  
    
			$sql .= 'WHERE `parent`='.$iParentKey.' ';


  		




  185
  
  
    
//		}


  		




  186
  
  
    
	// do not get pages with 'deleted' flag set on activated trashcan


  		




  187
  
  
    
		if($this->_oReg->PageTrash != 'inline') {


  		




  188
  
  
    
			$sql .= 'AND `visibility`!=\'deleted\' ';


  		




  189
  
  
    
		}


  		




  190
  
  
    
		$sql .= 'GROUP BY p.`page_id` '


  		




  
  179
  
    
		      .    'ON p.`page_id`=s.`page_id` '


  		




  
  180
  
    
		      . 'WHERE `parent`='.$iParentKey.' '


  		




  
  181
  
    
		      .    (($this->_oReg->PageTrash != 'inline') ? 'AND `visibility`!=\'deleted\' ' : '')


  		




  
  182
  
    
		      . 'GROUP BY p.`page_id` '


  		




  191
  183
  
    
		      . 'ORDER BY p.`position` ASC';


  		




  192
  184
  
    
		return $sql;


  		




  193
  185
  
    
	}


  		




  ......




  332
  324
  
    
			$file = $this->_oApp->page_is_active($aPage) ? "clock_16.png" : "clock_red_16.png";


  		




  333
  325
  
    
			$file = ($aPage['published'] && $aPage['module'] != 'menu_link') ? $file : 'noclock_16.png';


  		




  334
  326
  
    
			$sOutput .= '<a href="'.$this->_oReg->AcpRel.'pages/sections.php?page_id='


  		




  335
  
  
    
			          . $aPage['page_id'].'" title="'.$this->_oTrans->HEADING_MANAGE_SECTIONS.'">'


  		




  
  327
  
    
			          . $aPage['page_id'].'" title="'.$this->_oTrans->HEADING_MANAGE_SECTIONS."\n".$aPage['section_list'].'">'


  		




  336
  328
  
    
			          . '<img src="'.$this->_oReg->ThemeRel.'images/'.$file.'" alt="'


  		




  337
  
  
    
			          . $this->_oTrans->HEADING_MANAGE_SECTIONS.'" /></a>';


  		




  
  329
  
    
			          . $this->_oTrans->HEADING_MANAGE_SECTIONS."\n".$aPage['section_list'].'" /></a>';


  		




  338
  330
  
    
		}else { 


  		




  339
  331
  
    
			$sOutput .= '<img src="'.$this->_oReg->ThemeRel.'images/blank_16.gif" alt=" " />';


  		




  340
  332
  
    
		}


  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  51
  51
  
    

  		




  52
  52
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  53
  53
  
    
if(!defined('VERSION')) define('VERSION', '2.8.3');


  		




  54
  
  
    
if(!defined('REVISION')) define('REVISION', '1998');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '1999');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












Also available in:  Unified diff