features: Add screenshots again

And delete unused ones

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 2acfd7e3a31bb04874577ee35469f92d345488e6..292291aa6fca9f2dcb68a0c01d30aa136b4e14d5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,6 +162,17 @@ static_images_DATA = \
 
 static_imagesdir = $(staticdir)/img
 
+static_images_screenshots_DATA = \
+       src/static/img/screenshots/firewall-connections.png \
+       src/static/img/screenshots/firewall-host-groups.png \
+       src/static/img/screenshots/firewall-new-rule.png \
+       src/static/img/screenshots/firewall-rules.png \
+       src/static/img/screenshots/firewall-service-groups.png \
+       src/static/img/screenshots/pakfire-addon-services-1.png \
+       src/static/img/screenshots/pakfire-overview-1.png
+
+static_images_screenshotsdir = $(static_imagesdir)/screenshots
+
 static_js_DATA = \
        src/bootstrap/dist/js/bootstrap.min.js \
        src/bootstrap/dist/js/bootstrap.min.js.map \

diff --git a/src/static/images/screens/de/final/connsched.png b/src/static/images/screens/de/final/connsched.png
deleted file mode 100644 (file)
index 1bdc09a..0000000
Binary files a/src/static/images/screens/de/final/connsched.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/disk.png b/src/static/images/screens/de/final/disk.png
deleted file mode 100644 (file)
index b18a391..0000000
Binary files a/src/static/images/screens/de/final/disk.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/dyndns.png b/src/static/images/screens/de/final/dyndns.png
deleted file mode 100644 (file)
index 3489c40..0000000
Binary files a/src/static/images/screens/de/final/dyndns.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/fwdiag.png b/src/static/images/screens/de/final/fwdiag.png
deleted file mode 100644 (file)
index fa67ed2..0000000
Binary files a/src/static/images/screens/de/final/fwdiag.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/fwlog-port.png b/src/static/images/screens/de/final/fwlog-port.png
deleted file mode 100644 (file)
index f16af50..0000000
Binary files a/src/static/images/screens/de/final/fwlog-port.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/fwlog.png b/src/static/images/screens/de/final/fwlog.png
deleted file mode 100644 (file)
index 5374102..0000000
Binary files a/src/static/images/screens/de/final/fwlog.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/ids.png b/src/static/images/screens/de/final/ids.png
deleted file mode 100644 (file)
index c797321..0000000
Binary files a/src/static/images/screens/de/final/ids.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/index.png b/src/static/images/screens/de/final/index.png
deleted file mode 100644 (file)
index cd2f72f..0000000
Binary files a/src/static/images/screens/de/final/index.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/ipsec.png b/src/static/images/screens/de/final/ipsec.png
deleted file mode 100644 (file)
index bd52379..0000000
Binary files a/src/static/images/screens/de/final/ipsec.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/nettraffic.png b/src/static/images/screens/de/final/nettraffic.png
deleted file mode 100644 (file)
index e60d7de..0000000
Binary files a/src/static/images/screens/de/final/nettraffic.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/nw-internal.png b/src/static/images/screens/de/final/nw-internal.png
deleted file mode 100644 (file)
index 2f72d6a..0000000
Binary files a/src/static/images/screens/de/final/nw-internal.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/outgoingfw-1.png b/src/static/images/screens/de/final/outgoingfw-1.png
deleted file mode 100644 (file)
index d14849f..0000000
Binary files a/src/static/images/screens/de/final/outgoingfw-1.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/outgoingfw-2.png b/src/static/images/screens/de/final/outgoingfw-2.png
deleted file mode 100644 (file)
index 25a388d..0000000
Binary files a/src/static/images/screens/de/final/outgoingfw-2.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/pakfire-1.png b/src/static/images/screens/de/final/pakfire-1.png
deleted file mode 100644 (file)
index eb34343..0000000
Binary files a/src/static/images/screens/de/final/pakfire-1.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/pakfire-2.png b/src/static/images/screens/de/final/pakfire-2.png
deleted file mode 100644 (file)
index dba4e2c..0000000
Binary files a/src/static/images/screens/de/final/pakfire-2.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/proxy.png b/src/static/images/screens/de/final/proxy.png
deleted file mode 100644 (file)
index ecb0e39..0000000
Binary files a/src/static/images/screens/de/final/proxy.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/qos-2.png b/src/static/images/screens/de/final/qos-2.png
deleted file mode 100644 (file)
index 6a81e94..0000000
Binary files a/src/static/images/screens/de/final/qos-2.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/samba.png b/src/static/images/screens/de/final/samba.png
deleted file mode 100644 (file)
index 5188b87..0000000
Binary files a/src/static/images/screens/de/final/samba.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/system.png b/src/static/images/screens/de/final/system.png
deleted file mode 100644 (file)
index 137bc17..0000000
Binary files a/src/static/images/screens/de/final/system.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/fwlog-port.png b/src/static/images/screens/de/final/thumb/fwlog-port.png
deleted file mode 100644 (file)
index ff29616..0000000
Binary files a/src/static/images/screens/de/final/thumb/fwlog-port.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/index.png b/src/static/images/screens/de/final/thumb/index.png
deleted file mode 100644 (file)
index 8871ab7..0000000
Binary files a/src/static/images/screens/de/final/thumb/index.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/ipsec.png b/src/static/images/screens/de/final/thumb/ipsec.png
deleted file mode 100644 (file)
index 1725d51..0000000
Binary files a/src/static/images/screens/de/final/thumb/ipsec.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/pakfire-1.png b/src/static/images/screens/de/final/thumb/pakfire-1.png
deleted file mode 100644 (file)
index d44d63d..0000000
Binary files a/src/static/images/screens/de/final/thumb/pakfire-1.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/proxy.png b/src/static/images/screens/de/final/thumb/proxy.png
deleted file mode 100644 (file)
index b883e20..0000000
Binary files a/src/static/images/screens/de/final/thumb/proxy.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/qos-2.png b/src/static/images/screens/de/final/thumb/qos-2.png
deleted file mode 100644 (file)
index de0f748..0000000
Binary files a/src/static/images/screens/de/final/thumb/qos-2.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/thumb/system.png b/src/static/images/screens/de/final/thumb/system.png
deleted file mode 100644 (file)
index c2f369a..0000000
Binary files a/src/static/images/screens/de/final/thumb/system.png and /dev/null differ

