Merge branch 'master' into master

packages/composer-website/jekylldocs/_includes/sidebars/integrating.md

@@ -4,7 +4,7 @@
 **[Defining Business Networks](../business-network/businessnetwork.html)**
 **[Writing Applications](../applications/genapp.html)**
 **[Integrating Existing Systems](../integrating/integrating-index.html)**
-[Using Loopback to generate a REST API for your business network](../integrating/getting-started0rest-api.html)
+[Using Loopback to generate a REST API for your business network](../integrating/getting-started-rest-api.html)
 **[Managing and Operating](../managing/participant-add.html)**
 **[Determining Problems](../problems/diagnostics.html)**
 **[Reference](../reference/MeetTheModules.html)**

packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md

@@ -1,7 +1,7 @@
 **[Introduction](../introduction/introduction.html)**
 **[Tutorials](../tutorials/tutorialindex.html)**
 [Tutorial 1: Building your first business network](../tutorials/defining-a-business-network.html)
-[Getting started with the command line](../tutorial/getting-started-cmd-line.html)
+[Getting started with the command line](../tutorials/getting-started-cmd-line.html)
 [Getting started with the playground](../tutorials/getting-started-playground.html)
 **[Installing](../installing/prerequisites.html)**
 **[Defining Business Networks](../business-network/businessnetwork.html)**

packages/composer-website/jekylldocs/assets/css/new-style.scss

@@ -317,19 +317,19 @@ li {
   color: $primary-text;
 }
 
