merging 6.2.8 changes and initial draft of TinyMCE as rich editor
This commit is contained in:
JT Smith
parent
a189f52942
commit
6ddb7c49e6
38 changed files with 328 additions and 145 deletions
|
|
@ -13,6 +13,67 @@
|
|||
- WebGUI Operations are now dynamically loaded (Len Kranendonk)
|
||||
- Added <input type="button"> button to Form.pm / HTMLForm.pm (Len Kranendonk)
|
||||
- Added a "Cancel" button to each tab form (Len Kranendonk)
|
||||
- bugfix [ 1040341 ] Opera balks on HTMLArea TypeError
|
||||
- bugfix [ 1037364 ] HTMLArea3 breaks ^i macro
|
||||
- bugfix [ 889424 ] htmlArea td background image in expanded mode
|
||||
- bugfix [ 991070 ] 5.5.4 Editor(s) replacing ^ symbol
|
||||
- bugfix [ 1022287 ] WYSIWYG-Editor Add new web link
|
||||
- bugfix [ 1055153 ] Turn Admin ON with SSL and IE.
|
||||
|
||||
|
||||
6.2.8
|
||||
- bugfix [ 1056335 ] Cool Menus navigation template seems broken
|
||||
- bugfix [ 1041937 ] List Roots broken
|
||||
- bugfix [ 1053187 ] eq/ne suggestions 6.2.7
|
||||
- bugfix [ 1053003 ] theWg e-egg has a bug
|
||||
- bugfix [ 1044316 ] 6.2.7 (and earlier?) Navigation change-suggestion
|
||||
- bugfix [ 1052133 ] Databaselinks are not recognized (dapperdodo)
|
||||
- bugfix [ 1046683 ] SQLReport doesn't query selected Data Source
|
||||
- bugfix [ 1050133 ] broken link in 6.2.7 create.sql
|
||||
- bugfix [ 1048421 ] TestEnvironment.pl - OS check
|
||||
- bugfix [ 1044174 ] Site map wobject (Vadim Platonov)
|
||||
- bugfix [ 1042680 ] collateralImport.pl --folderId
|
||||
- bugfix [ 1050472 ] A CAUSE OF MANY BUGS (numeric comparisons against Ids)
|
||||
- bugfix [ 1047947 ] collateralimport.pl
|
||||
- bugfix [ 1040025 ] More HashId crashes (Paul Malabad)
|
||||
- bugfix [ 1050282 ] no documentation for "wobject privileges" under add/edit
|
||||
page
|
||||
- bugfix [ 1055396 ] Template switching issue
|
||||
- bugfix [ 1056122 ] 'bthis' is undefined
|
||||
- bugfix [ 1044151 ] Adding new layout template causes JS error
|
||||
- bugfix [ 1039765 ] Edit Page > Layout > Page Template
|
||||
- bugfix [ 1053736 ] USS FAQ questions not updating
|
||||
- bugfix [ 1043679 ] USS summary not updated on edit
|
||||
- bugfix [ 1048484 ] USS ignores "URL Extension" content setting
|
||||
- bugfix [ 1054364 ] Deleted event still visible
|
||||
- bugfix [ 1052863 ] Empty Trash
|
||||
- bugfix [ 1042682 ] op=emptyCollateralFolder
|
||||
- bugfix [ 1056118 ] 2 File Managers on a page produces confusing results.
|
||||
- Added missing POD in WebGUI::HTTP synopsis.
|
||||
- The page URLs are back to being generated as relative (from the document
|
||||
root) URLs once again. This means that you no longer have to specify all
|
||||
your potential site URLs in your WebGUI config file.
|
||||
- bugfix [ 1052613 ] sitename only first works
|
||||
- bugfix [ 1041068 ] Wrong side menu after deleting a template
|
||||
- bugfix [ 1043283 ] Prevent Proxy Caching breaks query string in URLs
|
||||
(6.2.7)
|
||||
- bugfix [ 1048167 ] grouping expiration notifications may not be working
|
||||
- Fixed a bug in the search properties where pages that weren't roots were
|
||||
showing up as roots to be searched.
|
||||
- bugfix [ 1055589 ] "Default search" results show "Nameless root" in bread
|
||||
crumb
|
||||
- bugfix [ 1047157 ] Search wobject returns Profile content excerpts to
|
||||
Visitor
|
||||
- bugfix [ 1048166 ] privileged forums displayed in search
|
||||
- bugfix [ 1040350 ] Calendar with Start and End Month = Current doesn't show
|
||||
cal (Gerald Young)
|
||||
- bugfix [ 1048955 ] all events in calendar moved ahead 1 day
|
||||
- bugfix [ 1043234 ] EventCalendar Current Day Incorrect 6.2.7
|
||||
- Added error handling to USS purge to deal with submissions without pages.
|
||||
- bugfix [ 1037138 ] empty trash not working, Trash.pm
|
||||
- bugfix [ 1053498 ] 6.2.7 gamma
|
||||
- The forum post archive function is now 2700% faster.
|
||||
|
||||
|
||||
6.2.7
|
||||
- Expanded upon the help for URL extensions.
|
||||
|
|
@ -44,8 +105,8 @@
|
|||
- Added a performance cache to the USS. Our testing indicates most USS' will see
|
||||
more than 900% increase in performance.
|
||||
- Added a performance cache to the Events Calendar. Our testing indicates
|
||||
that most Events Calendars will see more than 33000% increase in
|
||||
performance. No that's not a typo.
|
||||
that most Events Calendars will see more than 3300% increase in
|
||||
performance.
|
||||
- bugfix [ 1035901 ] Comparision logic based on int ids
|
||||
- bugfix [ 1035891 ] DBMS reserved keyword in webgui wsclient table
|
||||
- bugfix [ 1035055 ] Forum Karma
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,6 +7,13 @@ upgrading from one version to the next, or even between multiple
|
|||
versions. Be sure to heed the warnings contained herein as they will
|
||||
save you many hours of grief.
|
||||
|
||||
6.2.8
|
||||
--------------------------------------------------------------------
|
||||
* Due to a bug in the theme system, if you created any themes in any
|
||||
6.2.x version prior to 6.2.8 they will need to be deleted and
|
||||
recreated. Otherwise they will export a corrupt theme file.
|
||||
|
||||
|
||||
6.2.2
|
||||
--------------------------------------------------------------------
|
||||
* If you used 6.1.1 for a while, and feel like there's something
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
12
docs/upgrades/upgrade_6.2.7-6.2.8.sql
Normal file
12
docs/upgrades/upgrade_6.2.7-6.2.8.sql
Normal file
File diff suppressed because one or more lines are too long
12
docs/upgrades/upgrade_6.2.8-6.3.0.sql
Normal file
12
docs/upgrades/upgrade_6.2.8-6.3.0.sql
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
insert into webguiVersion values ('6.3.0','upgrade',unix_timestamp());
|
||||
|
||||
delete from template where templateId='tinymce' and namespace='richEditor';
|
||||
INSERT INTO template VALUES ('tinymce','TinyMCE','^JavaScript(\"<tmpl_var session.config.extrasURL>/tinymce/jscripts/tiny_mce/tiny_mce.js\");\r\n<script language=\"javascript\" type=\"text/javascript\">\r\n tinyMCE.init({\r\n theme : \"advanced\",\r\n mode : \"textareas\",\r\n plugins : \"collateral,emotions,insertImage,iespell,insertdatetime,pagetree,preview,zoom\",\r\n theme_advanced_buttons2_add : \"insertImage,pagetree,collateral\", \r\n theme_advanced_buttons3_add : \"emotions,iespell,insertdate,inserttime,preview,zoom\" \r\n });\r\n</script>\r\n\r\n<tmpl_var textarea>','richEditor',1,1);
|
||||
delete from template where templateId='1' and namespace='richEditor/pagetree';
|
||||
INSERT INTO template VALUES ('1','Rich Editor Page Tree','<html>\r\n\r\n<script language=\"javascript\" src=\"<tmpl_var session.config.extrasURL>/tinymce/jscripts/tiny_mce/tiny_mce_popup.js\"></script>\r\n\r\n<script language=\"javascript\">\r\n\r\nfunction setLink(page) {\r\n document.getElementById(\"url\").value=\"/index.pl/\" + page;\r\n}\r\n\r\nfunction createLink() {\r\n if (window.opener) { \r\n if (document.getElementById(\"url\").value == \"\") {\r\n alert(\"You must enter a link url\");\r\n document.getElementById(\"url\").focus();\r\n }\r\n\r\ntinyMCE.insertLink(document.getElementById(\"url\").value,document.getElementById(\"target\").value);\r\n //tinyMCE.insertLink(\"hello\",\"_self\");\r\n window.close();\r\n }\r\n}\r\n\r\n</script>\r\n\r\n<body>\r\n\r\n<fieldset>\r\n<legend>Insert/Edit Link</legend>\r\n\r\n <fieldset>\r\n <legend>Link Settings</legend>\r\n <form name=\"linkchooser\">\r\n <table border=\"0\">\r\n <tr>\r\n <td>Link URL:</td>\r\n <td><input id=\"url\" name=\"url\" type=\"text value=\"\" style=\"width: 200px\"></td>\r\n </tr>\r\n <tr>\r\n <td>Link Target:</td>\r\n <td><select id=\"target\" name=\"target\" style=\"width: 200px\">\r\n <option value=\"_self\">Open link in same window</option>\r\n <option value=\"_blank\">Open link in new window</option>\r\n </select>\r\n </td>\r\n </tr>\r\n <tr><td colspan=\"2\"> </td></tr>\r\n <tr>\r\n <td colspan=\"2\" align=\"right\"><input type=\"button\" value=\"Cancel\" onClick=\"window.close()\"><input type=\"button\" value=\"Create Link\" onClick=\"createLink()\"></td>\r\n </tr>\r\n </table>\r\n </form>\r\n \r\n\r\n </fieldset> \r\n<br>\r\n\r\n\r\n <fieldset>\r\n <legend>Available Page Tree</legend>\r\n\r\n<tmpl_loop page_loop>\r\n <tmpl_var indent><a href=\"#\" onClick=\"setLink(\'<tmpl_var url>\')\"><tmpl_var title></a><br />\r\n</tmpl_loop>\r\n\r\n </fieldset>\r\n \r\n</fieldset>\r\n</body>\r\n</html>','richEditor/pagetree',1,1);
|
||||
UPDATE template set template = '<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n <html>\r\n <head>\r\n <title><tmpl_var session.page.title> - <tmpl_var session.setting.companyName></title>\r\n <tmpl_var head.tags>\r\n <style type=\"text/css\">\r\nTD { font: 8pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\nTD.delete { font: italic 7pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\nTD.label { font: 8pt \'MS Shell Dlg\', Helvetica, sans-serif; background-color: #c0c0c0; }\r\nTD.none { font: italic 12pt \'MS Shell Dlg\', Helvetica, sans-serif; }\r\n\r\n</style>\r\n\r\n </head>\r\n <script language=\"javascript\">\r\n</script>\r\n<script language=\"javascript\">\r\n\r\nfunction actionComplete(action, path, error, info) {\r\n var manager=window.parent;\r\n\r\n if(manager) {\r\n if(error.length < 1) {\r\n if(action == \'upload\') {\r\n manager.document.getElementById(\"image\").value = \'\';\r\n manager.document.getElementById(\"name\").value = \'\';\r\n manager.document.getelementById(\"thumbnailSize\") = \'\';\r\n }\r\n if(action == \'create\')\r\n manager.document.getElementById(\"folder\").value = \'\';\r\n if(action == \'delete\')\r\n manager.document.getElementById(\"txtFileName\").value = \'\';\r\n }\r\n\r\nif (manager.document.getElementById(\"DPI\")) {\r\nmanager.document.getElementById(\"DPI\").value = 96;\r\n}\r\nif (manager.document.getElementById(\"path\")) {\r\nmanager.document.getElementById(\"path\").value = path;\r\n}\r\n }\r\nif (manager.document.getElementById(\"viewer\")) { \r\nmanager.document.getElementById(\"viewer\").src=\'^/;?op=htmlAreaviewCollateral\';\r\n} \r\nif(error.length > 0)\r\n alert(error);\r\n else if(info.length > 0)\r\n alert(info);\r\n}\r\n</script>\r\n\r\n<script language=\"javascript\">\r\nfunction deleteCollateral(options) {\r\n var lister = window.parent.document.getElementById(\"lister\");\r\n\r\n if(lister && confirm(\"Are you sure you want to delete this item ?\"))\r\n lister.src=\'^/;?op=htmlAreaDelete&\' + options;\r\n}\r\n</script>\r\n</head>\r\n<body leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">\r\n\r\n <tmpl_var body.content>\r\n \r\n</body>\r\n </html>\r\n ' where templateId = '10' and namespace='style';
|
||||
|
||||
delete from userProfileField where fieldName='richEditor';
|
||||
INSERT INTO userProfileField VALUES ('richEditor','WebGUI::International::get(496)',1,0,'selectList','{5=>WebGUI::International::get(880),\r\nnone=>WebGUI::International::get(881),\r\n\'tinymce\'=>WebGUI::International::get(\"tinymce\")\n}','[\'tinymce\']',11,'4',0,1);
|
||||
update userProfileData set fieldData='tinyMCE' where fieldName='richEditor';
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue