Fixed layout of category and tabular tags on the file pg. [ref #2465]

IQSS · Oct 25, 2016 · 8a99e1f · 8a99e1f
1 parent 012adbf
commit 8a99e1f
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -246,12 +246,10 @@
                             <div id="fileDescriptionBlock" class="col-xs-12" jsf:rendered="#{!empty FilePage.fileMetadata.description}">
                                  #{FilePage.fileMetadata.description}
                             </div>
-                            <div id="fileCategoriesBlock" class="col-xs-12" jsf:rendered="#{!(empty FilePage.fileMetadata.categoriesByName)}">
+                            <div id="fileCategoriesBlock" class="col-xs-12" jsf:rendered="#{!(empty FilePage.fileMetadata.categoriesByName) or !(empty FilePage.fileMetadata.dataFile.tags)}">
                                 <ui:repeat value="#{FilePage.fileMetadata.categoriesByName}" var="tag" rendered="#{!(empty FilePage.fileMetadata.categoriesByName)}">
                                     <h:outputText value="#{tag}" styleClass="label label-default"/>
                                 </ui:repeat>
-                            </div>
-                            <div id="fileDatatagsBlock" class="col-xs-12" jsf:rendered="#{!(empty FilePage.fileMetadata.dataFile.tags)}">
                                 <ui:repeat value="#{FilePage.fileMetadata.dataFile.tags}" var="tag">
                                     <h:outputText value="#{tag.typeLabel}" styleClass="label label-info"/>
                                 </ui:repeat>