Merge https://github.com/friendica/red into zpull

4 files changed, 24 insertions, 54 deletions

diff --git a/view/theme/redbasic/tpl/basic_theme_settings.tpl b/view/theme/redbasic/tpl/basic_theme_settings.tpl
index 6f71a6a1a..33a34b292 100644..100755
--- a/view/theme/redbasic/tpl/basic_theme_settings.tpl
+++ b/view/theme/redbasic/tpl/basic_theme_settings.tpl
@@ -1,9 +1,14 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$font_size}}
 
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+{{include file="field_select.tpl" field=$line_height}}
 
-{{inc field_select.tpl with $field=$colour_scheme}}{{endinc}}
+{{include file="field_select.tpl" field=$colour_scheme}}
 
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="redbasic-settings-submit" />
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
diff --git a/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl
deleted file mode 100644
index 33a34b292..000000000
--- a/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_select.tpl" field=$font_size}}
-
-{{include file="field_select.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$colour_scheme}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
deleted file mode 100644
index f8d9f223c..000000000
--- a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_select.tpl" field=$colour}}
-
-{{include file="field_input.tpl" field=$font_size}}
-
-{{include file="field_input.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$shadow}}
-
-{{include file="field_select.tpl" field=$navcolour}}
-
-{{include file="field_select.tpl" field=$displaystyle}}
-
-{{include file="field_input.tpl" field=$linkcolour}}
-
-{{include file="field_select.tpl" field=$iconset}}
-
-{{include file="field_select.tpl" field=$shiny}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 6e7e079e0..f8d9f223c 100644..100755
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,21 +1,26 @@
-{{inc field_select.tpl with $field=$colour}}{{endinc}}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$colour}}
 
-{{inc field_input.tpl with $field=$font_size}}{{endinc}}
+{{include file="field_input.tpl" field=$font_size}}
 
-{{inc field_input.tpl with $field=$line_height}}{{endinc}}
+{{include file="field_input.tpl" field=$line_height}}
 
-{{inc field_select.tpl with $field=$shadow}}{{endinc}}
+{{include file="field_select.tpl" field=$shadow}}
 
-{{inc field_select.tpl with $field=$navcolour}}{{endinc}}
+{{include file="field_select.tpl" field=$navcolour}}
 
-{{inc field_select.tpl with $field=$displaystyle}}{{endinc}}
+{{include file="field_select.tpl" field=$displaystyle}}
 
-{{inc field_input.tpl with $field=$linkcolour}}{{endinc}}
+{{include file="field_input.tpl" field=$linkcolour}}
 
-{{inc field_select.tpl with $field=$iconset}}{{endinc}}
+{{include file="field_select.tpl" field=$iconset}}
 
-{{inc field_select.tpl with $field=$shiny}}{{endinc}}
+{{include file="field_select.tpl" field=$shiny}}
 
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="redbasic-settings-submit" />
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>