From: <ri...@us...> - 2008-09-12 16:18:28
|
Revision: 14692 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=14692&view=rev Author: ricks99 Date: 2008-09-12 16:06:37 +0000 (Fri, 12 Sep 2008) Log Message: ----------- [FIX]Better ordering labeling of quicktags [Bug 1621] Modified Paths: -------------- trunk/db/tiki-3.0-mysql.sql trunk/db/tiki.sql Modified: trunk/db/tiki-3.0-mysql.sql =================================================================== --- trunk/db/tiki-3.0-mysql.sql 2008-09-12 15:04:10 UTC (rev 14691) +++ trunk/db/tiki-3.0-mysql.sql 2008-09-12 16:06:37 UTC (rev 14692) @@ -3092,16 +3092,16 @@ ) ENGINE=MyISAM AUTO_INCREMENT=1 ; # wiki -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('bold','__text__','pics/icons/text_bold.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('italic','\'\'text\'\'','pics/icons/text_italic.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('underline','===text===','pics/icons/text_underline.png','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\nr2c1|r2c2||','pics/icons/table.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('wiki link','((text))','pics/icons/page_link.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 ('heading, 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 ('dynamic content','{content id= }','pics/icons/database_refresh.png','wiki'); INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('hr','---','pics/icons/page.png','wiki'); Modified: trunk/db/tiki.sql =================================================================== --- trunk/db/tiki.sql 2008-09-12 15:04:10 UTC (rev 14691) +++ trunk/db/tiki.sql 2008-09-12 16:06:37 UTC (rev 14692) @@ -3092,12 +3092,12 @@ ) ENGINE=MyISAM AUTO_INCREMENT=1 ; # wiki -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('bold','__text__','pics/icons/text_bold.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('italic','\'\'text\'\'','pics/icons/text_italic.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('underline','===text===','pics/icons/text_underline.png','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\nr2c1|r2c2||','pics/icons/table.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('external link','[http://example.com|text]','pics/icons/world_link.png','wiki'); -INSERT INTO tiki_quicktags (taglabel, taginsert, tagicon, tagcategory) VALUES ('wiki link','((text))','pics/icons/page_link.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'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |