Per request of deb@, put the "Donate to FreeBSD" button in

the default page header.  The following changes were made:

 - Remove the Donate to FreeBSD button added a few days ago

 - Add stylesheet entries for the new button.  Note this
   button is pure CSS, and does not use background images
   for the rounded boarders.

 - Move the 'Donate' and 'Contact' links from the header:
    o 'Donate' is now 'Hardware Donations' in the menu
       dropdown.
    o 'Contact' is now in the footer.
    o The 'Donate' link that existed in the menu dropdown
      is now 'Monetary Donations'.

 - The header2.donatebutton entity is now used for this
   button, so translation teams can modify localized
   header.l10n.ent for the button text.

 - Comment the header2.searchnav entity entries in header.ent
   for now, until I figure out what to do with them.

This change should have zero UI regressions, and solves the
problem of the previously added button pushing the 'New to
FreeBSD' button down into the security text.[1]

Requested by:	deb
Reported by:	emaste[1], gavin[1]
This commit is contained in:
Glen Barber 2012-12-12 21:32:25 +00:00
parent 278149606e
commit 11e3c1e757
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40361
4 changed files with 56 additions and 11 deletions
en_US.ISO8859-1/htdocs
share/xml

View file

@ -190,14 +190,6 @@
</div> <!-- FRONTSHORTCUTSCONTENT -->
</div> <!-- FRONTSHORTCUTS -->
<div class="frontnewroundbox">
<div class="frontnewtop"><div><b style="display: none">.</b></div></div>
<div class="frontnewcontent">
<a href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
</div> <!-- frontnewcontent -->
<div class="frontnewbot"><div><b style="display: none">.</b></div></div>
</div> <!-- frontnewroundbox -->
<div class="frontnewroundbox">
<div class="frontnewtop"><div><b style="display: none">.</b></div></div>
<div class="frontnewcontent">
@ -344,5 +336,6 @@
permission of <a
href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
FreeBSD Foundation</a>.
<a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
</xsl:template>
</xsl:stylesheet>

View file

@ -409,6 +409,43 @@
width: 150px;
}
/* Donate Button */
/* height and width details */
.frontdonatetop div, .frontdonatetop, .frontdonatebot div, .frontdonatebot {
width: 20%;
height: 10px;
font-size: 1px;
text-align: center;
}
.frontdonatecontent {
margin: 0;
padding: 0;
margin-top: -4px;
margin-bottom: -4px;
text-align: center;
font-size: 1.1em;
font-weight: bold;
}
.frontdonatecontent a, .frontdonatecontent a:link, .frontdonatecontent a:visited, .frontdonatecontent a:hover, .frontdonatecontent a:active {
color: #990000;
text-decoration: none;
}
.frontdonateroundbox {
margin-top: 10px;
padding: 0;
/*padding-right: 30px;*/
width: 150px;
height: 25px;
background-color: white;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-khtml-border-radius: 10px;
border-radius: 10px;
}
/* Get FreeBSD Box */
/* set background images for corners */

View file

@ -37,6 +37,17 @@
<!ENTITY header2.word.donate 'Donate'>
<!ENTITY header2.word.contact 'Contact'>
<!ENTITY header2.donatebutton '
<div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
<div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
<div class="frontdonatecontent">
<a
href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
</div>
<div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
</div>
'>
<!ENTITY header2.searchinputs '
<div xmlns="http://www.w3.org/1999/xhtml">
<input type="hidden" name="max" value="25" />
@ -119,7 +130,8 @@
<ul>
<li><a href="http://www.freebsdfoundation.org/">Foundation</a>
<ul>
<li><a href="http://www.freebsdfoundation.org/donate/">Donate</a></li>
<li><a href="http://www.freebsdfoundation.org/donate/">Monetary Donations</a></li>
<li><a href="&base;/donations/">Hardware Donations</a></li>
</ul>
</li>
</ul>
@ -131,9 +143,9 @@
<!ENTITY header2.searchnav '
<div xmlns="http://www.w3.org/1999/xhtml" id="searchnav">
<ul id="searchnavlist">
<li><a href="&base;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>
<!--<li><a href="&base;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>-->
<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
<!--<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>-->
</ul>
</div> <!-- SEARCHNAV -->
'>
@ -156,6 +168,7 @@
</div> <!-- HEADERLOGOLEFT -->
<div id="headerlogoright">
&header2.donatebutton;
&header2.searchnav.label;
&header2.searchnav;

View file

@ -63,6 +63,8 @@
</div> <!-- HEADERLOGOLEFT -->
<div id="headerlogoright">
&header2.donatebutton;
&header2.searchnav.label;
&header2.searchnav;