Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1779) +++ branches/2.8.x/CHANGELOG (revision 1780) @@ -13,9 +13,13 @@ +10 Oct-2012 Build 1780 Dietmar Woellbrink (Luisehahne) +! change help mouseover to onclick in page settings only on help icon ++ add help to input filename +! /framework/initialize.php now accept _GET and _POST to set user language 09 Oct-2012 Build 1779 Dietmar Woellbrink (Luisehahne) # fixed wrong variable in admin/settings/index.php line 409 -! coreecting url to WB help in readme files module showmenu2 +! correcting url to WB help in readme files module showmenu2 05 Oct-2012 Build 1778 Dietmar Woellbrink (Luisehahne) # fixed empty template variable in admin/start 01 Oct-2012 Build 1777 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1779) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1780) @@ -33,8 +33,8 @@
- + + TEXT_PAGE_ICON
- + + TEXT_MENU_ICON_0
- + + TEXT_MENU_ICON_1 Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1779) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1780) @@ -25,7 +25,7 @@ { global $admin, $database, $oTpl, $aCurrentPage, $field_set; $sDisabled = ' disabled="disabled"'; - $sSelected = ' selected="selected"'; + $sSelected = ' selected="selected"'; $sql = 'SELECT `page_id`, `level`, `link`, `parent`, `menu_title`, `page_title`, ' . '`language`, `admin_groups`, `admin_users`, `visibility`, ' @@ -82,8 +82,8 @@ $mLang = ModLanguage::getInstance(); $mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); $sDisabled = ' disabled="disabled"'; - $sSelected = ' selected="selected"'; - $sChecked = ' checked="checked"'; + $sSelected = ' selected="selected"'; + $sChecked = ' checked="checked"'; // Get page id $page_id = $_GET['page_id'] ? intval($_GET['page_id']) : 0; @@ -196,11 +196,17 @@ // $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); $sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); + $sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` ' + . 'WHERE `page_id`='.$page_id.' '; + $sAccesFile = (($database->get_one($sql))); + $sFilename = replaceVars($mLang->HELP_SEO_TITLE, array('filename'=>PAGES_DIRECTORY.$sAccesFile.PAGE_EXTENSION ) ); + $oTpl->set_var('PAGE_EXTENDED_HIDE', $bIconDirHide); $oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); $oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); $oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); $oTpl->set_var('p_menu_page_code', p($mLang->HELP_PAGE_CODE,$mLang->TEXT_PAGE_CODE)); + $oTpl->set_var('p_menu_filename', p($sFilename,$mLang->TEXT_SEO_TITLE)); if(is_readable(WB_PATH.$sIconDir)) { $oIterator = new DirectoryIterator(WB_PATH.$sIconDir); @@ -596,7 +602,7 @@ function p($text,$lang) { global $admin; - $retVal = 'onmouseover="return overlib('; + $retVal = 'onclick="return overlib('; $retVal .= '\''.$text.'\','; $retVal .= 'CAPTION,\''.$lang.'\','; $retVal .= 'FGCOLOR,\'#ffffff\','; Index: branches/2.8.x/wb/admin/pages/languages/EN.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1779) +++ branches/2.8.x/wb/admin/pages/languages/EN.php (revision 1780) @@ -50,7 +50,7 @@ $TEXT['SECTION_ORGANISATION'] = 'Organisation'; $TEXT['SECTION_CONTENT'] = 'Content'; $TEXT['SECTION_SECURITY'] = 'Security'; -$TEXT['SEO_TITLE'] = 'Seo Title'; +$TEXT['SEO_TITLE'] = 'Filename'; $TEXT['PAGE_ICON'] = 'Page image'; $TEXT['PAGE_ICON_DIR'] = 'Folder Page image'; $TEXT['MENU_ICON_0'] = 'Menu image normal'; @@ -59,7 +59,7 @@ $TEXT['MENU_ICON_1_DIR'] = 'Folder Menu image hover'; $MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; -$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Seo Title'; +$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Filename'; $HELP['PAGE_IMAGE_DIR'] = '

The topical side picture path is
{{icon_dir}}.

'; @@ -73,4 +73,10 @@ $HELP['PAGE_CODE'] .= '

The side linguistic tree is provided from the provided sides of the standard language (Options).

'; $HELP['PAGE_CODE'] .= '

They can update any time the side linguistic tree by click on the title! The assigned sides remain unchanged.

'; $HELP['PAGE_CODE'] .= '

If you have put a side into another language, confirm from this list the matching entry of the standard language

'; -$HELP['PAGE_CODE'] .= '

Example:
Created page in sub DE: Impressum choose Default Language EN: Imprint

