Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1418) +++ branches/2.8.x/CHANGELOG (revision 1419) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +26 Jan-2011 Build 1419 Dietmar Woellbrink (Luisehahne) +! update rel handling FCKeditor for urls 25 Jan-2011 Build 1418 Dietmar Woellbrink (Luisehahne) # remove new function see http://www.websitebaker2.org/forum/index.php/topic,20268.msg139557.html#msg139557 24 Jan-2011 Build 1417 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1418) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1419) @@ -52,6 +52,6 @@ // 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.2.RC5'); -if(!defined('REVISION')) define('REVISION', '1418'); +if(!defined('REVISION')) define('REVISION', '1419'); ?> Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1418) +++ branches/2.8.x/wb/languages/EN.php (revision 1419) @@ -363,7 +363,6 @@ $TEXT['VIEW_DELETED_PAGES'] = 'View Deleted Pages'; $TEXT['VIEW_DETAILS'] = 'View Details'; $TEXT['VISIBILITY'] = 'Visibility'; -$TEXT['WARN_PAGE_LEAVE'] = 'Warn when leaving page'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Default From Mail'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Default Sender Name'; $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Please specify a default "FROM" address and "SENDER" name below. It is recommended to use a FROM address like: admin@yourdomain.com. Some mail provider (e.g. mail.com) may reject mails with a FROM: address like name@mail.com sent via a foreign relay to avoid spam.

