Changeset 5316
- Timestamp:
- 05/30/14 15:37:01 (10 years ago)
- Location:
- vlo/branches/vlo-3.0
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
vlo/branches/vlo-3.0
- Property svn:mergeinfo changed
/vlo/trunk merged: 5315
- Property svn:mergeinfo changed
-
vlo/branches/vlo-3.0/vlo-web-app
- Property svn:mergeinfo changed
/vlo/trunk/vlo-web-app merged: 5315
- Property svn:mergeinfo changed
-
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java
r5200 r5316 288 288 289 289 @Override 290 public IModel<String> getPageDescriptionModel() { 291 return new SolrFieldStringModel(getModel(), FacetConstants.FIELD_DESCRIPTION); 292 } 293 294 @Override 290 295 public void renderHead(IHeaderResponse response) { 291 296 super.renderHead(response); -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.html
r5163 r5316 30 30 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 31 31 <meta name="viewport" content="width=device-width"/> 32 <meta wicket:id="pageDescription" name="description" content="" /> 32 33 </head> 33 34 -
vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java
r5163 r5316 17 17 package eu.clarin.cmdi.vlo.wicket.pages; 18 18 19 import com.google.common.base.Strings; 19 20 import eu.clarin.cmdi.vlo.JavaScriptResources; 20 21 import eu.clarin.cmdi.vlo.VloWebAppParameters; … … 22 23 import eu.clarin.cmdi.vlo.wicket.HideJavascriptFallbackControlsBehavior; 23 24 import org.apache.wicket.Session; 25 import org.apache.wicket.behavior.AttributeAppender; 24 26 import org.apache.wicket.markup.head.CssHeaderItem; 25 27 import org.apache.wicket.markup.head.IHeaderResponse; 26 28 import org.apache.wicket.markup.head.JavaScriptHeaderItem; 27 29 import org.apache.wicket.markup.html.GenericWebPage; 30 import org.apache.wicket.markup.html.WebComponent; 28 31 import org.apache.wicket.markup.html.basic.Label; 29 32 import org.apache.wicket.markup.html.link.ExternalLink; … … 31 34 import org.apache.wicket.model.IModel; 32 35 import org.apache.wicket.model.Model; 36 import org.apache.wicket.model.StringResourceModel; 33 37 import org.apache.wicket.request.mapper.parameter.PageParameters; 34 38 import org.apache.wicket.request.resource.CssResourceReference; 35 import org.apache.wicket.request.resource.JavaScriptResourceReference;36 39 import org.apache.wicket.spring.injection.annot.SpringBean; 37 40 import org.apache.wicket.util.string.StringValue; 38 41 import org.slf4j.Logger; 39 42 import org.slf4j.LoggerFactory; 43 import org.springframework.util.StringUtils; 40 44 41 45 /** … … 113 117 // page title label is added here because it uses an overridable method 114 118 add(new Label("title", getTitleModel())); 119 120 // same for page description (this populates the <meta name="description" /> element) 121 add(new WebComponent("pageDescription") { 122 { 123 add(new AttributeAppender("content", getPageDescriptionModel())); 124 } 125 }); 115 126 } 116 127 … … 122 133 public IModel<String> getTitleModel() { 123 134 return Model.of(DEFAULT_PAGE_TITLE); 135 } 136 137 /** 138 * Override to give a custom or dynamic description for the page via the 139 * description "meta" tag in the page's header 140 * 141 * @return string model that provides a description for the page, null for 142 * no description 143 */ 144 public IModel<String> getPageDescriptionModel() { 145 return new StringResourceModel("vloDescription", null, (Object[]) null); 124 146 } 125 147
Note: See TracChangeset
for help on using the changeset viewer.