Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php |
— | — | @@ -83,4 +83,64 @@ |
84 | 84 | 'edittoolbar-help-content-bolditalic-description' => "Makes text bold & italic", |
85 | 85 | 'edittoolbar-help-content-bolditalic-syntax' => "'''Bold & italic text'''", |
86 | 86 | 'edittoolbar-help-content-bolditalic-result' => "<strong><em>Bold & italic text</em></strong>", |
| 87 | + |
| 88 | + 'edittoolbar-help-content-ilink-description' => "Internal link", |
| 89 | + 'edittoolbar-help-content-ilink-syntax' => "[[Page title|Link label]]", |
| 90 | + 'edittoolbar-help-content-ilink-result' => "", |
| 91 | + |
| 92 | + 'edittoolbar-help-content-xlink-description' => "External link", |
| 93 | + 'edittoolbar-help-content-xlink-syntax' => "[http://www.domain.com Link label]", |
| 94 | + 'edittoolbar-help-content-xlink-result' => "", |
| 95 | + |
| 96 | + 'edittoolbar-help-content-heading1-description' => "1st level heading", |
| 97 | + 'edittoolbar-help-content-heading1-syntax' => "= Heading text =", |
| 98 | + 'edittoolbar-help-content-heading1-result' => "", |
| 99 | + |
| 100 | + 'edittoolbar-help-content-heading2-description' => "2nd level heading", |
| 101 | + 'edittoolbar-help-content-heading2-syntax' => "== Heading text ==", |
| 102 | + 'edittoolbar-help-content-heading2-result' => "", |
| 103 | + |
| 104 | + 'edittoolbar-help-content-heading3-description' => "3rd level heading", |
| 105 | + 'edittoolbar-help-content-heading3-syntax' => "=== Heading text ===", |
| 106 | + 'edittoolbar-help-content-heading3-result' => "", |
| 107 | + |
| 108 | + 'edittoolbar-help-content-heading4-description' => "4th level heading", |
| 109 | + 'edittoolbar-help-content-heading4-syntax' => "==== Heading text ====", |
| 110 | + 'edittoolbar-help-content-heading4-result' => "", |
| 111 | + |
| 112 | + 'edittoolbar-help-content-heading5-description' => "5th level heading", |
| 113 | + 'edittoolbar-help-content-heading5-syntax' => "===== Heading text =====", |
| 114 | + 'edittoolbar-help-content-heading5-result' => "", |
| 115 | + |
| 116 | + 'edittoolbar-help-content-ulist-description' => "Bulleted list", |
| 117 | + 'edittoolbar-help-content-ulist-syntax' => "* List item", |
| 118 | + 'edittoolbar-help-content-ulist-result' => "", |
| 119 | + |
| 120 | + 'edittoolbar-help-content-olist-description' => "Numbered list", |
| 121 | + 'edittoolbar-help-content-olist-syntax' => "# List item", |
| 122 | + 'edittoolbar-help-content-olist-result' => "", |
| 123 | + |
| 124 | + 'edittoolbar-help-content-file-description' => "Embedded file", |
| 125 | + 'edittoolbar-help-content-file-syntax' => "[[File:File name]]", |
| 126 | + 'edittoolbar-help-content-file-result' => "", |
| 127 | + |
| 128 | + 'edittoolbar-help-content-reference-description' => "Reference", |
| 129 | + 'edittoolbar-help-content-reference-syntax' => "<ref name=\"test\">Reference content</ref>", |
| 130 | + 'edittoolbar-help-content-reference-result' => "", |
| 131 | + |
| 132 | + 'edittoolbar-help-content-rereference-description' => "Additional use of reference", |
| 133 | + 'edittoolbar-help-content-rereference-syntax' => "<ref name=\"test\" />", |
| 134 | + 'edittoolbar-help-content-rereference-result' => "", |
| 135 | + |
| 136 | + 'edittoolbar-help-content-signaturetimestamp-description' => "Signature with timestamp", |
| 137 | + 'edittoolbar-help-content-signaturetimestamp-syntax' => "~~~~", |
| 138 | + 'edittoolbar-help-content-signaturetimestamp-result' => "", |
| 139 | + |
| 140 | + 'edittoolbar-help-content-signature-description' => "Signature", |
| 141 | + 'edittoolbar-help-content-signature-syntax' => "~~~", |
| 142 | + 'edittoolbar-help-content-signature-result' => "", |
| 143 | + |
| 144 | + 'edittoolbar-help-content-indent-description' => "Indent", |
| 145 | + 'edittoolbar-help-content-indent-syntax' => ":Indented text", |
| 146 | + 'edittoolbar-help-content-indent-result' => "" |
87 | 147 | ); |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css |
— | — | @@ -106,6 +106,7 @@ |
107 | 107 | div#edittoolbar div.index > div.current { |
108 | 108 | background-color: white; |
109 | 109 | color: #333333; |
| 110 | + cursor: default; |
110 | 111 | } |
111 | 112 | div#edittoolbar div.pages { |
112 | 113 | float: right; |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php |
— | — | @@ -110,6 +110,51 @@ |
111 | 111 | 'edittoolbar-help-content-bolditalic-description', |
112 | 112 | 'edittoolbar-help-content-bolditalic-syntax', |
113 | 113 | 'edittoolbar-help-content-bolditalic-result', |
| 114 | + 'edittoolbar-help-content-ilink-description', |
| 115 | + 'edittoolbar-help-content-ilink-syntax', |
| 116 | + 'edittoolbar-help-content-ilink-result', |
| 117 | + 'edittoolbar-help-content-xlink-description', |
| 118 | + 'edittoolbar-help-content-xlink-syntax', |
| 119 | + 'edittoolbar-help-content-xlink-result', |
| 120 | + 'edittoolbar-help-content-heading1-description', |
| 121 | + 'edittoolbar-help-content-heading1-syntax', |
| 122 | + 'edittoolbar-help-content-heading1-result', |
| 123 | + 'edittoolbar-help-content-heading2-description', |
| 124 | + 'edittoolbar-help-content-heading2-syntax', |
| 125 | + 'edittoolbar-help-content-heading2-result', |
| 126 | + 'edittoolbar-help-content-heading3-description', |
| 127 | + 'edittoolbar-help-content-heading3-syntax', |
| 128 | + 'edittoolbar-help-content-heading3-result', |
| 129 | + 'edittoolbar-help-content-heading4-description', |
| 130 | + 'edittoolbar-help-content-heading4-syntax', |
| 131 | + 'edittoolbar-help-content-heading4-result', |
| 132 | + 'edittoolbar-help-content-heading5-description', |
| 133 | + 'edittoolbar-help-content-heading5-syntax', |
| 134 | + 'edittoolbar-help-content-heading5-result', |
| 135 | + 'edittoolbar-help-content-ulist-description', |
| 136 | + 'edittoolbar-help-content-ulist-syntax', |
| 137 | + 'edittoolbar-help-content-ulist-result', |
| 138 | + 'edittoolbar-help-content-olist-description', |
| 139 | + 'edittoolbar-help-content-olist-syntax', |
| 140 | + 'edittoolbar-help-content-olist-result', |
| 141 | + 'edittoolbar-help-content-file-description', |
| 142 | + 'edittoolbar-help-content-file-syntax', |
| 143 | + 'edittoolbar-help-content-file-result', |
| 144 | + 'edittoolbar-help-content-reference-description', |
| 145 | + 'edittoolbar-help-content-reference-syntax', |
| 146 | + 'edittoolbar-help-content-reference-result', |
| 147 | + 'edittoolbar-help-content-rereference-description', |
| 148 | + 'edittoolbar-help-content-rereference-syntax', |
| 149 | + 'edittoolbar-help-content-rereference-result', |
| 150 | + 'edittoolbar-help-content-signaturetimestamp-description', |
| 151 | + 'edittoolbar-help-content-signaturetimestamp-syntax', |
| 152 | + 'edittoolbar-help-content-signaturetimestamp-result', |
| 153 | + 'edittoolbar-help-content-signature-description', |
| 154 | + 'edittoolbar-help-content-signature-syntax', |
| 155 | + 'edittoolbar-help-content-signature-result', |
| 156 | + 'edittoolbar-help-content-indent-description', |
| 157 | + 'edittoolbar-help-content-indent-syntax', |
| 158 | + 'edittoolbar-help-content-indent-result', |
114 | 159 | ) |
115 | 160 | ); |
116 | 161 | // Continue |
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
— | — | @@ -658,32 +658,143 @@ |
659 | 659 | 'link': { |
660 | 660 | labelMsg: 'edittoolbar-help-page-link', |
661 | 661 | layout: 'table', |
662 | | - content: 'internal and external' |
| 662 | + headings: [ |
| 663 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 664 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 665 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 666 | + ], |
| 667 | + rows: [ |
| 668 | + { |
| 669 | + 'description': { contentMsg: 'edittoolbar-help-content-ilink-description' }, |
| 670 | + 'syntax': { contentMsg: 'edittoolbar-help-content-ilink-syntax' }, |
| 671 | + 'result': { contentMsg: 'edittoolbar-help-content-ilink-result' } |
| 672 | + }, |
| 673 | + { |
| 674 | + 'description': { contentMsg: 'edittoolbar-help-content-xlink-description' }, |
| 675 | + 'syntax': { contentMsg: 'edittoolbar-help-content-xlink-syntax' }, |
| 676 | + 'result': { contentMsg: 'edittoolbar-help-content-xlink-result' } |
| 677 | + } |
| 678 | + ] |
663 | 679 | }, |
664 | 680 | 'heading': { |
665 | 681 | labelMsg: 'edittoolbar-help-page-heading', |
666 | 682 | layout: 'table', |
667 | | - content: 'heading levels 1 - 5' |
| 683 | + headings: [ |
| 684 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 685 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 686 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 687 | + ], |
| 688 | + rows: [ |
| 689 | + { |
| 690 | + 'description': { contentMsg: 'edittoolbar-help-content-heading1-description' }, |
| 691 | + 'syntax': { contentMsg: 'edittoolbar-help-content-heading1-syntax' }, |
| 692 | + 'result': { contentMsg: 'edittoolbar-help-content-heading1-result' } |
| 693 | + }, |
| 694 | + { |
| 695 | + 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' }, |
| 696 | + 'syntax': { contentMsg: 'edittoolbar-help-content-heading2-syntax' }, |
| 697 | + 'result': { contentMsg: 'edittoolbar-help-content-heading2-result' } |
| 698 | + }, |
| 699 | + { |
| 700 | + 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' }, |
| 701 | + 'syntax': { contentMsg: 'edittoolbar-help-content-heading3-syntax' }, |
| 702 | + 'result': { contentMsg: 'edittoolbar-help-content-heading3-result' } |
| 703 | + }, |
| 704 | + { |
| 705 | + 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' }, |
| 706 | + 'syntax': { contentMsg: 'edittoolbar-help-content-heading4-syntax' }, |
| 707 | + 'result': { contentMsg: 'edittoolbar-help-content-heading4-result' } |
| 708 | + }, |
| 709 | + { |
| 710 | + 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' }, |
| 711 | + 'syntax': { contentMsg: 'edittoolbar-help-content-heading5-syntax' }, |
| 712 | + 'result': { contentMsg: 'edittoolbar-help-content-heading5-result' } |
| 713 | + } |
| 714 | + ] |
668 | 715 | }, |
669 | 716 | 'list': { |
670 | 717 | labelMsg: 'edittoolbar-help-page-list', |
671 | 718 | layout: 'table', |
672 | | - content: 'ordered and unordered' |
| 719 | + headings: [ |
| 720 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 721 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 722 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 723 | + ], |
| 724 | + rows: [ |
| 725 | + { |
| 726 | + 'description': { contentMsg: 'edittoolbar-help-content-ulist-description' }, |
| 727 | + 'syntax': { contentMsg: 'edittoolbar-help-content-ulist-syntax' }, |
| 728 | + 'result': { contentMsg: 'edittoolbar-help-content-ulist-result' } |
| 729 | + }, |
| 730 | + { |
| 731 | + 'description': { contentMsg: 'edittoolbar-help-content-olist-description' }, |
| 732 | + 'syntax': { contentMsg: 'edittoolbar-help-content-olist-syntax' }, |
| 733 | + 'result': { contentMsg: 'edittoolbar-help-content-olist-result' } |
| 734 | + } |
| 735 | + ] |
673 | 736 | }, |
674 | 737 | 'file': { |
675 | 738 | labelMsg: 'edittoolbar-help-page-file', |
676 | 739 | layout: 'table', |
677 | | - content: 'file with some parameters' |
| 740 | + headings: [ |
| 741 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 742 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 743 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 744 | + ], |
| 745 | + rows: [ |
| 746 | + { |
| 747 | + 'description': { contentMsg: 'edittoolbar-help-content-file-description' }, |
| 748 | + 'syntax': { contentMsg: 'edittoolbar-help-content-file-syntax' }, |
| 749 | + 'result': { contentMsg: 'edittoolbar-help-content-file-result' } |
| 750 | + } |
| 751 | + ] |
678 | 752 | }, |
679 | 753 | 'reference': { |
680 | 754 | labelMsg: 'edittoolbar-help-page-reference', |
681 | 755 | layout: 'table', |
682 | | - content: 'ref use and reuse' |
| 756 | + headings: [ |
| 757 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 758 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 759 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 760 | + ], |
| 761 | + rows: [ |
| 762 | + { |
| 763 | + 'description': { contentMsg: 'edittoolbar-help-content-reference-description' }, |
| 764 | + 'syntax': { contentMsg: 'edittoolbar-help-content-reference-syntax' }, |
| 765 | + 'result': { contentMsg: 'edittoolbar-help-content-reference-result' } |
| 766 | + }, |
| 767 | + { |
| 768 | + 'description': { contentMsg: 'edittoolbar-help-content-rereference-description' }, |
| 769 | + 'syntax': { contentMsg: 'edittoolbar-help-content-rereference-syntax' }, |
| 770 | + 'result': { contentMsg: 'edittoolbar-help-content-rereference-result' } |
| 771 | + } |
| 772 | + ] |
683 | 773 | }, |
684 | 774 | 'discussion': { |
685 | 775 | labelMsg: 'edittoolbar-help-page-discussion', |
686 | 776 | layout: 'table', |
687 | | - content: 'signature with and without timestamp and indent' |
| 777 | + headings: [ |
| 778 | + { contentMsg: 'edittoolbar-help-heading-description' }, |
| 779 | + { contentMsg: 'edittoolbar-help-heading-syntax' }, |
| 780 | + { contentMsg: 'edittoolbar-help-heading-result' } |
| 781 | + ], |
| 782 | + rows: [ |
| 783 | + { |
| 784 | + 'description': { contentMsg: 'edittoolbar-help-content-signaturetimestamp-description' }, |
| 785 | + 'syntax': { contentMsg: 'edittoolbar-help-content-signaturetimestamp-syntax' }, |
| 786 | + 'result': { contentMsg: 'edittoolbar-help-content-signaturetimestamp-result' } |
| 787 | + }, |
| 788 | + { |
| 789 | + 'description': { contentMsg: 'edittoolbar-help-content-signature-description' }, |
| 790 | + 'syntax': { contentMsg: 'edittoolbar-help-content-signature-syntax' }, |
| 791 | + 'result': { contentMsg: 'edittoolbar-help-content-signature-result' } |
| 792 | + }, |
| 793 | + { |
| 794 | + 'description': { contentMsg: 'edittoolbar-help-content-indent-description' }, |
| 795 | + 'syntax': { contentMsg: 'edittoolbar-help-content-indent-syntax' }, |
| 796 | + 'result': { contentMsg: 'edittoolbar-help-content-indent-result' } |
| 797 | + } |
| 798 | + ] |
688 | 799 | } |
689 | 800 | } |
690 | 801 | } |