SVN commit 1213509 by elenamramirez:
GUI: Changes on KDEdu general style, added the new favicon and new style on
site header. The new logo has been included inside a H1 tag, so title page
moves to a H2 tag.
M edu/favicon.png
M +72 -2 edu/index.php
AM media/images/bg-menu.png
A media/images/header (directory)
AM media/images/header/input-search.png
AM media/images/header/label-search.png
M +129 -23 media/includes/derry/css.php
M +1 -0 media/includes/derry/template-header.inc
M +2 -2 media/includes/header.inc
--- trunk/www/sites/www-devel/edu/index.php #1213508:1213509
@@ -8,10 +8,80 @@
include( "header.inc" );
include( "site_includes/show_news.inc" );
+
?>
+<script type="text/javascript"
src="/media/javascripts/jquery-1.4.2.min.js"></script>
+ <script type="text/javascript"
src="/media/javascripts/plasmaMenu.min.js"></script>
+ <script type="text/javascript"
src="/media/javascripts/jquery.cycle.all.min.js"></script>
+ <script type="text/javascript">
+ (function($) {
+ var cache = [];
+ // Arguments are image paths relative to the current
page.
+ $.preLoadImages = function() {
+ var args_len = arguments.length;
+ for (var i = args_len; i--;) {
+ var cacheImage = document.createElement('img');
+ cacheImage.src = arguments[i];
+ cache.push(cacheImage);
+ }
+ }
+ })(jQuery)
+
+ $(document).ready(function() {
+ $('.sub').hide();
+ $('.toggle').show();
+ $('.teaser_hide').css('display', 'block');
+ <?php if (isset($teaser)) { ?>
+ // You need to add a comma after the php function
output if there are more entries
+ jQuery.preLoadImages(<?php $teaserImages->imageList();
?>,
+
"/media/images/plasmaMenu/menubox_top.png",
+
"/media/images/plasmaMenu/menubox_body.png",
+
"/media/images/plasmaMenu/menubox_bottom.png");
+ $('.teaser').cycle({
+ fx: '<?php echo $teaserImages->options['fx'];
?>',
+ timeout: <?php echo
$teaserImages->options['timeout']; ?>,
+ speed: <?php echo
$teaserImages->options['speed']; ?>,
+ next : $('#next'),
+ prev : $('#previous')
+ });
+
+ var show = function(e) {
+ var teaserPosition = $('.teaser').offset();
+ var next = $('#next');
+ var prev = $('#previous');
+ var left = (teaserPosition.left +
$('.teaser').width()) / 2;
+ next.css({top:teaserPosition.top,
left:left}).show();
+
prev.css({top:teaserPosition.top+$('.teaser').height()-prev.height(),
left:left}).show();
+ };
+
+ var hide = function(time) {
+ $('#next').hide();
+ $('#previous').hide();
+ };
+
+ var pause = function() {
+ $('.teaser').cycle('pause');
+ }
+
+ var resume = function() {
+ $('.teaser').cycle('resume');
+ }
+
+ $('.teaser').mouseover(show);
+ $('.teaser').mouseout(hide);
+ $('.teaser').mouseover(pause);
+ $('.teaser').mouseout(resume);
+
+ $('#next').mouseover(show);
+ $('#previous').mouseover(show);
+
+ <?php } ?>
+ });
+ </script><?php if (isset($teaser)) $teaserImages->generate(); ?>
<div class="info-area">
- <p><strong>Latest News from our Blogs</strong></p>
- <?php show_news( 10 ); ?>
+
+ <h4><strong>Latest News from our Blogs</strong></h4>
+ <?php show_news( 6 ); ?>
<p><a href="./news/">More News »</a></p>
</div>
--- trunk/www/sites/www-devel/media/includes/derry/css.php #1213508:1213509
@@ -9,11 +9,18 @@
padding: 0;
border: 0;
outline: 0;
- font-size: 100%;
+ /*font-size: 100%;*/
vertical-align: baseline;
background: transparent;
}
-body { line-height: 1; }
+
+/*Rule por use EM font-size instead PX*/
+
+html{
+ font-size: 62.5%;
+}
+
+body { line-height: 1; /*font-size: 1.2em; */text-align: center;
font-family:"Liberation Sans","Bitstream Vera Sans",sans-serif}
ol, ul { list-style: none; }
blockquote, q { quotes: none; }
blockquote:before, blockquote:after,q:before, q:after { content: '';
content: none; }
@@ -28,34 +35,64 @@
/* tables still need 'cellspacing="0"' in the markup */
table { border-collapse: collapse; border-spacing: 0; }
-body { text-align: center; font-family:"Liberation Sans","Bitstream Vera
Sans",sans-serif}
+/*body { text-align: center; font-family:"Liberation Sans","Bitstream Vera
Sans",Arial, Helvetica, sans-serif}*/
/*Header and footer backgrounds*/
html{background: #fff; /*#d4e9f1 #c2dfec;*/
- background-image:url('../../images/kde1.jpg');
- background-repeat:no-repeat;
+ background-image:url('../../images/background.png');
background-position:top center;
- min-height: 1100px;
+ /*min-height: 1100px;*/
}
body{background: transparent;
- background-image:url('../../images/footer1.png');
+ background-image:url('../../images/background-grunge.png');
background-repeat:no-repeat;
- background-position:bottom center;
+ background-position:top center;
/*min-height: 1100px;*/
}
/*Formating and setups*/
-.root { width: 850px; margin: 0px auto; text-align: left; }
+.root { width: 920px; margin: 0px auto; text-align: left; background:
url('../../images/kde-grunge.png') no-repeat right bottom }
-.header {background-image:url('../../images/page-hr-alt.png');
+.header{
+ padding-top: 25px;
+
+}
+.header h1{
+ float: left;
+ padding-left: 20px;
+}
+
+.header .search{
+ float: right;
+ margin-top: 30px;
+ margin-right: 20px;
+ }
+.header .search label{
+ text-indent: -9999999999px;
+ background: url('../../images/header/label-search.png') no-repeat left
center;
+ display: block;
+ width: 90px;
+ height: 30px;
+ float: left;
+}
+
+.header .search input{
+ background: url('../../images/header/input-search.png') no-repeat left
top;
+ border:none;
+ padding: 8px 8px 7px 30px;
+ color: #2d4e63;
+ width: 95px;
+}
+
+/*.header {background-image:url('../../images/page-hr-alt.png');
background-repeat:no-repeat;
- background-position:0 28px}
- .header .toolbox { height:32px;margin-bottom:8px; padding-left:8px;
background-image:url('../../images/kde.png');
+ background-position:0 28px}*/
+ /*.header .toolbox { height:32px;margin-bottom:8px; padding-left:8px;
background-image:url('../../images/kde.png');
background-repeat:no-repeat;
- background-position:0 4px}
+ background-position:0 4px}*/
.header .toolbox .toolboxtext { padding-top: 10px; }
.header .toolbox div {float: left; width: auto;padding: 0 10px
0 10px;color: #888; text-shadow: #fff 0px 0px 3px; text-decoration:none;
font-size: 12px; font-weight:normal;}
.header .toolbox #location {min-width:370px;}
@@ -105,9 +142,9 @@
background-position:0 0}
#cp-menu-support:hover {text-shadow: #e285ff 0px 0px 18px;}
-.content { background-image:url('../../images/page-bg-alt.png');
- background-repeat:repeat-y;
- background-position:top center}
+.content { background:url('../../images/bg-content.png') repeat-y top center;
+ clear: left;
+ padding: 40px 0px;}
.content .teaser { height: 300px; width: 830px; display: block; margin:
auto; }
.content .teaser_hide { display: none; }
.content a { color: #235E9A; }
@@ -120,25 +157,30 @@
.footer .module { float: left; width: 25%; margin: 0 10px 30px 10px}
.footer .module {font-size:x-small;}
-#footer {color: #aaa; font-size:xx-small;
width:100%;background:#333;padding:5px 0 5px 0}
+#footer {color: #aaa; font-size:xx-small; width:100%;background:#505050
url('../../images/footer.png') no-repeat center top;padding:5px 0 5px 0}
#footer a {color: #eee;}
+#footer_text{
+ margin-top: 45px;
+ margin-bottom: 20px;
+}
+
#sidebar { color: #444; float: right; max-width:185px; min-height:200px;
margin:10px 0px 10px 15px; padding: 15px; border: 1px solid #ccc;
font-size:10pt; text-align:
left;background-image:url('../../images/30.png');border-radius: 3px;
-moz-border-radius: 3px; -webkit-border-radius: 3px;-khtml-border-radius:
3px;box-shadow: 0px 1px 8px #aaa;}
a.cp-doNotDisplay { display: none; }
-#main {text-align:justify; padding:10px 20px 0px 20px;}
+#main { padding:10px 50px 0px}/*text-align:justify;*/
/*Typography*/
-/*#main {font-size:10pt; line-height:120%;text-shadow: #fff 0px 0px 3px;}
+#main {/*font-size:10pt;*/ text-shadow: #fff 0px 0px 3px;}
#main p, #main ul { color: #444; padding: 15px}
#main ul { list-style: circle inside; }
#main ul li ul { padding: 0px; padding-left: 15px; }
#main h1 { color: #446888;font-size:22pt; padding:30px 0px 20px 0px;}
-#main h2 { color: #446888;margin:30px 0px 20px 0px;font-size:18pt;}
+#main h2 { color: #446888;margin:30px 0px 20px 0px;/*font-size:18pt;*/
background: url('../../images/under-h2.png') no-repeat center bottom;}
#main h3 { color: #446888;font-size:17pt;font-weight:bold}
#main h4 { color: #446888;font-size:16pt;}
#main h5 { color: #446888;font-size:14pt;}
@@ -149,11 +191,11 @@
#main a { color: #235E9A; text-decoration:none}
#main a:hover {text-decoration:underline;}
-#main p { color: #444; padding: 15px}
+#main p { color: #444; padding: 10px 15px; font-size: 1.3em;
line-height:1.7em;}
#main h1, #main h2, #main h3, #main h4, #main h5, #main h6 {font-weight:normal}
-#main h1 { line-height:130%; padding-left:10px;
background-image:url('../../images/30.png'); color: #335877;font-size:18pt;
margin:20px 10px 10px 0px;}
-#main h2 { color: #446888;font-size:16pt; padding:30px 0px 20px 0px;}
+#main h1 { line-height:1.3em; padding-left:10px;
/*background-image:url('../../images/30.png'); */ color:
#2d4e63;font-size:1.8em; margin:20px 10px 10px 0px;}
+#main h2 { color: #0d5381;font-size:1.9em; padding:10px 0px 15px 0px;}
#main h3 { color: #557899;font-size:15pt; padding:25px 0px 15px 0px;}
#main h4 { color: #557899;font-size:13pt; padding:20px 0px 10px
0px;font-weight:bold;}
#main h5 { color: #557899;font-size:12pt; padding:15px 0px 10px
0px;font-weight:bold;}
@@ -162,6 +204,10 @@
/*box-shadow: 0px 2px 10px #888;*/
#main img {margin:10px; padding:5px;
background-image:url('../../images/70.png'); border:1px solid #aaa;
border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius:
3px;-khtml-border-radius: 3px;}
+#main .teaser img{
+ border: none; margin: 0px; padding: 0px; background: none;
+}
+
#main dl,#main ol,#main ul {padding:10px 30px;}
#main ol {list-style:decimal}
#main ul {list-style-image:url('../../images/list-circle.png');}
@@ -187,6 +233,24 @@
#main cite {}
#main pre { font-size:9pt; font-style:"monospace"; color:#555; padding: 2px
5px 2px 20px; border:1px solid #DDD; margin-left:20px;}
+/*Breadcrumb*/
+
+#main .toolbox ul{
+ list-style: none;
+ text-align: right;
+ font-size: 1.1em;
+ padding: 10px 5px;
+ background: url('../../images/border-breadcrumb.png') no-repeat center
center;
+}
+
+#main .toolbox ul a{
+ color: #878787;
+}
+
+#main .toolbox ul li:hover {
+ list-style-image: none;
+}
+
/* Download button */
#main a.downloadButton {
display:block; width: 130px; height:61px; background:
url('/images/buttons/download_empty.png'); text-align:center; padding: 40px
10px 15px 130px; font-size:12pt; line-height:20px;
@@ -265,8 +329,48 @@
max-width: 300px;
padding-left: 10px;
text-align: left;
+ background: url('../../images/vertical-sep.png') repeat-y left top;
}
+#main .info-area h4{
+ font-size: 1.7em;
+ /*text-transform: uppercase;*/
+ padding-left: 55px;
+ font-weight: bold;
+ background: url('../../images/news.png') no-repeat 15px bottom;
+ font-family: Times New Roman, Georgia, serif;
+ font-style: italic;
+ color: #555;
+ text-shadow: 1px 1px 0px #ccc;
+}
+
+#main .info-area ul, #main .info-area ul li:hover{
+ list-style: none;
+}
+
+#main .info-area ul li{
+ margin: 15px 0px 15px 10px;
+}
+
+#main .info-area ul a{
+ font-size: 1.2em;
+ color: #777;
+ display: block;
+ margin: 9px 0px;
+ line-height: 1.4em;
+}
+
+.date{
+ text-shadow: none;
+ background: #E3726F;
+ color: #fff;
+ padding: 2px 5px;
+ font-size: 1.1em;
+}
+
+#main .info-area p{
+ text-align: right;
+}
#main table.ocs img {
padding: 1px !important;
margin: 0px;
@@ -314,3 +418,5 @@
.toggle {float: right; width: auto;padding: 10px 10px 0 10px;color: #888;
text-shadow: #fff 0px 0px 3px; text-decoration:none; font-size: 12px;
font-weight:normal; display none; }
#hotspot {float: right;}
+
+
--- trunk/www/sites/www-devel/media/includes/derry/template-header.inc
#1213508:1213509
@@ -44,6 +44,7 @@
<link rel="stylesheet" media="screen" type="text/css" title="KDE
Stylesheet" href="/media/includes/derry/css.php" />
<link rel="stylesheet" media="screen" type="text/css" title="KDE
Stylesheet" href="/media/styles/plasmaMenu.css" />
+ <link rel="stylesheet" media="screen" type="text/css" title="KDE
Stylesheet" href="/media/styles/plasmaMenuEdu.css" />
<?php $plasmaMenu->showCss(); ?>
<!--[if lte IE 7]>
<style type="text/css">
--- trunk/www/sites/www-devel/media/includes/header.inc #1213508:1213509
@@ -149,12 +149,12 @@
<a name="cp-content"></a>
<?php
if (isset ($_REQUEST ['edit']))
- print "<h1>Edit Page: \"$page_title\"</h1>\n";
+ print "<h2>Edit Page: \"$page_title\"</h2>\n";
elseif (isset($page_title) && ($page_title != "")) {
if (isset($page_title_extra_html)) {
print $page_title_extra_html;
}
- print "<h1>$page_title</h1>\n";
+ print "<h2>$page_title</h2>\n";
}
if (isset ($templatepath))
