merge revisions 1938 and 1949 from branch-1_7 to trunk:

dark theme correction
permalink and category.php redirections are permanent (http code 301) instead of temporary (301)
added rel nofollow for the metadata link on picture page
changed h2 background color style in dark/mail-css (was not readable when images are not downloaded)

git-svn-id: http://piwigo.org/svn/trunk@1950 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-04-09 23:25:45 +00:00
parent 56d9ed3c47
commit 01cc3d8d98
5 changed files with 4 additions and 10 deletions

View File

@@ -60,7 +60,7 @@ if ( isset($_GET['cat']) )
$url = make_index_url($url_params);
if (!headers_sent())
{
set_status_header(302);
set_status_header(301);
redirect_http( $url );
}
redirect ( $url );

View File

@@ -749,7 +749,7 @@ if ( 'categories'==$page['section'] and isset($page['category']) )
);
if (!headers_sent())
{ // this is a permanent redirection
set_status_header(302);
set_status_header(301);
redirect_http( $redirect_url );
}
redirect( $redirect_url );

View File

@@ -18,7 +18,7 @@
<div class="randomButtons">
<a href="{U_SLIDESHOW}" title="{lang:slideshow}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{lang:slideshow}"></a>
<a href="{U_METADATA}" title="{lang:picture_show_metadata}"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
<a href="{U_METADATA}" title="{lang:picture_show_metadata}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{lang:picture_show_metadata}"></a>
<!-- BEGIN representative -->
<a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"></a>
<!-- END representative -->

View File

@@ -7,7 +7,7 @@ body{background-color:#444; color:#fff;}
#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
color: #69c;}
h2 { background-color: #ddd;color:#fff48e;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
h2 { background-color: #333;color:#fff48e;background-image: url({pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/images/tableh1_bg.png);}
img { margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
img:hover { padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
a { color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; }

View File

@@ -146,11 +146,5 @@ TD.calDayCellEmpty { color: silver; }
.calBackDate { color: #000; }
.calForeDate { color: #fff; }
.virtual_cat { background: #3f3f3f !important; }
#content ul.thumbnailCategories li div.thumbnailCategory .description p {
display: none;
}
#content ul.thumbnailCategories li div.thumbnailCategory .description p + p {
display: inline;
}
.qsearch { font-size: 80%; font-style: normal; }
#mbMenu #quicksearch > p { text-align: left; }