r60679 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r60678‎ | r60679 | r60680 >
Date:18:53, 5 January 2010
Author:tparscal
Status:ok
Tags:
Comment:
Renamed CollapsibleLeftNav to CollapsibleNav - since it's not really always on the left. Also, adjusted styling to match other vector and wikiEditor UI elements. Moved and renamed some files to match overall resource organization.
Modified paths:
  • /trunk/extensions/UsabilityInitiative/Makefile (modified) (history)
  • /trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleLeftNav (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav (added) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleLeftNav.js (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js (added) (history)
  • /trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/collapsibleLeftNav.css (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history)
  • /trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css (added) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/arrow-down-over.png (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/arrow-right-over.png (deleted) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav (added) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-down.png (added) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-right.png (added) (history)
  • /trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/portal-break.png (added) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
——@@ -0,0 +1,24 @@
 2+/* Prototype code to show collapsing left nav options */
 3+/* First draft and will be changing greatly */
 4+
 5+mw.addOnloadHook( function() {
 6+ if( !wgVectorEnabledModules.collapsibleleftnav )
 7+ return true;
 8+ $j( '#panel' ).addClass( 'collapsible-nav' );
 9+ $j( '#panel > div.portal' ).toggleClass( 'collapsed' );
 10+ $j( '#panel > div.portal:first' )
 11+ .toggleClass( 'expanded' )
 12+ .toggleClass( 'collapsed' )
 13+ .find( 'div.body' )
 14+ .slideToggle( 'fast' );
 15+ // Toggle the selected menu's class and expand or collapse the menu
 16+ $j( '#panel > div.portal > h5' ).click( function() {
 17+ $j( this )
 18+ .parent()
 19+ .toggleClass( 'expanded' )
 20+ .toggleClass( 'collapsed' )
 21+ .find( 'div.body' )
 22+ .slideToggle( 'fast' );
 23+ return false;
 24+ } );
 25+} );
Property changes on: trunk/extensions/UsabilityInitiative/Vector/Modules/CollapsibleNav/CollapsibleNav.js
___________________________________________________________________
Name: svn:eol-style
126 + native
Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
——@@ -12,7 +12,7 @@
1313
1414 static $scripts = array(
1515 'raw' => array(
16 - array( 'src' => 'Modules/CollapsibleLeftNav/CollapsibleLeftNav.js', 'version' => 3 ),
 16+ array( 'src' => 'Modules/CollapsibleNav/CollapsibleNav.js', 'version' => 3 ),
1717 array( 'src' => 'Modules/CollapsibleTabs/CollapsibleTabs.js', 'version' => 6 ),
1818 array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 4 ),
1919 array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 4 ),
Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
——@@ -18,13 +18,13 @@
1919 private static $styleFiles = array(
2020 'base_sets' => array(
2121 'raw' => array(
22 - array( 'src' => 'css/collapsibleLeftNav.css', 'version' => 5 ),
2322 array( 'src' => 'css/suggestions.css', 'version' => 6 ),
 23+ array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 6 ),
2424 array( 'src' => 'css/wikiEditor.css', 'version' => 7 ),
25 - array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 8 ),
2625 array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 10 ),
 26+ array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ),
2727 array( 'src' => 'css/wikiEditor.toc.css', 'version' => 25 ),
28 - array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ),
 28+ array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 8 ),
