Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit ff2ef1b

Browse files
JakeeyturnerJakeeyturner
authored
Merge pull request #490 from EdProsser/master
Big docs update: structure, conrefs, intro, tutorials
2 parents 0ce804b + 8f4b739 commit ff2ef1b

File tree

78 files changed

+516
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+516
-232
lines changed

‎packages/composer-website/jekylldocs/_data/conrefs.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
composer_short:
3+
Composer
4+
5+
composer_full:
6+
Fabric Composer
7+
8+
hyperledger_fabric_full:
9+
Hyperledger Fabric

‎packages/composer-website/jekylldocs/_includes/footerbar.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
{% capture concepts %}{% include sidebars/concepts.md %}{% endcapture %}
2-
{% capture tasks %}{% include sidebars/tasks.md %}{% endcapture %}
3-
{% capture reference %}{% include sidebars/reference.md %}{% endcapture %}
4-
{% capture start %}{% include sidebars/start.md %}{% endcapture %}
5-
6-
71
<!-- Navigation -->
82
<nav class="navbar navbar-inverse navbar-fixed-bottom" role="navbar-fixed-bottom">
93
<ul class="nav navbar-nav navbar-left">

‎packages/composer-website/jekylldocs/_includes/head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
<!-- <link href="{{site.baseurl}}/assets/css/new-style.min.css" rel="stylesheet"> -->
3636
{% endif %}
3737

38-
<!--link href="/blog/atom.xml" type="application/atom+xml" rel="alternate" title="Concerto Blog Atom Feed">-->
38+
<!--link href="/blog/atom.xml" type="application/atom+xml" rel="alternate" title="Composer Blog Atom Feed">-->
3939
</head>

‎packages/composer-website/jekylldocs/_includes/header.html‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
<<<<<<< HEAD
2+
=======
13

2-
{% capture tasks %}{% include sidebars/tasks.md %}{% endcapture %}
3-
{% capture reference %}{% include sidebars/reference.md %}{% endcapture %}
4-
{% capture start %}{% include sidebars/start.md %}{% endcapture %}
54

65

6+
>>>>>>> refs/remotes/fabric-composer/master
77
<header class="page-header">
88
<div class="container">
99
<div class="mobile-bar">
@@ -16,19 +16,36 @@ <h1 ><a href="{{site.baseurl}}/index.html" class="logot">Fabric Composer</a> </h
1616
<a href="{{site.baseurl}}/index.html"><i class="fa fa-home" aria-hidden="true"></i></a>
1717
</li>
1818
<li>
19-
<a href="{{site.baseurl}}/overview/overview.html">Overview</a>
19+
<a href="{{site.baseurl}}/introduction/introduction.html">Introduction</a>
20+
{{ introduction | markdownify }}
2021
</li>
2122
<li>
22-
<a href="{{site.baseurl}}/start/getting-started.html">Getting Started</a>
23-
{{ start | markdownify }}
23+
<a href="{{site.baseurl}}/tutorials/tutorialindex.html">Tutorials</a>
24+
{{ tutorials | markdownify }}
2425
</li>
2526
<li>
26-
<a href="{{site.baseurl}}/concepts/index.html">Concepts</a>
27-
{{ concepts | markdownify }}
27+
<a href="{{site.baseurl}}/installing/prerequisites.html">Installing</a>
28+
{{ installing | markdownify }}
2829
</li>
2930
<li>
30-
<a href="{{site.baseurl}}/tasks/index.html">Tasks</a>
31-
{{ tasks | markdownify }}
31+
<a href="{{site.baseurl}}/business-network/bnd-define.html">Defining Business Networks</a>
32+
{{ businessnetworks | markdownify }}
33+
</li>
34+
<li>
35+
<a href="{{site.baseurl}}/applications/genapp.html">Writing Applications</a>
36+
{{ applications | markdownify }}
37+
</li>
38+
<li>
39+
<a href="{{site.baseurl}}/integrating/integrating-index.html">Integrating Existing Systems</a>
40+
{{ integrating | markdownify }}
41+
</li>
42+
<li>
43+
<a href="{{site.baseurl}}/managing/participant-add.html">Managing and Operating</a>
44+
{{ managing | markdownify }}
45+
</li>
46+
<li>
47+
<a href="{{site.baseurl}}/problems/diagnostics.html">Determining Problems</a>
48+
{{ problems | markdownify }}
3249
</li>
3350
<li>
3451
<a href="{{site.baseurl}}/reference/index.html">Reference</a>

