http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65483
Revision: 65483
Author: jeroendedauw
Date: 2010-04-23 20:17:55 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
Improved tab id naming and changed the style of the tabs to something more
vector-like
Modified Paths:
--------------
trunk/extensions/Storyboard/jquery/css/jquery-ui-1.7.2.custom.css
trunk/extensions/Storyboard/specials/StoryReview/StoryReview_body.php
Removed Paths:
-------------
trunk/extensions/Storyboard/jquery/css/images/
Modified: trunk/extensions/Storyboard/jquery/css/jquery-ui-1.7.2.custom.css
===================================================================
--- trunk/extensions/Storyboard/jquery/css/jquery-ui-1.7.2.custom.css
2010-04-23 20:04:56 UTC (rev 65482)
+++ trunk/extensions/Storyboard/jquery/css/jquery-ui-1.7.2.custom.css
2010-04-23 20:17:55 UTC (rev 65483)
@@ -42,35 +42,35 @@
* jQuery UI CSS Framework
* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt)
licenses.
-* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* To view and modify this theme, visit
http://jqueryui.com/themeroller/?ctl=themeroller
*/
/* Component containers
----------------------------------*/
-.ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif;
font-size: 1.1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee
url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color:
#333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828
url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color:
#ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: Verdana,Arial,sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff
url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #222222; }
+.ui-widget-content a { color: #222222; }
+.ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc
url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color:
#222222; font-weight: bold; }
+.ui-widget-header a { color: #222222; }
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid
#cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50%
50% repeat-x; font-weight: bold; color: #1c94c4; outline: none; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
color: #1c94c4; text-decoration: none; outline: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus,
.ui-widget-content .ui-state-focus { border: 1px solid #fbcb09; background:
#fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
font-weight: bold; color: #c77405; outline: none; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration:
none; outline: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid
#fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50%
50% repeat-x; font-weight: bold; color: #eb8f00; outline: none; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: #eb8f00; outline: none; text-decoration: none; }
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid
#d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50%
50% repeat-x; font-weight: normal; color: #555555; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
color: #555555; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus,
.ui-widget-content .ui-state-focus { border: 1px solid #999999; background:
#dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
font-weight: normal; color: #212121; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration:
none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid
#aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50%
50% repeat-x; font-weight: normal; color: #212121; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: #212121; outline: none; text-decoration: none; }
/* Interaction Cues
----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid
#fed22f; background: #ffe45c
url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color:
#363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid
#fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50%
50% repeat-x; color: #363636; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color:
#363636; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid
#cd0a0a; background: #b81900
url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color:
#ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color:
#ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid
#cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png)
50% bottom repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color:
#cd0a0a; }
.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35;
filter:Alpha(Opacity=35); background-image: none; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight:
bold; }
.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity:
.7; filter:Alpha(Opacity=70); font-weight: normal; }
@@ -81,12 +81,12 @@
/* states and images */
.ui-icon { width: 16px; height: 16px; background-image:
url(images/ui-icons_222222_256x240.png); }
.ui-widget-content .ui-icon {background-image:
url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image:
url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image:
url(images/ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image:
url(images/ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image:
url(images/ui-icons_ffd27a_256x240.png); }
+.ui-widget-header .ui-icon {background-image:
url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image:
url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image:
url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image:
url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image:
url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image:
url(images/ui-icons_cd0a0a_256x240.png); }
/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
@@ -279,8 +279,8 @@
.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }
/* Overlays */
-.ui-widget-overlay { background: #666666
url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity:
.50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000
url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity:
.20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -webkit-border-radius:
5px; }/* Tabs
+.ui-widget-overlay { background: #aaaaaa
url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity:
.30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa
url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity:
.30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius:
8px; }/* Tabs
----------------------------------*/
.ui-tabs { padding: .2em; zoom: 1; }
.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em
.2em 0; }
Modified: trunk/extensions/Storyboard/specials/StoryReview/StoryReview_body.php
===================================================================
--- trunk/extensions/Storyboard/specials/StoryReview/StoryReview_body.php
2010-04-23 20:04:56 UTC (rev 65482)
+++ trunk/extensions/Storyboard/specials/StoryReview/StoryReview_body.php
2010-04-23 20:17:55 UTC (rev 65483)
@@ -8,7 +8,7 @@
*
* @author Jeroen De Dauw
*
- * TODO: implement eternal load stuff for each list
+ * TODO: implement eternal load (or paging) stuff for each list
* TODO: fix layout
* TODO: ajax load tab contents?
*/
@@ -54,20 +54,20 @@
// Get a slave db object to do read operations against.
$dbr = wfGetDB( DB_SLAVE );
- $html = $this->getTabHtml( $dbr, Storyboard_STORY_UNPUBLISHED );
- $html .= $this->getTabHtml( $dbr, Storyboard_STORY_PUBLISHED );
- $html .= $this->getTabHtml( $dbr, Storyboard_STORY_HIDDEN );
-
$unpublished = htmlspecialchars( wfMsg(
'storyboard-unpublished' ) );
$published = htmlspecialchars( wfMsg( 'storyboard-published' )
);
- $hidden = htmlspecialchars( wfMsg( 'storyboard-hidden' ) );
+ $hidden = htmlspecialchars( wfMsg( 'storyboard-hidden' ) );
+ $html = $this->getTabHtml( $dbr, Storyboard_STORY_UNPUBLISHED,
$unpublished );
+ $html .= $this->getTabHtml( $dbr, Storyboard_STORY_PUBLISHED,
$published );
+ $html .= $this->getTabHtml( $dbr, Storyboard_STORY_HIDDEN,
$hidden );
+
$html = <<<EOT
<div id="storyreview-tabs">
<ul>
- <li><a href="#storyreview-tabs-0">$unpublished</a></li>
- <li><a href="#storyreview-tabs-1">$published</a></li>
- <li><a href="#storyreview-tabs-2">$hidden</a></li>
+ <li><a href="#$unpublished">$unpublished</a></li>
+ <li><a href="#$published">$published</a></li>
+ <li><a href="#$hidden">$hidden</a></li>
</ul>
$html
</div>
@@ -81,7 +81,7 @@
$wgOut->addHTML( $html );
}
- private function getTabHtml( DatabaseBase $dbr, $storyState ) {
+ private function getTabHtml( DatabaseBase $dbr, $storyState, $tabId ) {
// Create a query to retrieve information about all non hidden
stories.
$stories = $dbr->select(
Storyboard_TABLE,
@@ -103,7 +103,7 @@
$storyBlocks[] = $this->getStoryBlock( $story,
$storyState );
}
- return "<div id='storyreview-tabs-$storyState'>" . implode(
'<br />', $storyBlocks ) . '</div>';
+ return "<div id='$tabId'>" . implode( '<br />', $storyBlocks )
. '</div>';
}
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
