Revision 1780
Added by Dietmar about 12 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
13 | 13 |
|
14 | 14 |
|
15 | 15 |
|
16 |
10 Oct-2012 Build 1780 Dietmar Woellbrink (Luisehahne) |
|
17 |
! change help mouseover to onclick in page settings only on help icon |
|
18 |
+ add help to input filename |
|
19 |
! /framework/initialize.php now accept _GET and _POST to set user language |
|
16 | 20 |
09 Oct-2012 Build 1779 Dietmar Woellbrink (Luisehahne) |
17 | 21 |
# fixed wrong variable in admin/settings/index.php line 409 |
18 |
! coreecting url to WB help in readme files module showmenu2
|
|
22 |
! correcting url to WB help in readme files module showmenu2
|
|
19 | 23 |
05 Oct-2012 Build 1778 Dietmar Woellbrink (Luisehahne) |
20 | 24 |
# fixed empty template variable in admin/start |
21 | 25 |
01 Oct-2012 Build 1777 Dietmar Woellbrink (Luisehahne) |
branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt | ||
---|---|---|
33 | 33 |
<input type="text" id="page_title" name="page_title" value="{PAGE_TITLE}" /> |
34 | 34 |
</div> |
35 | 35 |
<div class="{PAGE_EXTENDED_HIDE}"> |
36 |
<label for="page_icon" {p_page_icon_dir} style="background-image: url({THEME_URL}/icons/help_16.png);" >{TEXT_PAGE_ICON}:
|
|
37 |
</label>
|
|
36 |
<label for="page_icon" >{TEXT_PAGE_ICON}:</label>
|
|
37 |
<span class="overlib" {p_page_icon_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_PAGE_ICON" /></span>
|
|
38 | 38 |
<select id="page_icon" name="page_icon"> |
39 | 39 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
40 | 40 |
<!-- BEGIN page_icon_list_block --> |
... | ... | |
48 | 48 |
</div> |
49 | 49 |
<div> |
50 | 50 |
<label for="seo_title">{TEXT_SEO_TITLE}:</label> |
51 |
<span class="overlib" {p_menu_filename} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_SEO_TITLE" /></span> |
|
51 | 52 |
<input type="text" id="seo_title" name="seo_title" value="{SEO_TITLE}" /> |
52 | 53 |
</div> |
53 | 54 |
<div class="{PAGE_EXTENDED_HIDE}"> |
54 |
<label for="menu_icon_0" {p_menu_icon0_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_0}:</label> |
|
55 |
<label for="menu_icon_0">{TEXT_MENU_ICON_0}:</label> |
|
56 |
<span class="overlib" {p_menu_icon0_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_MENU_ICON_0" /></span> |
|
55 | 57 |
<select id="menu_icon_0" name="menu_icon_0"> |
56 | 58 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
57 | 59 |
<!-- BEGIN menu_icon0_list_block --> |
... | ... | |
60 | 62 |
</select> |
61 | 63 |
</div> |
62 | 64 |
<div class="{PAGE_EXTENDED_HIDE}"> |
63 |
<label for="menu_icon_1" {p_menu_icon1_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_1}:</label> |
|
65 |
<label for="menu_icon_1" >{TEXT_MENU_ICON_1}:</label> |
|
66 |
<span class="overlib" {p_menu_icon1_dir} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_MENU_ICON_1" /></span> |
|
64 | 67 |
<select id="menu_icon_1" name="menu_icon_1"> |
65 | 68 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
66 | 69 |
<!-- BEGIN menu_icon1_list_block --> |
... | ... | |
124 | 127 |
</div> |
125 | 128 |
<!-- BEGIN show_page_code_block --> |
126 | 129 |
<div> |
127 |
<label for="page_code" {p_menu_page_code} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_PAGE_CODE}:</label> |
|
130 |
<label for="page_code">{TEXT_PAGE_CODE}:</label> |
|
131 |
<span class="overlib" {p_menu_page_code} ><img src="{THEME_URL}/icons/help_16.png" alt="TEXT_PAGE_CODE" /></span> |
|
128 | 132 |
<select id="page_code" name="page_code" class="value_page_code"> |
129 | 133 |
<!-- BEGIN page_code_list_block --> |
130 | 134 |
<option value="{VALUE}"{SELECTED} style="background: {FLAG_CODE_ICON} no-repeat center left; padding-left: 20px;"> {PAGE_VALUE}</option> |
branches/2.8.x/wb/admin/pages/settings.php | ||
---|---|---|
25 | 25 |
{ |
26 | 26 |
global $admin, $database, $oTpl, $aCurrentPage, $field_set; |
27 | 27 |
$sDisabled = ' disabled="disabled"'; |
28 |
$sSelected = ' selected="selected"';
|
|
28 |
$sSelected = ' selected="selected"'; |
|
29 | 29 |
|
30 | 30 |
$sql = 'SELECT `page_id`, `level`, `link`, `parent`, `menu_title`, `page_title`, ' |
31 | 31 |
. '`language`, `admin_groups`, `admin_users`, `visibility`, ' |
... | ... | |
82 | 82 |
$mLang = ModLanguage::getInstance(); |
83 | 83 |
$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); |
84 | 84 |
$sDisabled = ' disabled="disabled"'; |
85 |
$sSelected = ' selected="selected"';
|
|
86 |
$sChecked = ' checked="checked"';
|
|
85 |
$sSelected = ' selected="selected"'; |
|
86 |
$sChecked = ' checked="checked"'; |
|
87 | 87 |
|
88 | 88 |
// Get page id |
89 | 89 |
$page_id = $_GET['page_id'] ? intval($_GET['page_id']) : 0; |
... | ... | |
196 | 196 |
// $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); |
197 | 197 |
$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); |
198 | 198 |
|
199 |
$sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` ' |
|
200 |
. 'WHERE `page_id`='.$page_id.' '; |
|
201 |
$sAccesFile = (($database->get_one($sql))); |
|
202 |
$sFilename = replaceVars($mLang->HELP_SEO_TITLE, array('filename'=>PAGES_DIRECTORY.$sAccesFile.PAGE_EXTENSION ) ); |
|
203 |
|
|
199 | 204 |
$oTpl->set_var('PAGE_EXTENDED_HIDE', $bIconDirHide); |
200 | 205 |
$oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); |
201 | 206 |
$oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); |
202 | 207 |
$oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); |
203 | 208 |
$oTpl->set_var('p_menu_page_code', p($mLang->HELP_PAGE_CODE,$mLang->TEXT_PAGE_CODE)); |
209 |
$oTpl->set_var('p_menu_filename', p($sFilename,$mLang->TEXT_SEO_TITLE)); |
|
204 | 210 |
|
205 | 211 |
if(is_readable(WB_PATH.$sIconDir)) { |
206 | 212 |
$oIterator = new DirectoryIterator(WB_PATH.$sIconDir); |
... | ... | |
596 | 602 |
function p($text,$lang) |
597 | 603 |
{ |
598 | 604 |
global $admin; |
599 |
$retVal = 'onmouseover="return overlib(';
|
|
605 |
$retVal = 'onclick="return overlib(';
|
|
600 | 606 |
$retVal .= '\''.$text.'\','; |
601 | 607 |
$retVal .= 'CAPTION,\''.$lang.'\','; |
602 | 608 |
$retVal .= 'FGCOLOR,\'#ffffff\','; |
branches/2.8.x/wb/admin/pages/languages/EN.php | ||
---|---|---|
50 | 50 |
$TEXT['SECTION_ORGANISATION'] = 'Organisation'; |
51 | 51 |
$TEXT['SECTION_CONTENT'] = 'Content'; |
52 | 52 |
$TEXT['SECTION_SECURITY'] = 'Security'; |
53 |
$TEXT['SEO_TITLE'] = 'Seo Title';
|
|
53 |
$TEXT['SEO_TITLE'] = 'Filename';
|
|
54 | 54 |
$TEXT['PAGE_ICON'] = 'Page image'; |
55 | 55 |
$TEXT['PAGE_ICON_DIR'] = 'Folder Page image'; |
56 | 56 |
$TEXT['MENU_ICON_0'] = 'Menu image normal'; |
... | ... | |
59 | 59 |
$TEXT['MENU_ICON_1_DIR'] = 'Folder Menu image hover'; |
60 | 60 |
|
61 | 61 |
$MESSAGE['PAGES_LAST_MODIFIED'] = 'Last modification by'; |
62 |
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Seo Title';
|
|
62 |
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Please enter a Filename';
|
|
63 | 63 |
|
64 | 64 |
|
65 | 65 |
$HELP['PAGE_IMAGE_DIR'] = '<p>The topical side picture path is<br /> <b>{{icon_dir}}</b>.</p>'; |
... | ... | |
73 | 73 |
$HELP['PAGE_CODE'] .= '<p>The side linguistic tree is provided from the provided sides of the standard language (<i>Options</i>).</p>'; |
74 | 74 |
$HELP['PAGE_CODE'] .= '<p>They can update any time the side linguistic tree by click on the title! The assigned sides remain unchanged.</p>'; |
75 | 75 |
$HELP['PAGE_CODE'] .= '<p>If you have put a side into another language, confirm from this list the matching entry of the standard language</p>'; |
76 |
$HELP['PAGE_CODE'] .= '<p>Example:<br />Created page in sub DE: <b>Impressum</b> choose Default Language EN: <b>Imprint</b></p>'; |
|
76 |
$HELP['PAGE_CODE'] .= '<p>Example:<br />Created page in sub DE: <b>Impressum</b> choose Default Language EN: <b>Imprint</b></p>'; |
|
77 |
|
|
78 |
$HELP['SEO_TITLE'] = '<p>Folder and Filename for this Accessfile <br /> <b>{{filename}}</b></p>'; |
|
79 |
$HELP['SEO_TITLE'] .= '<p>In WebsiteBaker version 2.8.4 you have the possibility to create a Seo friendly Accessfile independent of Menutitle..</p>'; |
|
80 |
$HELP['SEO_TITLE'] .= '<p><b>For Example:</b><br /><br />Input Menu Title: <b>Pressemitteilung</b><br />'; |
|
81 |
$HELP['SEO_TITLE'] .= 'Input Filename: <b>Pressemitteilung and Downloads</b><br />'; |
|
82 |
$HELP['SEO_TITLE'] .= 'Create Accessfile: <b>pressemitteilungen-and-downloads.php</b></p>'; |
branches/2.8.x/wb/admin/pages/languages/DE.php | ||
---|---|---|
50 | 50 |
$TEXT['SECTION_ORGANISATION'] = 'Organisation'; |
51 | 51 |
$TEXT['SECTION_CONTENT'] = 'Inhalt'; |
52 | 52 |
$TEXT['SECTION_SECURITY'] = 'Sicherheit'; |
53 |
$TEXT['SEO_TITLE'] = 'Seo Titel';
|
|
53 |
$TEXT['SEO_TITLE'] = 'Dateiname';
|
|
54 | 54 |
$TEXT['PAGE_ICON'] = 'Seitenbild'; |
55 | 55 |
$TEXT['PAGE_ICON_DIR'] = 'Verzeichnis Seitenbilder'; |
56 | 56 |
$TEXT['MENU_ICON_0'] = 'Menübild normal'; |
... | ... | |
58 | 58 |
$TEXT['MENU_ICON_1'] = 'Menübild hover'; |
59 | 59 |
$TEXT['MENU_ICON_1_DIR'] = 'Verzeichnis Menübild hover'; |
60 | 60 |
$MESSAGE['PAGES_LAST_MODIFIED'] = 'Letze Änderung durch'; |
61 |
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Bitte geben Sie einen Seo Titel ein';
|
|
61 |
$MESSAGE['PAGES_BLANK_SEO_TITLE'] = 'Bitte geben Sie einen Dateinameen ein';
|
|
62 | 62 |
|
63 | 63 |
$HELP['PAGE_IMAGE_DIR'] = '<p>Der aktuelle Seitenbildpfad ist<br /> <b>{{icon_dir}}</b>.</p>'; |
64 | 64 |
$HELP['PAGE_IMAGE_DIR'] .='<p>Als Systemadministrator können Sie das Verzeichnis für Seiten-/Menuebilder unter <i>Optionen</i> <i>Erweiterte Optionen</i> in <i>Servereinstellung</i> ändern.</p>'; |
... | ... | |
73 | 73 |
$HELP['PAGE_CODE'] .= '<p>Wenn sie eine Seite in einer anderen Sprache angelegt haben, bestätigen Sie aus dieser Liste den dazugehörigen Eintrag der Standardsprache.</p>'; |
74 | 74 |
$HELP['PAGE_CODE'] .= '<p>Beispiel:<br />Erstellte Seite im Zweig EN: <b>Imprint</b> zuweisen an Standardsprache DE: <b>Impressum</b></p>'; |
75 | 75 |
|
76 |
$HELP['SEO_TITLE'] = '<p>Verzeichnis und Dateiname dieser Zugriffsdatei <br /> <b>{{filename}}</b></p>'; |
|
77 |
$HELP['SEO_TITLE'] .= '<p>In der WebsiteBaker Version 2.8.4 haben Sie die Möglichkeit, unabhängig vom Menutitel eine Seo freundliche Zugriffsdatei anzulegen.</p>'; |
|
78 |
$HELP['SEO_TITLE'] .= '<p><b>Beispiel:</b><br /><br />Eingabe Menütitel: <b>Pressemitteilung</b><br />'; |
|
79 |
$HELP['SEO_TITLE'] .= 'Eingabe Dateiname: <b>Pressemitteilung und Downloads</b><br />'; |
|
80 |
$HELP['SEO_TITLE'] .= 'Erstellt Zugriffsdatei: <b>pressemitteilungen-und-downloads.php</b></p>'; |
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', '1779');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1780');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/framework/initialize.php | ||
---|---|---|
142 | 142 |
if(defined('ENABLED_ASP') && ENABLED_ASP && !isset($_SESSION['session_started'])) |
143 | 143 |
$_SESSION['session_started'] = time(); |
144 | 144 |
|
145 |
|
|
146 |
|
|
145 | 147 |
// Get users language |
146 |
if(isset($_GET['lang']) AND $_GET['lang'] != '' AND !is_numeric($_GET['lang']) AND strlen($_GET['lang']) == 2) { |
|
147 |
define('LANGUAGE', strtoupper($_GET['lang'])); |
|
148 |
$requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); |
|
149 |
$language = (intval(isset(${$requestMethod}['lang'])) ? ${$requestMethod}['lang'] : null); |
|
150 |
if(isset($language) AND $language != '' AND !is_numeric($language) AND strlen($language) == 2) { |
|
151 |
define('LANGUAGE', strtoupper($language)); |
|
148 | 152 |
$_SESSION['LANGUAGE']=LANGUAGE; |
149 | 153 |
} else { |
150 | 154 |
if(isset($_SESSION['LANGUAGE']) AND $_SESSION['LANGUAGE'] != '') { |
Also available in: Unified diff
! 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