From: Jonny B. <tw...@no...> - 2009-08-11 17:48:58
|
Hi all - this was a big and scary change, so copying both lists. During the rename it became clear that the old 'quicktags_over_textarea' pref was going to be unreliable after the pref was renamed, so i removed it throughout. This was discussed in Barcelona and it was agreed that it was a very quirky feature and a considerable amount of extra overhead to maintain - i hope this is ok (enough) with everyone. If there is a massive clamour for it to be reinstated i will, of course, try to do so. As far as testing goes i have tested most of the features *slightly* - Maps defeated me again i'm afraid. More feedback required please. I have discovered that comments aren't wiki parsed (before this commit), which seems odd as the code for the old quicktags was already in there. I'll try and get this working as soon as possible. All feedback welcome - i have the rest of this week to get any gremlins nailed! jonny On 11 Aug 2009, at 18:29, jon...@us... wrote: > Revision: 20792 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20792&view=rev > Author: jonnybradley > Date: 2009-08-11 17:29:34 +0000 (Tue, 11 Aug 2009) > > Log Message: > ----------- > [MOD] QuickTags to Toolbars: The big renaming ceremony! > Note: Removed 'quicktags_over_textarea' pref behaviour. This was > broken by the pref renaming - i'm sure this has been discussed and > was agred to be an unnecessary overhead to maintain. Toolbars can > now only be above the edit area as is consistant with convention. > > Modified Paths: > -------------- > trunk/css/admin.css > trunk/db/features.csv > trunk/db/tiki-4.0-mysql.sql > trunk/db/tiki-4.0-mysqli.sql > trunk/db/tiki-4.0-pgsql.sql > trunk/db/tiki-4.0-sqlite.sql > trunk/db/tiki.sql > trunk/lib/setup/prefs.php > trunk/lib/smarty_tiki/block.textarea.php > trunk/lib/tiki-js.js > trunk/lib/toolbars/index.php > trunk/lib/trackers/trackerlib.php > trunk/lib/wiki-plugins/wikiplugin_tracker.php > trunk/setup_fckeditor.php > trunk/styles/darkroom.css > trunk/styles/layout/layout-reference.css > trunk/styles/layout/layout.css > trunk/styles/strasa/options/cool.css > trunk/styles/strasa/options/mono.css > trunk/templates/comments.tpl > trunk/templates/map/tiki-map_edit.tpl > trunk/templates/modules/mod-admin_menu.tpl > trunk/templates/modules/mod-last_images_th.tpl > trunk/templates/tiki-admin-include-textarea.tpl > trunk/templates/tiki-admin.tpl > trunk/templates/tiki-admin_content_templates.tpl > trunk/templates/tiki-admin_modules.tpl > trunk/templates/tiki-admin_surveys.tpl > trunk/templates/tiki-admin_tracker_fields.tpl > trunk/templates/tiki-admin_trackers.tpl > trunk/templates/tiki-blog_post.tpl > trunk/templates/tiki-calendar_edit_item.tpl > trunk/templates/tiki-edit_article.tpl > trunk/templates/tiki-edit_submission.tpl > trunk/templates/tiki-edit_wiki_section.tpl > trunk/templates/tiki-faq_questions.tpl > trunk/templates/tiki-send_newsletters.tpl > trunk/templates/tiki-take_survey.tpl > trunk/templates/tiki-user_tasks_edit.tpl > trunk/templates/tiki-view_forum.tpl > trunk/templates/tiki-view_tracker.tpl > trunk/templates/tiki-view_tracker_item.tpl > trunk/templates/tracker_item_field_input.tpl > trunk/templates/wiki_edit.tpl > trunk/tiki-admin_include_textarea.php > trunk/tiki-editpage.php > trunk/tiki-map_edit.php > trunk/tiki-take_survey.php > trunk/tiki-user_tasks.php > > Added Paths: > ----------- > trunk/installer/schema/ > 20090811_rename_quicktags_to_toolbars_tiki.sql > trunk/lib/smarty_tiki/function.toolbars.php > trunk/lib/toolbars/ > trunk/lib/toolbars/toolbarslib.php > trunk/templates/tiki-admin_toolbars.tpl > trunk/tiki-admin_toolbars.php > > Removed Paths: > ------------- > trunk/lib/quicktags/ > trunk/lib/smarty_tiki/function.quicktags.php > trunk/lib/toolbars/quicktagslib.php > trunk/templates/tiki-admin_quicktags.tpl > trunk/tiki-admin_quicktags.php > > Modified: trunk/css/admin.css > =================================================================== > --- trunk/css/admin.css 2009-08-11 16:11:45 UTC (rev 20791) > +++ trunk/css/admin.css 2009-08-11 17:29:34 UTC (rev 20792) > @@ -145,7 +145,7 @@ > > /* from ui-revamp branch, via coe branch - jb july 2009 */ > > -.quicktags-admin .full { > +.toolbars-admin .full { > border: solid thin gray; > float: left; > height: auto; > @@ -159,34 +159,34 @@ > margin: 0; > } > > -.quicktags-admin #qt_filter_div { > +.toolbars-admin #qt_filter_div { > width: 100%; > } > > -.quicktags-admin .lists { > +.toolbars-admin .lists { > padding: 1em 2em 1em 0; > float: left; > width: 40%; > min-height: 10em; > } > > -.quicktags-admin .rows { > +.toolbars-admin .rows { > width: 100%; > float: left; > clear: both; > padding: 1em 2em 1em 0; > } > > -.quicktags-admin .selectDiv { > +.toolbars-admin .selectDiv { > float: left; > clear: left; > } > > -.quicktags-admin .li { > +.toolbars-admin .li { > display: block; > white-space:nowrap; > } > -.quicktags-admin .full li { > +.toolbars-admin .full li { > white-space: nowrap; > padding: .1em .5em; > overflow: hidden; > @@ -194,18 +194,18 @@ > border-bottom: 1px #ccc solid; > } > > -.quicktag img.icon { > +.toolbar img.icon { > vertical-align: middle; > margin-right: 4px; > } > > -.quicktags-admin .quicktag { > +.toolbars-admin .toolbar { > cursor: pointer; > height: 1.5em; > line-height: 1.2em; > } > > -.quicktags-admin .rows .row { > +.toolbars-admin .rows .row { > width: 95%; > min-height: 20px; > min-width: 500px; > @@ -216,21 +216,21 @@ > padding: 2px 4px 0; > } > > -.quicktags-admin ul.full { > +.toolbars-admin ul.full { > list-style-type: none; > display: inline; > padding-left: 0pt; > width: 100%; > } > > -.quicktags-admin .row li.quicktag { > +.toolbars-admin .row li.toolbar { > list-style-type: none; > float: left; > width: 18px; > overflow: hidden; > } > > -.quicktags-admin .row li.qt-plugin { > +.toolbars-admin .row li.qt-plugin { > width: auto; > background-color: #9C0; > border: thin #690 solid; > > Modified: trunk/db/features.csv > =================================================================== > --- trunk/db/features.csv 2009-08-11 16:11:45 UTC (rev 20791) > +++ trunk/db/features.csv 2009-08-11 17:29:34 UTC (rev 20792) > @@ -613,7 +613,7 @@ > 708,Default number of rows (comments), > 113,,default_rows_textarea_comment,simple,,tiki_p_admin,,,,,, > 709,Default number of rows (forum replies), > 113,,default_rows_textarea_forumthread,simple,,tiki_p_admin,,12,,,, > 710,Use Quote plugin rather than モ>ヤ for quoting, > 113,,feature_use_quoteplugin,flag,,tiki_p_admin,,,,,, > -711,Show quicktags over textareas, > 113,,quicktags_over_textarea,flag,,tiki_p_admin,,,Quicktags,"If > disabled, Quicktags will appear to the left of the edit area. ",, > +711,Show toolbars over textareas, > 113,,toolbars_over_textarea,flag,,tiki_p_admin,,,Quicktags,"If > disabled, Quicktags will appear to the left of the edit area. ",, > 712, Allow to post comments as Anonymous, > 113,,feature_comments_post_as_anonymous,flag,,tiki_p_admin,,28,,,, > 713, AutoLinks,113,,feature_autolinks,flag,,tiki_p_admin,,,,,, > 714, Hotwords in New Windows, > 113,,feature_hotwords_nw,flag,,tiki_p_admin,,,,,, > > Modified: trunk/db/tiki-4.0-mysql.sql > =================================================================== > --- trunk/db/tiki-4.0-mysql.sql 2009-08-11 16:11:45 UTC (rev 20791) > +++ trunk/db/tiki-4.0-mysql.sql 2009-08-11 17:29:34 UTC (rev 20792) > @@ -1480,7 +1480,7 @@ > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php', > 1050,'feature_editcss','tiki_p_create_css','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php', > 1050,'','tiki_p_admin_contribution','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_users','',0); > -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_quicktags','', > 0); > +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_toolbars','', > 0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_edit_menu','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_clean_cache','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Admin Home','tiki-admin.php',1051,'','tiki_p_admin','',0); > @@ -1499,7 +1499,7 @@ > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Mail Notifications','tiki-admin_notifications.php', > 1120,'','tiki_p_admin_notifications','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Search Stats','tiki-search_stats.php', > 1125,'feature_search_stats','tiki_p_admin','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Theme Control','tiki-theme_control.php', > 1130,'feature_theme_control','tiki_p_admin','',0); > -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','QuickTags','tiki-admin_quicktags.php', > 1135,'','tiki_p_admin_quicktags','',0); > +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Toolbars','tiki-admin_toolbars.php', > 1135,'','tiki_p_admin_toolbars','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Categories','tiki-admin_categories.php', > 1145,'feature_categories','tiki_p_admin_categories','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Banners','tiki-list_banners.php', > 1150,'feature_banners','tiki_p_admin_banners','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Edit Templates','tiki-edit_templates.php', > 1155,'feature_edit_templates','tiki_p_edit_templates','',0); > @@ -2832,7 +2832,7 @@ > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_poll_results', > 'Can view poll results', 'basic', 'polls', NULL, 'feature_polls'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_vote_poll', 'Can > vote polls', 'basic', 'polls', NULL, 'feature_polls'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_poll_voters', > 'Can view poll voters', 'basic', 'polls', NULL, 'feature_polls'); > -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_quicktags', > 'Can admin quicktags', 'admin', 'quicktags', 'y', NULL); > +INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_toolbars', > 'Can admin toolbars', 'admin', 'toolbars', 'y', NULL); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_quizzes', > 'Can admin quizzes', 'editors', 'quizzes', 'y', 'feature_quizzes'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_take_quiz', 'Can > take quizzes', 'basic', 'quizzes', NULL, 'feature_quizzes'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_quiz_stats', > 'Can view quiz stats', 'basic', 'quizzes', NULL, 'feature_quizzes'); > @@ -3055,196 +3055,6 @@ > INSERT INTO tiki_integrator_rules VALUES ('2','1','2','img src=(\"| > \')(?!http://)','img src=\1{path}/','y','n','i','y','Fix image > paths'); > INSERT INTO tiki_integrator_rules VALUES ('3','1','3','href=(\"|\') > (?!(#|(http|ftp)://))','href=\1tiki-integrator.php? > repID={repID}&file=','y','n','i','y','Replace internal links to > integrator. Don\'t touch an external link.'); > > -DROP TABLE IF EXISTS `tiki_quicktags`; > -CREATE TABLE `tiki_quicktags` ( > - `tagId` int(4) unsigned NOT NULL auto_increment, > - `taglabel` varchar(255) default NULL, > - `taginsert` text, > - `tagicon` varchar(255) default NULL, > - `tagcategory` varchar(255) default NULL, > - PRIMARY KEY (`tagId`), > - KEY `tagcategory` (tagcategory), > - KEY `taglabel` (taglabel) > -) ENGINE=MyISAM AUTO_INCREMENT=1 ; > - > --- wiki > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('link, external','[http://example.com| > text]','pics/icons/world_link.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('link, wiki','((text))','pics/icons/ > page_link.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('list bullets', '*text', 'pics/icons/ > text_list_bullets.png', 'wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('list numbers', '#text', 'pics/icons/ > text_list_numbers.png', 'wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','wiki'); > - > --- maps > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" > \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r > \n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n > "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/ > tag_blue_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Class', 'CLASS\r\n EXPRESSION ()\r\n > SYMBOL 0\r\n OUTLINECOLOR\r\n COLOR\r\n NAME "myclass" \r\nEND #end > of class', 'pics/icons/application_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Projection','PROJECTION\r\n "init=epsg: > 4326"\r\nEND','pics/icons/image_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Query','#\r\n# Start of query definitions\r > \n#\r\n QUERYMAP\r\n STATUS ON\r\n STYLE HILITE\r\nEND','pics/icons/ > database_gear.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Scalebar','#\r\n# Start of scalebar\r\n#\r > \nSCALEBAR\r\n IMAGECOLOR 255 255 255\r\n STYLE 1\r\n SIZE 400 2\r\n > COLOR 0 0 0\r\n UNITS KILOMETERS\r\n INTERVALS 5\r\n STATUS ON\r > \nEND','pics/icons/layout_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Layer','LAYER\r\n NAME\r\n TYPE\r\n STATUS > ON\r\n DATA "mydata"\r\nEND #end of layer', 'pics/icons/layers.png', > 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Label','LABEL\r\n COLOR\r\n ANGLE\r\n FONT > arial\r\n TYPE TRUETYPE\r\n POSITION\r\n PARTIALS TRUE\r\n SIZE 6\r > \n BUFFER 0\r\n OUTLINECOLOR \r\nEND #end of label', 'pics/icons/ > comment_add.png', 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Reference','#\r\n#start of reference\r\n#\r > \n REFERENCE\r\n SIZE 120 60\r\n STATUS ON\r\n EXTENT -180 -90 182 > 88\r\n OUTLINECOLOR 255 0 0\r\n IMAGE "myimagedata"\r\n COLOR -1 -1 > -1\r\nEND','pics/icons/picture_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Legend','#\r\n#start of Legend\r\n#\r\n > LEGEND\r\n KEYSIZE 18 12\r\n POSTLABELCACHE TRUE\r\n STATUS ON\r > \nEND','pics/icons/note_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Web','#\r\n# Start of web interface > definition\r\n#\r\nWEB\r\n TEMPLATE "myfile/url"\r\n MINSCALE 1000\r > \n MAXSCALE 40000\r\n IMAGEPATH "myimagepath"\r\n IMAGEURL "mypath"\r > \nEND', 'pics/icons/world_link.png', 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Outputformat','OUTPUTFORMAT\r\n NAME\r\n > DRIVER " "\r\n MIMETYPE "myimagetype"\r\n IMAGEMODE RGB\r\n > EXTENSION "png"\r\nEND','pics/icons/newspaper_go.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Mapfile','#\r\n# Start of mapfile\r\n#\r > \nNAME MYMAPFLE\r\n STATUS ON\r\nSIZE \r\nEXTENT\r\nUNITS \r > \nSHAPEPATH " "\r\nIMAGETYPE " "\r\nFONTSET " "\r\nIMAGECOLOR -1 -1 > -1\r\n\r\n#remove this text and add objects here\r\n\r\nEND # end of > mapfile','pics/icons/world_add.png','maps'); > - > --- newsletters > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com|text| > nocache]','pics/icons/world_link.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule', '---', 'pics/icons/ > page.png', 'newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','newsletters'); > - > --- trackers > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','trackers'); > - > --- blogs > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','blogs'); > - > --- calendar > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','calendar'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','calendar'); > - > --- articles > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','articles'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','articles'); > - > --- faqs > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','faqs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','faqs'); > - > --- forums > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','forums'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','forums'); > - > -- Translated objects table > DROP TABLE IF EXISTS `tiki_translated_objects`; > CREATE TABLE `tiki_translated_objects` ( > > Modified: trunk/db/tiki-4.0-mysqli.sql > =================================================================== > --- trunk/db/tiki-4.0-mysqli.sql 2009-08-11 16:11:45 UTC (rev 20791) > +++ trunk/db/tiki-4.0-mysqli.sql 2009-08-11 17:29:34 UTC (rev 20792) > @@ -1480,7 +1480,7 @@ > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php', > 1050,'feature_editcss','tiki_p_create_css','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php', > 1050,'','tiki_p_admin_contribution','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_users','',0); > -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_quicktags','', > 0); > +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_toolbars','', > 0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_edit_menu','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_clean_cache','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Admin Home','tiki-admin.php',1051,'','tiki_p_admin','',0); > @@ -1499,7 +1499,7 @@ > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Mail Notifications','tiki-admin_notifications.php', > 1120,'','tiki_p_admin_notifications','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Search Stats','tiki-search_stats.php', > 1125,'feature_search_stats','tiki_p_admin','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Theme Control','tiki-theme_control.php', > 1130,'feature_theme_control','tiki_p_admin','',0); > -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','QuickTags','tiki-admin_quicktags.php', > 1135,'','tiki_p_admin_quicktags','',0); > +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Toolbars','tiki-admin_toolbars.php', > 1135,'','tiki_p_admin_toolbars','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Categories','tiki-admin_categories.php', > 1145,'feature_categories','tiki_p_admin_categories','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Banners','tiki-list_banners.php', > 1150,'feature_banners','tiki_p_admin_banners','',0); > INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, > `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES > (42,'o','Edit Templates','tiki-edit_templates.php', > 1155,'feature_edit_templates','tiki_p_edit_templates','',0); > @@ -2832,7 +2832,7 @@ > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_poll_results', > 'Can view poll results', 'basic', 'polls', NULL, 'feature_polls'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_vote_poll', 'Can > vote polls', 'basic', 'polls', NULL, 'feature_polls'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_poll_voters', > 'Can view poll voters', 'basic', 'polls', NULL, 'feature_polls'); > -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_quicktags', > 'Can admin quicktags', 'admin', 'quicktags', 'y', NULL); > +INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_toolbars', > 'Can admin toolbars', 'admin', 'toolbars', 'y', NULL); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_quizzes', > 'Can admin quizzes', 'editors', 'quizzes', 'y', 'feature_quizzes'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_take_quiz', 'Can > take quizzes', 'basic', 'quizzes', NULL, 'feature_quizzes'); > INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, > `type`, `admin`, `feature_check`) VALUES('tiki_p_view_quiz_stats', > 'Can view quiz stats', 'basic', 'quizzes', NULL, 'feature_quizzes'); > @@ -3055,196 +3055,6 @@ > INSERT INTO tiki_integrator_rules VALUES ('2','1','2','img src=(\"| > \')(?!http://)','img src=\1{path}/','y','n','i','y','Fix image > paths'); > INSERT INTO tiki_integrator_rules VALUES ('3','1','3','href=(\"|\') > (?!(#|(http|ftp)://))','href=\1tiki-integrator.php? > repID={repID}&file=','y','n','i','y','Replace internal links to > integrator. Don\'t touch an external link.'); > > -DROP TABLE IF EXISTS `tiki_quicktags`; > -CREATE TABLE `tiki_quicktags` ( > - `tagId` int(4) unsigned NOT NULL auto_increment, > - `taglabel` varchar(255) default NULL, > - `taginsert` text, > - `tagicon` varchar(255) default NULL, > - `tagcategory` varchar(255) default NULL, > - PRIMARY KEY (`tagId`), > - KEY `tagcategory` (tagcategory), > - KEY `taglabel` (taglabel) > -) ENGINE=MyISAM AUTO_INCREMENT=1 ; > - > --- wiki > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('link, external','[http://example.com| > text]','pics/icons/world_link.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('link, wiki','((text))','pics/icons/ > page_link.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('list bullets', '*text', 'pics/icons/ > text_list_bullets.png', 'wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('list numbers', '#text', 'pics/icons/ > text_list_numbers.png', 'wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','wiki'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','wiki'); > - > --- maps > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New wms Metadata','METADATA\r\n \"wms_name\" > \"myname\"\r\n "wms_srs" "EPSG:4326"\r\n "wms_server_version" " "\r > \n "wms_layers" "mylayers"\r\n "wms_request" "myrequest"\r\n > "wms_format" " "\r\n "wms_time" " "\r\n END', 'pics/icons/ > tag_blue_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Class', 'CLASS\r\n EXPRESSION ()\r\n > SYMBOL 0\r\n OUTLINECOLOR\r\n COLOR\r\n NAME "myclass" \r\nEND #end > of class', 'pics/icons/application_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Projection','PROJECTION\r\n "init=epsg: > 4326"\r\nEND','pics/icons/image_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Query','#\r\n# Start of query definitions\r > \n#\r\n QUERYMAP\r\n STATUS ON\r\n STYLE HILITE\r\nEND','pics/icons/ > database_gear.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Scalebar','#\r\n# Start of scalebar\r\n#\r > \nSCALEBAR\r\n IMAGECOLOR 255 255 255\r\n STYLE 1\r\n SIZE 400 2\r\n > COLOR 0 0 0\r\n UNITS KILOMETERS\r\n INTERVALS 5\r\n STATUS ON\r > \nEND','pics/icons/layout_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Layer','LAYER\r\n NAME\r\n TYPE\r\n STATUS > ON\r\n DATA "mydata"\r\nEND #end of layer', 'pics/icons/layers.png', > 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Label','LABEL\r\n COLOR\r\n ANGLE\r\n FONT > arial\r\n TYPE TRUETYPE\r\n POSITION\r\n PARTIALS TRUE\r\n SIZE 6\r > \n BUFFER 0\r\n OUTLINECOLOR \r\nEND #end of label', 'pics/icons/ > comment_add.png', 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Reference','#\r\n#start of reference\r\n#\r > \n REFERENCE\r\n SIZE 120 60\r\n STATUS ON\r\n EXTENT -180 -90 182 > 88\r\n OUTLINECOLOR 255 0 0\r\n IMAGE "myimagedata"\r\n COLOR -1 -1 > -1\r\nEND','pics/icons/picture_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Legend','#\r\n#start of Legend\r\n#\r\n > LEGEND\r\n KEYSIZE 18 12\r\n POSTLABELCACHE TRUE\r\n STATUS ON\r > \nEND','pics/icons/note_add.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Web','#\r\n# Start of web interface > definition\r\n#\r\nWEB\r\n TEMPLATE "myfile/url"\r\n MINSCALE 1000\r > \n MAXSCALE 40000\r\n IMAGEPATH "myimagepath"\r\n IMAGEURL "mypath"\r > \nEND', 'pics/icons/world_link.png', 'maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Outputformat','OUTPUTFORMAT\r\n NAME\r\n > DRIVER " "\r\n MIMETYPE "myimagetype"\r\n IMAGEMODE RGB\r\n > EXTENSION "png"\r\nEND','pics/icons/newspaper_go.png','maps'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('New Mapfile','#\r\n# Start of mapfile\r\n#\r > \nNAME MYMAPFLE\r\n STATUS ON\r\nSIZE \r\nEXTENT\r\nUNITS \r > \nSHAPEPATH " "\r\nIMAGETYPE " "\r\nFONTSET " "\r\nIMAGECOLOR -1 -1 > -1\r\n\r\n#remove this text and add objects here\r\n\r\nEND # end of > mapfile','pics/icons/world_add.png','maps'); > - > --- newsletters > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com|text| > nocache]','pics/icons/world_link.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule', '---', 'pics/icons/ > page.png', 'newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','newsletters'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','newsletters'); > - > --- trackers > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('external link','[http://example.com| > text]','pics/icons/world_link.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('wiki link','((text))','pics/icons/ > page_link.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading1','!text','pics/icons/ > text_heading_1.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading2','!!text','pics/icons/ > text_heading_2.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' heading3','!!!text','pics/icons/ > text_heading_3.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('title bar','-=text=-','pics/icons/ > text_padding_top.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('box','^text^','pics/icons/box.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' horizontal rule','---','pics/icons/ > page.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('center text','::text::','pics/icons/ > text_align_center.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' colored text','~~#FF0000:text~~','pics/icons/ > palette.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('dynamic variable','%text%','pics/icons/ > database_gear.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('image','popup_plugin_form("img")','pics/icons/ > picture.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' deleted','--text--','pics/icons/ > text_strikethrough.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('quote','popup_plugin_form("quote")','pics/ > icons/quotes.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('code','popup_plugin_form("code")','pics/icons/ > page_white_code.png','trackers'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('flash','popup_plugin_form("flash")','pics/ > icons/page_white_actionscript.png','trackers'); > - > --- blogs > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, bold','__text__','pics/icons/ > text_bold.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, italic','\'\'text\'\'','pics/icons/ > text_italic.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES (' text, underline','===text===','pics/icons/ > text_underline.png','blogs'); > -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, > tagcategory) VALUES ('table new','||r1c1|r1c2|r1c3\nr2c1|r2c2| > r2c3\nr3c1|r3c2|r3c3||','pics/icons/table.png','blogs'); > -INSE... [truncated message content] |