Permalink
Browse files

More FAQ cleanup. Added sponsor script thingy to lower right corner.

  • Loading branch information...
1 parent bb4c04f commit cd9910cdbf4b78f4abd1e451a1849972c3effa48 @jhannah jhannah committed Aug 26, 2012
Showing with 17 additions and 19 deletions.
  1. +1 −0 lib/layout
  2. +1 −5 src/faq/hosting_faq.html
  3. +11 −14 src/faq/index.html
  4. +4 −0 src/includes/style.css
View
@@ -67,6 +67,7 @@
<div id="footer">
<div class="sub_holder">
<hr />
+ <div id="sponsor_element"><script language="JavaScript" src="http://www.perl.org/misc/site-sponsor-js.html"></script></div>
<div id="google_translate_element"></div>
<p>Copyright © 1997-2012 <a href="http://www.perlfoundation.org/">The Perl Foundation</a> - <a href="https://github.com/perlorg/www.pm.org/">Site repository</a></p>
<p>The Perl camel image is a trademark of <a href="http://www.oreilly.com/">O'Reilly Media, Inc.</a> Used with permission.</p>
@@ -354,13 +354,9 @@
<p>
The output width is fixed at 180, but the height is variable. If you want
to personalize the text message, you can add '?notext=1' to the src string.
- Here's the ad rotation in action:
+ You can see the ad rotation in action at the bottom right corner of this page.
</p>
<p>
-<center>
-<script language="JavaScript" src="http://www.perl.org/misc/site-sponsor-js.html"></script>
-</center>
-</p>
<hr>
View
@@ -92,44 +92,41 @@
<hr/>
<h2>
- The Perl Mongers logo
-</h2>
-<h3>
<a href="#camel">*</a><a name="camel"></a>
- Can I use the Perl Mongers logo?
-</h3>
+ Perl Mongers logo
+</h2>
<p>
The camel used in association with the Perl language is a trademark of O'Reilly &amp; Associates.
- <a href="http://onlamp.com/pub/a/oreilly/perl/usage/">More information</a>.
+ More information:
+ <a href="http://onlamp.com/pub/a/oreilly/perl/usage/">[1]</a>
+ <a href="http://www.oreillynet.com/lpt/a/3157">[2]</a>
</p>
<p>
Perl Mongers groups can use the logo that appears on this page on their own
web page as long as they include the following text somewhere (able to be
clearly seen) on the page:
</p>
<p>
- "The use of the camel image in association with the Perl language is a
+ &nbsp; &nbsp; &nbsp; "The use of the camel image in association with the Perl language is a
trademark of O'Reilly &amp; Associates, Inc. Used with permission."
</p>
<p>
Use of the Perl Mongers logo in other media is evaluated on a case by case
basis since Perl Mongers is legally liable for its misuse. Our license with
O'Reilly &amp; Associates requires us to report misuse of the Camel logo
with the Perl Mongers name. Help us not get in trouble.
-</p>
-<p>
- You can only use the image as you find it. Additionally, you cannot
+ You can only use the image as you find it. You cannot
incorporate it into a larger logo or make it look like it is part of a
- larger graphic. If you have other needs, we might be able to work something
- out. We will, however, be less willing to work out special situations if we
- have to ask you to remove an improperly used logo before you ask us. We are
- legally liable for misuse of the logo.
+ larger graphic.
</p>
<p>
<img src="/images/shirts.png">
<a href="/images/logo.jpg"><img src="/images/logo_thumb.jpg" border=0></a>
<img src="/images/title.png">
</p>
+<p>
+ In contrast, you may prefer <a href="http://www.perlfoundation.org/perl_trademark">onions</a>.
+</p>
[% END %]
@@ -178,6 +178,10 @@ img.masthead{
padding-right: 40px;
float: right;
}
+#sponsor_element {
+ padding-right: 40px;
+ float: right;
+}
@media only screen and (max-width: 767px) {
#masthead{

0 comments on commit cd9910c

Please sign in to comment.