Changeset 5200

Timestamp:

05/15/14 07:38:24 (10 years ago)

Author:

Twan Goosen

Message:

Merged two small fixes from trunk to 3.0

Location:

vlo/branches/vlo-3.0

Files:

• . (modified) (1 prop)
• vlo-web-app (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) (6 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.properties (modified) (1 diff)
• vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/cmdi.css (deleted)
• vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/cmdi.css (copied) (copied from vlo/trunk/vlo-web-app/src/main/resources/eu/clarin/cmdi/vlo/wicket/pages/cmdi.css)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java

@@ -27 +27 @@
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
+import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.SearchContextModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
@@ -47 +48 @@
 import org.apache.wicket.Session;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -57 +60 @@
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -64 +69 @@
  */
 public class RecordPage extends VloBasePage<SolrDocument> {
+
+    private final static ResourceReference CMDI_HTML_CSS = new CssResourceReference(RecordPage.class, "cmdi.css");
 
     @SpringBean(name = "documentParamsConverter")
@@ -133 +140 @@
 
         // General information section
-        add(new SolrFieldLabel("name", getModel(), FacetConstants.FIELD_NAME, "Unnamed record"));
+        add(new SolrFieldLabel("name", getModel(), FacetConstants.FIELD_NAME, getString("recordpage.unnamedrecord")));
         add(createLandingPageLink("landingPageLink"));
         add(new FieldsTablePanel("documentProperties", new DocumentFieldsProvider(getModel(), basicPropertiesFilter, fieldOrder)));
@@ -276 +283 @@
         // Put the name of the record in the page title
         return new StringResourceModel("recordpage.title",
-                new SolrFieldStringModel(getModel(), FacetConstants.FIELD_NAME),
+                new NullFallbackModel(new SolrFieldStringModel(getModel(), FacetConstants.FIELD_NAME), getString("recordpage.unnamedrecord")),
                 DEFAULT_PAGE_TITLE);
     }
 
+    @Override
+    public void renderHead(IHeaderResponse response) {
+        super.renderHead(response);
+        // add styling for CMDI to HTML transformation output
+        response.render(CssHeaderItem.forReference(CMDI_HTML_CSS));
+    }
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.properties

@@ -16 +16 @@
 # ${} = value of 'name' field of record
 recordpage.title=CLARIN VLO - ${}
+recordpage.unnamedrecord=Unnamed record