Changeset 6405
- Timestamp:
- 07/22/15 14:16:44 (9 years ago)
- Location:
- vlo/trunk/vlo-web-app/src/main
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/VloWicketApplication.java
r6341 r6405 14 14 import eu.clarin.cmdi.vlo.wicket.pages.VloBasePage; 15 15 import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider; 16 import java.io.IOException; 17 import java.io.InputStream; 18 import java.util.Properties; 16 19 import javax.inject.Inject; 17 20 import org.apache.wicket.Application; … … 51 54 52 55 private ApplicationContext applicationContext; 56 private String appVersionQualifier; 53 57 54 58 /** … … 76 80 // configure Wicket cache according to parameters set in VloConfig 77 81 setupCache(); 82 83 // determine version qualifier (e.g. 'beta'), which can be used to visually mark the base page 84 appVersionQualifier = determineVersionQualifier(); 85 logger.info("Version qualifier: {}", appVersionQualifier); 78 86 } 79 87 … … 127 135 /** 128 136 * 137 * @return a version qualifier, either 'snapshot', 'beta' or null 138 */ 139 private String determineVersionQualifier() { 140 try (InputStream applicationPropertiesStream = getClass().getResourceAsStream("/application.properties")) { 141 Properties applicationProperties = new Properties(); 142 applicationProperties.load(applicationPropertiesStream); 143 final String version = applicationProperties.getProperty("vlo.version"); 144 if (version != null) { 145 if (version.endsWith("-SNAPSHOT")) { 146 return "snapshot"; 147 } else if (version.contains("beta")) { 148 return "beta"; 149 } 150 } 151 } catch (IOException ex) { 152 logger.error("Could not read application properties on init", ex); 153 } 154 return null; 155 } 156 157 /** 158 * 129 159 * @return the active VLO wicket application 130 160 */ … … 173 203 } 174 204 205 public String getAppVersionQualifier() { 206 return appVersionQualifier; 207 } 208 175 209 } -
vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.html
r6194 r6405 36 36 <body> 37 37 <div id="main"> 38 <div id="header">38 <div wicket:id="header" id="header"> 39 39 <div id="logo"> 40 40 <h1>CLARIN Virtual Language Observatory</h1> 41 41 <a id="headerlink_clarin" href="http://www.clarin.eu/"><span>CLARIN</span></a> 42 <div class="qualifier snapshot">TESTING</div> 43 <div class="qualifier beta">BETA</div> 42 44 </div> 43 45 </div> -
vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java
r6210 r6405 19 19 import eu.clarin.cmdi.vlo.JavaScriptResources; 20 20 import eu.clarin.cmdi.vlo.VloWebAppParameters; 21 import eu.clarin.cmdi.vlo.VloWicketApplication; 21 22 import eu.clarin.cmdi.vlo.config.VloConfig; 22 23 import eu.clarin.cmdi.vlo.wicket.HideJavascriptFallbackControlsBehavior; … … 28 29 import org.apache.wicket.markup.html.GenericWebPage; 29 30 import org.apache.wicket.markup.html.WebComponent; 31 import org.apache.wicket.markup.html.WebMarkupContainer; 30 32 import org.apache.wicket.markup.html.basic.Label; 31 33 import org.apache.wicket.markup.html.link.ExternalLink; … … 177 179 add(new ExternalLink("help", vloConfig.getHelpUrl())); 178 180 181 // add 'class' attribute to header indicating version qualifier (e.g. 'beta') 182 add(new WebMarkupContainer("header").add(new AttributeAppender("class", VloWicketApplication.get().getAppVersionQualifier()))); 183 179 184 add(new HideJavascriptFallbackControlsBehavior()); 180 185 } 181 186 182 183 187 } -
vlo/trunk/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-top.less
r5148 r6405 114 114 font-weight: bold; 115 115 } 116 117 div#header .qualifier { 118 display: none; /* overridden depending on header class */ 119 120 position: absolute; 121 top: 1em; 122 border: 1px solid; 123 text-align: center; 124 line-height: 2em; 125 126 border-color: red; 127 color: red; 128 } 129 130 div#header.snapshot div.qualifier.snapshot { 131 display: block; 132 width: 8em; 133 } 134 135 div#header.beta div.qualifier.beta { 136 display: block; 137 width: 5em; 138 }
Note: See TracChangeset
for help on using the changeset viewer.