'; \ No newline at end of file +$HELP['PAGE_CODE'] .= '

Example:
Created page in sub DE: Impressum choose Default Language EN: Imprint

'; + +$HELP['SEO_TITLE'] = '

Folder and Filename for this Accessfile
{{filename}}

'; +$HELP['SEO_TITLE'] .= '

In WebsiteBaker version 2.8.4 you have the possibility to create a Seo friendly Accessfile independent of Menutitle..

'; +$HELP['SEO_TITLE'] .= '

For Example:

Input Menu Title: Pressemitteilung
'; +$HELP['SEO_TITLE'] .= 'Input Filename: Pressemitteilung and Downloads
'; +$HELP['SEO_TITLE'] .= 'Create Accessfile: pressemitteilungen-and-downloads.php

'; Index: branches/2.8.x/wb/admin/pages/languages/DE.php =================================================================== --- branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1779) +++ branches/2.8.x/wb/admin/pages/languages/DE.php (revision 1780) @@ -50,7 +50,7 @@ $TEXT['SECTION_ORGANISATION'] = 'Organisation'; $TEXT['SECTION_CONTENT'] = 'Inhalt'; $TEXT['SECTION_SECURITY'] = 'Sicherheit'; -$TEXT['SEO_TITLE'] = 'Seo Titel'; +$TEXT['SEO_TITLE'] = 'Dateiname'; $TEXT['PAGE_ICON'] = 'Seitenbild'; $TEXT['PAGE_ICON_DIR'] = 'Verzeichnis Seitenbilder'; $TEXT['MENU_ICON_0'] = 'Menübild normal'; @@ -58,7 +58,7 @@ $TEXT['MENU_ICON_1'] = 'Menübild hover'; $TEXT['MENU_ICON_1_DIR'] = 'Verzeichnis Menübild hover'; $MESSAGE['PAGES_LAST_MODIFIED'] = 'Letze Änderung durch'; -$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Bitte geben Sie einen Seo Titel ein'; +$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Bitte geben Sie einen Dateinameen ein'; $HELP['PAGE_IMAGE_DIR'] = '

Der aktuelle Seitenbildpfad ist
{{icon_dir}}.

'; $HELP['PAGE_IMAGE_DIR'] .='

Als Systemadministrator können Sie das Verzeichnis für Seiten-/Menuebilder unter Optionen Erweiterte Optionen in Servereinstellung ändern.

'; @@ -73,3 +73,8 @@ $HELP['PAGE_CODE'] .= '

Wenn sie eine Seite in einer anderen Sprache angelegt haben, bestätigen Sie aus dieser Liste den dazugehörigen Eintrag der Standardsprache.

'; $HELP['PAGE_CODE'] .= '

Beispiel:
Erstellte Seite im Zweig EN: Imprint zuweisen an Standardsprache DE: Impressum

'; +$HELP['SEO_TITLE'] = '

Verzeichnis und Dateiname dieser Zugriffsdatei
{{filename}}

'; +$HELP['SEO_TITLE'] .= '

In der WebsiteBaker Version 2.8.4 haben Sie die Möglichkeit, unabhängig vom Menutitel eine Seo freundliche Zugriffsdatei anzulegen.

'; +$HELP['SEO_TITLE'] .= '

Beispiel:

Eingabe Menütitel: Pressemitteilung
'; +$HELP['SEO_TITLE'] .= 'Eingabe Dateiname: Pressemitteilung und Downloads
'; +$HELP['SEO_TITLE'] .= 'Erstellt Zugriffsdatei: pressemitteilungen-und-downloads.php

'; Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1779) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1780) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1779'); +if(!defined('REVISION')) define('REVISION', '1780'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/initialize.php =================================================================== --- branches/2.8.x/wb/framework/initialize.php (revision 1779) +++ branches/2.8.x/wb/framework/initialize.php (revision 1780) @@ -142,9 +142,13 @@ if(defined('ENABLED_ASP') && ENABLED_ASP && !isset($_SESSION['session_started'])) $_SESSION['session_started'] = time(); + + // Get users language - if(isset($_GET['lang']) AND $_GET['lang'] != '' AND !is_numeric($_GET['lang']) AND strlen($_GET['lang']) == 2) { - define('LANGUAGE', strtoupper($_GET['lang'])); + $requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); + $language = (intval(isset(${$requestMethod}['lang'])) ? ${$requestMethod}['lang'] : null); + if(isset($language) AND $language != '' AND !is_numeric($language) AND strlen($language) == 2) { + define('LANGUAGE', strtoupper($language)); $_SESSION['LANGUAGE']=LANGUAGE; } else { if(isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') {