diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index ccd3b9aac7..133ceb67d5 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2119,9 +2119,9 @@ body {
*/
@import-once "def_colors.less";
#socialMedia {
- float: right;
position: relative;
- top: -30px;
+ top: 22px;
+ left: 408px;
}
#socialMedia a {
margin-left: 10px;
diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php
index 1017fb8211..d8f624f342 100755
--- a/pixelegg/inc/class.pixelegg_framework.inc.php
+++ b/pixelegg/inc/class.pixelegg_framework.inc.php
@@ -68,18 +68,4 @@ class pixelegg_framework extends jdots_framework
{
return egw_framework::_get_css();
}
-
- /**
- * displays a login screen
- *
- * Reimplemented to allow to include JSONP file with social media urls from egroupware.org
- *
- * @param string $extra_vars for login url
- */
- function login_screen($extra_vars)
- {
- self::csp_script_src_attrs('https://www.egroupware.org');
-
- return parent::login_screen($extra_vars);
- }
}
diff --git a/pixelegg/js/login.js b/pixelegg/js/login.js
deleted file mode 100755
index 8c75bc0a41..0000000000
--- a/pixelegg/js/login.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-
-egw_LAB.wait(function() {
- $j.ajax('https://www.egroupware.org/social.js', {
- dataType: "jsonp",
- jsonp: false,
- jsonpCallback: "do_social",
- cache: true
- }).done(function(_data)
- {
- $j(document).ready(function() {
- var social = $j(document.createElement('div'))
- .attr({
- id: "socialMedia",
- class: "socialMedia"
- })
- .appendTo($j('#centerBox'));
-
- for(var i=0; i < _data.length; ++i)
- {
- var data = _data[i];
- var url = (data.lang ? data.lang[$j('meta[name="language"]').attr('content')] : null) || data.url;
- $j(document.createElement('a')).attr({
- href: url,
- target: '_blank'
- })
- .appendTo(social)
- .append($j(document.createElement('img'))
- .attr('src', data.svg));
- }
- });
- });
-});
-
-// $j('img.bgfade').hide();
-//// var dg_H = $j(window).height();
-//// var dg_W = $j(window).width();
-//// $j('#wrap').css({'height':dg_H,'width':dg_W});
-//
-// function anim() {
-// $j("#wrap img.bgfade").first().appendTo('#wrap').fadeOut(3500);
-// $j("#wrap img").first().fadeIn(3500);
-// setTimeout(anim, 7000);
-// }
-//anim();
-//$j(window).resize(function(){window.location.href=window.location.href});
-// });
-//
-//});
diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less
index 952a707436..51b9c1f9ca 100644
--- a/pixelegg/less/layout_loginPage.less
+++ b/pixelegg/less/layout_loginPage.less
@@ -18,9 +18,9 @@
//##############################################################################################################
#socialMedia {
- float: right;
position: relative;
- top: -30px;
+ top: 22px;
+ left: 408px;
}
#socialMedia a {
margin-left: 10px;
diff --git a/pixelegg/templates/pixelegg/login.tpl b/pixelegg/templates/pixelegg/login.tpl
index 2b809c91e4..4ad3338295 100644
--- a/pixelegg/templates/pixelegg/login.tpl
+++ b/pixelegg/templates/pixelegg/login.tpl
@@ -1,4 +1,4 @@
-
+
@@ -64,6 +64,9 @@
+
+ |
+