Commits

Cat's Eye Technologies committed 4b6498c

Make image entries like references: url plus optional extras.

Comments (0)

Files changed (9)

data/articles.yaml

     in this article, I talk about what it's *like* to design languages
     and what my thoughts on certain languages and the design process are.
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
   description: |
     ### Esolangs
     
     language an artistic medium, and [[Esolang|esolang]] a movement within that
     medium.  In this article I expand on those points a bit.
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
   description: |
     Proglang-as-art is a thesis I've been toying with for about a decade now, and
     it's about time I wrote something explicitly about it.  But really, there is
     previous article (and it will probably make more sense if you've already
     read [[Programming Languages as an Artistic Medium|the previous article]].)
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
   description: |
     A preliminary point I should probably make is that by "art" I do not
     necessarily mean the "art world" (which consists of galleries, critics,

data/collections.yaml

     Here is a list of software tools and libraries I've developed.
     For a list of all software tools known to Chrysoberyl, see [[Tool]].
   images:
-  - '/images/illustrations/Allen_wrench_and_screw_(PSF).jpg'
+    - url: '/images/illustrations/Allen_wrench_and_screw_(PSF).jpg'
 
 LoUIE:
   type: Collection

data/electronics.yaml

     a single capacitor.
   defining-distribution: The 'Kitsilano' Oscillator distribution
   images:
-  - 'https://raw.github.com/catseye/Electronics-Projects/master/kitsilano/kitsilano.png'
+    - url: 'https://raw.github.com/catseye/Electronics-Projects/master/kitsilano/kitsilano.png'
   development-stage: not fully complete
   constructed: false
 
     The LM386 audio amplifier IC, that is...
   defining-distribution: LED-386 distribution
   images:
-  - 'https://raw.github.com/catseye/Electronics-Projects/master/led386/doc/led386_photo.jpg'
+    - url: 'https://raw.github.com/catseye/Electronics-Projects/master/led386/doc/led386_photo.jpg'
   development-stage: mature
   constructed: true
 
     with 40K of memory (8K EEPROM, 32K SRAM.)
   defining-distribution: Mildred distribution
   images:
-  - 'https://raw.github.com/catseye/Electronics-Projects/master/mildred/doc/mildred_photo.jpg'
+    - url: 'https://raw.github.com/catseye/Electronics-Projects/master/mildred/doc/mildred_photo.jpg'
   development-stage: not fully complete
   constructed: true
   # close only counts in horseshoes, handgrenades, and Chrysoberyl

data/organizations.yaml

   type: Organization
   domain: Chrysoberyl
   images:
-  - /images/logo/witide.jpg
+    - url: /images/logo/witide.jpg
   description: |
     _What is this I don't even: Oh god how did this get here I am not good
     with synthesizer_ is the working title for [[Chris Pressey]]'s ongoing

data/original-games.yaml

     "Bubble Escape 2K", and submitted to the [[Mini Game Compo 2009]]
     where (surprisingly, to me!) it got first place in its class.
   images:
-  - 'https://raw.github.com/catseye/Bubble-Escape/master/images/bubble%20escape%202k.png'
+    - url: 'https://raw.github.com/catseye/Bubble-Escape/master/images/bubble%20escape%202k.png'
 
 Bubble Escape (BASIC):
   type: Implementation
   - competition: Mini Game Compo 2009
     prize: 1st place in 2K category
   images:
-  - 'https://raw.github.com/catseye/Bubble-Escape/master/images/bubble%20escape%202k.png'
+    - url: 'https://raw.github.com/catseye/Bubble-Escape/master/images/bubble%20escape%202k.png'
   online-locations:
   - 'Bubble Escape (JaC64)'
 
     called CARPE DIEM (Computer-Assisted Role-Playing Engine for Diverse Interactive
     Entertainment Modules.)
   images:
-  - 'https://raw.github.com/catseye/Corona-Realm-of-Magic/master/doc/carpe_ss2.gif'
+    - url: 'https://raw.github.com/catseye/Corona-Realm-of-Magic/master/doc/carpe_ss2.gif'
 
 'Corona: Realm of Magic (Perl)':
   type: Implementation
     monsters, treasure, potions, traps, chests, combat with experience points,
     etc.
   images:
-  - 'https://raw.github.com/catseye/Dungeons-of-Ekileugor/master/images/dungeons-of-ekileugor.png'
+    - url: 'https://raw.github.com/catseye/Dungeons-of-Ekileugor/master/images/dungeons-of-ekileugor.png'
 
 Dungeons of Ekileugor (BASIC):
   type: Implementation
   description: |
     Super Wumpus Land is an "extended dance mix" version of [[Hunt the Wumpus]].
   images:
-  - 'https://raw.github.com/catseye/Super-Wumpus-Land/master/images/Super%20Wumpus%20Land.png'
+    - url: 'https://raw.github.com/catseye/Super-Wumpus-Land/master/images/Super%20Wumpus%20Land.png'
 
 swl.pl:
   type: Implementation
     Note that these are also available in an
     <a class="rss" href="http://catseye.tc/feeds/atom_30_news.xml">Atom feed</a>.
   images:
-  - '/images/illustrations/Hatched.jpg'
+    - url: '/images/illustrations/Hatched.jpg'
 Online Installation:
   type: type
   description: |
 Musical Instrument:
   type: type
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
 Discipline:
   type: type
 Collection:
     For a list of just those tools produced by [[Cat's Eye Technologies]], see
     [[Tools by Chris Pressey]].
   images:
-  - '/images/illustrations/Allen_wrench_and_screw_(PSF).jpg'
+    - url: '/images/illustrations/Allen_wrench_and_screw_(PSF).jpg'
 Platform:
   type: type
   description: |
     * [[Programming Languages as an Artistic Medium]]
     * [[The Aesthetics of Esolangs]]
   images:
-  - '/images/illustrations/Abacus_(PSF).jpg'
+    - url: '/images/illustrations/Abacus_(PSF).jpg'
   commentary: |
     There are two things about programming languages that every programmer
     should know.
     For a list of just those compositions by [[What is this I don't even]], see
     [[What is this I don't even]].
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
 Music Format:
   type: type
   images:
-  - '/images/illustrations/Accordion_(PSF).jpg'
+    - url: '/images/illustrations/Accordion_(PSF).jpg'
 Electronics Project:
   type: type
+  images:
+    - url: 'https://raw.github.com/catseye/Electronics-Projects/master/mildred/doc/mildred_photo.jpg'
   references:
   - url: http://www.intio.or.jp/jf10zl/
     title: JF10ZL

src/chrysoberyl/checker.py

         for sub in node['submitted-to']:
             check_scalar_ref(data, key, sub, 'competition',
                              types=['Competition'])
+    if 'images' in node:
+        for image in node['images']:
+            assert 'url' in image, 'image %r has no url' % image
 
     # Every node may have these, and they may have internal links.
     description = None

templates/Games by Chris Pressey.html

           </div>
           <div class="span4">
             {% for image in data[thing].images %}
-              <img src="{{ image }}">
+              <img src="{{ image.url }}">
             {% endfor %}
           </div>
         </div>

templates/base.html

           <div class="span4">
             <section id="images">
               {%- for image in images -%}
-                <img src="{{ image }}">
+                <img src="{{ image.url }}">
+                {#- TODO: caption, credit -#}
               {%- endfor -%}
             </section>
           </div>