‎packages/composer-website/jekylldocs/_includes/indexfooter.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
{% capture concepts %}{% include sidebars/concepts.md %}{% endcapture %}
2-
{% capture tasks %}{% include sidebars/tasks.md %}{% endcapture %}
3-
{% capture reference %}{% include sidebars/reference.md %}{% endcapture %}
4-
{% capture start %}{% include sidebars/start.md %}{% endcapture %}
5-
6-
71
<div class="footercontainer">
82
<div class="footerleft">
93
<ul>

‎packages/composer-website/jekylldocs/_includes/indexnavbar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ul>
88
<li><a href="#" title="Composer">Playground</a></li>
99
<li><a href="{{site.baseurl}}/start/quickstart.html" title="Quickstart">Quickstart</a></li>
10-
<li><a href="{{site.baseurl}}/overview/overview.html" title="Docs">Docs</a></li>
10+
<li><a href="{{site.baseurl}}/introduction/introduction.html" title="Docs">Docs</a></li>
1111
<li><a href="{{site.baseurl}}/support/index.html" title="Support">Support</a></li>
1212
</ul>
1313
</div>

‎packages/composer-website/jekylldocs/_includes/navbar.html‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
{% capture concepts %}{% include sidebars/concepts.md %}{% endcapture %}
2-
{% capture tasks %}{% include sidebars/tasks.md %}{% endcapture %}
3-
{% capture reference %}{% include sidebars/reference.md %}{% endcapture %}
4-
{% capture start %}{% include sidebars/start.md %}{% endcapture %}
5-
6-
7-
81
<!-- Navigation -->
92
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
103
<div class="container">

‎packages/composer-website/jekylldocs/_includes/sidebars/applications.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
**[Introduction](../introduction/introduction.html)**
2+
**[Tutorials](../tutorials/tutorialindex.html)**
3+
**[Installing](../installing/prerequisites.html)**
4+
**[Defining Business Networks](../business-network/businessnetwork.html)**
5+
**[Writing Applications](../applications/genapp.html)**
6+
[Generating a starter application](../applications/genapp.html)
7+
[Writing a node.js application](../applications/getting-started-nodejs-app.html)
8+
[Generating a REST API](../applications/rest-api-server.html)
9+
**[Integrating Existing Systems](../integrating/integrating-index.html)**
10+
**[Managing and Operating](../managing/participant-add.html)**
11+
**[Determining Problems](../problems/diagnostics.html)**
12+
**[Reference](../reference/MeetTheModules.html)**
13+
**[Support](../support/index.html)**

‎packages/composer-website/jekylldocs/_includes/sidebars/businessnetworks.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
**[Introduction](../introduction/introduction.html)**
2+
**[Tutorials](../tutorials/tutorialindex.html)**
3+
**[Installing](../installing/prerequisites.html)**
4+
**[Defining Business Networks](../business-network/businessnetwork.html)**
5+
[Defining a business network definition](../business-network/getting-started-coding-bnd.html)
6+
[Deploying a business network](../business-network/deploybusinessnetwork.html)
7+
[Create a business network definition](../business-network/bnd-define.html)
8+
[Publish a business network definition](../business-network/bnd-publish.html)
9+
[Publish a business domain model](../business-network/model-publish.html)
10+
[Update a business network definition on Fabric](../business-network/runtime-update.html)
11+
[Test a business network definition](../business-network/testing.html)
12+
**[Writing Applications](../applications/genapp.html)**
13+
**[Integrating Existing Systems](../integrating/integrating-index.html)**
14+
**[Managing and Operating](../managing/participant-add.html)**
15+
**[Determining Problems](../problems/diagnostics.html)**
16+
**[Reference](../reference/MeetTheModules.html)**
17+
**[Support](../support/index.html)**

‎packages/composer-website/jekylldocs/_includes/sidebars/concepts.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)