Index: telemeta/htdocs/css/telemeta.css =================================================================== --- telemeta/htdocs/css/telemeta.css (revision 33b65e386278ae14a10234bc63d6affe996d8c40) +++ telemeta/htdocs/css/telemeta.css (revision 3815c512493ac017e7c62e8aa0ce1ab5e01f73e3) @@ -1,6 +1,3 @@ -body { - font-family: Verdana; - font-size: 80%; -} +body { font-family: Verdana; font-size: 80%; } a:link, a:visited { @@ -10,42 +7,27 @@ } -a:link:hover, a:visited:hover { - background-color:#EEEEEE; - color:#555555; -} +a:link:hover, a:visited:hover { background-color:#EEEEEE; color:#555555; } +a img { border: none; } #header { - border-bottom: solid 1px black; padding-bottom: 0.2em; padding-top: 0.2em; } -#header a { - text-decoration: none; + +#logo { padding-top: 1ex; } +#logo a, #logo a:hover { border: none; background: transparent; } + +#menu a, #menu a:hover { border: none;} +#menu { + text-align: right; + clear: right; + background: #DDDDDD; + padding: 1px; + border-bottom: solid 1px black; } -#header a img { - border: none; -} +#submenu { clear: right; float: right; padding-top: 1em; } +#submenu a { color: #000066; } - -#menu { - text-align: right; - clear: right; -} - -#submenu { - clear: right; - float: right; - padding-top: 1em; -} -#submenu a { - color: #000066; -} - -#quick_search { - position: absolute; - top: 2em; - right: 1em; -} - +#quick_search { position: absolute; top: 2em; right: 1em; } #quick_search input { vertical-align: middle; @@ -53,6 +35,5 @@ } -#quick_search_pattern { -} +#quick_search_pattern { } .item_visualization { @@ -62,12 +43,6 @@ margin-top: 1em; } -.item_visualization select { - width: 200px; -} - -.item_visualization img { - width: 300px; - border: solid 1px black; -} +.item_visualization select { width: 200px; } +.item_visualization img { width: 300px; border: solid 1px black; } @@ -164,5 +139,3 @@ /* HTML dublin core display */ -table.dublincore { - width: auto; -} +table.dublincore { width: auto; } Index: telemeta/models.py =================================================================== --- telemeta/models.py (revision 01bf9f7c60b41e6815bd3cdaaad033f94e6ab2ec) +++ telemeta/models.py (revision 3815c512493ac017e7c62e8aa0ce1ab5e01f73e3) @@ -8,10 +8,15 @@ # Author: Olivier Guilyardi -import telemeta from django.db import models from django.db.models import Q +from django.core.exceptions import ObjectDoesNotExist +from django.core import validators + +import telemeta from telemeta.core import * -from django.core.exceptions import ObjectDoesNotExist from telemeta import dublincore as dc + +# Regular (sub) expression for matching/validating media objects IDs +media_id_regex = r'[0-9A-Za-z._:%?-]+' class MediaModel(Component): @@ -26,25 +31,20 @@ return fields_dict -# def dc_elements(self): -# """Return model fields mapped to Dublin Core elements, as a dict of -# the form: {dc_element_name: [value1, value2, ....], ...} -# """ -# fields_dict = {} -# for field in self._meta.fields: -# if (hasattr(field, 'dc_element')): -# if fields_dict.has_key(field.dc_element): -# fields_dict[field.dc_element].append(getattr(self, field.name)) -# else: -# fields_dict[field.dc_element] = [getattr(self, field.name)] -# -# return fields_dict - class PhysicalFormat(models.Model): value = models.CharField(maxlength=250) - is_dictionary = True + is_enumeration = True def __str__(self): return self.value class Meta: ordering = ['value'] + +class PublishingStatus(models.Model): + value = models.CharField(maxlength=250) + is_enumeration = True + def __str__(self): + return self.value + class Meta: + ordering = ['value'] + verbose_name_plural = "Publishing status" class MediaCollectionManager(models.Manager): @@ -56,18 +56,20 @@ ) - class MediaCollection(models.Model, MediaCore): "Group related media items" + + id_regex = media_id_regex + id_validator = validators.MatchesRegularExpression('^' + id_regex + '$') publisher_reference = models.CharField(maxlength=250, blank=True) physical_format = models.CharField(maxlength=250, blank=True) id = models.CharField(maxlength=250, primary_key=True, - verbose_name='identifier') + verbose_name='identifier', validator_list=[id_validator]) title = models.CharField(maxlength=250) native_title = models.CharField(maxlength=250, blank=True) physical_items_num = models.CharField(maxlength=250, blank=True) publishing_status = models.CharField(maxlength=250, blank=True) - is_original = models.CharField(maxlength=250) - is_full_copy = models.CharField(maxlength=250) + is_original = models.CharField(maxlength=250, blank=True) + is_full_copy = models.CharField(maxlength=250, blank=True) copied_from = models.ForeignKey('self', null=True, blank=True) creator = models.CharField(maxlength=250) @@ -147,4 +149,7 @@ "Describe a item with metadata" + id_regex = media_id_regex + id_validator = validators.MatchesRegularExpression('^' + id_regex + '$') + ref = models.CharField(maxlength=250, blank=True) format = models.CharField(maxlength=250, blank=True) @@ -152,5 +157,5 @@ face_plage = models.CharField(maxlength=250, blank=True) id = models.CharField(maxlength=250, primary_key=True, - verbose_name='identifier') + verbose_name='identifier', validator_list=[id_validator]) duree = models.CharField(maxlength=250, blank=True) dates_enregistr = models.CharField(maxlength=250, blank=True) Index: telemeta/templates/admin.html =================================================================== --- telemeta/templates/admin.html (revision 7b2ff59beed06bc4607868bead2c9c9c7606a14a) +++ telemeta/templates/admin.html (revision 3815c512493ac017e7c62e8aa0ce1ab5e01f73e3) @@ -11,12 +11,13 @@
  • Users
    • -{% if dictionaries %} -
  • Dictionaries +{% if enumerations %} +
  • Enumerations