From: Michael Tremer Date: Sun, 15 Jul 2018 12:15:10 +0000 (+0100) Subject: features: Add screenshots again X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b2e8f05d338f33e1314d43b2ad206efeba551f02;p=ipfire.org.git features: Add screenshots again And delete unused ones Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 2acfd7e3..292291aa 100644 --- 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 index 1bdc09a0..00000000 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 index b18a391c..00000000 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 index 3489c404..00000000 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 index fa67ed2d..00000000 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 index f16af504..00000000 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 index 53741022..00000000 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 index c7973210..00000000 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 index cd2f72ff..00000000 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 index bd523794..00000000 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 index e60d7deb..00000000 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 index 2f72d6a0..00000000 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 index d14849fa..00000000 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 index 25a388dd..00000000 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 index eb343439..00000000 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 index dba4e2c4..00000000 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 index ecb0e39c..00000000 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 index 6a81e949..00000000 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 index 5188b870..00000000 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 index 137bc173..00000000 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 index ff29616d..00000000 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 index 8871ab7a..00000000 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 index 1725d514..00000000 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 index d44d63dc..00000000 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 index b883e208..00000000 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 index de0f7483..00000000 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 index c2f369a7..00000000 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 index ee07b40c..00000000 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 index 09bd1e3d..00000000 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 index 85b1418f..00000000 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 index 1db00a01..00000000 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 index b38b0d2f..00000000 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 index 75df10df..00000000 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 index 409745b0..00000000 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 index 9b0a9ea2..00000000 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 index db17d976..00000000 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 index 6b490710..00000000 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 index 8ba145f2..00000000 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 index 8ca4b2d5..00000000 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 index 63805a8d..00000000 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 index 50c7bb5c..00000000 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 index 7beea524..00000000 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 023bb46a..014a8fc0 100644 --- a/src/templates/static/features.html +++ b/src/templates/static/features.html @@ -209,34 +209,34 @@
- - {{ _( + + {{ _(
- - {{ _( + + {{ _(
- - {{ _( + + {{ _(
- - {{ _( + + {{ _(
- - {{ _( + + {{ _(
@@ -275,14 +275,14 @@
- - {{ _( + + {{ _(
- - {{ _( + + {{ _(
@@ -722,14 +722,6 @@ More about this may be found on the ARM project page.

--> - -
-
- - {{ _( - -
-
@@ -788,14 +780,6 @@ Because of this, it is not suggested to use IPFire as a virtual machine in a production-level environment.

- -
-
- - {{ _( - -
-