2929 array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
3030 ),
3131 'combined' => array(
Index: trunk/extensions/UsabilityInitiative/images/vector/arrow-right-over.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/vector/arrow-down-over.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-down.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-down.png
___________________________________________________________________
Name: svn:mime-type
3232 + application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/portal-break.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/portal-break.png
___________________________________________________________________
Name: svn:mime-type
3333 + application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-right.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/extensions/UsabilityInitiative/images/vector/collapsibleNav/arrow-right.png
___________________________________________________________________
Name: svn:mime-type
3434 + application/octet-stream
Index: trunk/extensions/UsabilityInitiative/css/collapsibleLeftNav.css
——@@ -1,44 +0,0 @@
2 -/* Prototype code to show collapsing left nav options */
3 -#panel.collapsible-nav div.portal {
4 - border-top: 1px solid #dddddd;
5 - border-bottom: 1px solid #dddddd;
6 - padding: 2px 0 !important;
7 - margin: -11px 9px 10px 11px;
8 -}
9 -#panel.collapsible-nav div.portal h5 {
10 - color: #4D4D4D;
11 - font-weight: normal;
12 - background: url(../images/wikiEditor/toolbar/arrow-down.png) 0 50% no-repeat;
13 - padding: 4px 0 3px 1.5em;
14 - margin-bottom: 0px;
15 -}
16 -#panel.collapsible-nav div.collapsed h5 {
17 - color: #0066cc;
18 - background: url(../images/wikiEditor/toolbar/arrow-right.png) 0 50% no-repeat;
19 - margin-bottom: 0px;
20 -}
21 -#panel.collapsible-nav div h5:hover {
22 - cursor: pointer;
23 - color: #0066cc;
24 - background: url(../images/vector/arrow-down-over.png) 0 50% no-repeat #E8E8E8;
25 -}
26 -#panel.collapsible-nav div.collapsed h5:hover {
27 - background: url(../images/vector/arrow-right-over.png) 0 50% no-repeat #E8E8E8;
28 -}
29 -#panel.collapsible-nav div.portal div.body {
30 - padding-top: 0px;
31 - display: none;
32 -}
33 -#panel.collapsible-nav div.portal div.body ul li {
34 - padding: 0.25em 0;
35 -}
36 -#panel.collapsible-nav div.portal div.body {
37 - background: none !important;
38 -}
39 -#panel.collapsible-nav #p-navigation {
40 - border-top: none;
41 - margin-top: 0px;
42 -}
43 -#panel.collapsible-nav #p-navigation h5 {
44 - display: none;
45 -}
Index: trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
——@@ -0,0 +1,47 @@
 2+/* Prototype code to show collapsing left nav options */
 3+#panel.collapsible-nav div.portal {
 4+ background-image:url(../images/vector/collapsibleNav/portal-break.png);
 5+ background-position:left top;
 6+ background-repeat:no-repeat;
 7+ padding: 0.25em 0 !important;
 8+ margin: -11px 9px 10px 11px;
 9+}
 10+#panel.collapsible-nav div.portal h5 {
 11+ color: #4D4D4D;
 12+ font-weight: normal;
 13+ background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
 14+ padding: 4px 0 3px 1.5em;
 15+ margin-bottom: 0px;
 16+}
 17+#panel.collapsible-nav div.collapsed h5 {
 18+ color: #0645AD;
 19+ background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
 20+ margin-bottom: 0px;
 21+}
 22+#panel.collapsible-nav div h5:hover {
 23+ cursor: pointer;
 24+ text-decoration: none;
 25+}
 26+#panel.collapsible-nav div.collapsed h5:hover {
 27+ text-decoration: underline;
 28+}
 29+#panel.collapsible-nav div.portal div.body {
 30+ padding-top: 0px;
 31+ display: none;
 32+}
 33+#panel.collapsible-nav div.portal div.body ul li {
 34+ padding: 0.25em 0;
 35+}
 36+#panel.collapsible-nav div.portal div.body {
 37+ background: none !important;
 38+}
 39+#panel.collapsible-nav #p-navigation {
 40+ background-image: none;
 41+ margin-top: 0px;
 42+}
 43+#panel.collapsible-nav #p-navigation div.body {
 44+ margin-left: 0.5em;
 45+}
 46+#panel.collapsible-nav #p-navigation h5 {
 47+ display: none;
 48+}
