Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert last two commits. Broke wikibits and don't know how to fix it at the moment.

Browse source
This commit is contained in:
Aryeh Gregor 2006-10-12 09:02:25 +00:00
parent 9430ed8258
commit 8825de5e6f
13 changed files with 19 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -42,8 +42,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
* (bug 6918) Stopped borders and backgrounds from showing through floated
tables in Monobook
* (bug 6868) Un-hardcode section edit link style
* (bug 4525) Move section links down to same level as headings (editsection
links are now inside the h# elements)
== Languages updated ==

6
includes/Linker.php
View file

@ -1046,11 +1046,11 @@ class Linker {
$editurl = '&section='.$section;
$url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl );
return "<span class=\"editsection\">[".$url."]</span>";
return "<div class=\"editsection\">[".$url."]</div>";
}
/**
/**
* @param $title Title object.
* @param $section Integer: section number.
* @param $hint Link String: title, or default if omitted or empty
@ -1062,7 +1062,7 @@ class Linker {
$hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"';
$url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '', $hint );
return "<span class=\"editsection\">[".$url."]</span>";
return "<div class=\"editsection\">[".$url."]</div>";
}
/**

7
includes/Parser.php
View file

@ -3501,9 +3501,6 @@ class Parser
if( $enoughToc && ( !isset($wgMaxTocLevel) || $toclevel<$wgMaxTocLevel ) ) {
$toc .= $sk->tocLine($anchor, $tocline, $numbering, $toclevel);
}
# give headline the correct <h#> tag
@$head[$headlineCount] .= "<a name=\"$anchor\"></a><h".$level.$matches[2][$headlineCount];
if( $showEditLink && ( !$istemplate || $templatetitle !== "" ) ) {
if ( empty( $head[$headlineCount] ) ) {
$head[$headlineCount] = '';
@ -3513,7 +3510,9 @@ class Parser
else
$head[$headlineCount] .= $sk->editSectionLink($this->mTitle, $sectionCount+1, $headline_hint);
}
$head[$headlineCount] .= $headline.'</h'.$level.'>';
# give headline the correct <h#> tag
@$head[$headlineCount] .= "<a name=\"$anchor\"></a><h".$level.$matches[2][$headlineCount] .$headline.'</h'.$level.'>';
$headlineCount++;
if( !$istemplate )

10
skins/chick/main.css
View file

@ -50,26 +50,16 @@ h1, h2, h3, h4, h5, h6 {
padding-bottom: 0.17em;
border-bottom: 1px solid #aaaaaa;
}
.editsection {
font-weight: normal;
float: right;
margin-left: 5px;
}
h1 { font-size: 188%; }
h1 .editsection { font-size: 53.2%; }
h2 { font-size: 150%; }
h2 .editsection { font-size: 66.7%; }
h3, h4, h5, h6 {
border-bottom: none;
font-weight: bold;
}
h3 { font-size: 132%; }
h3 .editsection { font-size: 75.8%; }
h4 { font-size: 116%; }
h4 .editsection { font-size: 86.2%; }
h5 { font-size: 100%; }
h6 { font-size: 80%; }
h6 .editsection { font-size: 125%; }
ul {
line-height: 1.5em;

3
skins/common/cologneblue.css
View file

@ -78,9 +78,8 @@ td.bottom {
h1 {
color: #666666;
font-family: Verdana, Arial, sans-serif;
font-size: 180%; line-height: 21pt;
font-size: 18pt; font-weight: bold; line-height: 21pt;
}
h1 .editsection { font-size: 55.6%; }
h1.pagetitle { padding-bottom: 0; margin-bottom: 0; }
#article p.subtitle {
color: #666666; font-size: 11pt; font-weight: bold;

30
skins/common/common.css
View file

@ -2,31 +2,6 @@
* common.css
* This file contains CSS settings common to Wikistandard, Nostalgia and CologneBlue
*/
/* For clarity, explicitly state some recommendations from <http://www.w3.org/
TR/CSS21/sample.html> to make sure the editsection links scale right */
h1 { font-size: 2em; }
h2 { font-size: 1.5em; }
h3 { font-size: 1.17em; }
h5 { font-size: .83em; }
h6 { font-size: .75em; }
h1, h2, h3, h4, h5, h6 { font-weight: bolder }
/* Now the custom parts */
/* Make edit sections (which are inside h# tags) normal-sized */
.editsection {
font-weight: normal;
float: right;
margin-left: 5px;
}
h1 .editsection { font-size: 50% }
h2 .editsection { font-size: 66.7% }
h3 .editsection { font-size: 85.5% }
h5 .editsection { font-size: 120% }
h6 .editsection { font-size: 133% }
#footer { clear: both }
/* images */
div.floatright { float: right; margin: 0 0 1em 1em; }
@ -339,6 +314,11 @@ li span.deleted {
font-style: italic;
}
div.editsection {
float: right;
margin-left: 5px;
}
/* Classes for EXIF data display */
table.mw_metadata {
margin-left: 0.5em;

5
skins/common/commonPrint.css
View file

@ -130,10 +130,7 @@ ul {
h1, h2, h3, h4, h5, h6
{
font-weight: bold;
}
.editsection {
font-weight: normal;
font-weight: bold;
}
p, .documentDescription {

2
skins/common/common_rtl.css
View file

@ -13,7 +13,7 @@ fieldset.operaprefsection {
margin-right: 1.4em;
margin-left: 0.4em;
}
.editsection {
div.editsection {
float: left;
margin-right: 5px;
}

6
skins/common/wikibits.js
View file

@ -503,9 +503,9 @@ function akeytt() {
function setupRightClickEdit() {
if (document.getElementsByTagName) {
var spans = document.getElementsByTagName('span');
for (var i = 0; i < spans.length; i++) {
var el = spans[i];
var divs = document.getElementsByTagName('div');
for (var i = 0; i < divs.length; i++) {
var el = divs[i];
if(el.className == 'editsection') {
addRightClickEditHandler(el);
}

6
skins/common/wikistandard.css
View file

@ -29,18 +29,12 @@ textarea { overflow: auto; }
h1.pagetitle { padding-top: 0; margin-top: 0; padding-bottom: 0; margin-bottom: 0;
font-size:150%; }
h1.pagetitle .editsection { font-size: 66.7%; }
h2 { font-size: 120%; }
h2 .editsection { font-size: 83.3%; }
h2, h3, h4, h5, h6 { margin-bottom: 0;}
h3 { font-size: 106.25%; }
h3 .editsection { font-size: 94.1%; }
h4 { font-size: 103.125%; }
h4 .editsection { font-size: 97.0%; }
h5 { font-size: 100%; }
h5 .editsection { font-size: 100%; }
h6 { font-size: 95%; }
h6 .editsection { font-size: 105.3%; }
hr.sep { color:gray;height:1px;background-color:gray;}
p.subpages { font-size:small;}
p.subtitle { padding-top: 0; margin-top: 0;}

8
skins/monobook/main.css
View file

@ -119,23 +119,17 @@ h1, h2, h3, h4, h5, h6 {
border-bottom: 1px solid #aaa;
}
h1 { font-size: 188%; }
h1 .editsection { font-size: 53%; }
h2 { font-size: 150%; }
h2 .editsection { font-size: 67%; }
h3, h4, h5, h6 {
border-bottom: none;
font-weight: bold;
}
h3 { font-size: 132%; }
h3 .editsection { font-size: 76%; font-weight: normal; }
h4 { font-size: 116%; }
h4 .editsection { font-size: 86%; font-weight: normal; }
h5 { font-size: 100%; }
h5 .editsection { font-weight: normal; }
h6 { font-size: 80%; }
h6 .editsection { font-size: 125%; font-weight: normal; }
.editsection {
div.editsection {
float: right;
margin-left: 5px;
}

2
skins/monobook/rtl.css
View file

@ -41,7 +41,7 @@ html>body .portlet {
float: right;
clear: right;
}
.editsection {
div.editsection {
float: left;
margin-right: 5px;
}

26
skins/simple/main.css
View file

@ -1,29 +1,3 @@
/* For clarity, explicitly state some recommendations from <http://www.w3.org/
TR/CSS21/sample.html> to make sure the editsection links scale right */
h1 { font-size: 2em; }
h2 { font-size: 1.5em; }
h3 { font-size: 1.17em; }
h5 { font-size: .83em; }
h6 { font-size: .75em; }
h1, h2, h3, h4, h5, h6 { font-weight: bolder }
/* Now the custom parts */
/* Make edit sections (which are inside h# tags) normal-sized
and otherwise format */
.editsection {
font-weight: normal;
float: right;
margin-left: 5px;
}
h1 .editsection { font-size: 50% }
h2 .editsection { font-size: 66.7% }
h3 .editsection { font-size: 85.5% }
h5 .editsection { font-size: 120% }
h6 .editsection { font-size: 133% }
#toolbar {
display: none;
}