swish/commit

New upstream help pages

authorJan Wielemaker
Wed Sep 21 14:29:24 2016 +0200
committerJan Wielemaker
Wed Sep 21 14:29:24 2016 +0200
commit7f1534084c4940cd8216ca9999a5bd85ede89b29
treece77b33f0c0e4d317c5f2393610f2c4bdea62546
parent59d6dbb9905bc2b1e9c98d3edcab96e8a351f25a
Diff style: patch stat
diff --git a/web/help/about.html b/web/help/about.html
index ea1e37f..98a4fb5 100644
--- a/web/help/about.html
+++ b/web/help/about.html
@@ -13,17 +13,22 @@
     border: 0px;
   }
   div.acknowledgement { width: 90%;
-			margin-top: 2em; margin-left:auto; margin-right: auto;
+			margin-top: 2em; margin-left: auto; margin-right: auto;
 			border-top: 1px solid #bbb;
 			padding-top: 5px;
+			text-align: center;
 		      }
-  div.acknowledgement > span { display: inline-block; width: 48%;
-			       vertical-align: top;
-			       color: #888;
-			     }
-  img.commit-logo { vertical-align: top;}
+  div.sponsors { text-align: center;
+		 width: 70%;
+		 margin: auto;
+		 color: #888;
+	       }
+  div.acknowledgement img { margin: 0px 5px; }
+  img.sponsor-logo.top { vertical-align: top;}
   img.commit { width: 30% }
   img.vu { width: 8% }
+  img.cwi { width: 15%; }
+  img.vre4eic { width: 12% }
   img.synerscope { width: 12% }
   </style>  </head>
   <body>
@@ -69,14 +74,21 @@ latest <a href="http://github.com/SWI-Prolog/swipl-devel.git">GIT</a>.
 
 <div class=acknowledgement>
 <a href="http://vu.nl" target="_blank">
-<img src="../icons/VU-logo.png" class="vu commit-logo"></a>
+<img src="../icons/VU-logo.png" class="vu sponsor-logo top"></a>
+<a href="http://www.cwi.nl" target="_blank">
+<img src="../icons/cwi-logo.png" class="cwi sponsor-logo"></a>
+<a href="http://www.vre4eic.eu" target="_blank">
+<img src="../icons/vre4eic-logo.png" class="vre4eic sponsor-logo top"></a>
 <a href="http://www.commit-nl.nl" target="_blank">
-<img src="../icons/COMMIT_logo.png" class="commit commit-logo"></a>
-<span>SWISH is developed within the DataLab valorisation project sponsored by
-the <a href="http://www.commit-nl.nl">COMMIT/ consortium</a>
-</span>
+<img src="../icons/COMMIT_logo.png" class="commit sponsor-logo"></a>
 <a href="http://www.synerscope.com" target="_blank">
-<img src="../icons/Synerscope-logo.png" class="synerscope commit-logo"></a>
+<img src="../icons/Synerscope-logo.png" class="synerscope sponsor-logo top"></a>
+</div>
+
+<div class="sponsors">
+The development of SWISH as a <em>DataLab</em> is sponsored by
+the <a href="http://www.commit-nl.nl">COMMIT/ consortium</a> and
+<a href="http://www.vre4eic.eu">VRE4EIC</a>.
 </div>
 
 </body>
diff --git a/web/help/notebook.html b/web/help/notebook.html
index 534496e..ad0c627 100644
--- a/web/help/notebook.html
+++ b/web/help/notebook.html
@@ -10,6 +10,8 @@ p.note { margin-left: 5%; margin-top: 1em; position: relative }
 p.note span.glyphicon-hand-right {
 float: left; font-size: 120%; color: orange; padding-right: 0.2em;
 }
+
+a.nb-cell.program { margin: 0px; }
 </style>
 <p>
 A notebook is a list of <i>cells</i>. Notebooks are different from a
@@ -57,15 +59,27 @@ markdown notation <code>[label](myfile.pl)</code>, e.g.,
 
 <h3>Notebook queries and programs</h3>
 
+<p>
 A notebook <em>query</em> cell is executed against the program cell
 <strong>above it</strong> and all program cells marked as
-<em>background</em> using the <a class="btn btn-success btn-xs"><span
-style="color:#bef" class="glyphicon glyphicon-cloud"></span></a> button.
+<em>background</em> using the <a class="nb-cell btn-default program
+background btn btn-image btn-xs"><span
+class="image-icon"></span></a> button. Click the <a class="nb-cell
+btn-default program btn btn-image btn-xs"><span
+class="image-icon"></span></a> button to turn a normal program cell
+into a <i>background</i> cell.
 
 <p class="note"><span class="glyphicon glyphicon-hand-right"></span>
 Longer fragments of code that are required throughout a notebook and
 possibly on multiple notebooks are defined in a <em>program</em> tab,
 saved and included using, e.g., <code>:- include(mybasics).</code> in a
 background program kept at the bottom of the notebook.
+
+<p class="note"><span class="glyphicon glyphicon-hand-right"></span>
+If you want to have multiple related queries in a notebook you can
+add a <i>background</i> program at the end of the notebook and above
+this program pairs of a normal program and query where the normal
+program provides data and/or parameters by defining predicates that
+are missing from the background program.
 </body>
 </html>