1. Barry Schwartz
  2. CF4

Commits

Barry Schwartz  committed 3f76dcd

Another sample image for Linden Hill.

  • Participants
  • Parent commits 1290a55
  • Branches default

Comments (0)

Files changed (11)

File cf4/controllers/font.py

View file
 log = logging.getLogger(__name__)
 
 my_fonts = [
+    'lindenhill',
     'goudy',
     'gb1911',
     'prociono',

File cf4/i18n/cf4.pot

View file
 msgstr ""
 "Project-Id-Version: CF4 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-09-18 18:58-0500\n"
+"POT-Creation-Date: 2010-12-26 23:37-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 "Linden Hill"
+msgstr ""
+
+#: cf4/templates/base.mako:23
 msgid "Sorts Mill Goudy"
 msgstr ""
 
-#: cf4/templates/base.mako:23 cf4/templates/font/index.mako:29
+#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
 msgid "Goudy Bookletter 1911"
 msgstr ""
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Prociono"
 msgstr ""
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Juvelo"
 msgstr ""
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Bonveno"
 msgstr ""
 
-#: cf4/templates/base.mako:29 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr ""
 
-#: cf4/templates/base.mako:32 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr ""
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr ""
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr ""
 
-#: cf4/templates/base.mako:88
+#: cf4/templates/base.mako:89
 msgid "dove"
 msgstr ""
 
 msgid "Photo credit:"
 msgstr ""
 
-#: cf4/templates/font/goudy.mako:4
+#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.mako:4
 msgid "Crud Factory: Sorts Mill Goudy"
 msgstr ""
 
 msgstr ""
 
 #: cf4/templates/font/index.mako:28
+msgid "Linden Hill <em>and Linden Hill Italic</em>"
+msgstr ""
+
+#: cf4/templates/font/index.mako:29
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr ""
 

File cf4/i18n/en/LC_MESSAGES/cf4.po

View file
 "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-09-18 18:58-0500\n"
+"PO-Revision-Date: 2010-12-26 23:38-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 "Linden Hill"
+msgstr ""
+
+#: cf4/templates/base.mako:23
 msgid "Sorts Mill Goudy"
 msgstr ""
 
-#: cf4/templates/base.mako:23 cf4/templates/font/index.mako:29
+#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
 msgid "Goudy Bookletter 1911"
 msgstr ""
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Prociono"
 msgstr ""
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Juvelo"
 msgstr ""
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Bonveno"
 msgstr ""
 
-#: cf4/templates/base.mako:29 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr ""
 
-#: cf4/templates/base.mako:32 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr ""
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr ""
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr ""
 
-#: cf4/templates/base.mako:88
+#: cf4/templates/base.mako:89
 msgid "dove"
 msgstr ""
 
 msgid "Photo credit:"
 msgstr ""
 
-#: cf4/templates/font/goudy.mako:4
+#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.mako:4
 msgid "Crud Factory: Sorts Mill Goudy"
 msgstr ""
 
 msgstr ""
 
 #: cf4/templates/font/index.mako:28
+msgid "Linden Hill <em>and Linden Hill Italic</em>"
+msgstr ""
+
+#: cf4/templates/font/index.mako:29
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr ""
 

File cf4/i18n/eo/LC_MESSAGES/cf4.po

View file
 "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-09-18 19:03-0500\n"
+"PO-Revision-Date: 2010-12-26 23:38-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 "Linden Hill"
+msgstr "Linden Hill"
+
+#: cf4/templates/base.mako:23
 msgid "Sorts Mill Goudy"
 msgstr "Sorts Mill Goudy"
 
-#: cf4/templates/base.mako:23 cf4/templates/font/index.mako:29
+#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
 msgid "Goudy Bookletter 1911"
 msgstr "Goudy Bookletter 1911"
 
-#: cf4/templates/base.mako:24 cf4/templates/font/index.mako:30
+#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
 msgid "Prociono"
 msgstr "Prociono"
 
-#: cf4/templates/base.mako:25 cf4/templates/font/index.mako:31
+#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
 msgid "Juvelo"
 msgstr "Juvelo"
 
-#: cf4/templates/base.mako:26 cf4/templates/font/index.mako:32
+#: cf4/templates/base.mako:27 cf4/templates/font/index.mako:33
 msgid "Bonveno"
 msgstr "Bonveno"
 
-#: cf4/templates/base.mako:29 cf4/templates/main/main.mako:27
+#: cf4/templates/base.mako:30 cf4/templates/main/main.mako:27
 #: cf4/templates/rubbish/index.mako:41
 msgid "E-books"
 msgstr "E-libroj"
 
-#: cf4/templates/base.mako:32 cf4/templates/main/main.mako:28
+#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:28
 msgid "Font Server"
 msgstr "Tipara servo"
 
-#: cf4/templates/base.mako:33 cf4/templates/main/main.mako:29
+#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:29
 msgid "Links"
 msgstr "Ligiloj"
 
-#: cf4/templates/base.mako:34 cf4/templates/main/main.mako:30
+#: cf4/templates/base.mako:35 cf4/templates/main/main.mako:30
 msgid "Contact"
 msgstr "Kontakti"
 
-#: cf4/templates/base.mako:88
+#: cf4/templates/base.mako:89
 msgid "dove"
 msgstr "kolombo"
 
 msgid "Photo credit:"
 msgstr "Fotis:"
 
-#: cf4/templates/font/goudy.mako:4
+#: cf4/templates/font/goudy.mako:4 cf4/templates/font/lindenhill.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 "Linden Hill <em>and Linden Hill Italic</em>"
+msgstr "Linden Hill <em>kaj Linden Hill kursiva</em>"
+
+#: cf4/templates/font/index.mako:29
 msgid "Sorts Mill Goudy <em>and Goudy Italic</em>"
 msgstr "Goudy de Sorts-Mill <em>kaj Goudy kursiva</em>"
 

File cf4/model/webfonts_data.py

View file
     file_list = os.listdir(fonts_dir)
     fonts = []
     for file_name in file_list:
-        if file_name[-4:] == '.ttf':
+        if file_name[-4:] in ('.ttf', '.otf'):
             font_data = examine_font(fonts_dir, file_name)
             fonts.append(font_data)
     fonts.sort(key = (lambda font : (font['family'], font['fullname'])))

File cf4/public/font/fontshow.css

View file
 
 #old-versions
 {
-    margin-top : 8pc;
+    margin-top : 6pc;
 }

File cf4/public/font/index.css

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

File cf4/public/font/lindenhill.css

View file
+#font-page
+{
+    position : relative;
+    top : 1pc;
+    height : 30pc;
+}
+
+#specimen-images
+{
+    position : absolute;
+    top : 0;
+    left : 24pc;
+}
+
+.LindenHill-Image-neighborhood
+{
+    width : 200px;
+    height : 200px;
+    margin : 0 0 3pt 0;
+}
+
+.a_poets_advice
+{
+    width : 36pc;
+    margin : 0 0 3pt 0;
+}

File cf4/templates/base.mako

View file
         <ul class="submenu width72pt">
           <li><a href="/font/index${h.make_params()}">${_(u'Fonts')}</a>
             <ul class="subsubmenu width136pt">
+              <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>
               <li><a href="/font/show/prociono${h.make_params()}">${_(u'Prociono')}</a></li>

File cf4/templates/font/index.mako

View file
   <h1>${_(u'The Crud Factory Font Collection')}</h1>
 
   <ul>
+    <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>
     <li class="prociono"><a href="/font/show/prociono${h.make_params()}" class="quiet-link">${_(u'Prociono')}</a></li>

File cf4/templates/font/lindenhill.mako

View file
+<%inherit file="fontshow.mako"/>
+
+<%def name="title()">
+  <title>${_(u'Crud Factory: Sorts Mill Goudy')}</title>
+</%def>
+
+<%
+   info = {
+       'name'     : u'Linden Hill',
+       'version'  : u'1.2',
+       'license'  : 'mit',
+       }
+
+   c.download_url = 'http://sortsmill.googlecode.com/files/lindenhill-1.2.zip'
+   c.old_versions = 'http://code.google.com/p/sortsmill/downloads/list?q=label:Linden%20Hill'
+%>
+
+<div id="font-page">
+
+  ${self.font_info(info)}
+
+  <div id="specimen-images">
+    <a href="/cf3/fonts/neighborhood.png" class="quiet-link"><img src="/cf3/fonts/neighborhood.png" alt="Linden Hill neighborhood" class="LindenHill-Image-neighborhood" /></a>
+    <a href="/cf3/fonts/a_poets_advice.png" class="quiet-link"><img src="/cf3/fonts/a_poets_advice.png" alt="A poet’s advice" class="a_poets_advice" /></a>
+  </div>
+
+</div>