diff --git a/.gitattributes b/.gitattributes
index 378ae32..674e6b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,7 @@
# Unittests
UnitTests export-ignore
sonar-project.properties export-ignore
+# binary files
+*.jpg binary diff=exif
+*.gif binary diff=exif
+*.png binary diff=exif
diff --git a/php/auth.inc.php b/php/auth.inc.php
index f1f0b54..e475d07 100644
--- a/php/auth.inc.php
+++ b/php/auth.inc.php
@@ -70,6 +70,9 @@
if (defined("IMAGE_PHP") && conf::get("share.enable") && !empty($hash)) {
require_once "classes/anonymousUser.inc.php";
$user = new anonymousUser();
+ } else if (defined("IMAGE_BG")) {
+ require_once "classes/anonymousUser.inc.php";
+ $user = new anonymousUser();
} else {
$uname = getvar("uname");
$pword = getvar("pword");
diff --git a/php/css.php b/php/css.php
index 48337ef..c6df12c 100644
--- a/php/css.php
+++ b/php/css.php
@@ -20,14 +20,16 @@
if (isset($_GET['logged_on'])) {
define("LOGON", true);
echo "/* This is the default CSS, the user is not logged on */";
+ $cssfile="logon.css";
} else {
echo "/* This is the customized CSS, user is logged on */";
+ $cssfile="css.php";
}
require_once "include.inc.php";
$tpl=conf::get("interface.template");
-$css="templates/" . $tpl . "/css.php";
+$css="templates/" . $tpl . "/" . $cssfile;
if (!file_exists($css)) {
- $css="templates/default/css.php";
+ $css="templates/default/" . $cssfile;
}
require_once $css;
diff --git a/php/image.php b/php/image.php
index 4935a01..1343b80 100644
--- a/php/image.php
+++ b/php/image.php
@@ -24,11 +24,14 @@
require_once "variables.inc.php";
$hash = getvar("hash");
$annotated = getvar('annotated');
+$type = getvar("type");
+if($type == "background") {
+ define("IMAGE_BG", 1);
+}
define("IMAGE_PHP", 1);
require_once "include.inc.php";
$photo_id = getvar("photo_id");
-$type = getvar("type");
if (($type=="import_thumb" || $type=="import_mid") &&
($user->isAdmin() || $user->get("import"))) {
diff --git a/php/logon.php b/php/logon.php
index 37bb170..f68b6d6 100644
--- a/php/logon.php
+++ b/php/logon.php
@@ -37,26 +37,10 @@
$user = new user();
$lang=$user->loadLanguage();
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+$tpl=new template("logon", array(
+ "title" => conf::get("interface.title"),
+ "redirect" => $redirect
+));
+
+echo $tpl;
diff --git a/php/templates/default/images/backgrounds/fir.jpg b/php/templates/default/images/backgrounds/fir.jpg
new file mode 100644
index 0000000..4c22cb4
Binary files /dev/null and b/php/templates/default/images/backgrounds/fir.jpg differ
diff --git a/php/templates/default/images/backgrounds/flower.jpg b/php/templates/default/images/backgrounds/flower.jpg
new file mode 100644
index 0000000..a4085da
Binary files /dev/null and b/php/templates/default/images/backgrounds/flower.jpg differ
diff --git a/php/templates/default/logon.css b/php/templates/default/logon.css
new file mode 100644
index 0000000..7f1799e
--- /dev/null
+++ b/php/templates/default/logon.css
@@ -0,0 +1,118 @@
+
+
+body {
+ font-family: Verdana, Arial, Sans-serif;
+ padding: 0;
+ margin: 0;
+ font-size: 10px;
+}
+
+img.background {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+body > h1 {
+ position: absolute;
+ left: 15px;
+ top: 0px;
+ font-size: 6em;
+ text-align: left;
+ color: rgba(0,0,0,0.3);
+ margin: 0;
+}
+
+div.logon {
+ position: absolute;
+ left: 0;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ margin: auto;
+ background: white;
+ width: 300px;
+ height: 220px;
+ border-radius: 15px;
+ opacity: 0.95;
+ box-shadow: 5px 5px 5px 5px rgba(0,0,0,0.5);
+ background: linear-gradient(to bottom, #1e5799 0%,#7db9e8 100%);
+}
+
+div.logon h1 {
+ background: #1e5799;
+ color: white;
+ border-radius: 15px 15px 0 0;
+ padding: 10px;
+ margin: 0;
+ text-align: center;
+ font-size: 1.5em;
+ font-weight: bold;
+}
+
+div.logon label {
+ color: rgba(0,0,0,0.8);
+ display: block;
+ clear: both;
+ font-size: 1.5em;
+ margin: 5px 20px 0 20px;
+}
+
+div.logon input {
+ opacity: 0.6;
+ display: block;
+ clear: both;
+}
+
+div.logon input[type=text],
+div.logon input[type=password] {
+ width: 256px;
+ height: 35px;
+ padding: 8px;
+ margin: 0 20px 5px 20px;
+ border: 1px solid rgba(0,0,0,0.5);
+ border-radius: 5px;
+ background: rgba(0,0,0,0.1);
+
+}
+
+div.logon input[type=submit] {
+ position: absolute;
+ border: none;
+ width: 300px;
+ padding: 10px;
+ margin: auto 0 0 0;
+ background: #1e5799;
+ color: white;
+ font-size: 1.5em;
+ font-weight: bold;
+ top: auto;
+ bottom: 0;
+ height: 35px;
+ border-radius: 0 0 15px 15px;
+}
+
+div.logon input[type=submit]:hover {
+ background: #7db9e8;
+}
diff --git a/php/templates/default/logon.tpl.php b/php/templates/default/logon.tpl.php
new file mode 100644
index 0000000..3c549a2
--- /dev/null
+++ b/php/templates/default/logon.tpl.php
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+= $tpl_title . ' - ' . translate("logon",0) ?>
+
+
+
+= $tpl_title ?>
+
+
= translate("logon",0)?>
+
+
+
+
+