[NBP web-reskin] [SCM] UNNAMED PROJECT branch, master,
updated. 2bf971e8d7889e7fe37298f79d0deb029296e839
fidelity_camp at nbp.org
fidelity_camp at nbp.org
Thu Nov 5 13:32:05 EST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, master has been updated
via 2bf971e8d7889e7fe37298f79d0deb029296e839 (commit)
from c6f49347b084b90a000491e86e4d1bd2c80b8105 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2bf971e8d7889e7fe37298f79d0deb029296e839
Author: V.Prabhakar at FMR.COM <fidelity_camp at tp6.endpoint.com>
Date: Thu Nov 5 13:31:07 2009 -0500
copy steve's changes -edie
-----------------------------------------------------------------------
Summary of changes:
commit 2bf971e8d7889e7fe37298f79d0deb029296e839
Author: V.Prabhakar at FMR.COM <fidelity_camp at tp6.endpoint.com>
Date: Thu Nov 5 13:31:07 2009 -0500
copy steve's changes -edie
---
catalogs/nbp/templates/regions/HEAD_P | 43 +++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/catalogs/nbp/templates/regions/HEAD_P b/catalogs/nbp/templates/regions/HEAD_P
index ca8b772..35247eb 100644
--- a/catalogs/nbp/templates/regions/HEAD_P
+++ b/catalogs/nbp/templates/regions/HEAD_P
@@ -1,7 +1,40 @@
+<<<<<<< HEAD:catalogs/nbp/templates/regions/HEAD_P
+<!-- BEGIN HEAD_P 09-29-2009 -->
+[perl]
+$Scratch->{xtitle} = 'NBP - ' . $Scratch->{xsection_title} . ' - ' . $Scratch->{xpage_title} if ($Scratch->{xsection_title} && $Scratch->{xpage_title});
+ return '';
+[/perl][tmpn with_highlights]1[/tmpn]
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+ <title>[if scratch xtitle][scratchd xtitle][else]NBP - Promoting Braille Literacy, Braille Books, and other Braille Publications[/else][/if]</title>
+ <META name="description" content="National Braille Press offers blind children the power of literacy and blind adults access to the printed word.">
+ <META name="keywords" content="Louis Braille biography, braille books, books in braille, blind literacy">
+
+[comment] The style sheet variable is commented out until it is ready SWD 9-29-09 [var CUSTOM_CSS] [/comment]
+
+<script type="text/javascript" language="JavaScript">
+<!--
+ TMonth = new Array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
+ TDate = new Date();
+ CurYear = TDate.getFullYear();
+ CurMonth = TDate.getMonth();
+ CurDay = TDate.getDate();
+ TheDate = TMonth[CurMonth] + ' ' + CurDay + ', ' + CurYear;
+// -->
+</script>
+
+
+<!-- Until all the styles in StylesNew.css and style1 are added to the .css files
+ they will be included here.
+ S.DiDomenico 9/16/2009
+-->
+
+=======
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<head>
<title>NBP Home Page</title>
+>>>>>>> c6f49347b084b90a000491e86e4d1bd2c80b8105:catalogs/nbp/templates/regions/HEAD_P
<link href="/nbp/StylesNew.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.style1
@@ -9,6 +42,12 @@
width: 24px;
}
</style>
+<<<<<<< HEAD:catalogs/nbp/templates/regions/HEAD_P
+
+<!-- The JavaScript will also stay here until we create the .js files -->
+
+=======
+>>>>>>> c6f49347b084b90a000491e86e4d1bd2c80b8105:catalogs/nbp/templates/regions/HEAD_P
<script type="text/javascript">
// SECOND MENU TYPE
var timeout = 500;
@@ -55,3 +94,7 @@
document.onclick = mclose;
</script>
</head>
+<<<<<<< HEAD:catalogs/nbp/templates/regions/HEAD_P
+<!-- END HEAD_P -->
+=======
+>>>>>>> c6f49347b084b90a000491e86e4d1bd2c80b8105:catalogs/nbp/templates/regions/HEAD_P
hooks/post-receive
--
UNNAMED PROJECT
More information about the Web-reskin
mailing list