diff --git a/src/static/images/screens/de/final/xtaccess.png b/src/static/images/screens/de/final/xtaccess.png
deleted file mode 100644 (file)
index ee07b40..0000000
Binary files a/src/static/images/screens/de/final/xtaccess.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/concept/index-detail-1.png b/src/static/images/screenshots/en/concept/index-detail-1.png
deleted file mode 100644 (file)
index 09bd1e3..0000000
Binary files a/src/static/images/screenshots/en/concept/index-detail-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/concept/index-detail-1_thumb.png b/src/static/images/screenshots/en/concept/index-detail-1_thumb.png
deleted file mode 100644 (file)
index 85b1418..0000000
Binary files a/src/static/images/screenshots/en/concept/index-detail-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/concept/traffic-graph-1.png b/src/static/images/screenshots/en/concept/traffic-graph-1.png
deleted file mode 100644 (file)
index 1db00a0..0000000
Binary files a/src/static/images/screenshots/en/concept/traffic-graph-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/concept/traffic-graph-1_thumb.png b/src/static/images/screenshots/en/concept/traffic-graph-1_thumb.png
deleted file mode 100644 (file)
index b38b0d2..0000000
Binary files a/src/static/images/screenshots/en/concept/traffic-graph-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/hardware/hwtemp-1.png b/src/static/images/screenshots/en/hardware/hwtemp-1.png
deleted file mode 100644 (file)
index 75df10d..0000000
Binary files a/src/static/images/screenshots/en/hardware/hwtemp-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/hardware/hwtemp-1_thumb.png b/src/static/images/screenshots/en/hardware/hwtemp-1_thumb.png
deleted file mode 100644 (file)
index 409745b..0000000
Binary files a/src/static/images/screenshots/en/hardware/hwtemp-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/p2p-block-1.png b/src/static/images/screenshots/en/p2p-block-1.png
deleted file mode 100644 (file)
index 9b0a9ea..0000000
Binary files a/src/static/images/screenshots/en/p2p-block-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/pakfire/addon-services-1_thumb.png b/src/static/images/screenshots/en/pakfire/addon-services-1_thumb.png
deleted file mode 100644 (file)
index db17d97..0000000
Binary files a/src/static/images/screenshots/en/pakfire/addon-services-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/pakfire/pakfire-overview-1_thumb.png b/src/static/images/screenshots/en/pakfire/pakfire-overview-1_thumb.png
deleted file mode 100644 (file)
index 6b49071..0000000
Binary files a/src/static/images/screenshots/en/pakfire/pakfire-overview-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/system-information-1.png b/src/static/images/screenshots/en/system-information-1.png
deleted file mode 100644 (file)
index 8ba145f..0000000
Binary files a/src/static/images/screenshots/en/system-information-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/virtualization/virt-manager-1.png b/src/static/images/screenshots/en/virtualization/virt-manager-1.png
deleted file mode 100644 (file)
index 8ca4b2d..0000000
Binary files a/src/static/images/screenshots/en/virtualization/virt-manager-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/virtualization/virt-manager-1_thumb.png b/src/static/images/screenshots/en/virtualization/virt-manager-1_thumb.png
deleted file mode 100644 (file)
index 63805a8..0000000
Binary files a/src/static/images/screenshots/en/virtualization/virt-manager-1_thumb.png and /dev/null differ

