Add image files, fix browser issues

2 files changed, 13 insertions, 12 deletions

diff --git a/themes/colors/header.php b/themes/colors/header.php
index eab6d4efb0..c96e81bc6e 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -53,11 +53,6 @@ if ($ENABLE_RSS && !$REQUIRE_AUTHENTICATION) {
 	echo '<link href="', urlencode($SERVER_URL.'rss.php?ged='.WT_GEDCOM), '" rel="alternate" type="', $applicationType, '" title="', htmlspecialchars($GEDCOM_TITLE), '" />';
 }
 
-if ($use_alternate_styles && $BROWSERTYPE != "other") { ?>
-	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
-<?php 
-}
-
 if (WT_USE_LIGHTBOX) {
 	if ($TEXT_DIRECTION=='rtl') {
 		echo
@@ -103,6 +98,12 @@ echo
 	'<link type="text/css" href="themes/colors/modules.css" rel="Stylesheet" />',
 	'<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />';
 	
+if ($use_alternate_styles && $BROWSERTYPE != "other") { ?>
+	<link rel="stylesheet" href="<?php echo $THEME_DIR.$BROWSERTYPE; ?>.css" type="text/css" media="all" />
+<?php 
+}
+	
+	
 if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?> 
 	<link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> 
 <?php }
@@ -112,9 +113,6 @@ flush(); // Allow the browser to start fetching external stylesheets, javascript
 ?>
 
 <!-- begin header section -->
-<?php
-if ($view!='simple')
-   {?>
 <div id="header" class="<?php echo $TEXT_DIRECTION; ?>">
 
 <!-- begin colors code -->
@@ -144,7 +142,6 @@ if ($view!='simple')
 	</tr>
 </table>
 </div>
-<?php } ?>
 <!--end colors code -->
 <?php include($toplinks);
 } ?>
diff --git a/themes/colors/theme.php b/themes/colors/theme.php
index b7320df8b7..ae69e45655 100644
--- a/themes/colors/theme.php
+++ b/themes/colors/theme.php
@@ -65,7 +65,7 @@ $COLOR_THEME_LIST=array(
 	'mercury'         => /* I18N: This is the name of theme color-scheme */ i18n::translate('Mercury'),
 	'nocturnal'       => /* I18N: This is the name of theme color-scheme */ i18n::translate('Nocturnal'),
 	'olivia'          => /* I18N: This is the name of theme color-scheme */ i18n::translate('Olivia'),
-	'pinkplastic'     => /* I18N: This is the name of theme color-scheme */ i18n::translate('Pink Plastic'),
+	'pinkplastic'     => /* I18N: This is the name of theme color-scheme */ i18n::translate('Pink Plstic'),
 	'shinytomato'     => /* I18N: This is the name of theme color-scheme */ i18n::translate('Shiny Tomato'),
 	'tealtop'         => /* I18N: This is the name of theme color-scheme */ i18n::translate('Teal Top'),
 );
@@ -131,8 +131,10 @@ $WT_IMAGES["source"]["large"] = "source.gif";
 $WT_IMAGES["sex"]["large"] = "male.gif";
 $WT_IMAGES["sexf"]["large"] = "female.gif";
 $WT_IMAGES["sexn"]["large"] = "fe_male.gif";
-$WT_IMAGES['slide_open']['other'] = "open.png";
-$WT_IMAGES['slide_close']['other'] = "close.png";
+$WT_IMAGES["edit_indi"]["large"] = "edit_indi.png";
+$WT_IMAGES["edit_fam"]["large"] = "edit_fam.png";
+$WT_IMAGES["edit_source"]["large"] = "edit_source.png";
+
 
 //- WT main icons for optional modules
 $WT_IMAGES["menu_gallery"]["large"] = "menu_gallery.gif";
@@ -250,6 +252,8 @@ $WT_IMAGES["pin-in"]["other"] = "pin-in.png";
 $WT_IMAGES["default_image_M"]["other"] = "silhouette_male.gif";
 $WT_IMAGES["default_image_F"]["other"] = "silhouette_female.gif";
 $WT_IMAGES["default_image_U"]["other"] = "silhouette_unknown.gif";
+$WT_IMAGES['slide_open']['other'] = "open.png";
+$WT_IMAGES['slide_close']['other'] = "close.png";
 
 // - lifespan chart arrows
 $WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";