Property changes on: trunk/extensions/UsabilityInitiative/css/vector.collapsibleNav.css
___________________________________________________________________
Name: svn:eol-style
149 + native
Index: trunk/extensions/UsabilityInitiative/css/combined.css
——@@ -1,47 +1,3 @@
2 -/* Prototype code to show collapsing left nav options */
3 -#panel.collapsible-nav div.portal {
4 - border-top: 1px solid #dddddd;
5 - border-bottom: 1px solid #dddddd;
6 - padding: 2px 0 !important;
7 - margin: -11px 9px 10px 11px;
8 -}
9 -#panel.collapsible-nav div.portal h5 {
10 - color: #4D4D4D;
11 - font-weight: normal;
12 - background: url(../images/wikiEditor/toolbar/arrow-down.png) 0 50% no-repeat;
13 - padding: 4px 0 3px 1.5em;
14 - margin-bottom: 0px;
15 -}
16 -#panel.collapsible-nav div.collapsed h5 {
17 - color: #0066cc;
18 - background: url(../images/wikiEditor/toolbar/arrow-right.png) 0 50% no-repeat;
19 - margin-bottom: 0px;
20 -}
21 -#panel.collapsible-nav div h5:hover {
22 - cursor: pointer;
23 - color: #0066cc;
24 - background: url(../images/vector/arrow-down-over.png) 0 50% no-repeat #E8E8E8;
25 -}
26 -#panel.collapsible-nav div.collapsed h5:hover {
27 - background: url(../images/vector/arrow-right-over.png) 0 50% no-repeat #E8E8E8;
28 -}
29 -#panel.collapsible-nav div.portal div.body {
30 - padding-top: 0px;
31 - display: none;
32 -}
33 -#panel.collapsible-nav div.portal div.body ul li {
34 - padding: 0.25em 0;
35 -}
36 -#panel.collapsible-nav div.portal div.body {
37 - background: none !important;
38 -}
39 -#panel.collapsible-nav #p-navigation {
40 - border-top: none;
41 - margin-top: 0px;
42 -}
43 -#panel.collapsible-nav #p-navigation h5 {
44 - display: none;
45 -}
462 /* suggestions plugin */
473
484 .suggestions {
——@@ -93,6 +49,53 @@
9450 color: white;
9551 color: HighlightText;
9652 }
 53+/* Prototype code to show collapsing left nav options */
 54+#panel.collapsible-nav div.portal {
 55+ background-image:url(../images/vector/collapsibleNav/portal-break.png);
 56+ background-position:left top;
 57+ background-repeat:no-repeat;
 58+ padding: 0.25em 0 !important;
 59+ margin: -11px 9px 10px 11px;
 60+}
 61+#panel.collapsible-nav div.portal h5 {
 62+ color: #4D4D4D;
 63+ font-weight: normal;
 64+ background: url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
 65+ padding: 4px 0 3px 1.5em;
 66+ margin-bottom: 0px;
 67+}
 68+#panel.collapsible-nav div.collapsed h5 {
 69+ color: #0645AD;
 70+ background: url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
 71+ margin-bottom: 0px;
 72+}
 73+#panel.collapsible-nav div h5:hover {
 74+ cursor: pointer;
 75+ text-decoration: none;
 76+}
 77+#panel.collapsible-nav div.collapsed h5:hover {
 78+ text-decoration: underline;
 79+}
 80+#panel.collapsible-nav div.portal div.body {
 81+ padding-top: 0px;
 82+ display: none;
 83+}
 84+#panel.collapsible-nav div.portal div.body ul li {
 85+ padding: 0.25em 0;
 86+}
 87+#panel.collapsible-nav div.portal div.body {
 88+ background: none !important;
 89+}
 90+#panel.collapsible-nav #p-navigation {
 91+ background-image: none;
 92+ margin-top: 0px;
 93+}
 94+#panel.collapsible-nav #p-navigation div.body {
 95+ margin-left: 0.5em;
 96+}
 97+#panel.collapsible-nav #p-navigation h5 {
 98+ display: none;
 99+}
