Remove login.js from pixelegg, because we add it generally to phpgwapi for all templates. Additionally, fix changes accordingly for socialMedia icons

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;

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);
-	}
 }

pixelegg/js/login.js

@@ -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});
-//	});
-//
-//});

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;

pixelegg/templates/pixelegg/login.tpl

@@ -1,4 +1,4 @@
-<script src="./pixelegg/js/login.js" type="text/javascript"></script>
+<script src="./phpgwapi/js/login.js" type="text/javascript"></script>
 
 
 <div id="loginMainDiv">
@@ -64,6 +64,9 @@
                     </td>
                 </tr>
                 <!-- END registration -->
+				<tr>
+					<td id="socialBox"></td>
+				</tr>
             </table>
         </form>
     </div>