Permalink
Browse files

Merge branch 'master' of github.com:collective/collective.nitf

Conflicts:
	docs/HISTORY.txt
  • Loading branch information...
2 parents ab297f4 + 5e19b64 commit 28f6b4d4e129f04980431cf59b958149a0ee5d80 @jpgimenez jpgimenez committed Jan 14, 2013
Showing with 9 additions and 3 deletions.
  1. +6 −0 .gitignore
  2. +2 −2 docs/HISTORY.txt
  3. +1 −1 src/collective/nitf/templates/view.pt
View
6 .gitignore
@@ -13,3 +13,9 @@ parts/
var/
include/
lib/
+.project
+.pydevproject
+.settings
+local.cfg
+src/collective.*
+src/plone.*
View
4 docs/HISTORY.txt
@@ -6,8 +6,8 @@ Because you have to know where your towel is.
1.0a4 (unreleased)
^^^^^^^^^^^^^^^^^^
-- NITF CT doesn't implement INonStructuralFolder any longer
- to allow folder factories menu [jpgimenez]
+- NITF content type does not implement INonStructuralFolder any longer to
+ allow folder factories menu. [jpgimenez]
- Add Pillow as a dependency of the package. [hvelarde]
View
2 src/collective/nitf/templates/view.pt
@@ -44,7 +44,7 @@
<div tal:content="structure context/text/output|nothing" />
- <fieldset id="related-items" tal:condition="exists:context/relatedItems">
+ <fieldset id="related-items" tal:condition="context/relatedItems|nothing">
<legend i18n:translate="">Related items</legend>
<tal:relateditems tal:content="structure view/w/relatedItems/render" />
</fieldset>

0 comments on commit 28f6b4d

Please sign in to comment.