diff --git a/phpgwapi/js/login.js b/phpgwapi/js/login.js index 7d8cc4d366..0fff07bc79 100644 --- a/phpgwapi/js/login.js +++ b/phpgwapi/js/login.js @@ -14,12 +14,13 @@ egw_LAB.wait(function() { }).done(function(_data) { $j(document).ready(function() { + var isPixelegg = $j('link[href*="pixelegg.css"]')[0]; var social = $j(document.createElement('div')) .attr({ id: "socialMedia", class: "socialMedia" }) - .appendTo($j('#socialBox')); + .appendTo($j( isPixelegg? 'form' : '#socialBox')); for(var i=0; i < _data.length; ++i) { @@ -36,19 +37,3 @@ egw_LAB.wait(function() { }); }); }); - -// $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/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl index 038a446323..3b40c26d41 100644 --- a/phpgwapi/templates/default/login.tpl +++ b/phpgwapi/templates/default/login.tpl @@ -62,7 +62,7 @@ - + diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css index 1abb9cdb15..2ffbf5fd87 100755 --- a/phpgwapi/templates/idots/css/traditional.css +++ b/phpgwapi/templates/idots/css/traditional.css @@ -471,8 +471,8 @@ body { background-color: white; } #socialMedia { - left: 273px; position: relative; + float:right; } #loginScreenMessage { text-align: center;