diff --git a/src/static/images/screenshots/ipfire-1.png b/src/static/images/screenshots/ipfire-1.png
deleted file mode 100644 (file)
index 50c7bb5..0000000
Binary files a/src/static/images/screenshots/ipfire-1.png and /dev/null differ

diff --git a/src/static/images/screenshots/ipfire-2.png b/src/static/images/screenshots/ipfire-2.png
deleted file mode 100644 (file)
index 7beea52..0000000
Binary files a/src/static/images/screenshots/ipfire-2.png and /dev/null differ

diff --git a/src/static/images/screenshots/en/firewall/connections-1.png b/src/static/img/screenshots/firewall-connections.png
similarity index 100%
rename from src/static/images/screenshots/en/firewall/connections-1.png
rename to src/static/img/screenshots/firewall-connections.png

diff --git a/src/static/images/screenshots/en/firewall/host-groups.png b/src/static/img/screenshots/firewall-host-groups.png
similarity index 100%
rename from src/static/images/screenshots/en/firewall/host-groups.png
rename to src/static/img/screenshots/firewall-host-groups.png

diff --git a/src/static/images/screenshots/en/firewall/new-rule.png b/src/static/img/screenshots/firewall-new-rule.png
similarity index 100%
rename from src/static/images/screenshots/en/firewall/new-rule.png
rename to src/static/img/screenshots/firewall-new-rule.png

diff --git a/src/static/images/screenshots/en/firewall/rules.png b/src/static/img/screenshots/firewall-rules.png
similarity index 100%
rename from src/static/images/screenshots/en/firewall/rules.png
rename to src/static/img/screenshots/firewall-rules.png

diff --git a/src/static/images/screenshots/en/firewall/service-groups.png b/src/static/img/screenshots/firewall-service-groups.png
similarity index 100%
rename from src/static/images/screenshots/en/firewall/service-groups.png
rename to src/static/img/screenshots/firewall-service-groups.png

diff --git a/src/static/images/screenshots/en/pakfire/addon-services-1.png b/src/static/img/screenshots/pakfire-addon-services-1.png
similarity index 100%
rename from src/static/images/screenshots/en/pakfire/addon-services-1.png
rename to src/static/img/screenshots/pakfire-addon-services-1.png

