r51707 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r51706‎ | r51707 | r51708 >
Date:21:49, 10 June 2009
Author:tparscal
Status:deferred
Tags:
Comment:
Tweaked the booklet UI a bit and added some more examples to the help section. Still missing the file example
Modified paths:
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
——@@ -74,73 +74,61 @@
7575 'edittoolbar-help-page-file' => 'Files',
7676 'edittoolbar-help-page-reference' => 'References',
7777 'edittoolbar-help-page-discussion' => 'Discussion',
78 - 'edittoolbar-help-content-bold-description' => "Makes text bold",
 78+ 'edittoolbar-help-content-bold-description' => 'Bold',
7979 'edittoolbar-help-content-bold-syntax' => "'''Bold text'''",
80 - 'edittoolbar-help-content-bold-result' => "<strong>Bold text</strong>",
81 - 'edittoolbar-help-content-italic-description' => "Makes text italic",
 80+ 'edittoolbar-help-content-bold-result' => '<strong>Bold text</strong>',
 81+ 'edittoolbar-help-content-italic-description' => 'Italic',
8282 'edittoolbar-help-content-italic-syntax' => "'''Italic text'''",
83 - 'edittoolbar-help-content-italic-result' => "<em>Italic text</em>",
84 - 'edittoolbar-help-content-bolditalic-description' => "Makes text bold &amp; italic",
 83+ 'edittoolbar-help-content-italic-result' => '<em>Italic text</em>',
 84+ 'edittoolbar-help-content-bolditalic-description' => 'Bold &amp; italic',
8585 'edittoolbar-help-content-bolditalic-syntax' => "'''Bold &amp; italic text'''",
86 - 'edittoolbar-help-content-bolditalic-result' => "<strong><em>Bold &amp; 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]]",
 86+ 'edittoolbar-help-content-bolditalic-result' => '<strong><em>Bold &amp; italic text</em></strong>',
 87+ 'edittoolbar-help-content-ilink-description' => 'Internal link',
 88+ 'edittoolbar-help-content-ilink-syntax' => '[[Page title|Internal link label]]',
 89+ 'edittoolbar-help-content-ilink-result' => "<a href='#'>Internal link label</a>",
 90+ 'edittoolbar-help-content-xlink-description' => 'External link',
 91+ 'edittoolbar-help-content-xlink-syntax' => '[http://www.domain.com External link label]',
 92+ 'edittoolbar-help-content-xlink-result' => "<a href='#'>External link label</a>",
 93+ 'edittoolbar-help-content-heading1-description' => '1st level heading',
 94+ 'edittoolbar-help-content-heading1-syntax' => '= Heading text =',
 95+ 'edittoolbar-help-content-heading1-result' => '<h1>Heading text</h1>',
 96+ 'edittoolbar-help-content-heading2-description' => '2nd level heading',
 97+ 'edittoolbar-help-content-heading2-syntax' => '== Heading text ==',
 98+ 'edittoolbar-help-content-heading2-result' => '<h2>Heading text</h2>',
 99+ 'edittoolbar-help-content-heading3-description' => '3rd level heading',
 100+ 'edittoolbar-help-content-heading3-syntax' => '=== Heading text ===',
 101+ 'edittoolbar-help-content-heading3-result' => '<h3>Heading text</h3>',
 102+ 'edittoolbar-help-content-heading4-description' => '4th level heading',
 103+ 'edittoolbar-help-content-heading4-syntax' => '==== Heading text ====',
 104+ 'edittoolbar-help-content-heading4-result' => '<h4>Heading text</h4>',
 105+ 'edittoolbar-help-content-heading5-description' => '5th level heading',
 106+ 'edittoolbar-help-content-heading5-syntax' => '===== Heading text =====',
 107+ 'edittoolbar-help-content-heading5-result' => '<h5>Heading text</h5>',
 108+ 'edittoolbar-help-content-ulist-description' => 'Bulleted list',
 109+ 'edittoolbar-help-content-ulist-syntax' => '* List item<br />* List item',
 110+ 'edittoolbar-help-content-ulist-result' => '<ul><li>List item</li><li>List item</li></ul>',
 111+ 'edittoolbar-help-content-olist-description' => 'Numbered list',
 112+ 'edittoolbar-help-content-olist-syntax' => '# List item',
 113+ 'edittoolbar-help-content-olist-result' => '<ol><li>List item</li><li>List item</li></ol>',
 114+ 'edittoolbar-help-content-file-description' => 'Embedded file',
 115+ 'edittoolbar-help-content-file-syntax' => '[[File:Wiki.png|thumb|Caption text]]',