The default values are only used if no other values are specified by WebsiteBaker. If your server supports SMTP, you may want use this option for outgoing mails.'; Index: branches/2.8.x/wb/languages/DE.php =================================================================== --- branches/2.8.x/wb/languages/DE.php (revision 1418) +++ branches/2.8.x/wb/languages/DE.php (revision 1419) @@ -364,7 +364,6 @@ $TEXT['VIEW_DELETED_PAGES'] = 'gelöschte Seiten anschauen'; $TEXT['VIEW_DETAILS'] = 'Details'; $TEXT['VISIBILITY'] = 'Sichtbarkeit'; -$TEXT['WARN_PAGE_LEAVE'] = 'Warnung bei Seitenwechsel'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standard "VON" Adresse'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standard Absender Name'; $TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Bitte geben Sie eine Standard "VON" Adresse und einen Sendernamen an. Als Absender Adresse empfiehlt sich ein Format wie: admin@IhreWebseite.de. Manche E-Mail Provider (z.B. mail.de) stellen keine E-Mails zu, die nicht über den Provider selbst verschickt wurden, in der Absender Adresse aber den Namen des E-Mail Providers name@mail.de enthalten. Die Standard Werte werden nur verwendet, wenn keine anderen Werte von WebsiteBaker gesetzt wurden. Wenn Ihr Service Provider SMTP anbietet, sollten Sie diese Option für ausgehende E-Mails verwenden.'; Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link.html =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link.html (revision 1418) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link.html (revision 1419) @@ -1,318 +1,317 @@ - - - - - Link Properties - - - - - - - - - - - - + + + + + Link Properties + + + + + + + + + + + + Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image/fck_image.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image/fck_image.js (revision 1418) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image/fck_image.js (revision 1419) @@ -189,10 +189,57 @@ if ( sLinkUrl == null ) sLinkUrl = oLink.getAttribute('href',2) ; + var sLinkRel = GetE('cmbLnkContentRel'); + + if ( sLinkRel.lenght == null ) + { + var myselect = document.getElementById("cmbLnkContentRel") + var found = false; + + for (var i=0; i < myselect.options.length; i++) + { + if (myselect.options[i].value == oLink.rel) + { + found = true; + break; + } + } + + if ( found == false ) + { + try { + myselect.add(new Option(oLink.rel, oLink.rel,true ), myselect.options[1]) //add new option to beginning of "cmbLnkContentRel" + } + catch(e) { //in IE, try the below version instead of add() + myselect.add(new Option( oLink.rel, oLink.rel,true ),1 ) //add new option to beginning of "cmbLnkContentRel" + //myselect.options[1].selected=true; + } + } + } GetE('txtLnkUrl').value = sLinkUrl ; GetE('cmbLnkTarget').value = oLink.target ; + // Get Advances Attributes + GetE('txtLnkTitle').value = oLink.title ; + GetE('cmbLnkContentRel').value = oLink.rel ; + GetE('txtLnkCharSet').value = oLink.charset ; + GetE('txtLnkId').value = oLink.id ; + GetE('txtLnkLangCode').value = oLink.lang ; + + var sClass ; + if ( oEditor.FCKBrowserInfo.IsIE ) + { + sClass = oLink.getAttribute('className',2) || '' ; + // Clean up temporary classes for internal use: + sClass = sClass.replace( FCKRegexLib.FCK_Class, '' ) ; + GetE('txtLnkStyle').value = oLink.style.cssText ; + } + else + { + sClass = oLink.getAttribute('class',2) || '' ; + GetE('txtLnkStyle').value = oLink.getAttribute('style',2) || '' ; + } + GetE('txtLnkClasses').value = sClass ; } - UpdatePreview() ; } @@ -238,7 +285,6 @@ UpdateImage( oImage ) ; var sLnkUrl = GetE('txtLnkUrl').value.Trim() ; - if ( sLnkUrl.length == 0 ) { if ( oLink ) @@ -247,7 +293,9 @@ else { if ( oLink ) // Modifying an existent link. + { oLink.href = sLnkUrl ; + } else // Creating a new link. { if ( !bHasImage ) @@ -264,6 +312,30 @@ SetAttribute( oLink, '_fcksavedurl', sLnkUrl ) ; SetAttribute( oLink, 'target', GetE('cmbLnkTarget').value ) ; + // Advances Attributes + SetAttribute( oLink, 'title' , GetE('txtLnkTitle').value ) ; + SetAttribute( oLink, 'rel' , GetE('cmbLnkContentRel').value ) ; + SetAttribute( oLink, 'lang' , GetE('txtLnkLangCode').value ) ; + SetAttribute( oLink, 'charset' , GetE('txtLnkCharSet').value ) ; +/* + alert( FCKLang.DlgImgAlertUrl ) ; + SetAttribute( oLink, 'name' , GetE('txtLnktName').value ) ; +*/ + if ( oEditor.FCKBrowserInfo.IsIE ) + { + var sClass = GetE('txtLnkClasses').value ; + // If it's also an anchor add an internal class + if ( GetE('txtLnkName').value.length != 0 ) + sClass += ' FCK__AnchorC' ; + SetAttribute( oLink, 'className', sClass ) ; + oLink.style.cssText = GetE('txtLnkStyle').value ; + } + else + { + SetAttribute( oLink, 'class', GetE('txtLnkClasses').value ) ; + SetAttribute( oLink, 'style', GetE('txtLnkStyle').value ) ; + } + } return true ; Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html (revision 1418) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_image.html (revision 1419) @@ -1,306 +1,341 @@ - - - - - Image Properties - - - - - - - -
- - - - - - - - - - -
- - - - - - - - -
- URL -
- -
-
- Short Description
-
-
- - - - - - -
-
- - - - - - - - - - - -
- Width  - -
-
- 		-
-
-
- Height  -
-
- - - - - - - - - - - - - - - - - -
- Border  -
- HSpace  -
- VSpace  -
- Align  - -
- 		-     - - - - - - - -
- Preview
- -
-
-
-
- - - - - + + + + + Image Properties + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +
+ URL +
+ +
+
+ Short Description
+
+
+ + + + + + +
+
+ + + + + + + + + + + +
+ Width  + +
+
+ 		+
+
+
+ Height  +
+
+ + + + + + + + + + + + + + + + + +
+ Border  +
+ HSpace  +
+ VSpace  +
+ Align  + +
+ 		+     + + + + + + + +
+ Preview
+ +
+
+
+
+ + + + + + Index: branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link/fck_link.js =================================================================== --- branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link/fck_link.js (revision 1418) +++ branches/2.8.x/wb/modules/fckeditor/fckeditor/editor/dialog/fck_link/fck_link.js (revision 1419) @@ -466,6 +466,40 @@ } } + var sLnkRel = GetE('cmbAttContentRel').value.Trim() ; + if ( (sLnkRel.length == 0) && (oLink.rel.lenght != 0) ) // Modifying an existent rel. + { + sLnkRel = oLink.rel; + } + + var sLinkRel = GetE('cmbAttContentRel'); + + if ( sLinkRel.lenght == null ) + { + var myselect = document.getElementById("cmbAttContentRel") + var found = false; + + for (var i=0; i < myselect.options.length; i++) + { + if (myselect.options[i].value == oLink.rel) + { + found = true; + break; + } + } + + if ( found == false ) + { + try { + myselect.add(new Option(oLink.rel, oLink.rel,true ), myselect.options[1]) //add new option to beginning of "cmbAttContentRel" + } + catch(e) { //in IE, try the below version instead of add() + myselect.add(new Option( oLink.rel, oLink.rel,true ),1 ) //add new option to beginning of "cmbAttContentRel" + //myselect.options[1].selected=true; + } + } + } + // Get Advances Attributes GetE('txtAttId').value = oLink.id ; GetE('txtAttName').value = oLink.name ; @@ -475,8 +509,8 @@ GetE('txtAttTabIndex').value = oLink.tabIndex <= 0 ? '' : oLink.tabIndex ; GetE('txtAttTitle').value = oLink.title ; GetE('txtAttContentType').value = oLink.type ; + GetE('txtAttCharSet').value = oLink.charset ; GetE('cmbAttContentRel').value = oLink.rel ; - GetE('txtAttCharSet').value = oLink.charset ; var sClass ; if ( oEditor.FCKBrowserInfo.IsIE ) @@ -768,7 +802,7 @@ SetAttribute( oLink, 'tabindex' , ( GetE('txtAttTabIndex').value > 0 ? GetE('txtAttTabIndex').value : null ) ) ; SetAttribute( oLink, 'title' , GetE('txtAttTitle').value ) ; SetAttribute( oLink, 'type' , GetE('txtAttContentType').value ) ; - SetAttribute( oLink, 'rel' , GetE('cmbAttContentRel').value ) ; + SetAttribute( oLink, 'rel' , sLnkRel ) ; SetAttribute( oLink, 'charset' , GetE('txtAttCharSet').value ) ; if ( oEditor.FCKBrowserInfo.IsIE )