From ab0885f0efe0d8da5f69659d6a908bb5f51899b4 Mon Sep 17 00:00:00 2001
From: Lucas Dohmen <lucas@arangodb.com>
Date: Fri, 12 Dec 2014 18:43:10 +0100
Subject: [PATCH] Show License and Version for each of the apps

---
 .../aardvark/frontend/js/templates/applicationDetailView.ejs  | 2 +-
 js/apps/system/aardvark/manifest.json                         | 1 +
 js/apps/system/cerberus/manifest.json                         | 4 +++-
 js/apps/system/gharial/manifest.json                          | 1 +
 js/apps/system/sessions/manifest.json                         | 3 ++-
 js/apps/system/simple-auth/manifest.json                      | 3 ++-
 js/apps/system/users/manifest.json                            | 3 ++-
 js/server/modules/org/arangodb/foxx/manager.js                | 1 +
 8 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/js/apps/system/aardvark/frontend/js/templates/applicationDetailView.ejs b/js/apps/system/aardvark/frontend/js/templates/applicationDetailView.ejs
index 8068231eea..7b9b68faa8 100644
--- a/js/apps/system/aardvark/frontend/js/templates/applicationDetailView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/applicationDetailView.ejs
@@ -10,7 +10,7 @@
         <h3>
           <%= attributes.name %>
           <span class="license"><%= attributes.license %></span>
-          <span class="version"><%= attributes.version %></span>
+          <span class="version"><%= attributes.app.split(':').pop() %></span>
         </h3>
         <p class="description"><%= attributes.description %></p>
       </div>
diff --git a/js/apps/system/aardvark/manifest.json b/js/apps/system/aardvark/manifest.json
index 6eb9b62c2f..9aa8cefa15 100644
--- a/js/apps/system/aardvark/manifest.json
+++ b/js/apps/system/aardvark/manifest.json
@@ -3,6 +3,7 @@
   "description": "ArangoDB Admin Web Interface",
   "author": "ArangoDB GmbH",
   "version": "1.0",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
 
   "contributors": [
diff --git a/js/apps/system/cerberus/manifest.json b/js/apps/system/cerberus/manifest.json
index 34c4002b80..1f467cb260 100644
--- a/js/apps/system/cerberus/manifest.json
+++ b/js/apps/system/cerberus/manifest.json
@@ -1,7 +1,9 @@
 {
   "name": "cerberus",
-  "version": "0.0.1",
+  "description": "Password Manager",
   "author": "ArangoDB GmbH",
+  "version": "0.0.1",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
 
   "contributors": [
diff --git a/js/apps/system/gharial/manifest.json b/js/apps/system/gharial/manifest.json
index 1a5316ea49..1605677cc7 100644
--- a/js/apps/system/gharial/manifest.json
+++ b/js/apps/system/gharial/manifest.json
@@ -3,6 +3,7 @@
   "description": "ArangoDB Graph Module",
   "author": "ArangoDB GmbH",
   "version": "0.1",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
 
   "contributors": [
diff --git a/js/apps/system/sessions/manifest.json b/js/apps/system/sessions/manifest.json
index e6a4eab727..bf8ad2f8e5 100644
--- a/js/apps/system/sessions/manifest.json
+++ b/js/apps/system/sessions/manifest.json
@@ -1,9 +1,10 @@
 {
   "name": "sessions",
+  "description": "Session storage for Foxx.",
   "author": "ArangoDB GmbH",
   "version": "0.1",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
-  "description": "Session storage for Foxx.",
 
   "contributors": [
     {
diff --git a/js/apps/system/simple-auth/manifest.json b/js/apps/system/simple-auth/manifest.json
index 9b3351e0c7..8e1f70db91 100644
--- a/js/apps/system/simple-auth/manifest.json
+++ b/js/apps/system/simple-auth/manifest.json
@@ -1,9 +1,10 @@
 {
   "name": "simple-auth",
+  "description": "Simple password-based authentication for Foxx.",
   "author": "ArangoDB GmbH",
   "version": "0.1",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
-  "description": "Simple password-based authentication for Foxx.",
 
   "contributors": [
     {
diff --git a/js/apps/system/users/manifest.json b/js/apps/system/users/manifest.json
index 44aaa03aca..1449994077 100644
--- a/js/apps/system/users/manifest.json
+++ b/js/apps/system/users/manifest.json
@@ -1,9 +1,10 @@
 {
   "name": "users",
+  "description": "Username-based user storage for Foxx.",
   "author": "ArangoDB GmbH",
   "version": "0.1",
+  "license": "Apache License, Version 2.0",
   "isSystem": true,
-  "description": "Username-based user storage for Foxx.",
 
   "contributors": [
     {
diff --git a/js/server/modules/org/arangodb/foxx/manager.js b/js/server/modules/org/arangodb/foxx/manager.js
index 68e4d96808..62df8e14b0 100644
--- a/js/server/modules/org/arangodb/foxx/manager.js
+++ b/js/server/modules/org/arangodb/foxx/manager.js
@@ -665,6 +665,7 @@ function mountAalApp (app, mount, options) {
     app: app._id,
     name: app._name,
     description: app._manifest.description,
+    license: app._manifest.license,
     author: app._manifest.author,
     contributors: app._manifest.contributors,
     mount: mount,