-.navbar-inverse .navbar-nav > li > a {
-  color: $primary-text;
-  &:hover {
-    color: $primary-text;
-  }
-}
-
-.navbar-inverse .navbar-brand {
-  color: $primary-text;
-  &:hover {
-    color: $primary-text;
-  }
-}
+// .navbar-inverse .navbar-nav > li > a {
+//   color: $primary-text;
+//   &:hover {
+//     color: $primary-text;
+//   }
+// }
+//
+// .navbar-inverse .navbar-brand {
+//   color: $primary-text;
+//   &:hover {
+//     color: $primary-text;
+//   }
+// }
 
 .navbar-fixed-top {
   border: none;

packages/composer-website/jekylldocs/index.html

@@ -34,7 +34,7 @@ <h1>Build Hyperledger Fabric applications and business networks your way</h1>
   <div class="trio-left">
     <img src="assets/img/Abstract.png"/>
     <h2>Really simple models</h2>
-    <p>Define a business network in our purpose-bulit modelling language, and script trasactions in Javascript: the most popular language on the planet.</p>
+    <p>Define a business network in our purpose-built modelling language, and script transactions in Javascript: the most popular language on the planet.</p>
   </div>
   <div class="trio-center">
     <img src="assets/img/Quick_POC_2.png"/>

packages/composer-website/jekylldocs/tutorials/defining-a-business-network.md

@@ -19,6 +19,7 @@ Defining a business network is the entry point to any {{site.data.conrefs.fabric
 Before beginning this tutorial you will need:
 
 * A GitHub account
+* If you want to run this tutorial locally, see [Installing and running the {{site.data.conrefs.composer_full}} Playground locally](../tutorials/getting-started-playground.html).
 
 ---
 
@@ -36,6 +37,7 @@ which controls the transactions, in this script file, there is JavaScript logic
 1. To get a better understanding of how business network definitions work in practise, click the **Test** tab at the top. From this screen, we can create assets and participants, and submit transactions.
 
 2. To start with, add a *Member* participant by clicking **Member** then clicking **Create New Participant**. Enter the balance, email, and name credentials for the new participant in the following format, then click **Create New**. The credentials which are required for each participant are defined in the `.cto` file viewable in the **Define** tab.
+
 ```
 {
   "$class": "org.acme.vehicle.auction.Member",
@@ -61,6 +63,7 @@ which controls the transactions, in this script file, there is JavaScript logic
 ```
 
 6. Next, to sell the car at auction, an auction listing asset must be created. Assets can be any tangible or intangible goods or services, in this case, the auction listing itself. To create the auction listing, click **VehicleListing** then click **Create New Asset**. The *VehicleListing* requires several properties, and should have the following format:
+
 ```
 {
   "$class": "org.acme.vehicle.auction.VehicleListing",
@@ -76,6 +79,7 @@ which controls the transactions, in this script file, there is JavaScript logic
 ### Running the auction
 
 1. Now that you have *Members* to own and bid on an asset, an *Auctioneer*, a *Vehicle* asset with registered ownership, and a *VehicleListing* asset to track the bids, reserve price, and state of the auction. The next step is to begin using transactions to interact with assets. This sample includes the *Offer* and *CloseBidding* transactions. Transactions, combined with assets and participants, make up the economic model of a business network. Transactions can modify, transfer, or otherwise alter assets, as in this sample, where transactions allow participants to place bids or allow the auctioneer to close the auction. Placing a bid uses the *Offer* transaction. To submit a transaction, click the **Submit Transaction** button. In the dialog box, use the dropdown to select the *Offer* transaction type. The *Offer* transaction requires a number of properties and should have the following format:
+
 ```
 {
   "$class": "org.acme.vehicle.auction.Offer",

packages/composer-website/jekylldocs/applications/docker-compose.yml → packages/composer-website/jekylldocs/tutorials/docker-compose.yml

@@ -31,7 +31,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   composer:
-    image: fabriccomposer/composer-ui
+    image: fabriccomposer/composer-playground
     ports:
       - '8080:8080'
     links:

packages/composer-website/jekylldocs/tutorials/getting-started-playground.md

@@ -173,17 +173,17 @@ In order to install Fabric Composer Playground with npm, you need the following
 You can install Fabric Composer Playground by running the following command in your terminal or command prompt:
 
   ```
-  sudo npm install -g composer-ui
+  sudo npm install -g composer-playground
   ```
 
 You should see the following output in your terminal or command prompt:
 
   ```
-  $ sudo npm install -g composer-ui
+  $ sudo npm install -g composer-playground
   ...
-  /usr/local/bin/composer-ui -> /usr/local/lib/node_modules/composer-ui/cli.js
+  /usr/local/bin/composer-playground -> /usr/local/lib/node_modules/composer-playground/cli.js
   /usr/local/lib/node_modules
-  └─┬ composer-ui@0.4.3
+  └─┬ composer-playground@0.4.3
   ...
   ```
 
@@ -192,7 +192,7 @@ Verify that no errors occurred. If any part of this process fails, then Fabric C
 You can then start Fabric Composer Playground by running the following command in your terminal or command prompt:
 
   ```
-  composer-ui
+  composer-playground
   ```
 
 A web browser will be automatically opened once the playground has started, but should that not happen you should be able to access Fabric Composer Playground by clicking on this link: <a href="http://localhost:8080" target="_blank">http://<span></span>localhost:8080</a>
@@ -227,13 +227,13 @@ In order to install Fabric Composer Playground with Docker, you need the followi
 You can install Fabric Composer Playground by running the following Docker command in your terminal or command prompt:
 
   ```
-  docker run -d -p 8080:8080 fabriccomposer/composer-ui
+  docker run -d -p 8080:8080 fabriccomposer/composer-playground
   ```
 
 You should see the following output in your terminal or command prompt:
 
   ```
-  $ docker run -d -p 8080:8080 fabriccomposer/composer-ui
+  $ docker run -d -p 8080:8080 fabriccomposer/composer-playground
   afd1baff0487de5c69626b8baea69c702744f92813043e3d2b0ef786c7f77517
   ```
 

packages/composer-website/jekylldocs/tutorials/tutorialindex.md

@@ -28,7 +28,7 @@ These getting started guides are intended for more technical users and may requi
 
 * [Quickstart](../installing/quickstart.html) installs and tests the prerequisites for the digital property network sample.
 * [Running a sample with the command line](../tutorials/getting-started-cmd-line.html).
-* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html).
+* [Installing and running the {{site.data.conrefs.composer_short}} Playground locally](../tutorials/getting-started-playground.html). To run the [business network tutorial](../tutorials/defining-a-business-network.html) locally, install the playground locally first. 
 
 {% for page in site.tutorials %}
 <ul>