Merge pull request #229 from isawnyu/issue227

incorporate all updates for romance and reason exhibition

Author: paregorios

scripts/batch_update.py

@@ -15,29 +15,38 @@
 from plone.namedfile.file import NamedBlobImage
 
 
-FIELDS = ['artist',
-          'title',
-          'description',
-          'exhibition_context',
+FIELDS = [
+          'artist',
+          'author',
+          'copyist',
+          'copyright',
+          'credits',
           'date',
-          'not_before',
-          'not_after',
+          'description',
+          'download_link',
+          'download_link_text',
+          'download_link_type',
           'dimensions',
+          'exhibition_context',
+          'full_title',
           'id',
+          'image',
           'inventory_num',
+          'label',
           'lender',
           'lender_link',
           'medium',
+          'not_after',
+          'not_before',
           'notes',
-          'image',
-          'text',
-          'label',
-          'credits',
-          'copyright',
-          'subjects',
-          'pleiades_url',
           'object_language',
-          'object_location'
+          'object_location',
+          'pleiades_url',
+          'subjects',
+          'text',
+          'title',
+          'title_detail',
+          'translator'
           ]
 
 

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

@@ -12,9 +12,16 @@
          tal:condition="nocall:image"
          tal:content="structure image">
     </div>
-    <div class="ExhibitObjectInfo">
+    <div class="ExhibitObjectInfo" tal:define="short context/title; full context/full_title|nothing; detail context/title_detail|nothing">
+      <div class="ExhibitObjectTitle">
+        <h2 tal:condition="full" tal:content="full">FULL</h2>
+        <h2 tal:condition="not:full" tal:content="short">SHORT</h2>
+      </div>
+      <dl class="ExhibitObjectTitleDetail" tal:condition="python:detail != full"><dt>Description:</dt><dd tal:content="context/title_detail">Title Detail</dd></dl>
       <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="ExhibitObjectAuthor" tal:condition="context/author|nothing"><dt>Author:</dt><dd tal:content="context/author">Author</dd></dl>
+      <dl class="ExhibitObjectCopyist" tal:condition="context/copyist|nothing"><dt>Copyist:</dt><dd tal:content="context/copyist">Copyist</dd></dl>
+      <dl class="ExhibitObjectTranslator" tal:condition="context/translator|nothing"><dt>Translator:</dt><dd tal:content="context/translator">Translator</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>
@@ -27,15 +34,22 @@
       <dl class="ExhibitObjectInventoryNum" tal:condition="context/inventory_num|nothing"><dt>Inventory Number:</dt><dd tal:content="context/inventory_num">Inventory Number</dd></dl>
       <dl class="ExhibitObjectLender" tal:condition="context/lender|nothing">
         <dt>Lender:</dt>
-        <dd><a href="" title="Lender" tal:attributes="href context/lender_link" tal:omit-tag="not:context/lender_link" tal:content="context/lender">Lender</a></dd>
+        <dd><a href="" rel="external" title="Visit the website of the lender" tal:attributes="href context/lender_link" tal:omit-tag="not:context/lender_link" tal:content="context/lender">Lender</a></dd>
+      </dl>
+      <dl class="ExhibitObjectDownload" tal:define="dlink context/download_link|nothing; dtext context/download_link_text|string:select link to download; dtype context/download_link_type|nothing" tal:condition="dlink">
+        <dt>Download:</dt>
+        <dd>
+          <a tal:condition="dtype" href="" title="Download the document" type="" rel="external" tal:attributes="href dlink; type dtype" tal:content="dtext">link text</a>
+          <a tal:condition="not:dtype" href="" title="Download the document" rel="external" tal:attributes="href dlink; type dtype" tal:content="dtext">link text</a>
+        </dd>
       </dl>
       <dl class="ExhibitObjectLabel"
           tal:define="text context/label/output|nothing"
           tal:condition="text">
         <dt>Label:</dt>
         <dd tal:content="structure text">Rich Text Content</dd>
       </dl>
-      <div class="ExhibitObjectCredits discreet" tal:condition="context/credits|nothing" tal:content="context/credits">Credit Line</div>
+      <dl class="ExhibitObjectCredits" tal:condition="context/credits|nothing"><dt>Credit:</dt><dd tal:content="context/credits">Credit Line</dd></dl>
       <div class="ExhibitObjectCopyright discreet" tal:condition="context/copyright|nothing" tal:content="context/copyright">Copyright Notice</div>
     </div>
     <div class="ExhibitObjectText"

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

@@ -14,55 +14,31 @@ class IISAWExhibitionsLayer(Interface):
 class IExhibitionObject(model.Schema):
     """Schema for Exhibition Objects."""
 
-    artist = schema.TextLine(title=_(u'Artist'),
-                             required=False)
-
-    exhibition_context = schema.TextLine(title=_(u'Context'),
-                                         required=False)
-
-    date = schema.TextLine(title=_(u'Date'),
-                           required=False)
-
-    not_before = schema.Int(title=_(u'Not Before'),
-                            required=False)
-
-    not_after = schema.Int(title=_(u'Not After'),
-                           required=False)
-
-    dimensions = schema.TextLine(title=_(u'Dimensions'),
-                                 required=False)
-
+    full_title = schema.TextLine(title=_(u'Full Title'), required=False)
+    title_detail = schema.TextLine(title=_(u'Title Detail'), required=False)
+    artist = schema.TextLine(title=_(u'Artist'), required=False)
+    author = schema.TextLine(title=_(u'Author'), required=False)
+    copyist = schema.TextLine(title=_(u'Copyist'), required=False)
+    download_link = schema.TextLine(title=_(u'Download Link'), required=False)
+    download_link_text = schema.TextLine(title=_(u'Download Link Text'), required=False)
+    download_link_type = schema.TextLine(title=_(u'Download Link Type'), required=False)
+    translator = schema.TextLine(title=_(u'Translator'), required=False)
+    copyright = schema.TextLine(title=_(u'Copyright Notice'), required=False)
+    credits = schema.TextLine(title=_(u'Credit Line'), required=False)
+    date = schema.TextLine(title=_(u'Date'), required=False)
+    dimensions = schema.TextLine(title=_(u'Dimensions'), required=False)
+    exhibition_context = schema.TextLine(title=_(u'Context'), required=False)
+    image = namedfile.NamedBlobImage(title=_(u'Lead Image'), required=False)
+    inventory_num = schema.TextLine(title=_(u'Inventory Number'), required=True)
+    lender = schema.TextLine(title=_(u'Lender'), required=False)
+    lender_link = schema.URI(title=_(u'Lender Link'), required=False)
+    medium = schema.TextLine(title=_(u'Medium'), required=False)
+    not_after = schema.Int(title=_(u'Not After'), required=False)
+    not_before = schema.Int(title=_(u'Not Before'), required=False)
+    notes = schema.TextLine(title=_(u'Notes'), required=False)
     object_language = schema.TextLine(title=_(u'Object Language'), required=False)
-
-    inventory_num = schema.TextLine(title=_(u'Inventory Number'),
-                                    required=True)
-
-    lender = schema.TextLine(title=_(u'Lender'),
-                             required=False)
-
-    lender_link = schema.URI(title=_(u'Lender Link'),
-                             required=False)
-
-    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)
-
-    credits = schema.TextLine(title=_(u'Credit Line'),
-                              required=False)
-
-    copyright = schema.TextLine(title=_(u'Copyright Notice'),
-                                required=False)
-
-    image = namedfile.NamedBlobImage(title=_(u'Lead Image'),
-                                     required=False)
-
     dexteritytextindexer.searchable('text')
-    text = RichText(title=_(u'Body'),
-                    required=False)
-
-    label = RichText(title=_(u'Label'),
-                     required=False)
+    text = RichText(title=_(u'Body'), required=False)
+    label = RichText(title=_(u'Label'), required=False)