diff --git a/trunk/yolanda/controllers/index.py b/trunk/yolanda/controllers/index.py index f5ef91f..7c8d14a 100644 --- a/trunk/yolanda/controllers/index.py +++ b/trunk/yolanda/controllers/index.py @@ -7,5 +7,9 @@ log = logging.getLogger(__name__) class IndexController(BaseController): def index(self): + + raise(RuntimeError) + c.tagcloud = model.DC_Subject.query.all() + return render('/xhtml/index.mako') diff --git a/trunk/yolanda/controllers/upload.py b/trunk/yolanda/controllers/upload.py index 1aa833d..fbba055 100644 --- a/trunk/yolanda/controllers/upload.py +++ b/trunk/yolanda/controllers/upload.py @@ -63,6 +63,7 @@ class UploadController(BaseController): # Dublin Core terms dc_title = request.params['dc_title'], + dc_alternative = request.params['dc_title'], dc_subject = [model.DC_Subject(name=subject.lstrip()) for subject in request.params['dc_subject'].split(',')], dc_creator = model.DC_Creator(name = request.params['dc_creator']), diff --git a/trunk/yolanda/model/entities.py b/trunk/yolanda/model/entities.py index 93714ab..0652e73 100644 --- a/trunk/yolanda/model/entities.py +++ b/trunk/yolanda/model/entities.py @@ -5,6 +5,7 @@ class Video(Entity): # Dublin Core terms dc_title = Field(Unicode(255)) + dc_alternative = Field(Unicode(255)) dc_creator = ManyToOne('DC_Creator') dc_subject = ManyToMany('DC_Subject') diff --git a/trunk/yolanda/public/css/layout/padma.css b/trunk/yolanda/public/css/layout/padma.css index 36bd8b0..6ff88fb 100644 --- a/trunk/yolanda/public/css/layout/padma.css +++ b/trunk/yolanda/public/css/layout/padma.css @@ -61,15 +61,21 @@ label #results li { display: inline-block; - width: 216px; } #results li img { border-width: 1px; + display: block; + opacity: 0.8; } - #results li a.title + #results li img:hover + { + opacity: 1; + } + + #results li .title { display: block; height: 1em; diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako index f5f06bc..ce49969 100644 --- a/trunk/yolanda/templates/xhtml/base.mako +++ b/trunk/yolanda/templates/xhtml/base.mako @@ -81,81 +81,13 @@ method="post">

Tagcloud

diff --git a/trunk/yolanda/templates/xhtml/results.mako b/trunk/yolanda/templates/xhtml/results.mako index 9bc35f4..d561cce 100644 --- a/trunk/yolanda/templates/xhtml/results.mako +++ b/trunk/yolanda/templates/xhtml/results.mako @@ -13,12 +13,10 @@ % for result in c.results:
  • - thumbnail for "${result[ - -
    - - ${result['dc_title']} + + ${result['dc_title']} +
  • % endfor diff --git a/trunk/yolanda/templates/xhtml/upload.mako b/trunk/yolanda/templates/xhtml/upload.mako index 9b6860c..4cb88da 100644 --- a/trunk/yolanda/templates/xhtml/upload.mako +++ b/trunk/yolanda/templates/xhtml/upload.mako @@ -40,7 +40,7 @@
    - +