Revert "Merge pull request #41 from YunoHost-Apps/testing"

This reverts commit 316c6580d6, reversing
changes made to 7ad6208018.

.gitignore

@@ -1,3 +1 @@
-!dist/*~
+!dist/
-*.sw[op]
-.DS_Store

ALL_README.md

@@ -5,6 +5,4 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
-- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
-- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Strut for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Working status](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![Working status](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![Install Strut with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
-**Shipped version:** 20231204~ynh2
+**Shipped version:** 20231204~ynh1
 
 **Demo:** <http://strut.io/dist/>
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Strut para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![Instalar Strut con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
-**Versión actual:** 20231204~ynh2
+**Versión actual:** 20231204~ynh1
 
 **Demo:** <http://strut.io/dist/>
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Strut YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![Instalatu Strut YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
-**Paketatutako bertsioa:** 20231204~ynh2
+**Paketatutako bertsioa:** 20231204~ynh1
 
 **Demoa:** <http://strut.io/dist/>
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Strut pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![Installer Strut avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Strut est un éditeur WEB de présentations fonctionnant en HTML/JS. Tout se passe en local.
 
-**Version incluse :** 20231204~ynh2
+**Version incluse :** 20231204~ynh1
 
 **Démo :** <http://strut.io/dist/>
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Strut para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![Instalar Strut con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
-**Versión proporcionada:** 20231204~ynh2
+**Versión proporcionada:** 20231204~ynh1
 
 **Demo:** <http://strut.io/dist/>
 

README_id.md

@@ -1,52 +0,0 @@
-<!--
-N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-Ini TIDAK boleh diedit dengan tangan.
--->
-
-# Strut untuk YunoHost
-
-[![Tingkat integrasi](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
-
-[![Pasang Strut dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
-
-*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
-
-> *Paket ini memperbolehkan Anda untuk memasang Strut secara cepat dan mudah pada server YunoHost.*  
-> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
-
-## Ringkasan
-
-Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
-
-**Versi terkirim:** 20231204~ynh2
-
-**Demo:** <http://strut.io/dist/>
-
-## Tangkapan Layar
-
-![Tangkapan Layar pada Strut](./doc/screenshots/screenshot.gif)
-
-## :red_circle: Antifitur
-
-- **Upstream not maintained**: This software is not maintained anymore. Expect it to break down over time, be exposed to unfixed security breaches, etc.
-
-## Dokumentasi dan sumber daya
-
-- Website aplikasi resmi: <http://strut.io>
-- Depot kode aplikasi hulu: <https://github.com/MohannadNaj/Strut>
-- Gudang YunoHost: <https://apps.yunohost.org/app/strut>
-- Laporkan bug: <https://github.com/YunoHost-Apps/strut_ynh/issues>
-
-## Info developer
-
-Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/strut_ynh/tree/testing).
-
-Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
-atau
-sudo yunohost app upgrade strut -u https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
-```
-
-**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -1,52 +0,0 @@
-<!--
-Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-Он НЕ ДОЛЖЕН редактироваться вручную.
--->
-
-# Strut для YunoHost
-
-[![Уровень интеграции](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
-
-[![Установите Strut с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
-
-*[Прочтите этот README на других языках.](./ALL_README.md)*
-
-> *Этот пакет позволяет Вам установить Strut быстро и просто на YunoHost-сервер.*  
-> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
-
-## Обзор
-
-Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
-
-**Поставляемая версия:** 20231204~ynh2
-
-**Демо-версия:** <http://strut.io/dist/>
-
-## Снимки экрана
-
-![Снимок экрана Strut](./doc/screenshots/screenshot.gif)
-
-## :red_circle: Анти-функции
-
-- **Upstream not maintained**: This software is not maintained anymore. Expect it to break down over time, be exposed to unfixed security breaches, etc.
-
-## Документация и ресурсы
-
-- Официальный веб-сайт приложения: <http://strut.io>
-- Репозиторий кода главной ветки приложения: <https://github.com/MohannadNaj/Strut>
-- Магазин YunoHost: <https://apps.yunohost.org/app/strut>
-- Сообщите об ошибке: <https://github.com/YunoHost-Apps/strut_ynh/issues>
-
-## Информация для разработчиков
-
-Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/strut_ynh/tree/testing).
-
-Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
-
-```bash
-sudo yunohost app install https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
-или
-sudo yunohost app upgrade strut -u https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
-```
-
-**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Strut
 
-[![集成程度](https://dash.yunohost.org/integration/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![工作状态](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg)
 
 [![使用 YunoHost 安装 Strut](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
@@ -18,7 +18,7 @@
 
 Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
-**分发版本：** 20231204~ynh2
+**分发版本：** 20231204~ynh1
 
 **演示：** <http://strut.io/dist/>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Strut"
 description.en = "Slide editor for creating impress.js presentations"
 description.fr = "Éditeur de diapositives permettant de créer des présentations impress.js"
 
-version = "20231204~ynh2"
+version = "20231204~ynh1"
 
 maintainers = ["ljf"]
 
@@ -16,8 +16,7 @@ demo = "http://strut.io/dist/"
 code = "https://github.com/MohannadNaj/Strut"
 
 [integration]
-yunohost = ">= 11.2.29"
+yunohost = ">= 11.2"
-helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
 
@@ -50,7 +49,6 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
-    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"

scripts/_common.sh

@@ -1,5 +1,17 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES AND CUSTOM HELPERS
+# COMMON VARIABLES
+#=================================================
+
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
+
+#=================================================
+# FUTURE OFFICIAL HELPERS
 #=================================================

scripts/backup

@@ -1,24 +1,33 @@
 #!/bin/bash
 
-source ../settings/scripts/_common.sh
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+# source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-ynh_print_info "Declaring files to be backed up..."
+#=================================================
+# DECLARE DATA AND CONF FILES TO BACKUP
+#=================================================
+ynh_print_info --message="Declaring files to be backed up..."
 
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup "$install_dir"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/change_url

@@ -1,17 +1,25 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 # source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# STANDARD MODIFICATIONS
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression "Updating NGINX web server configuration..."
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
 
-ynh_config_change_url_nginx
+ynh_change_url_nginx_config
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression "Change of URL completed for $app"
+ynh_script_progression --message="Change of URL completed for $app" --last

scripts/install

@@ -1,38 +1,52 @@
 #!/bin/bash
 
-source _common.sh
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+# source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# STANDARD MODIFICATIONS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression "Setting up source files..."
+ynh_script_progression --message="Setting up source files..." --weight=4
 
 tmp_dir=$(mktemp -d)
 ynh_setup_source --dest_dir="$tmp_dir"
 # Dist is the compiled version. Other directories are source code and tools to build the program
 cp -a "$tmp_dir/dist/."  "$install_dir/"
-ynh_safe_rm "$tmp_dir"
+ynh_secure_remove --file="$tmp_dir"
 
+# Set permissions on app files
+chown -R $app:www-data "$install_dir"
+chmod -R 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression "Configuring NGINX web server..."
+ynh_script_progression --message="Configuring NGINX web server..." --weight=4
 
-ynh_config_add_nginx
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
+#=================================================
+# SPECIFIC SETUP
 #=================================================
 # PATCH SOURCE
 #=================================================
 
 # Imgur is deactivated on the specific upstream selected, but this text is still here
 # Don't use a patch because it's minified js
-ynh_replace --match="are currently uploaded to imgur.*re working on changing this" --replace="size is limited" --file="$install_dir/scripts/amd-app.js"
+ynh_replace_string --match_string="are currently uploaded to imgur.*re working on changing this" --replace_string="size is limited" --target_file="$install_dir/scripts/amd-app.js"
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression "Installation of $app completed"
+ynh_script_progression --message="Installation of $app completed" --last

scripts/remove

@@ -1,16 +1,24 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+# source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression "Removing NGINX web server configuration..."
+ynh_script_progression --message="Removing NGINX web server configuration..."
 
-ynh_config_remove_nginx
+# Remove the dedicated NGINX config
+ynh_remove_nginx_config
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression "Removal of $app completed"
+ynh_script_progression --message="Removal of $app completed" --last

scripts/restore

@@ -1,37 +1,50 @@
 #!/bin/bash
 
-source ../settings/scripts/_common.sh
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
+# source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# STANDARD RESTORATION STEPS
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression "Restoring the NGINX web server configuration..."
+ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
 
-ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression "Restoring the app main directory..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore "$install_dir"
+ynh_restore_file --origin_path="$install_dir"
 
 #=================================================
 # RESTORE USER RIGHTS
 #=================================================
 
+# Restore permissions on app files
+chown -R $app:www-data "$install_dir"
+chmod -R 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
+#=================================================
+# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression "Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
-ynh_systemctl --service=nginx --action=reload
+ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression "Restoration completed for $app"
+ynh_script_progression --message="Restoration completed for $app" --last

scripts/upgrade

@@ -1,42 +1,74 @@
 #!/bin/bash
 
+#=================================================
+# GENERIC START
+#=================================================
+# IMPORT GENERIC HELPERS
+#=================================================
+
 # source _common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
+#=================================================
+# STANDARD UPGRADE STEPS
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression "Upgrading source files..."
 
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_script_progression --message="Upgrading source files..." --weight=4
+
+	# Download, check integrity, uncompress and patch the source from app.src
+	# For this app sources are in app subdirectory 
 	tmp_dir=$(mktemp -d)
 
 	ynh_setup_source --dest_dir="$tmp_dir"
-
+	# Dist is the compiled version. Other directories are source code and tools to build the program
 	cp -a "$tmp_dir/dist/."  "$install_dir/"
-ynh_safe_rm "$tmp_dir"
+	ynh_secure_remove --file="$tmp_dir"
+fi
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression "Upgrading NGINX web server configuration..."
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
 
-ynh_config_add_nginx
+# Create a dedicated nginx config
+ynh_add_nginx_config
 
+#=================================================
+# SPECIFIC UPGRADE
 #=================================================
 # PATCH SOURCE
 #=================================================
+
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
 	# Imgur is deactivated on the specific upstream selected, but this text is still here
 	# Don't use a patch because it's minified js
-ynh_replace --match="are currently uploaded to imgur.*re working on changing this" --replace="size is limited" --file="$install_dir/scripts/amd-app.js"
+	ynh_replace_string --match_string="are currently uploaded to imgur.*re working on changing this" --replace_string="size is limited" --target_file="$install_dir/scripts/amd-app.js"
+fi
 
+#=================================================
+# GENERIC FINALIZATION
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
+# Set permissions on app files
+chown -R $app:www-data "$install_dir"
+chmod -R 640 "$install_dir"
 find "$install_dir" -type d -print0 | xargs -0 chmod 750
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression "Upgrade of $app completed"
+ynh_script_progression --message="Upgrade of $app completed" --last

sources/patches/app-00-remove-google.patch

@@ -0,0 +1,25 @@
+--- a/dist/index.html
++++ b/dist/index.html
+@@ -15,15 +15,6 @@
+ 		<link rel="apple-touch-icon-precomposed" href="img/strut-touch.png">
+ 		<link rel="stylesheet" type="text/css" href="styles/built.css">
+ 		<script type="text/javascript" src="preview_export/download_assist/swfobject.js"></script>
+-		<script>
+-  	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-  	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-  	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-  	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-  	ga('create', 'UA-42322531-1', 'strut.io');
+-  	ga('send', 'pageview');
+-	</script>
+ 	</head>
+ 	<body class="bg-default">
+ 		<!--[IF IE]>
+@@ -124,4 +115,4 @@
+ 		<div id="modals">
+ 		</div>
+ 	</body>
+-</html>
+\ No newline at end of file
++</html>