Merge pull request #73 from MetOffice/develop

Merge v1.1.0 to master

Author: william-buckfield

ldregistry/config/app.conf

@@ -72,6 +72,6 @@ registry.bootSpec    = /opt/ldregistry/config/root-register.ttl|{webapp}/WEB-INF
 registry.systemBoot  = /opt/ldregistry/boot
 registry.facetService = $facetService
 registry.backupDir   = /var/opt/ldregistry/backup
-registry.redirectToHttpsOnLogin = false
+registry.redirectToHttpsOnLogin = true
 registry.configExtensions = $config
 registry.requestLogger = $requestLogger

ldregistry/templates/main/_page-category.vm

@@ -40,8 +40,8 @@
       <table class="table table-striped table-bordered #if($registry.configExtensions.showRegisterAsDatatable) datatable #end">
         <thead>
           <tr>
-            <th>$msg['registerItem.name.label']</th>
             <th>$msg['registerItem.notation.label']</th>
+            <th>$msg['registerItem.name.label']</th>
             <th>$msg['registerItem.description.label']</th>
 ##            <th>$msg['registerItem.types.label']</th>
             <th>$msg['registerItem.status.label']</th>
@@ -54,11 +54,11 @@
             $entity.modelW.setLanguage($language)
 
           <tr>
+            <td>$item.getPropertyValue("reg:notation").lexicalForm</td>
             <td>
               #if($entity.hasResourceValue("rdf:type", "reg:Register"))<span class="glyphicon glyphicon-folder-open"></span> &nbsp; #end
               <a href="#linkhref($item)" title="$item.uRI">$entity.name</a>
             </td>
-            <td>$item.getPropertyValue("reg:notation").lexicalForm</td>
             <td>#tdescription($entity,"",70)</td>
 ##            <td> #foreach($ty in $entity.listPropertyValues("rdf:type"))#linkfor($ty)#if( $foreach.hasNext ), #end#end </td>
             <td>#showstatus($item.getPropertyValue("reg:status"))</td>

ldregistry/templates/main/_render-register-as-list.vm

@@ -9,10 +9,10 @@
   	  <table class="table table-striped table-bordered #if($registry.configExtensions.showRegisterAsDatatable) datatable #end">
   	  	<thead>
   	      <tr>
+            <th>$msg['registerItem.notation.label']</th>
   	      	<th>$msg['registerItem.name.label']</th>
-  	      	<th>$msg['registerItem.notation.label']</th>
   	      	<th>$msg['registerItem.description.label']</th>
-  	      	<th>$msg['registerItem.types.label']</th>
+##              <th>$msg['registerItem.types.label']</th>
   	      	<th>$msg['registerItem.status.label']</th>
   	      </tr>
   	  	</thead>
@@ -24,15 +24,15 @@
           #if( !$memitem.hasResourceValue("reg:status", "reg:statusReserved") )
           <tr>
           	## When might we not have an $memitem?
+              <td>$memitem.getPropertyValue("reg:notation").lexicalForm</td>
           	<td>
               #if($member.hasResourceValue("rdf:type", "reg:Register"))<span class="glyphicon glyphicon-folder-open"></span> &nbsp; #end
               <a href="#linkhref($memitem)" title="$memitem.uRI">$member.name</a>
             </td>
-          	<td>$memitem.getPropertyValue("reg:notation").lexicalForm</td>
-            <td>#tdescription($member,"",70)</td>
-            <td>              
-              #foreach($ty in $member.listPropertyValues("rdf:type"))#linkfor($ty)#if( $foreach.hasNext ), #end#end
-            </td>
+              <td>#tdescription($member,"",70)</td>
+##            <td>
+##              #foreach($ty in $member.listPropertyValues("rdf:type"))#linkfor($ty)#if( $foreach.hasNext ), #end#end
+##            </td>
             <td>#showstatus($memitem.getPropertyValue("reg:status"))</td>
           </tr>
           #end

ldregistry/templates/nav/_navbar.vm

@@ -66,9 +66,9 @@
             </div>
         </div>
     </div>
+
 </nav>
 
 #if($subject.isAuthenticated())
     #parse( "actions/_logout-dialog.vm" )
 #end
-

ldregistry/templates/structure/_service-bar.vm

@@ -7,3 +7,8 @@
    ##     </span>
    ##     $msg.get('service.beta.description', 'TBD')
    ## </div>
+#if(!$request.getServerName().equals("codes.wmo.int"))
+    <div class="row">
+        <div class="non-operational-banner">This is a test website – some features and links may not work, and data may be incorrect.</div>
+    </div>
+#end

ldregistry/templates/text-search.vm

@@ -1,14 +1,14 @@
 #macro(resultrow $entity $item)
             <tr>
+              <td>$item.getPropertyValue("reg:notation").lexicalForm</td>
               <td>
                 #if($entity.hasResourceValue("rdf:type", "reg:Register"))<span class="glyphicon glyphicon-folder-open"></span> &nbsp; #end
                 <a href="#linkhref($item)" title="$item.uRI">$entity.name</a>
               </td>
-              <td>$item.getPropertyValue("reg:notation").lexicalForm</td>
               <td>#tdescription($entity,"",70)</td>
-              <td>
-                #foreach($ty in $entity.listPropertyValues("rdf:type"))#linkfor($ty)#if( $foreach.hasNext ), #end#end
-              </td>
+##              <td>
+##                #foreach($ty in $entity.listPropertyValues("rdf:type"))#linkfor($ty)#if( $foreach.hasNext ), #end#end
+##              </td>
               <td>#showstatus($item.getPropertyValue("reg:status"))</td>
             </tr>
 #end
@@ -38,10 +38,10 @@
     <table class="table table-striped table-bordered">
       <thead>
         <tr>
-          <th>$msg['registerItem.name.label']</th>
           <th>$msg['registerItem.notation.label']</th>
+          <th>$msg['registerItem.name.label']</th>
           <th>$msg['registerItem.description.label']</th>
-          <th>$msg['registerItem.types.label']</th>
+##          <th>$msg['registerItem.types.label']</th>
           <th>$msg['registerItem.status.label']</th>
         </tr>
       </thead>

ldregistry/ui/assets/css/ui.css

@@ -199,4 +199,14 @@ td.align-right {
   margin-left: 10px;
   margin-bottom: 3px;
   font-size: 15.4px;
+}
+
+.non-operational-banner {
+  background-color: #ff7e00;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 16px;
+  margin-bottom: 10px;
+  padding: 10px;
+  text-align: center;
+  width: 100%;
 }