97100 /* wikiEditor plugin */
98101
99102 /* This ID (#editform) could change in MediaWiki */
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
——@@ -1,46 +1,3 @@
2 -#panel.collapsible-nav div.portal{
3 -border-top:1px solid #dddddd;
4 -border-bottom:1px solid #dddddd;
5 -padding:2px 0 !important;
6 -margin:-11px 9px 10px 11px;
7 -}
8 -#panel.collapsible-nav div.portal h5{
9 -color:#4D4D4D;
10 -font-weight:normal;
11 -background:url(../images/wikiEditor/toolbar/arrow-down.png) 0 50% no-repeat;
12 -padding:4px 0 3px 1.5em;
13 -margin-bottom:0px;
14 -}
15 -#panel.collapsible-nav div.collapsed h5{
16 -color:#0066cc;
17 -background:url(../images/wikiEditor/toolbar/arrow-right.png) 0 50% no-repeat;
18 -margin-bottom:0px;
19 -}
20 -#panel.collapsible-nav div h5:hover{
21 -cursor:pointer;
22 -color:#0066cc;
23 -background:url(../images/vector/arrow-down-over.png) 0 50% no-repeat #E8E8E8;
24 -}
25 -#panel.collapsible-nav div.collapsed h5:hover{
26 -background:url(../images/vector/arrow-right-over.png) 0 50% no-repeat #E8E8E8;
27 -}
28 -#panel.collapsible-nav div.portal div.body{
29 -padding-top:0px;
30 -display:none;
31 -}
32 -#panel.collapsible-nav div.portal div.body ul li{
33 -padding:0.25em 0;
34 -}
35 -#panel.collapsible-nav div.portal div.body{
36 -background:none !important;
37 -}
38 -#panel.collapsible-nav #p-navigation{
39 -border-top:none;
40 -margin-top:0px;
41 -}
42 -#panel.collapsible-nav #p-navigation h5{
43 -display:none;
44 -}
452 .suggestions{
463 overflow:hidden;
474 position:absolute;
——@@ -90,6 +47,52 @@
9148 color:white;
9249 color:HighlightText;
9350 }
 51+#panel.collapsible-nav div.portal{
 52+background-image:url(../images/vector/collapsibleNav/portal-break.png);
 53+background-position:left top;
 54+background-repeat:no-repeat;
 55+padding:0.25em 0 !important;
 56+margin:-11px 9px 10px 11px;
 57+}
 58+#panel.collapsible-nav div.portal h5{
 59+color:#4D4D4D;
 60+font-weight:normal;
 61+background:url(../images/vector/collapsibleNav/arrow-down.png) 0 50% no-repeat;
 62+padding:4px 0 3px 1.5em;
 63+margin-bottom:0px;
 64+}
 65+#panel.collapsible-nav div.collapsed h5{
 66+color:#0645AD;
 67+background:url(../images/vector/collapsibleNav/arrow-right.png) 0 50% no-repeat;
 68+margin-bottom:0px;
 69+}
 70+#panel.collapsible-nav div h5:hover{
 71+cursor:pointer;
 72+text-decoration:none;
 73+}
 74+#panel.collapsible-nav div.collapsed h5:hover{
 75+text-decoration:underline;
 76+}
 77+#panel.collapsible-nav div.portal div.body{
 78+padding-top:0px;
 79+display:none;
 80+}
 81+#panel.collapsible-nav div.portal div.body ul li{
 82+padding:0.25em 0;
 83+}
 84+#panel.collapsible-nav div.portal div.body{
 85+background:none !important;
 86+}
 87+#panel.collapsible-nav #p-navigation{
 88+background-image:none;
 89+margin-top:0px;
 90+}
 91+#panel.collapsible-nav #p-navigation div.body{
 92+margin-left:0.5em;
 93+}
 94+#panel.collapsible-nav #p-navigation h5{
 95+display:none;
 96+}
9497 form#editform{
9598 margin:0;
9699 padding:0;
Index: trunk/extensions/UsabilityInitiative/Makefile
——@@ -3,8 +3,8 @@
44 #
55
66 CSS := \
7 - css/collapsibleLeftNav.css\
87 css/suggestions.css\
 8+ css/vector.collapsibleNav.css\
99 css/wikiEditor.css\
1010 css/wikiEditor.dialogs.css\
1111 css/wikiEditor.toc.css\

Status & tagging log