Merge pull request #226 from isawnyu/issue225

added 'object_location' and 'object_language' fields to the exhbition…

Author: paregorios

src/isaw.exhibitions/isaw/exhibitions/browser/exhibition_object.pt

@@ -15,7 +15,9 @@
     <div class="ExhibitObjectInfo">
       <dl class="ExhibitObjectArtist" tal:condition="context/artist|nothing"><dt>Artist:</dt><dd tal:content="context/artist">Artist</dd></dl>
       <dl class="ExhibitObjectTitle"><dt>Title:</dt><dd tal:content="context/title">Title</dd></dl>
-      <dl class="ExhibitObjectMedium" tal:condition="context/medium|nothing"><dt>Medium:</dt> <dd tal:content="context/medium">Medium</dd></dl>
+      <dl class="ExhibitObjectLanguage" tal:condition="context/object_language|nothing"><dt>Languge:</dt><dd tal:content="context/object_language">Object Language</dd></dl>
+      <dl class="ExhibitObjectMedium" tal:condition="context/medium|nothing"><dt>Medium:</dt><dd tal:content="context/medium">Medium</dd></dl>
+      <dl class="ExhibitObjectSite" tal:condition="context/object_location|nothing"><dt>Location:</dt><dd tal:content="context/object_location">Object Location</dd></dl>
       <dl class="ExhibitObjectDimensions" tal:condition="context/dimensions|nothing" tal:define="medium context/medium">
           <dt tal:condition="python:medium != 'Video/installation'">Dimensions:</dt>
           <dt tal:condition="python:medium == 'Video/installation'">Running time:</dt>

src/isaw.exhibitions/isaw/exhibitions/interfaces/__init__.py

@@ -32,6 +32,8 @@ class IExhibitionObject(model.Schema):
     dimensions = schema.TextLine(title=_(u'Dimensions'),
                                  required=False)
 
+    object_language = schema.TextLine(title=_(u'Object Language'), required=False)
+
     inventory_num = schema.TextLine(title=_(u'Inventory Number'),
                                     required=True)
 
@@ -44,6 +46,8 @@ class IExhibitionObject(model.Schema):
     medium = schema.TextLine(title=_(u'Medium'),
                              required=False)
 
+    object_location = schema.TextLine(title=_(u'Object Location'), required=False)
+
     notes = schema.TextLine(title=_(u'Notes'),
                             required=False)