Merge pull request #417 from electerious/develop

Lychee v3.0.7
electerious · Nov 15, 2015 · d56e34f · d56e34f
2 parents 7879869 + 12eb927
commit d56e34f
Show file tree

Hide file tree

Showing 41 changed files with 464 additions and 528 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -43,6 +43,10 @@ Lychee supports [Twitter Cards](https://dev.twitter.com/docs/cards) and [Open Gr
 
 Lychee uses [Imagick](http://www.imagemagick.org) when installed on your server. In this case you will benefit from a faster processing of your uploads, better looking thumbnails and intermediate sized images for small screen devices. You can disable the usage of [Imagick](http://www.imagemagick.org) in [the settings](docs/Settings.md).
 
+### Docker
+
+Browse the [Docker Hub Registry](https://hub.docker.com/r/kdelfour/lychee-docker/) for various automated Lychee-Docker builds. We recommed to use [lychee-docker](https://hub.docker.com/r/kdelfour/lychee-docker/) by [kdelfour](https://github.com/kdelfour).
+
 ### Plugins and Extensions
 
 The plugin-system of Lychee allows you to execute scripts, when a certain action fires. Plugins are hooks, which are injected directly into Lychee. [Plugin documentation &#187;](docs/Plugins.md)

diff --git a/dist/main.css b/dist/main.css
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/view.js b/dist/view.js
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -1,3 +1,11 @@
+## v3.0.7
+
+Released November 15, 2015
+
+- Internal changes and updated dependencies
+- `New` PHP-version-check now requires PHP >= 5.5
+- `New` Preloading of big photos (#185)
+
 ## v3.0.6
 
 Released September 13, 2015

diff --git a/docs/Installation.md b/docs/Installation.md
@@ -1,5 +1,5 @@
 ### 1. Requirements
-Everything you need is a web-server with PHP 5.3 or later and a MySQL-Database.
+Everything you need is a web-server with PHP 5.5 or later and a MySQL-Database.
 
 The following PHP extensions must be activated:
 

diff --git a/index.html b/index.html
@@ -9,7 +9,6 @@
 		<meta name="keywords" content="">
 		<meta name="description" content="">
 
-		<!-- CSS -->
 		<link type="text/css" rel="stylesheet" href="dist/main.css">
 
 		<link rel="shortcut icon" href="favicon.ico">
@@ -33,88 +32,106 @@
 	<div id="loading"></div>
 
 	<!-- Header -->
-	<header>
+	<header class="header">
 
-		<!-- Title -->
-		<a id="title"></a>
+		<div class="header__toolbar header__toolbar--public">
 
-		<!-- Buttons -->
-		<div class="toolbar" id="tools_albums">
-			<a class="button button--left" id="button_settings" title="Settings">
-				<svg class="iconic"><use xlink:href="#cog"></use></svg>
-			</a>
-			<a class="button button--left" id="button_signin" title="Sign In">
+			<a class="button" id="button_signin" title="Sign In">
 				<svg class="iconic"><use xlink:href="#account-login"></use></svg>
 			</a>
-			<a id="hostedwith">Hosted with Lychee</a>
-			<a class="button button--right button_add" title="Add">
+
+			<a class="header__title"></a>
+
+			<a class="header__hostedwith">Hosted with Lychee</a>
+
+		</div>
+		<div class="header__toolbar header__toolbar--albums">
+
+			<a class="button" id="button_settings" title="Settings">
+				<svg class="iconic"><use xlink:href="#cog"></use></svg>
+			</a>
+
+			<a class="header__title"></a>
+
+			<input class="header__search" type="text" name="search" placeholder="Search …">
+			<a class="header__clear">&times;</a>
+			<a class="header__divider"></a>
+			<a class="button button_add" title="Add">
 				<svg class="iconic"><use xlink:href="#plus"></use></svg>
 			</a>
-			<a class="button_divider"></a>
-			<input id="search" type="text" name="search" placeholder="Search …">
-			<a id="clearSearch">&times;</a>
+
 		</div>
-		<div class="toolbar" id="tools_album">
-			<a class="button button--left" id="button_back_home" title="Close Album">
+		<div class="header__toolbar header__toolbar--album">
+
+			<a class="button" id="button_back_home" title="Close Album">
 				<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
 			</a>
-			<a class="button button--right button_add" title="Add">
-				<svg class="iconic"><use xlink:href="#plus"></use></svg>
+
+			<a class="header__title"></a>
+
+			<a class="button button--eye" id="button_share_album" title="Share Album">
+				<svg class="iconic iconic--eye"><use xlink:href="#eye"></use></svg>
 			</a>
-			<a class="button_divider"></a>
-			<a class="button button--right" id="button_trash_album" title="Delete Album">
-				<svg class="iconic"><use xlink:href="#trash"></use></svg>
+			<a class="button" id="button_archive" title="Download Album">
+				<svg class="iconic"><use xlink:href="#cloud-download"></use></svg>
 			</a>
-			<a class="button button--right button--info" id="button_info_album" title="About Album">
+			<a class="button button--info" id="button_info_album" title="About Album">
 				<svg class="iconic"><use xlink:href="#info"></use></svg>
 			</a>
-			<a class="button button--right" id="button_archive" title="Download Album">
-				<svg class="iconic"><use xlink:href="#cloud-download"></use></svg>
+			<a class="button" id="button_trash_album" title="Delete Album">
+				<svg class="iconic"><use xlink:href="#trash"></use></svg>
 			</a>
-			<a class="button button--right button--eye" id="button_share_album" title="Share Album">
-				<svg class="iconic iconic--eye"><use xlink:href="#eye"></use></svg>
+			<a class="header__divider"></a>
+			<a class="button button_add" title="Add">
+				<svg class="iconic"><use xlink:href="#plus"></use></svg>
 			</a>
+
 		</div>
-		<div class="toolbar" id="tools_photo">
-			<a class="button button--left" id="button_back" title="Close Photo">
+		<div class="header__toolbar header__toolbar--photo">
+
+			<a class="button" id="button_back" title="Close Photo">
 				<svg class="iconic"><use xlink:href="#chevron-left"></use></svg>
 			</a>
-			<a class="button button--right" id="button_more" title="More">
-				<svg class="iconic"><use xlink:href="#ellipses"></use></svg>
-			</a>
-			<a class="button_divider"></a>
-			<a class="button button--right" id="button_trash" title="Delete">
-				<svg class="iconic"><use xlink:href="#trash"></use></svg>
+
+			<a class="header__title"></a>
+
+			<a class="button button--star" id="button_star" title="Star Photo">
+				<svg class="iconic"><use xlink:href="#star"></use></svg>
 			</a>
-			<a class="button button--right" id="button_move" title="Move">
-				<svg class="iconic"><use xlink:href="#folder"></use></svg>
+			<a class="button button--eye" id="button_share" title="Share Photo">
+				<svg class="iconic"><use xlink:href="#eye"></use></svg>
 			</a>
-			<a class="button button--right button--info" id="button_info" title="About Photo">
+			<a class="header__divider"></a>
+			<a class="button button--info" id="button_info" title="About Photo">
 				<svg class="iconic"><use xlink:href="#info"></use></svg>
 			</a>
-			<a class="button_divider"></a>
-			<a class="button button--right button--eye" id="button_share" title="Share Photo">
-				<svg class="iconic"><use xlink:href="#eye"></use></svg>
+			<a class="button" id="button_move" title="Move">
+				<svg class="iconic"><use xlink:href="#folder"></use></svg>
 			</a>
-			<a class="button button--right button--star" id="button_star" title="Star Photo">
-				<svg class="iconic"><use xlink:href="#star"></use></svg>
+			<a class="button" id="button_trash" title="Delete">
+				<svg class="iconic"><use xlink:href="#trash"></use></svg>
 			</a>
+			<a class="header__divider"></a>
+			<a class="button" id="button_more" title="More">
+				<svg class="iconic"><use xlink:href="#ellipses"></use></svg>
+			</a>
+
 		</div>
 
 	</header>
 
 	<!-- Content -->
-	<div id="content"></div>
+	<div class="content"></div>
 
 	<!-- ImageView -->
 	<div id="imageview"></div>
 
 	<!-- Sidebar -->
-	<div id="sidebar">
-		<div class='header'>
+	<div class="sidebar">
+		<div class="sidebar__header">
 			<h1>About</h1>
 		</div>
-		<div class='wrapper'></div>
+		<div class="sidebar__wrapper"></div>
 	</div>
 
 	<!-- Upload -->

diff --git a/php/api.php b/php/api.php
@@ -5,12 +5,6 @@
 # @copyright	2015 by Tobias Reich
 ###
 
-@ini_set('max_execution_time', '200');
-@ini_set('post_max_size', '200M');
-@ini_set('upload_max_size', '200M');
-@ini_set('upload_max_filesize', '20M');
-@ini_set('max_file_uploads', '100');
-
 if (!empty($_POST['function'])||!empty($_GET['function'])) {
 
 	session_start();
@@ -96,4 +90,4 @@
 
 }
 
-?>
+?>
diff --git a/plugins/check/index.php b/plugins/check/index.php
@@ -26,7 +26,7 @@
 echo('-----------' . PHP_EOL);
 
 # PHP Version
-if (floatval(phpversion())<5.3)		$error .= ('Error: Upgrade to PHP 5.3 or higher' . PHP_EOL);
+if (floatval(phpversion())<5.5)		$error .= ('Error: Upgrade to PHP 5.5 or higher' . PHP_EOL);
 
 # Extensions
 if (!extension_loaded('session'))	$error .= ('Error: PHP session extension not activated' . PHP_EOL);
@@ -89,6 +89,12 @@
 # Check mysql version
 if ($database->server_version<50500) echo('Warning: Lychee uses the GBK charset to avoid sql injections on your MySQL version. Please update to MySQL 5.5 or higher to enable UTF-8 support.' . PHP_EOL);
 
+# About GD
+$gdVersion = gd_info();
+if (!$gdVersion['JPEG Support'])											$error .= ('Error: PHP gd extension without jpeg support' . PHP_EOL);
+if (!$gdVersion['PNG Support'])												$error .= ('Error: PHP gd extension without png support' . PHP_EOL);
+if (!$gdVersion['GIF Read Support'] || !$gdVersion['GIF Create Support'])	$error .= ('Error: PHP gd extension without full gif support' . PHP_EOL);
+
 # Output
 if ($error==='')	echo('No critical problems found. Lychee should work without problems!' . PHP_EOL);
 else				echo $error;
@@ -108,9 +114,6 @@
 if (!isset($imagickVersion, $imagickVersion['versionNumber'])||$imagickVersion==='')	$imagickVersion = '-';
 else																					$imagickVersion = $imagickVersion['versionNumber'];
 
-# About GD
-$gdVersion = gd_info();
-
 # Output system information
 echo('Lychee Version:  ' . $json['version'] . PHP_EOL);
 echo('DB Version:      ' . $settings['version'] . PHP_EOL);

diff --git a/src/commands/start b/src/commands/start
diff --git a/src/gulpfile.js b/src/gulpfile.js
@@ -96,6 +96,7 @@ paths.main = {
 	],
 	styles: [
 		'node_modules/basiccontext/src/styles/main.scss',
+		'node_modules/basiccontext/src/styles/addons/popin.scss',
 		'node_modules/basicmodal/src/styles/main.scss',
 		'./styles/main.scss'
 	],

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Lychee",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Self-hosted photo-management done right.",
   "authors": "Tobias Reich <[email protected]>",
   "license": "MIT",
@@ -10,18 +10,18 @@
     "url": "https://github.com/electerious/Lychee.git"
   },
   "devDependencies": {
-    "basiccontext": "^3.3.1",
-    "basicmodal": "^3.1.2",
+    "basiccontext": "^3.5.0",
+    "basicmodal": "^3.1.7",
     "gulp": "^3.9.0",
-    "gulp-autoprefixer": "3.0.1",
-    "gulp-babel": "^5.2.1",
+    "gulp-autoprefixer": "3.1.0",
+    "gulp-babel": "^5.3.0",
     "gulp-concat": "^2.6.0",
-    "gulp-inject": "^1.5.0",
-    "gulp-load-plugins": "^1.0.0-rc",
+    "gulp-inject": "^3.0.0",
+    "gulp-load-plugins": "^1.1.0",
     "gulp-minify-css": "^1.2.1",
-    "gulp-rimraf": "^0.1.1",
-    "gulp-sass": "^2.0.4",
-    "gulp-uglify": "^1.4.1",
+    "gulp-rimraf": "^0.2.0",
+    "gulp-sass": "^2.1.0",
+    "gulp-uglify": "^1.5.1",
     "jquery": "^2.1.4",
     "mousetrap": "^1.5.3"
   }

diff --git a/src/scripts/album.js b/src/scripts/album.js
@@ -30,11 +30,11 @@ album.getID = function() {
 
 }
 
-album.load = function(albumID, refresh) {
+album.load = function(albumID, refresh = false) {
 
 	password.get(albumID, function() {
 
-		if (!refresh) lychee.animate('#content', 'contentZoomOut')
+		if (refresh===false) lychee.animate('.content', 'contentZoomOut')
 
 		let startTime = new Date().getTime()
 
@@ -81,8 +81,8 @@ album.load = function(albumID, refresh) {
 
 				view.album.init()
 
-				if (!refresh) {
-					lychee.animate('#content', 'contentZoomIn')
+				if (refresh===false) {
+					lychee.animate(lychee.content, 'contentZoomIn')
 					header.setMode('album')
 				}
 

diff --git a/src/scripts/albums.js b/src/scripts/albums.js
@@ -13,7 +13,7 @@ albums.load = function() {
 
 	let startTime = new Date().getTime()
 
-	lychee.animate('#content', 'contentZoomOut')
+	lychee.animate('.content', 'contentZoomOut')
 
 	if (albums.json===null) {
 
@@ -38,7 +38,7 @@ albums.load = function() {
 			setTimeout(() => {
 				header.setMode('albums')
 				view.albums.init()
-				lychee.animate('#content', 'contentZoomIn')
+				lychee.animate(lychee.content, 'contentZoomIn')
 			}, waitTime)
 
 		})
@@ -48,7 +48,7 @@ albums.load = function() {
 		setTimeout(() => {
 			header.setMode('albums')
 			view.albums.init()
-			lychee.animate('#content', 'contentZoomIn')
+			lychee.animate(lychee.content, 'contentZoomIn')
 		}, 300)
 
 	}