126116 'edittoolbar-help-content-file-result' => "",
127 -
128 - 'edittoolbar-help-content-reference-description' => "Reference",
129 - 'edittoolbar-help-content-reference-syntax' => "&lt;ref name=\"test\"&gt;Reference content&lt;/ref&gt;",
130 - 'edittoolbar-help-content-reference-result' => "",
131 -
132 - 'edittoolbar-help-content-rereference-description' => "Additional use of reference",
133 - 'edittoolbar-help-content-rereference-syntax' => "&lt;ref name=\"test\" /&gt;",
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' => ""
 117+ 'edittoolbar-help-content-reference-description' => 'Reference',
 118+ 'edittoolbar-help-content-reference-syntax' => 'Article text.&lt;ref name="test"&gt;[http://www.example.org Link text], additional text.&lt;/ref&gt;',
 119+ 'edittoolbar-help-content-reference-result' => "Aticle text <sup><a href='#'>[1]</a></sup>",
 120+ 'edittoolbar-help-content-rereference-description' => 'Additional use of same reference',
 121+ 'edittoolbar-help-content-rereference-syntax' => '&lt;ref name=\"test\" /&gt;',
 122+ 'edittoolbar-help-content-rereference-result' => "Aticle text <sup><a href='#'>[1]</a></sup>",
 123+ 'edittoolbar-help-content-showreferences-description' => 'Display references',
 124+ 'edittoolbar-help-content-showreferences-syntax' => '&lt;references /&gt; or {{Reflist}}',
 125+ 'edittoolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Link text</a>, additional text.</li></ol>",
 126+ 'edittoolbar-help-content-signaturetimestamp-description' => 'Signature with timestamp',
 127+ 'edittoolbar-help-content-signaturetimestamp-syntax' => '~~~~',
 128+ 'edittoolbar-help-content-signaturetimestamp-result' => "<a href='#' title='Special:MyPage'>Username</a> (<a href='#' title='Special:MyTalk'>talk</a>) 15:54, 10 June 2009 (UTC)",
 129+ 'edittoolbar-help-content-signature-description' => 'Signature',
 130+ 'edittoolbar-help-content-signature-syntax' => '~~~',
 131+ 'edittoolbar-help-content-signature-result' => "<a href='#' title='Special:MyPage'>Username</a> (<a href='#' title='Special:MyTalk'>talk</a>)</p>",
 132+ 'edittoolbar-help-content-indent-description' => 'Indent',
 133+ 'edittoolbar-help-content-indent-syntax' => 'Normal text<br />:Indented text<br />::Indented text',
 134+ 'edittoolbar-help-content-indent-result' => 'Normal text<dl><dd>Indented text<dl><dd>Indented text</dd></dl></dd></dl>'
147135 );
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css
——@@ -95,11 +95,12 @@
9696 div#edittoolbar div.index {
9797 float: left;
9898 width: 20%;
99 - height: 150px;
 99+ height: 175px;
100100 overflow: auto;
101101 }
102102 div#edittoolbar div.index > div {
103 - padding: 9px;
 103+ padding: 4px;
 104+ padding-left: 18px;
104105 cursor: pointer;
105106 color: #00528C;
106107 }
——@@ -107,11 +108,17 @@
108109 background-color: white;
109110 color: #333333;
110111 cursor: default;
 112+ background-image: url(images/arrow-right.png);
 113+ background-position: left center;
 114+ background-repeat: no-repeat;
111115 }
 116+div#edittoolbar div.index > div:first-child {
 117+ border-top: none;
 118+}
112119 div#edittoolbar div.pages {
113120 float: right;
114121 width: 80%;
115 - height: 150px;
 122+ height: 175px;
116123 overflow: auto;
117124 background-color: white;
118125 }
——@@ -122,12 +129,20 @@
123130 display: block;
124131 }
125132 div#edittoolbar div.pages > div.page > table {
126 - padding: 4px;
 133+ padding-left: 5px;
 134+ padding-right: 5px;
 135+ background: none;
