Merged pull-request #6,#15 and #16

PhotoboothProject · Nov 13, 2017 · a43fef1 · a43fef1
1 parent d0f5a98
commit a43fef1
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,8 @@ cd /var/www/
 sudo rm -r html/
 sudo git clone https://github.com/andreknieriem/photobooth
 sudo mv photobooth html
+sudo chown -R pi: /var/www/
+sudo chmod -R 777 /var/www
 ```
 Give sudo rights to the webserver user (www-data)
 
@@ -48,6 +50,7 @@ If you want the english labels, just change it to en.js.
 If you want to change the labels just change the de.js or en.js
 
 ### Changelog
+- 1.3.1: Merged pull-request #6,#15 and #16
 - 1.3.0: Option for QR and Print Butons, code rework, gulp-sass feature enabled
 - 1.2.0: Printing feature, code rework, bugfixes
 - 1.1.1: Bugix - QR not working on touch devices

diff --git a/config.inc.php b/config.inc.php
@@ -2,9 +2,11 @@
 
 $config = array();
 $config['os'] = (DIRECTORY_SEPARATOR == '\\') || (strtolower(substr(PHP_OS, 0, 3)) === 'win') ? 'windows' : 'linux';
-$config['dev'] = false;
+$config['dev'] = true;
 $config['use_print'] = true;
 $config['use_qr'] = true;
+$config['show_fork'] = true;
+#$config['file_format'] = 'date'; // comment in to get dateformat images
 
 // FOLDERS
 // change the folders to whatever you like

diff --git a/index.php b/index.php
@@ -76,7 +76,9 @@
 				</div>
 			</div>
 		</div>
-		<a target="_blank" href="https://github.com/andreknieriem/photobooth"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
+		<?php if($config['show_fork']){ ?>
+			<a target="_blank" href="https://github.com/andreknieriem/photobooth"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
+		<?php } ?>
 	</div>
 
 

diff --git a/lang/de.js b/lang/de.js
@@ -10,5 +10,5 @@ L10N = {
 	"qrHelp": "Um das Bild auf dein Handy zu laden, verbinde dich mit dem WLAN <strong>photobooth<\/strong>",
 	"error": "Es ist ein Fehler aufgetreten, bitte versuche es erneut",
 	"reload": "Seite neu laden",
-    "print": "Drucken"
-}
+	"print": "Drucken"
+}
diff --git a/lang/en.js b/lang/en.js
@@ -10,5 +10,5 @@ L10N = {
 	"qrHelp": "Connect to the wifi <strong>photobooth<\/strong>, to download the picture to your smartphone.",
 	"error": "Something went wrong. Please try it again",
 	"reload": "Reload Page",
-    "print": "Print"
-}
+	"print": "Print"
+}
diff --git a/lang/fr.js b/lang/fr.js
@@ -0,0 +1,14 @@
+L10N = {
+	"gallery": "Galerie",
+	"startScreen": "<h1>Photobooth<\/h1><h2>Interface Web<\/h2> by Andr\u00e9 Rinas",
+	"takePhoto": "Prendre une photo!",
+	"home": "Accueil",
+	"qr": "QR Code",
+	"newPhoto": "Une autre",
+	"busy": "En cours de traitement",
+	"cheese": "Cheeeeeeeese!",
+	"qrHelp": "Se connecter au wifi du <strong>photobooth<\/strong>, pour télécharger la photo sur votre smartphone.",
+	"error": "Il y a eu un problème. Merci de réessayer",
+	"reload": "Recharger la page",
+	"print": "Imprimer"
+}
diff --git a/package.json b/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "photobooth",
+  "version": "1.0.0",
+  "description": "photobooth sass setup",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "GPL",
+  "dependencies": {
+    "bower": "1.7.9",
+    "gulp": "3.9.1",
+    "gulp-sass": "2.3.2"
+  }
+}
diff --git a/resources/css/style.css b/resources/css/style.css
@@ -542,3 +542,7 @@ hr.small {
   margin: 0;
   float: right;
   opacity: 0.75; }
+
+@media (max-width: 767px) {
+  .takePic {
+    bottom: auto; } }
diff --git a/resources/sass/style.scss b/resources/sass/style.scss
@@ -650,3 +650,9 @@ hr.small {
   float: right;
   opacity: 0.75;
 }
+
+@media (max-width: 767px){
+	.takePic {
+		bottom: auto;
+	}
+}
diff --git a/takePic.php b/takePic.php
@@ -4,6 +4,16 @@
 require_once('config.inc.php');
 
 $file = md5(time()).'.jpg';
+
+switch($config['file_format']){
+	case 'date':
+		$file = date('Ymd_His').'.jpg';
+		break;
+	default:
+		$file = md5(time()).'.jpg';
+		break;
+ }
+
 $filename_photo = $config['folders']['images'] . DIRECTORY_SEPARATOR . $file;
 $filename_thumb = $config['folders']['thumbs'] . DIRECTORY_SEPARATOR . $file;