Feature/collages

api/admin.php

@@ -151,7 +151,8 @@
         $newConfig['get_request']['processed'] = false;
     }
 
-    if ($newConfig['collage']['layout'] === '1+2') {
+    $collageLayout = $newConfig['collage']['layout'];
+    if ($collageLayout === '1+2' || $collageLayout == '2+1') {
         $newConfig['collage']['limit'] = 3;
     } else {
         $newConfig['collage']['limit'] = 4;

config/config.inc.php

@@ -94,7 +94,7 @@
 $config['collage']['cntdwn_time'] = '3';
 $config['collage']['continuous'] = true;
 $config['collage']['continuous_time'] = '5';
-// possible layout values: '2x2', '2x2-2', '2x4', '2x4-2', '1+3', '1+3-2', '3+1', '1+2'
+// possible layout values: '2x2', '2x2-2', '2x4', '2x4-2', '1+3', '1+3-2', '3+1', '1+2', '2+1'
 $config['collage']['layout'] = '2x2-2';
 $config['collage']['dashedline_color'] = '#000000';
 $config['collage']['keep_single_images'] = false;

faq/faq.md

@@ -63,6 +63,11 @@ Open `http://localhost/admin` in your Webbrowser and change the configuration fo
 
 <hr>
 
+### How can I test my current collage settings?
+Open `http://localhost/test/collage.php` in your Webbrowser and a you can find a collage that is created with your current settings.
+
+<hr>
+
 ### How to change the look of my Photobooth?
 Photobooth can be easylie styled for your personal needs via admin panel, open [localhost/admin](http://localhost/admin) in your browser and take a look at the `User Interface` options.  
 To use a private custom index you need to create the following files: