diff --git a/docs/upgrades/upgrade_5.0.3-5.1.0.sql b/docs/upgrades/upgrade_5.0.3-5.1.0.sql index fb09e03a2..f50eecde6 100644 --- a/docs/upgrades/upgrade_5.0.3-5.1.0.sql +++ b/docs/upgrades/upgrade_5.0.3-5.1.0.sql @@ -158,7 +158,7 @@ delete from international where languageId=1 and namespace='WebGUI' and internat insert into international (internationalId,languageId,namespace,message,lastUpdated) values (494,1,'WebGUI','RealObjects edit-on Pro 2.x', 1044704984); delete from international where languageId=1 and namespace='WebGUI' and internationalId=495; insert into international (internationalId,languageId,namespace,message,lastUpdated) values (495,1,'WebGUI','htmlArea (Internet Explorer 5.5+)', 1044704928); -INSERT INTO userProfileField VALUES ('richEditor','WebGUI::International::get(496)',1,0,'select','{\r\nhtmlArea=>WebGUI::International::get(495),\r\n#editOnPro2=>WebGUI::International::get(494),\r\nclassic=>WebGUI::International::get(879),\r\nlastResort=>WebGUI::International::get(880),\r\nnone=>WebGUI::International::get(881)\r\n}','[\'htmlArea\']',11,4,0); +INSERT INTO userProfileField VALUES ('richEditor','WebGUI::International::get(496)',1,0,'select','{\r\nhtmlArea=>WebGUI::International::get(495),\r\nmidas=>WebGUI::International::get(887),\r\n#editOnPro2=>WebGUI::International::get(494),\r\nclassic=>WebGUI::International::get(879),\r\nlastResort=>WebGUI::International::get(880),\r\nnone=>WebGUI::International::get(881)\r\n}','[\'htmlArea\']',11,4,0); INSERT INTO userProfileField VALUES ('richEditorMode','WebGUI::International::get(882)',1,0,'select','{\r\ninline=>WebGUI::International::get(883),\r\npopup=>WebGUI::International::get(884)\r\n}','[\'inline\']',12,4,0); delete from international where internationalId=306 and namespace='WebGUI'; delete from international where languageId=1 and namespace='WebGUI' and internationalId=618; @@ -716,7 +716,8 @@ delete from international where languageId=1 and namespace='WebGUI' and internat insert into international (internationalId,languageId,namespace,message,lastUpdated) values (606,1,'WebGUI','Think of pages as containers for content. For instance, if you want to write a letter to the editor of your favorite magazine you\'d get out a notepad (or open a word processor) and start filling it with your thoughts. The same is true with WebGUI. Create a page, then add your content to the page.\r\n

\r\n\r\nTitle
\r\nThe title of the page is what your users will use to navigate through the site. Titles should be descriptive, but not very long.\r\n

\r\n\r\n\r\nMenu Title
\r\nA shorter or altered title to appear in navigation. If left blank this will default to Title.\r\n

\r\n\r\nHide from navigation?
\r\nSelect yes to hide this page from the navigation.\r\n

\r\nNOTE: This will not hide the page from the page tree or from the site map, only from navigation macros.\r\n

\r\n\r\n\r\nPage URL
\r\nWhen you create a page a URL for the page is generated based on the page title. If you are unhappy with the URL that was chosen, you can change it here.\r\n

\r\n\r\nLanguage
\r\nChoose the default language for this page. All WebGUI generated messages will appear in that language and the character set will be changed to the character set for that language.\r\n

\r\n\r\nRedirect URL
\r\nWhen this page is visited, the user will be redirected to the URL specified here. In order to edit this page in the future, you\'ll have to access it from the "Manage page tree." menu under "Administrative functions..."\r\n

\r\n\r\nTemplate
\r\nBy default, WebGUI has one big content area to place wobjects. However, by specifying a template other than the default you can sub-divide the content area into several sections.\r\n

\r\n\r\nSynopsis
\r\nA short description of a page. It is used to populate default descriptive meta tags as well as to provide descriptions on Site Maps.\r\n

\r\n\r\nMeta Tags
\r\nMeta tags are used by some search engines to associate key words to a particular page. There is a great site called Meta Tag Builder that will help you build meta tags if you\'ve never done it before.\r\n

\r\n\r\nAdvanced Users: If you have other things (like JavaScript) you usually put in the area of your pages, you may put them here as well.\r\n

\r\n\r\nUse default meta tags?
\r\nIf you don\'t wish to specify meta tags yourself, WebGUI can generate meta tags based on the page title and your company\'s name. Check this box to enable the WebGUI-generated meta tags.\r\n

\r\n\r\n\r\nStyle
\r\nBy default, when you create a page, it inherits a few traits from its parent. One of those traits is style. Choose from the list of styles if you would like to change the appearance of this page. See Add Style for more details.\r\n

\r\n\r\nIf you select "Yes" below the style pull-down menu, all of the pages below this page will take on the style you\'ve chosen for this page.\r\n

\r\n\r\nStart Date
\r\nThe date when users may begin viewing this page. Note that before this date only content managers with the rights to edit this page will see it.\r\n

\r\n\r\nEnd Date
\r\nThe date when users will stop viewing this page. Note that after this date only content managers with the rights to edit this page will see it.\r\n

\r\n\r\n\r\nOwner
\r\nThe owner of a page is usually the person who created the page. This user always has full edit and viewing rights on the page.\r\n

\r\nNOTE: The owner can only be changed by an administrator.\r\n

\r\n\r\n\r\nWho can view?
\r\nChoose which group can view this page. If you want both visitors and registered users to be able to view the page then you should choose the "Everybody" group.\r\n

\r\n\r\nWho can edit?
\r\nChoose the group that can edit this page. The group assigned editing rights can also always view the page.\r\n

\r\n\r\nYou can optionally recursively give these privileges to all pages under this page.\r\n

\r\n\r\nWhat next?
\r\nIf you leave this on the default setting you\'ll be redirected to the new page after creating it.\r\n

', 1044740204); delete from international where languageId=1 and namespace='WebGUI' and internationalId=886; insert into international (internationalId,languageId,namespace,message,lastUpdated) values (886,1,'WebGUI','Hide from navigation?', 1044727952); - +alter table MailForm_field add column width int(11) default NULL; +insert into international (internationalId,languageId,namespace,message,lastUpdated) values (887,1,'WebGUI','Midas (IE 6+ or Mozilla 1.3+)', 1045168392); diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm index 10a9f4dbe..7df55fc90 100644 --- a/lib/WebGUI/Form.pm +++ b/lib/WebGUI/Form.pm @@ -684,6 +684,14 @@ sub HTMLArea { $output .= ''."\n"; $htmlArea = 1; } + } elsif ($session{user}{richEditor} eq "midas" && (($browser->ie && $browser->version >= 6) || ($browser->gecko && $browser->version >= 1.3))) { + $output .= ''; + $output .= $button; } elsif ($session{user}{richEditor} eq "classic" && $browser->ie && $browser->version >= 5) { $output .= ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/www/extras/midas/copy.gif b/www/extras/midas/copy.gif new file mode 100644 index 000000000..9e27259c0 Binary files /dev/null and b/www/extras/midas/copy.gif differ diff --git a/www/extras/midas/cut.gif b/www/extras/midas/cut.gif new file mode 100644 index 000000000..2a9448693 Binary files /dev/null and b/www/extras/midas/cut.gif differ diff --git a/www/extras/midas/editor.html b/www/extras/midas/editor.html new file mode 100644 index 000000000..23689626c --- /dev/null +++ b/www/extras/midas/editor.html @@ -0,0 +1,383 @@ + + +Midas Demo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
Cut
+
+
Copy
+
+
Paste
+
+ + +
Undo
+
+
Redo
+
+ + + + +
Insert Table
+
Align Left
Center
Align Right
Ordered List
Unordered List
Outdent
Indent
+

+ + + + + + + + + + + + + + +
+ + + + + + +
Bold
+
+
Italic
+
+
Underline
+
+ +
Text Color
+
+ +
Background Color
+
+
+ + + + +
+ +View HTML Source + +Use CSS + +Finished Editing +
+ + + diff --git a/www/extras/midas/forecolor.gif b/www/extras/midas/forecolor.gif new file mode 100644 index 000000000..bc5e1ddd2 Binary files /dev/null and b/www/extras/midas/forecolor.gif differ diff --git a/www/extras/midas/indent.gif b/www/extras/midas/indent.gif new file mode 100644 index 000000000..aed9d88fc Binary files /dev/null and b/www/extras/midas/indent.gif differ diff --git a/www/extras/midas/italic.gif b/www/extras/midas/italic.gif new file mode 100644 index 000000000..f2c131845 Binary files /dev/null and b/www/extras/midas/italic.gif differ diff --git a/www/extras/midas/justifycenter.gif b/www/extras/midas/justifycenter.gif new file mode 100644 index 000000000..2dbc47161 Binary files /dev/null and b/www/extras/midas/justifycenter.gif differ diff --git a/www/extras/midas/justifyleft.gif b/www/extras/midas/justifyleft.gif new file mode 100644 index 000000000..306006f72 Binary files /dev/null and b/www/extras/midas/justifyleft.gif differ diff --git a/www/extras/midas/justifyright.gif b/www/extras/midas/justifyright.gif new file mode 100644 index 000000000..6ca9dfe9e Binary files /dev/null and b/www/extras/midas/justifyright.gif differ diff --git a/www/extras/midas/link.gif b/www/extras/midas/link.gif new file mode 100644 index 000000000..5b72c548d Binary files /dev/null and b/www/extras/midas/link.gif differ diff --git a/www/extras/midas/orderedlist.gif b/www/extras/midas/orderedlist.gif new file mode 100644 index 000000000..53c9d4515 Binary files /dev/null and b/www/extras/midas/orderedlist.gif differ diff --git a/www/extras/midas/outdent.gif b/www/extras/midas/outdent.gif new file mode 100644 index 000000000..90a234c93 Binary files /dev/null and b/www/extras/midas/outdent.gif differ diff --git a/www/extras/midas/paste.gif b/www/extras/midas/paste.gif new file mode 100644 index 000000000..e0f4e7e40 Binary files /dev/null and b/www/extras/midas/paste.gif differ diff --git a/www/extras/midas/redo.gif b/www/extras/midas/redo.gif new file mode 100644 index 000000000..2b685c2d7 Binary files /dev/null and b/www/extras/midas/redo.gif differ diff --git a/www/extras/midas/table.gif b/www/extras/midas/table.gif new file mode 100644 index 000000000..407c3ad4e Binary files /dev/null and b/www/extras/midas/table.gif differ diff --git a/www/extras/midas/underline.gif b/www/extras/midas/underline.gif new file mode 100644 index 000000000..e8a8e9ad3 Binary files /dev/null and b/www/extras/midas/underline.gif differ diff --git a/www/extras/midas/undo.gif b/www/extras/midas/undo.gif new file mode 100644 index 000000000..bff9fee1d Binary files /dev/null and b/www/extras/midas/undo.gif differ diff --git a/www/extras/midas/unorderedlist.gif b/www/extras/midas/unorderedlist.gif new file mode 100644 index 000000000..803868e65 Binary files /dev/null and b/www/extras/midas/unorderedlist.gif differ