Skip to content

Commit

Permalink
Merge pull request #4 from simahawk/fix-namespaces
Browse files Browse the repository at this point in the history
[add] exhibit namespaces makes chameleon happy. addresses #1
  • Loading branch information
avoinea committed Jan 9, 2013
2 parents a51b79d + 9c21f0d commit e97f6cd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 17 deletions.
19 changes: 11 additions & 8 deletions eea/app/visualization/browser/zpt/view.pt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<tal:left define="hidden python:request.set('disable_plone.leftcolumn', 1)" />
<tal:right define="hidden python:request.set('disable_plone.rightcolumn', 1)" />
<tal:html define="macro here/main_template/macros/master | here/@@daviz-fallback.html/macros/view">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
<html
xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
xmlns:ex="http://simile.mit.edu/2006/11/exhibit#"
lang="en-US"
metal:use-macro="macro"
i18n:domain="eea">
Expand All @@ -20,13 +22,14 @@
tal:attributes="href string:${here/absolute_url}/daviz.json" />

<!-- External sources JSONs -->
<tal:additional repeat="source python:view.sources">
<link rel="exhibit/data"
tal:attributes="
type string:application/${source/type};
href string:${source/name};
ex:converter python:source.get('converter', None) or None;" />
</tal:additional>
<tal:additional repeat="source python:view.sources"
>
<link rel="exhibit/data"
tal:attributes="
type string:application/${source/type};
href string:${source/name};
ex:converter python:source.get('converter', None) or None;" />
</tal:additional>

<!-- include exhibit api -->
<script type="text/javascript">
Expand Down
22 changes: 13 additions & 9 deletions eea/app/visualization/facets/list/view.pt
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<tal:facet define="
name python:view.gett('name', '');
label python:view.gett('label', '');">
<tal:block xmlns:ex="http://simile.mit.edu/2006/11/exhibit#">

<div ex:role="facet" tal:attributes="
ex:expression string:.$name;
ex:facetLabel string:$label;"
tal:condition="name"
></div>
<tal:facet define="
name python:view.gett('name', '');
label python:view.gett('label', '');">

</tal:facet>
<div ex:role="facet" tal:attributes="
ex:expression string:.$name;
ex:facetLabel string:$label;"
tal:condition="name"
></div>

</tal:facet>

</tal:block>

0 comments on commit e97f6cd

Please sign in to comment.