From 25860da36859dc6c421dada14711bb74d779addc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 25 Jan 2019 15:28:24 +0000 Subject: [PATCH] Use "Javascript include" for filters. --- 2019-fosdem/4300-about-nbdkit-filters.html | 21 +----- 2019-fosdem/4400-about-nbdkit-filters-today.html | 32 ++------- 2019-fosdem/4500-about-nbdkit-layers.html | 67 +++---------------- 2019-fosdem/4600-about-nbdkit-layers-command.html | 81 +++++------------------ 2019-fosdem/7000-visualization.html | 38 +++-------- 2019-fosdem/7100-delay-filter.html | 30 ++------- 2019-fosdem/7200-error-filter.html | 30 ++------- 2019-fosdem/7300-log-filter.html | 30 ++------- 2019-fosdem/code.js | 23 +++++++ 2019-fosdem/style.css | 43 ++++++++++++ 10 files changed, 120 insertions(+), 275 deletions(-) diff --git a/2019-fosdem/4300-about-nbdkit-filters.html b/2019-fosdem/4300-about-nbdkit-filters.html index 5c95c1c..359c8e1 100644 --- a/2019-fosdem/4300-about-nbdkit-filters.html +++ b/2019-fosdem/4300-about-nbdkit-filters.html @@ -4,24 +4,9 @@

nbdkit — filters

- -
- blocksize - cache - cow - delay - error - - fua - log - nozero - offset - partition - truncate -
+

diff --git a/2019-fosdem/4400-about-nbdkit-filters-today.html b/2019-fosdem/4400-about-nbdkit-filters-today.html index a71f23e..d9bb1cd 100644 --- a/2019-fosdem/4400-about-nbdkit-filters-today.html +++ b/2019-fosdem/4400-about-nbdkit-filters-today.html @@ -4,33 +4,13 @@

nbdkit — filters

- - - -
- blocksize - cache - cow - delay - error +

diff --git a/2019-fosdem/4500-about-nbdkit-layers.html b/2019-fosdem/4500-about-nbdkit-layers.html index f977e3a..8ba4783 100644 --- a/2019-fosdem/4500-about-nbdkit-layers.html +++ b/2019-fosdem/4500-about-nbdkit-layers.html @@ -4,69 +4,20 @@

nbdkit — layers

- - -
- blocksize - cache - cow - delay - error + diff --git a/2019-fosdem/4600-about-nbdkit-layers-command.html b/2019-fosdem/4600-about-nbdkit-layers-command.html index c780251..b62ef6d 100644 --- a/2019-fosdem/4600-about-nbdkit-layers-command.html +++ b/2019-fosdem/4600-about-nbdkit-layers-command.html @@ -4,70 +4,19 @@

nbdkit — layers

- - -
- blocksize - cache - cow - delay - error + + +

- -

- - -
- blocksize - cache - cow - delay - error - - fua - log - nozero - offset - partition - truncate -
diff --git a/2019-fosdem/7100-delay-filter.html b/2019-fosdem/7100-delay-filter.html index e0ba6c5..4ce3a3a 100644 --- a/2019-fosdem/7100-delay-filter.html +++ b/2019-fosdem/7100-delay-filter.html @@ -4,15 +4,6 @@

Useful nbdkit filters: the delay filter

- - 
 nbdkit --filter=delay [...] rdelay=1
 
@@ -27,21 +18,8 @@ nbdkit --filter=delay [...] rdelay=100ms wdelay=50ms
 
  •  Requests handled in parallel are delayed in parallel, as expected.
 
 
-
-
    
-  blocksize
-  cache
-  cow
-  delay
-  error
+
diff --git a/2019-fosdem/7200-error-filter.html b/2019-fosdem/7200-error-filter.html
index 36e90f1..38d7c2f 100644
--- a/2019-fosdem/7200-error-filter.html
+++ b/2019-fosdem/7200-error-filter.html
@@ -4,15 +4,6 @@
 
 
    Useful nbdkit filters: the error filter
    
 
-
-
 
     nbdkit --filter=error [...] error=EIO error-rate=10%
 
@@ -28,21 +19,8 @@ an error file.
 ESHUTDOWN.
 
 
-
-
    
-  blocksize
-  cache
-  cow
-  delay
-  error
+
diff --git a/2019-fosdem/7300-log-filter.html b/2019-fosdem/7300-log-filter.html
index 13f3f1a..5a9c4c3 100644
--- a/2019-fosdem/7300-log-filter.html
+++ b/2019-fosdem/7300-log-filter.html
@@ -4,15 +4,6 @@
 
 
    Useful nbdkit filters: the log filter
    
 
-
-
 
     nbdkit --filter=log [...] logfile=/tmp/log
 
    
@@ -31,21 +22,8 @@ nbdkit --filter=log [...] logfile=/tmp/log
 2018-11-16 10:55:21.447197 connection=2 ...Read id=5 return=0 (Success)
 
    
 
-
-
    
-  blocksize
-  cache
-  cow
-  delay
-  error
+
diff --git a/2019-fosdem/code.js b/2019-fosdem/code.js
index 749558c..261fc85 100644
--- a/2019-fosdem/code.js
+++ b/2019-fosdem/code.js
@@ -36,3 +36,26 @@ function plugins ()
 
     \
 ");
 }
+
+function filters (layer)
+{
+    document.write ("\
+
     \
+
    filters available in nbdkit 1.10
     \
+
       \
+
    •  blocksize \
+
    •  cache \
+
    •  cow \
+
    •  delay \
+
    •  error \
+
    •  fua \
+
    •  log \
+
    •  nozero \
+
    •  offset \
+
    •  partition \
+
    •  truncate \
+
    •  xz \
+
     \
+
     \
+");
+}
diff --git a/2019-fosdem/style.css b/2019-fosdem/style.css
index 64a66b5..7235b7c 100644
--- a/2019-fosdem/style.css
+++ b/2019-fosdem/style.css
@@ -115,3 +115,46 @@ div.plugins ul li.highlighted {
     border-radius: 20px;
     font-weight: bold;
 }
+
+/* Filters box. */
+div.filters {
+    background: #f8fff8;
+    border: 1px solid rgb(204,0,0);
+    border-radius: 15px;
+    width: 800px;
+    height: 200px;
+    /* Position relative is needed so that items may be
+       positioned inside. */
+    position: relative;
+    column-count: 4;
+}
+
+div.filters p.filtercaption {
+    position: absolute;
+    bottom: -5px; right: 5px;
+    color: rgb(204,0,0);
+    text-align: right;
+    font-size: 16px;
+    font-weight: bold;
+}
+
+div.filters ul {
+    list-style-type: none;
+    top: 50%;
+    transform: translateY(15%);
+    margin: 0;
+}
+
+div.filters ul li {
+    padding: 4px;
+    margin: 5px;
+}
+
+div.filters ul li.highlighted {
+    border: 1px solid rgb(204,0,0);
+    background: #fff;
+    padding-left: 10px;
+    color: rgb(204,0,0);
+    border-radius: 20px;
+    font-weight: bold;
+}
-- 
1.8.3.1