Commits

Barry Schwartz committed 2cb1128

A bit of correction to Linden Hill, and a new font family Fanwood.

Comments (0)

Files changed (10)

cf4/controllers/font.py

 log = logging.getLogger(__name__)
 
 my_fonts = [
+    'fanwood',
     'lindenhill',
     'goudy',
     'gb1911',
 # Translations template for CF4.
-# Copyright (C) 2010 ORGANIZATION
+# Copyright (C) 2011 ORGANIZATION
 # This file is distributed under the same license as the CF4 project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: CF4 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-12-26 23:37-0600\n"
+"POT-Creation-Date: 2011-01-06 15:49-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 msgstr ""
 
 #: cf4/templates/base.mako:22
+msgid "Fanwood"
+msgstr ""
+
+#: cf4/templates/base.mako:23
 msgid "Linden Hill"
 msgstr ""
 
-#: cf4/templates/base.mako:23
+#: cf4/templates/base.mako:24
 msgid "Sorts Mill Goudy"
 msgstr ""
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Goudy Bookletter 1911"
 msgstr ""
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Prociono"
 msgstr ""
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Juvelo"
 msgstr ""
 
-#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
+#: cf4/templates/base.mako:28 cf4/templates/font/index.mako:34
 msgid "Bonveno"
 msgstr ""
 
-#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:31 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr ""
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr ""
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr ""
 
-#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:36 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr ""
 
-#: cf4/templates/base.mako:89
+#: cf4/templates/base.mako:90
 msgid "dove"
 msgstr ""
 
-#: cf4/templates/base.mako:109
+#: cf4/templates/base.mako:110
 msgid "Who is The Crud Factory?"
 msgstr ""
 
-#: cf4/templates/base.mako:111
+#: cf4/templates/base.mako:112
 msgid "This page is made with:"
 msgstr ""
 
-#: cf4/templates/base.mako:114
+#: cf4/templates/base.mako:115
 msgid "IM Fell Types"
 msgstr ""
 
-#: cf4/templates/base.mako:118
+#: cf4/templates/base.mako:119
 msgid "You may like to see an <a href=\"/cf3/\">old version</a> of our pages."
 msgstr ""
 
 msgid "Crud Factory: Bonveno"
 msgstr ""
 
+#: cf4/templates/font/fanwood.mako:4
+msgid "Crud Factory: Fanwood"
+msgstr ""
+
 #: cf4/templates/font/fontshow.mako:19
 msgid "Free"
 msgstr ""
 msgid "Photo credit:"
 msgstr ""
 
-#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.mako:4
+#: cf4/templates/font/goudy.mako:4
 msgid "Crud Factory: Sorts Mill Goudy"
 msgstr ""
 
 msgstr ""
 
 #: cf4/templates/font/index.mako:28
+msgid "Fanwood <em>and Fanwood Italic</em>"
+msgstr ""
+
+#: cf4/templates/font/index.mako:29
 msgid "Linden Hill <em>and Linden Hill Italic</em>"
 msgstr ""
 
-#: cf4/templates/font/index.mako:29
+#: cf4/templates/font/index.mako:30
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr ""
 
 msgid "Crud Factory: Juvelo"
 msgstr ""
 
+#: cf4/templates/font/lindenhill.mako:4
+msgid "Crud Factory: Linden Hill"
+msgstr ""
+
 #: cf4/templates/font/prociono.mako:4
 msgid "Crud Factory: Prociono"
 msgstr ""

cf4/i18n/en/LC_MESSAGES/cf4.po

 "Project-Id-Version: CF4 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2010-08-15 22:37+0500\n"
-"PO-Revision-Date: 2010-12-26 23:38-0600\n"
+"PO-Revision-Date: 2011-01-06 15:49-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 msgstr ""
 
 #: cf4/templates/base.mako:22
+msgid "Fanwood"
+msgstr ""
+
+#: cf4/templates/base.mako:23
 msgid "Linden Hill"
 msgstr ""
 
-#: cf4/templates/base.mako:23
+#: cf4/templates/base.mako:24
 msgid "Sorts Mill Goudy"
 msgstr ""
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Goudy Bookletter 1911"
 msgstr ""
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Prociono"
 msgstr ""
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Juvelo"
 msgstr ""
 
-#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
+#: cf4/templates/base.mako:28 cf4/templates/font/index.mako:34
 msgid "Bonveno"
 msgstr ""
 
-#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:31 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr ""
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr ""
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr ""
 
-#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:36 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr ""
 
-#: cf4/templates/base.mako:89
+#: cf4/templates/base.mako:90
 msgid "dove"
 msgstr ""
 
-#: cf4/templates/base.mako:109
+#: cf4/templates/base.mako:110
 msgid "Who is The Crud Factory?"
 msgstr ""
 
-#: cf4/templates/base.mako:111
+#: cf4/templates/base.mako:112
 msgid "This page is made with:"
 msgstr ""
 
-#: cf4/templates/base.mako:114
+#: cf4/templates/base.mako:115
 msgid "IM Fell Types"
 msgstr ""
 
-#: cf4/templates/base.mako:118
+#: cf4/templates/base.mako:119
 msgid "You may like to see an <a href=\"/cf3/\">old version</a> of our pages."
 msgstr ""
 
 msgid "Crud Factory: Bonveno"
 msgstr ""
 
+#: cf4/templates/font/fanwood.mako:4
+msgid "Crud Factory: Fanwood"
+msgstr ""
+
 #: cf4/templates/font/fontshow.mako:19
 msgid "Free"
 msgstr ""
 msgid "Photo credit:"
 msgstr ""
 
-#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.mako:4
+#: cf4/templates/font/goudy.mako:4
 msgid "Crud Factory: Sorts Mill Goudy"
 msgstr ""
 
 msgstr ""
 
 #: cf4/templates/font/index.mako:28
+msgid "Fanwood <em>and Fanwood Italic</em>"
+msgstr ""
+
+#: cf4/templates/font/index.mako:29
 msgid "Linden Hill <em>and Linden Hill Italic</em>"
 msgstr ""
 
-#: cf4/templates/font/index.mako:29
+#: cf4/templates/font/index.mako:30
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr ""
 
 msgid "Crud Factory: Juvelo"
 msgstr ""
 
+#: cf4/templates/font/lindenhill.mako:4
+msgid "Crud Factory: Linden Hill"
+msgstr ""
+
 #: cf4/templates/font/prociono.mako:4
 msgid "Crud Factory: Prociono"
 msgstr ""

cf4/i18n/eo/LC_MESSAGES/cf4.po

 "Project-Id-Version: CF4 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2010-08-15 19:14+0500\n"
-"PO-Revision-Date: 2010-12-26 23:38-0600\n"
+"PO-Revision-Date: 2011-01-06 15:52-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: eo <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 msgstr "Tiparoj"
 
 #: cf4/templates/base.mako:22
+msgid "Fanwood"
+msgstr "Fanwood"
+
+#: cf4/templates/base.mako:23
 msgid "Linden Hill"
 msgstr "Linden Hill"
 
-#: cf4/templates/base.mako:23
+#: cf4/templates/base.mako:24
 msgid "Sorts Mill Goudy"
 msgstr "Sorts Mill Goudy"
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Goudy Bookletter 1911"
 msgstr "Goudy Bookletter 1911"
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Prociono"
 msgstr "Prociono"
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Juvelo"
 msgstr "Juvelo"
 
-#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
+#: cf4/templates/base.mako:28 cf4/templates/font/index.mako:34
 msgid "Bonveno"
 msgstr "Bonveno"
 
-#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:31 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr "E-libroj"
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr "Tipara servo"
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr "Ligiloj"
 
-#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:36 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr "Kontakti"
 
-#: cf4/templates/base.mako:89
+#: cf4/templates/base.mako:90
 msgid "dove"
 msgstr "kolombo"
 
-#: cf4/templates/base.mako:109
+#: cf4/templates/base.mako:110
 msgid "Who is The Crud Factory?"
 msgstr "Kiu estas la Rubejplenigejo?"
 
-#: cf4/templates/base.mako:111
+#: cf4/templates/base.mako:112
 msgid "This page is made with:"
 msgstr "Ĉi tiun retpaĝon oni faris per:"
 
-#: cf4/templates/base.mako:114
+#: cf4/templates/base.mako:115
 msgid "IM Fell Types"
 msgstr "Tipoj IM-Fell"
 
-#: cf4/templates/base.mako:118
+#: cf4/templates/base.mako:119
 msgid "You may like to see an <a href=\"/cf3/\">old version</a> of our pages."
 msgstr ""
 "Eble vi ŝatus vidi <a href=\"/cf3/\">malnovan version</a> de niaj "
 msgid "Crud Factory: Bonveno"
 msgstr "Rubejplenigejo: Bonveno"
 
+#: cf4/templates/font/fanwood.mako:4
+msgid "Crud Factory: Fanwood"
+msgstr "Rubejplenigejo: Fanwood"
+
 #: cf4/templates/font/fontshow.mako:19
 msgid "Free"
 msgstr "Senpaga"
 msgid "Photo credit:"
 msgstr "Fotis:"
 
-#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.mako:4
+#: cf4/templates/font/goudy.mako:4
 msgid "Crud Factory: Sorts Mill Goudy"
 msgstr "Rubejplenigejo: Sorts Mill Goudy"
 
 msgstr "La Rubejplenigeja Tiparo-Kolekto"
 
 #: cf4/templates/font/index.mako:28
+msgid "Fanwood <em>and Fanwood Italic</em>"
+msgstr "Fanwood <em>kaj Fanwood kursiva</em>"
+
+#: cf4/templates/font/index.mako:29
 msgid "Linden Hill <em>and Linden Hill Italic</em>"
 msgstr "Linden Hill <em>kaj Linden Hill kursiva</em>"
 
-#: cf4/templates/font/index.mako:29
+#: cf4/templates/font/index.mako:30
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr "Goudy de Sorts-Mill <em>kaj Goudy kursiva</em>"
 
 msgid "Crud Factory: Juvelo"
 msgstr "Rubejplenigejo: Juvelo"
 
+#: cf4/templates/font/lindenhill.mako:4
+msgid "Crud Factory: Linden Hill"
+msgstr "Rubejplenigejo: Linden Hill"
+
 #: cf4/templates/font/prociono.mako:4
 msgid "Crud Factory: Prociono"
 msgstr "Rubejplenigejo: Prociono"

cf4/public/font/fanwood.css

+#font-page
+{
+    position : relative;
+    top : 1pc;
+    height : 30pc;
+}
+
+#specimen-images
+{
+    position : absolute;
+    top : 0;
+    left : 24pc;
+}
+
+.specimen
+{
+    width : 36pc;
+    margin : 0 0 3pt 0;
+}

cf4/public/font/index.css

+@font-face
+{
+    font-family : Fanwood;
+    font-style : normal;
+    font-weight : normal;
+    src : url(/fontserver/serve/Fanwood);
+}
+
+@font-face
+{
+    font-family : Fanwood;
+    font-style : italic;
+    font-weight : normal;
+    src : url(/fontserver/serve/Fanwood-Italic);
+}
+
 @font-face
 {
     font-family : LindenHill;
     src : url(/font/BonvenoCF-Light.otf);
 }
 
+.fanwood
+{
+    font-family : Fanwood, serif;
+}
+
 .lindenhill
 {
     font-family : LindenHill, serif;

cf4/templates/base.mako

         <ul class="submenu width72pt">
           <li><a href="/font/index${h.make_params()}">${_(u'Fonts')}</a>
             <ul class="subsubmenu width136pt">
+              <li><a href="/font/show/fanwood${h.make_params()}">${_(u'Fanwood')}</a></li>
               <li><a href="/font/show/lindenhill${h.make_params()}">${_(u'Linden Hill')}</a></li>
               <li><a href="/font/show/goudy${h.make_params()}">${_(u'Sorts Mill Goudy')}</a></li>
               <li><a href="/font/show/gb1911${h.make_params()}">${_(u'Goudy Bookletter 1911')}</a></li>

cf4/templates/font/fanwood.mako

+<%inherit file="fontshow.mako"/>
+
+<%def name="title()">
+  <title>${_(u'Crud Factory: Fanwood')}</title>
+</%def>
+
+<%
+   info = {
+       'name'     : u'Fanwood',
+       'version'  : u'1.0',
+       'license'  : 'mit',
+       }
+
+   c.download_url = 'http://sortsmill.googlecode.com/files/fanwood-1.0.zip'
+   #c.old_versions = 'http://code.google.com/p/sortsmill/downloads/list?q=label:Fanwood'
+   c.old_versions = None
+%>
+
+<div id="font-page">
+
+  ${self.font_info(info)}
+
+  <div id="specimen-images">
+    <a href="/cf3/fonts/fanwood-promo.png" class="quiet-link"><img src="/cf3/fonts/fanwood-promo.png" alt="Fanwood specimen" class="specimen" /></a>
+  </div>
+
+</div>

cf4/templates/font/index.mako

   <h1>${_(u'The Crud Factory Font Collection')}</h1>
 
   <ul>
+    <li class="fanwood"><a href="/font/show/fanwood${h.make_params()}" class="quiet-link">${_(u'Fanwood <em>and Fanwood Italic</em>')|n}</a></li>
     <li class="lindenhill"><a href="/font/show/lindenhill${h.make_params()}" class="quiet-link">${_(u'Linden Hill <em>and Linden Hill Italic</em>')|n}</a></li>
     <li class="goudy"><a href="/font/show/goudy${h.make_params()}" class="quiet-link">${_(u'Sorts Mill Goudy <em>and Goudy Italic</em>')|n}</a></li>
     <li class="gb1911"><a href="/font/show/gb1911${h.make_params()}" class="quiet-link">${_(u'Goudy Bookletter 1911')}</a></li>

cf4/templates/font/lindenhill.mako

 <%inherit file="fontshow.mako"/>
 
 <%def name="title()">
-  <title>${_(u'Crud Factory: Sorts Mill Goudy')}</title>
+  <title>${_(u'Crud Factory: Linden Hill')}</title>
 </%def>
 
 <%