diff --git a/src/static/images/screenshots/en/pakfire/pakfire-overview-1.png b/src/static/img/screenshots/pakfire-overview-1.png
similarity index 100%
rename from src/static/images/screenshots/en/pakfire/pakfire-overview-1.png
rename to src/static/img/screenshots/pakfire-overview-1.png

diff --git a/src/templates/static/features.html b/src/templates/static/features.html
index 023bb46a47dad59853857c7b25d9dc2743a2ef3c..014a8fc0cac21d4521682390d0b290689a357898 100644 (file)
--- a/src/templates/static/features.html
+++ b/src/templates/static/features.html
@@ -209,34 +209,34 @@
 
                                                        <div class="row my-gallery" itemscope itemtype="https://schema.org/ImageGallery">
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/rules.png") }}" itemprop="contentUrl" data-size="999x589">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/rules.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/firewall-rules.png") }}" itemprop="contentUrl" data-size="999x589">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/firewall-rules.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
 
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/new-rule.png") }}" itemprop="contentUrl" data-size="1033x1077">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/new-rule.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/firewall-new-rule.png") }}" itemprop="contentUrl" data-size="1033x1077">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/firewall-new-rule.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
 
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/service-groups.png") }}" itemprop="contentUrl" data-size="977x825">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/service-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/firewall-service-groups.png") }}" itemprop="contentUrl" data-size="977x825">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/firewall-service-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
                                                        </div>
 
                                                        <div class="row my-gallery">
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/host-groups.png") }}" itemprop="contentUrl" data-size="1029x675">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/host-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/firewall-host-groups.png") }}" itemprop="contentUrl" data-size="1029x675">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/firewall-host-groups.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
 
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}" itemprop="contentUrl" data-size="776x686">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/firewall-connections.png") }}" itemprop="contentUrl" data-size="776x686">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/firewall-connections.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
                                                        </div>
@@ -275,14 +275,14 @@
 
                                                        <div class="row my-gallery mb-5" itemscope itemtype="https://schema.org/ImageGallery">
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}" itemprop="contentUrl" data-size="770x508">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/pakfire-overview-1.png") }}" itemprop="contentUrl" data-size="770x508">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/pakfire-overview-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
 
                                                                <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}" itemprop="contentUrl" data-size="698x284">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
+                                                                       <a class="thumbnail" href="{{ static_url("img/screenshots/pakfire-addon-services-1.png") }}" itemprop="contentUrl" data-size="698x284">
+                                                                               <img class="img-fluid" src="{{ static_url("img/screenshots/pakfire-addon-services-1.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
                                                                        </a>
                                                                </figure>
                                                        </div>
@@ -722,14 +722,6 @@
                                                                More about this may be found on the
                                                                <a href="/features/ports/arm">ARM project page</a>.
                                                        </p> -->
-
-                                                       <div class="row my-gallery" itemscope itemtype="https://schema.org/ImageGallery">
-                                                               <figure class="col-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/hardware/hwtemp-1.png") }}" itemprop="contentUrl" data-size="756x432">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/hardware/hwtemp-1_thumb.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
-                                                                       </a>
-                                                               </figure>
-                                                       </div>
                                                </section>
 
                                                <div class="divider"></div>
@@ -788,14 +780,6 @@
                                                                Because of this, it is not suggested to use IPFire as a virtual machine
                                                                in a production-level environment.
                                                        </p>
-
-                                                       <div class="row my-gallery">
-                                                               <figure class="col-sm-12 col-md-3" itemprop="associatedMedia" itemscope itemtype="https://schema.org/ImageObject">
-                                                                       <a class="thumbnail" href="{{ static_url("images/screenshots/en/virtualization/virt-manager-1.png") }}" itemprop="contentUrl" data-size="605x375">
-                                                                               <img class="img-fluid" src="{{ static_url("images/screenshots/en/virtualization/virt-manager-1_thumb.png") }}" itemprop="thumbnail" alt="{{ _("Screenshot") }}">
-                                                                       </a>
-                                                               </figure>
-                                                       </div>
                                                </section>
 
                                                <div class="divider"></div>