Index page blurp

src/main/java/org/genesys2/server/servlet/controller/HtmlController.java

@@ -87,6 +87,7 @@ public class HtmlController extends BaseController {
 		// FIXME get user locale!
 		model.addAttribute("cropList", cropService.list(getLocale()));
 		model.addAttribute("lastNews", activityPostService.lastNews());
+		model.addAttribute("welcomeBlurp", contentService.getGlobalArticle("welcome", getLocale()));
 		return "/index";
 	}
 

src/main/resources/default-content/welcome

+{
+	"en": {
+		"title": "Gateway to Plant Genetic Resources",
+		"body": "<p>GENESYS is a global portal to information about Plant Genetic Resources for Food and Agriculture (PGRFA). It is a gateway from which germplasm accessions from genebanks around the world can be easily found and ordered.</p>"
+	}
+}
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/index.jsp

@@ -45,13 +45,18 @@
 <!-- left column end / middle columns start -->
     
     <div class="col-md-7" id="middle-col">
+    
+    <c:if test="${welcomeBlurp ne null}">
+	 	<h2>${welcomeBlurp.title}</h2>
+	    <div class="welcome-blurp">
+	    <c:set var="blurp" value="${welcomeBlurp}" />
+		<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp"%>
+	    <c:remove var="blurp" />
+	    </div>
+    </c:if>
+    
     <h2><spring:message code="activity.recent-activity" /></h2>
-          <ul class="nav nav-tabs" id="news">
-            <li class="active"><a href="#news-feed">News Feed</a></li>
-            <li><a href="#by-country">By Country</a></li>
-            <li><a href="#by-crop">By Crop</a></li>
-          </ul>
-          
+         
           <div class="tab-content">
             <div class="tab-pane active" id="news-feed">
 			<security:authorize access="hasRole('ADMINISTRATOR')">

src/main/webapp/html/css/custom.css

@@ -472,7 +472,6 @@ html[dir="rtl"] .nav-tabs > li > a {
 
 #middle-col .tab-content {
   background:#fff;
-  border-top:1px solid #4d4c46;
 }
 
 .tab-pane {
@@ -610,11 +609,10 @@ html[dir="rtl"] .tab-pane .all-posts .type-crop .post-inner .post-image img {
 
 .tab-pane .all-posts .post-inner .post-content {
   float:left;
-  width:68.69%;
+  padding: 10px;
 }
 
 .tab-pane .all-posts .type-crop .post-inner .post-content {
-  width:77.34%;
 }
 
 .tab-pane .all-posts .type-list .post-inner .post-content {
@@ -698,8 +696,9 @@ html[dir="rtl"] .tab-pane .all-posts .post-actions {
 #middle-col h1 {
   border-bottom:1px solid #4d4c46;
   font-size:24px;
-  margin:30px 0 20px 0;
-  padding:0 0 10px 0;
+  padding:20px 0 10px 0;
+  background-color: #FFF;
+  margin-top: 0;
 }
 
 #middle-col h1 img {
@@ -1830,3 +1829,10 @@ html[dir="rtl"] ul.statistics .stats-number {
 	background-position: 0 0;
 	padding-left: 30px;
 }
+
+.welcome-blurp {
+	padding: 20px;
+	font-size: 110%;
+	background-color: #FFF;
+	margin-bottom: 1em;
+}
\ No newline at end of file