CORD GUI -- Information about bundles and functions updated.

Change-Id: Iad39ee4df5185e0a017a542b5a583241b78476da

@@ -64,6 +64,9 @@ public class CordModelCache extends JsonFactory {
     private static final String LEVEL = "level";
     private static final String LEVEL = "level";
     private static final String LOGOUT = "logout";
     private static final String LOGOUT = "logout";
 
 
+    private static final String BUNDLE_NAME = BUNDLE + "_name";
+    private static final String BUNDLE_DESC = BUNDLE + "_desc";
+
     private static final Map<Integer, Integer> LOOKUP = new HashMap<>();
     private static final Map<Integer, Integer> LOOKUP = new HashMap<>();
 
 
     private String email = null;
     private String email = null;
@@ -315,8 +318,10 @@ public class CordModelCache extends JsonFactory {
             return jsonLogout();
             return jsonLogout();
         }
         }
 
 
+        BundleDescriptor bundleDescriptor = currentBundle.descriptor();
         ObjectNode root = objectNode();
         ObjectNode root = objectNode();
-        root.put(BUNDLE, currentBundle.descriptor().displayName());
+        root.put(BUNDLE_NAME, bundleDescriptor.displayName());
+        root.put(BUNDLE_DESC, bundleDescriptor.description());
         root.set(USERS, userJsonArray());
         root.set(USERS, userJsonArray());
         addSubId(root);
         addSubId(root);
         return root.toString();
         return root.toString();

@@ -35,12 +35,18 @@ public class BundleFactory extends JsonFactory {
     private static final String BASIC_ID = "basic";
     private static final String BASIC_ID = "basic";
     private static final String BASIC_DISPLAY_NAME = "Basic Bundle";
     private static final String BASIC_DISPLAY_NAME = "Basic Bundle";
     private static final String BASIC_DESCRIPTION =
     private static final String BASIC_DESCRIPTION =
-            "Provides basic internet and firewall functions.";
+            "If the thing that matters most to you is high speed Internet" +
+                    " connectivity delivered at a great price, then the basic" +
+                    " bundle is right for you.\n" +
+                    "Starting at $30 a month for 12 months.";
 
 
     private static final String FAMILY_ID = "family";
     private static final String FAMILY_ID = "family";
     private static final String FAMILY_DISPLAY_NAME = "Family Bundle";
     private static final String FAMILY_DISPLAY_NAME = "Family Bundle";
     private static final String FAMILY_DESCRIPTION =
     private static final String FAMILY_DESCRIPTION =
-            "Provides internet, firewall and parental control functions.";
+            "Enjoy great entertainment, peace of mind and big savings when " +
+                    "you bundle high speed Internet and Firewall with" +
+                    " Parental Control.\n" +
+                    "Starting at $40 a month for 12 months.";
 
 
 
 
     // no instantiation
     // no instantiation

@@ -26,7 +26,8 @@ public enum XosFunctionDescriptor {
      */
      */
     INTERNET("internet",
     INTERNET("internet",
              "Internet",
              "Internet",
-             "Basic internet connectivity.",
+             "Discover the joys of high-speed, reliable Internet" +
+                     " connectivity delivered seamlessly to your home.",
              false,
              false,
              true),
              true),
 
 
@@ -35,7 +36,7 @@ public enum XosFunctionDescriptor {
      */
      */
     FIREWALL("firewall",
     FIREWALL("firewall",
              "Firewall",
              "Firewall",
-             "Normal firewall protection.",
+             "Simple access control and filtering with minimal set-up.",
              true,
              true,
              true),
              true),
 
 
@@ -44,7 +45,11 @@ public enum XosFunctionDescriptor {
      */
      */
     URL_FILTER("url_filter",
     URL_FILTER("url_filter",
                "Parental Control",
                "Parental Control",
-               "Variable levels of URL filtering.",
+               "Parental Control is peace of mind that your kids are safe" +
+                       " - whether you are around or away. Indicate with a " +
+                       "few clicks what online content is appropriate for " +
+                       "your children, and voila - you have control over" +
+                       " what your kids can and cannot view.",
                true,
                true,
                true),
                true),
 
 

 <!--Foot partial html-->
 <!--Foot partial html-->
 <div class="foot">
 <div class="foot">
     <div class="left">
     <div class="left">
-        Sample copyright notice here
+
     </div>
     </div>
 
 
     <div class="right">
     <div class="right">
-        Some other text here
+        © ONOS Project. All rights reserved.
     </div>
     </div>
 </div>
 </div>

@@ -44,7 +44,7 @@ div#bundle div.main-right {
     padding-left: 3%;
     padding-left: 3%;
 }
 }
 #bundle td.desc {
 #bundle td.desc {
-    width: 50%;
+    width: 60%;
     text-align: left;
     text-align: left;
     font-style: italic;
     font-style: italic;
 }
 }

@@ -70,6 +70,7 @@ p {
     color: rgba(0,0,0, 0.8);
     color: rgba(0,0,0, 0.8);
     text-indent: 20px;
     text-indent: 20px;
     text-align: justify;
     text-align: justify;
+    padding-right: 5%;
 }
 }
 th {
 th {
     background-color: #7AB6EA;
     background-color: #7AB6EA;

@@ -9,17 +9,10 @@
             <div class="bundle-title">
             <div class="bundle-title">
                 <h4>Welcome Dad!</h4>
                 <h4>Welcome Dad!</h4>
                 <h5>You are subscribed to the</h5>
                 <h5>You are subscribed to the</h5>
-                <h3>{{bundle}}</h3>
+                <h3>{{bundle_name}}</h3>
             </div>
             </div>
 
 
-            <p>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sit
-                amet ultricies metus. Praesent pretium diam et nibh lacinia
-                faucibus. Donec commodo efficitur ex quis faucibus.
-                Pellentesque nec commodo metus. Nulla ultrices odio vitae tellus
-                tempor, quis fringilla arcu pellentesque. Duis efficitur massa
-                libero, et molestie diam vulputate nec. Nulla vitae lacinia odio.
-            </p>
+            <p>{{bundle_desc}}</p>
 
 
 
 
             <h4>Users</h4>
             <h4>Users</h4>

@@ -35,7 +35,8 @@
                 resource = DashboardData.get({},
                 resource = DashboardData.get({},
                     // success
                     // success
                     function () {
                     function () {
-                        $scope.bundle = resource.bundle;
+                        $scope.bundle_name = resource.bundle_name;
+                        $scope.bundle_desc = resource.bundle_desc;
                         $scope.users = resource.users;
                         $scope.users = resource.users;
 
 
                         if ($.isEmptyObject($scope.shared.userActivity)) {
                         if ($.isEmptyObject($scope.shared.userActivity)) {