Revision 1685
Added by darkviper over 12 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
03 May-2012 Build 1684 Dietmar Woellbrink (Luisehahne) |
|
| 14 |
06 May-2012 Build 1685 Werner v.d.Decken(DarkViper) |
|
| 15 |
! last fixes for use of page_icon s.o. |
|
| 16 |
06 May-2012 Build 1684 Dietmar Woellbrink (Luisehahne) |
|
| 15 | 17 |
! update upgrade-script, now don't overwrite existings values in settings |
| 16 | 18 |
+ add field tooltip to table pages in installer |
| 17 | 19 |
! change some module tool_icon.png (Tks to Stefek) |
| branches/2.8.x/wb/admin/pages/settings.php | ||
|---|---|---|
| 164 | 164 |
$oIterator = new DirectoryIterator(WB_PATH.$sIconDir); |
| 165 | 165 |
foreach ($oIterator as $fileinfo) {
|
| 166 | 166 |
if(preg_match('/'.$sAllowedImageTypes.'$/i', $fileinfo->getFilename())) {
|
| 167 |
$sItem = str_replace(WB_PATH, '', str_replace('\\', '/', $fileinfo->getPathname()));
|
|
| 167 |
$sItem = str_replace(str_replace('\\', '/', WB_PATH), '',
|
|
| 168 |
str_replace('\\', '/', $fileinfo->getPathname()));
|
|
| 168 | 169 |
// $sItem = WB_REL.$sItem; |
| 169 | 170 |
$aPageIcons[] = array('VALUE'=>$sItem, 'NAME'=>$fileinfo->getFilename());
|
| 170 | 171 |
} |
| 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', '1684');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1685');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/class.frontend.php | ||
|---|---|---|
| 35 | 35 |
// page database row |
| 36 | 36 |
public $page; |
| 37 | 37 |
public $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility; |
| 38 |
public $page_description,$page_keywords,$page_link; |
|
| 38 |
public $page_description,$page_keywords,$page_link, $page_icon, $menu_icon_0, $menu_icon_1, $tooltip;
|
|
| 39 | 39 |
public $page_trail=array(); |
| 40 |
|
|
| 40 |
|
|
| 41 | 41 |
public $page_access_denied; |
| 42 | 42 |
public $page_no_active_sections; |
| 43 | 43 |
|
| ... | ... | |
| 157 | 157 |
if(!defined('MENU_TITLE')) {define('MENU_TITLE', PAGE_TITLE);}
|
| 158 | 158 |
} |
| 159 | 159 |
$this->menu_title = MENU_TITLE; |
| 160 |
$this->page_icon = $this->page['page_icon']; |
|
| 161 |
$this->menu_icon_0 = $this->page['menu_icon_0']; |
|
| 162 |
$this->menu_icon_1 = $this->page['menu_icon_1']; |
|
| 163 |
$this->tooltip = $this->page['tooltip']; |
|
| 160 | 164 |
// Page parent |
| 161 | 165 |
if(!defined('PARENT')) {define('PARENT', $this->page['parent']);}
|
| 162 | 166 |
$this->parent=$this->page['parent']; |
| branches/2.8.x/wb/modules/droplets/example/iParentPageIcon.php | ||
|---|---|---|
| 13 | 13 |
{
|
| 14 | 14 |
$icon_url = WB_REL.'/'.TEMPLATE.'/'.$icon; |
| 15 | 15 |
} |
| 16 |
if( !isset($wb->page_icon) ) { return $icon_url; }
|
|
| 17 | 16 |
$tmp_trail = $wb->page_trail; |
| 18 | 17 |
$tmp_trail = array_reverse($tmp_trail); |
| 19 | 18 |
foreach($tmp_trail as $pid) |
Also available in: Unified diff
last fixes for use of page_icon s.o.