#1678 Define theme features in JSON

backstage/appearance.php

@@ -178,15 +178,15 @@
                             <div class="col-sm-9">
                                 <select class="form-control" name="form[default_style]">
 <?php
-$styles = forum_list_styles();
 
-foreach ($styles as $temp) {
-    if ($luna_config['o_default_style'] == $temp) {
-        echo "\t\t\t\t\t\t\t\t\t\t\t" . '<option value="' . $temp . '" selected="selected">' . str_replace('_', ' ', $temp) . '</option>' . "\n";
+$styles = forum_list_themes();
+
+foreach ($styles as &$style) {
+    if ($luna_config['o_default_style'] == $style['id']) {
+        echo '<option value="'.$style['id'].'" selected="selected">'.str_replace('_', ' ', $style['name']).' v'.$style['version'].'</option>';
     } else {
-        echo "\t\t\t\t\t\t\t\t\t\t\t" . '<option value="' . $temp . '">' . str_replace('_', ' ', $temp) . '</option>' . "\n";
+        echo '<option value="'.$temp.'">'.str_replace('_', ' ', $style['name']).' v'.$style['version'].'</option>';
     }
-
 }
 
 ?>

include/install.php

@@ -123,7 +123,7 @@ public static function validate_config($username, $password1, $password2, $email
             $alerts[] = __('The default language chosen doesn\'t seem to exist.', 'luna');
         }
 
-        $styles = forum_list_styles();
+        $styles = forum_list_themes();
         if (!in_array($default_style, $styles)) {
             $alerts[] = __('The default style chosen doesn\'t seem to exist.', 'luna');
         }

install.php

@@ -443,7 +443,7 @@ function process_form(the_form) {
 									<select id="req_default_style" class="form-control" name="req_default_style">
 <?php
 
-    $styles = forum_list_styles();
+    $styles = forum_list_themes();
     foreach ($styles as $temp) {
         if ($temp == $default_style) {
             echo "\t\t\t\t\t\t\t\t\t" . '<option value="' . $temp . '" selected>' . str_replace('_', ' ', $temp) . '</option>' . "\n";

settings.php

@@ -743,7 +743,7 @@
 
 		// Make sure we got a valid style string
 		if (isset($_POST['form']['style'])) {
-			$styles = forum_list_styles();
+			$styles = forum_list_themes();
 			$form['style'] = luna_trim($_POST['form']['style']);
 			if (!in_array($form['style'], $styles))
 				message(__('Bad request. The link you followed is incorrect, outdated or you are simply not allowed to hang around here.', 'luna'), false, '404 Not Found');

themes/Fifteen/theme.json

@@ -0,0 +1,9 @@
+    {
+        "id": "fifteen",
+        "name": "Fifteen",
+        "developer": "Studio 384",
+        "date": "14 June 2018",
+        "version": "2.1-alpha.2",
+        "minversion": "2.0.0",
+        "maxversion": "2.1-alpha.2"
+    }

themes/Sunrise/theme.json

@@ -0,0 +1,11 @@
+
+    {
+        "id": "sunrise",
+        "name": "Sunrise",
+        "developer": "Studio 384",
+        "date": "14 June 2018",
+        "version": "3.1-alpha.2",
+        "minversion": "2.0.0",
+        "maxversion": "3.1-alpha.2",
+        "parent": "fifteen"
+    }