127136 }
128137 div#edittoolbar div.pages > div.page > table th {
129138 color: #999999;
130 - border-bottom: solid 1px #DDDDDD;
131139 }
 140+div#edittoolbar div.pages > div.page > table td {
 141+ color: black;
 142+ border-top: solid 1px #EEEEEE;
 143+}
 144+div#edittoolbar div.pages > div.page > table tr:first-child > td {
 145+ border-top: solid 1px #DDDDDD;
 146+}
132147 div#edittoolbar div.pages > div.page > table th,
133148 div#edittoolbar div.pages > div.page > table td {
134149 text-align: left;
——@@ -137,6 +152,9 @@
138153 div#edittoolbar div.pages > div.page > table td.syntax {
139154 font-family: monospace;
140155 }
 156+div#edittoolbar-section-help div.page > table td {
 157+ width: 33%;
 158+}
141159 div#edittoolbar div.tabs > div.tab {
142160 float: left;
143161 line-height: 26px;
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
——@@ -146,6 +146,9 @@
147147 'edittoolbar-help-content-rereference-description',
148148 'edittoolbar-help-content-rereference-syntax',
149149 'edittoolbar-help-content-rereference-result',
 150+ 'edittoolbar-help-content-showreferences-description',
 151+ 'edittoolbar-help-content-showreferences-syntax',
 152+ 'edittoolbar-help-content-showreferences-result',
150153 'edittoolbar-help-content-signaturetimestamp-description',
151154 'edittoolbar-help-content-signaturetimestamp-syntax',
152155 'edittoolbar-help-content-signaturetimestamp-result',
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
——@@ -225,7 +225,7 @@
226226 // Appends table to page
227227 var contentTable = $( '<table />' )
228228 .attr( {
229 - 'cellpadding': '5',
 229+ 'cellpadding': '0',
230230 'cellspacing': '0',
231231 'border': '0',
232232 'width': '100%'
——@@ -245,7 +245,10 @@
246246 for ( cell in section.pages[page].rows[row] ) {
247247 contentRow.append(
248248 $( '<td />' )
249 - .attr( 'class', cell )
 249+ .attr( {
 250+ 'class': cell,
 251+ 'valign': 'top'
 252+ } )
250253 .append(
251254 $( '<span>' + msg( section.pages[page].rows[row][cell], 'content' ) + '</span>' )
252255 )
——@@ -696,17 +699,17 @@
697700 'result': { contentMsg: 'edittoolbar-help-content-heading2-result' }
698701 },
699702 {
700 - 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' },
 703+ 'description': { contentMsg: 'edittoolbar-help-content-heading3-description' },
701704 'syntax': { contentMsg: 'edittoolbar-help-content-heading3-syntax' },
702705 'result': { contentMsg: 'edittoolbar-help-content-heading3-result' }
703706 },
704707 {
705 - 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' },
 708+ 'description': { contentMsg: 'edittoolbar-help-content-heading4-description' },
706709 'syntax': { contentMsg: 'edittoolbar-help-content-heading4-syntax' },
707710 'result': { contentMsg: 'edittoolbar-help-content-heading4-result' }
708711 },
709712 {
710 - 'description': { contentMsg: 'edittoolbar-help-content-heading2-description' },
 713+ 'description': { contentMsg: 'edittoolbar-help-content-heading5-description' },
711714 'syntax': { contentMsg: 'edittoolbar-help-content-heading5-syntax' },
712715 'result': { contentMsg: 'edittoolbar-help-content-heading5-result' }
713716 }
——@@ -767,6 +770,11 @@
768771 'description': { contentMsg: 'edittoolbar-help-content-rereference-description' },
769772 'syntax': { contentMsg: 'edittoolbar-help-content-rereference-syntax' },
770773 'result': { contentMsg: 'edittoolbar-help-content-rereference-result' }
 774+ },
 775+ {
 776+ 'description': { contentMsg: 'edittoolbar-help-content-showreferences-description' },
 777+ 'syntax': { contentMsg: 'edittoolbar-help-content-showreferences-syntax' },
 778+ 'result': { contentMsg: 'edittoolbar-help-content-showreferences-result' }
771779 }
772780 ]
773781 },

Status & tagging log