* to ensure that client-side caches do not keep obsolete copies of global
* styles.
*/
-$wgStyleVersion = '243';
+$wgStyleVersion = '241';
# Server-side caching:
$wgUseTwoButtonsSearchForm = true;
/**
- * Search form behavior for Vector skin only
+ * Search form behavior for Vector skin only
* true = use an icon search button
* false = use Go & Search buttons
*/
$wgVectorUseSimpleSearch = false;
-/**
- * Watch and unwatch as an icon rather than a link for Vector skin only
- * true = use an icon watch/unwatch button
- * false = use watch/unwatch text link
- */
-$wgVectorUseIconWatch = false;
-
/**
* Preprocessor caching threshold
*/
* @private
*/
function buildNavigationUrls() {
- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle, $wgStylePath;
- global $wgDisableLangConversion, $wgVectorUseIconWatch;
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+ global $wgDisableLangConversion;
wfProfileIn( __METHOD__ );
}
}
wfProfileOut( __METHOD__ . '-live' );
+
/**
* The following actions use messages which, if made particular to
* the Vector skin, would break the Ajax code which makes this
* the global versions.
*/
// Checks if the user is logged in
- if ( $this->loggedin ) {
- if ( $wgVectorUseIconWatch ) {
- $class = 'icon ';
- $place = 'views';
+ if( $this->loggedin ) {
+ // Checks if the user is watching this page
+ if( !$this->mTitle->userIsWatching() ) {
+ // Adds watch action link
+ $links['actions']['watch'] = array(
+ 'class' =>
+ ( $action == 'watch' or $action == 'unwatch' ) ?
+ 'selected' : false,
+ 'text' => wfMsg( 'watch' ),
+ 'href' => $this->mTitle->getLocalUrl( 'action=watch' )
+ );
} else {
- $class = '';
- $place = 'actions';
+ // Adds unwatch action link
+ $links['actions']['unwatch'] = array(
+ 'class' =>
+ ($action == 'unwatch' or $action == 'watch') ?
+ 'selected' : false,
+ 'text' => wfMsg( 'unwatch' ),
+ 'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
+ );
}
- $mode = $this->mTitle->userIsWatching() ? 'unwatch' : 'watch';
- $links[$place][$mode] = array(
- 'class' => $class . ( ( $action == 'watch' || $action == 'unwatch' ) ? ' selected' : false ),
- 'text' => wfMsg( $mode ), // uses 'watch' or 'unwatch' message
- 'href' => $this->mTitle->getLocalUrl( 'action=' . $mode )
- );
}
+
// This is instead of SkinTemplateTabs - which uses a flat array
wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$links ) );
<h5><?php $this->msg('views') ?></h5>
<ul <?php $this->html('userlangattributes') ?>>
<?php foreach ($this->data['view_urls'] as $key => $link ): ?>
- <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo (array_key_exists('img',$link) ? '<img src="'.$link['img'].'" alt="'.$link['text'].'" />' : '<span>'.htmlspecialchars( $link['text'] ).'</span>') ?></a></li>
+ <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
<?php endforeach; ?>
</ul>
</div>
wgAjaxWatch.inprogress = false; // ajax request in progress
wgAjaxWatch.timeoutID = null; // see wgAjaxWatch.ajaxCall
wgAjaxWatch.watchLinks = []; // "watch"/"unwatch" links
-wgAjaxWatch.iconMode = false; // new icon driven functionality
-wgAjaxWatch.imgBasePath = ""; // base img path derived from icons on load
-wgAjaxWatch.setLinkText = function( newText ) {
- if( wgAjaxWatch.iconMode ) {
- for ( i = 0; i < wgAjaxWatch.watchLinks.length; i++ ) {
- wgAjaxWatch.watchLinks[i].firstChild.alt = newText;
- if ( newText == wgAjaxWatch.watchingMsg || newText == wgAjaxWatch.unwatchingMsg ) {
- wgAjaxWatch.watchLinks[i].className += ' loading';
- } else if ( newText == wgAjaxWatch.watchMsg || newText == wgAjaxWatch.unwatchMsg ) {
- wgAjaxWatch.watchLinks[i].className = wgAjaxWatch.watchLinks[i].className.replace( /loading/i, '' );
- }
- }
- } else {
- for ( i = 0; i < wgAjaxWatch.watchLinks.length; i++ ) {
- changeText( wgAjaxWatch.watchLinks[i], newText );
- }
+wgAjaxWatch.setLinkText = function(newText) {
+ for (i = 0; i < wgAjaxWatch.watchLinks.length; i++) {
+ changeText(wgAjaxWatch.watchLinks[i], newText);
}
};
-wgAjaxWatch.setLinkID = function( newId ) {
+wgAjaxWatch.setLinkID = function(newId) {
// We can only set the first one
- wgAjaxWatch.watchLinks[0].parentNode.setAttribute( 'id', newId );
+ wgAjaxWatch.watchLinks[0].setAttribute( 'id', newId );
akeytt(newId); // update tooltips for Monobook
};
wgAjaxWatch.onLoad = function() {
// This document structure hardcoding sucks. We should make a class and
// toss all this out the window.
-
var el1 = document.getElementById("ca-unwatch");
var el2 = null;
- if ( !el1 ) {
+ if (!el1) {
el1 = document.getElementById("mw-unwatch-link1");
el2 = document.getElementById("mw-unwatch-link2");
}
- if( el1 ) {
+ if(el1) {
wgAjaxWatch.watching = true;
} else {
wgAjaxWatch.watching = false;
el1 = document.getElementById("ca-watch");
- if ( !el1 ) {
+ if (!el1) {
el1 = document.getElementById("mw-watch-link1");
el2 = document.getElementById("mw-watch-link2");
}
- if( !el1 ) {
+ if(!el1) {
wgAjaxWatch.supported = false;
return;
}
}
-
- // Detect if the watch/unwatch feature is in icon mode
- if ( el1.className.match( /icon/i ) ) {
- wgAjaxWatch.iconMode = true;
- }
-
+
// The id can be either for the parent (Monobook-based) or the element
// itself (non-Monobook)
wgAjaxWatch.watchLinks.push( el1.tagName.toLowerCase() == "a"
font-size: 1em;
}
body {
+ background-color: #f3f3f3;
background-image: url(images/page-base.png);
- background-color: #f9f9f9;
- color: #000000;
}
/* Content */
#content {
div.vectorTabs li.selected a span,
div.vectorTabs li.selected a:visited
div.vectorTabs li.selected a:visited span {
- color: #be5900;
+ color: #333333;
text-decoration: none;
}
div.vectorTabs li.new a,
div.vectorTabs li.new a span,
div.vectorTabs li.new a:visited,
div.vectorTabs li.new a:visited span {
- color: #990000;
+ color: #a55858;
}
/* Variants and Actions */
/* @noflip */
/* Links */
a {
text-decoration: none;
- color: #003cb3;
+ color: #0645ad;
background: none;
}
a:visited {
- color: #004d99;
+ color: #0b0080;
}
a:active {
color: #faa700;
color: #772233;
}
a.new, #p-personal a.new {
- color: #990000;
+ color: #ba0000;
}
a.new:visited, #p-personal a.new:visited {
color: #a55858;
margin: 0;
padding-top: .5em;
padding-bottom: .17em;
- border-bottom: 1px solid #8d8d8d;
+ border-bottom: 1px solid #aaa;
width: auto;
}
h1 { font-size: 188%; }
#toc,
.toc,
.mw-warning {
- border: 1px solid #c0c0c0;
- background-color: #f0f0f0;
+ border: 1px solid #aaa;
+ background-color: #f9f9f9;
padding: 5px;
font-size: 95%;
}
background-color: transparent;
}
div.thumbinner {
- border: 1px solid #c0c0c0;
+ border: 1px solid #ccc;
padding: 3px !important;
- background-color: #f0f0f0;
+ background-color: #f9f9f9;
font-size: 94%;
text-align: center;
overflow: hidden;
}
html .thumbimage {
- border: 1px solid #c0c0c0;
- background-color: #f0f0f0;
+ border: 1px solid #ccc;
}
html .thumbcaption {
border: none;
line-height: 1.2em;
font-size: 1.6em;
padding-bottom: 0;
- color:#005780;
}
#content a.external,
#content a[href ^="gopher://"] {
padding-left: 15px !important;
text-transform: none;
}
+
.toccolours {
border: 1px solid #aaa;
background-color: #f9f9f9;
position: relative;
width: 100%;
}
-
#mw-js-message {
font-size: 0.8em;
}
div#bodyContent {
line-height: 1.5em;
}
-/* Watch/Unwatch Icon Styling */
-#ca-unwatch.icon,
-#ca-watch.icon {
-}
-#ca-unwatch.icon a,
-#ca-watch.icon a {
- margin: 0;
- padding: 0;
- outline: none;
- display: block;
- width: 26px;
- height: 2.5em;
-}
-#ca-unwatch.icon a {
- background-image: url(images/watch-icons.png);
- background-position: -43px 60%;
-}
-#ca-watch.icon a {
- background-image: url(images/watch-icons.png);
- background-position: 5px 60%;
-}
-#ca-unwatch.icon a:hover {
- background-image: url(images/watch-icons.png);
- background-position: -67px 60%;
-}
-#ca-watch.icon a:hover {
- background-image: url(images/watch-icons.png);
- background-position: -19px 60%;
-}
-#ca-unwatch.icon a.loading,
-#ca-watch.icon a.loading {
- background-image: url(images/watch-icon-loading.gif);
- background-position: center 60%;
-}
-#ca-unwatch.icon a span,
-#ca-watch.icon a span {
- display: none;
-}
\ No newline at end of file
+
position: relative;
width: 100%;
}
-
#mw-js-message {
font-size: 0.8em;
}
line-height: 1.5em;
}
-
-
-/* Babaco color scheme */
-/* Still working on this. Needs incorporated above once it's closer to final */
-body {
- background-color: #f9f9f9;
- color: #000000;
-}
-a {
- color: #003cb3;
-}
-a.new {
- color: #990000;
-}
-
-a:visited,
-div.vectorTabs li.selected a:visited div.vectorTabs li.selected a:visited span {
- color: #260e9c;
-}
-
-html .thumbimage,
-#toc, .toc, .mw-warning, div.thumbinner {
- border-color: #c0c0c0;
- background-color: #f0f0f0;
-}
-
-h1, h2, h3, h4, h5, h6 {
- border-color: #8d8d8d;
-}
-
-/* Watch/Unwatch Icon Styling */
-#ca-unwatch.icon,
-#ca-watch.icon {
-}
-#ca-unwatch.icon a,
-#ca-watch.icon a {
- margin: 0;
- padding: 0;
- outline: none;
- display: block;
- width: 26px;
- height: 2.5em;
-}
-#ca-unwatch.icon a {
- background-image: url(images/watch-icons.png);
- background-position: -43px 60%;
-}
-#ca-watch.icon a {
- background-image: url(images/watch-icons.png);
- background-position: 5px 60%;
-}
-#ca-unwatch.icon a:hover {
- background-image: url(images/watch-icons.png);
- background-position: -67px 60%;
-}
-#ca-watch.icon a:hover {
- background-image: url(images/watch-icons.png);
- background-position: -19px 60%;
-}
-#ca-unwatch.icon a.loading,
-#ca-watch.icon a.loading {
- background-image: url(images/watch-icon-loading.gif);
- background-position: center 60%;
-}
-#ca-unwatch.icon a span,
-#ca-watch.icon a span {
- display: none;
-}
\ No newline at end of file
+
\ No newline at end of file
dépôts / lhc / web / wiklou.git / commitdiff
