extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get the socialMedia icons out of table and append it to form if it is pixelegg template

Browse Source
This commit is contained in:
Hadi Nategh 2014-07-25 07:53:30 +00:00
parent 1912a14fe7
commit 5e8de7f972
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/js/login.js
View File

@ -14,12 +14,13 @@ egw_LAB.wait(function() {
}).done(function(_data) }).done(function(_data)
{ {
$j(document).ready(function() { $j(document).ready(function() {
var isPixelegg = $j('link[href*="pixelegg.css"]')[0];
var social = $j(document.createElement('div')) var social = $j(document.createElement('div'))
.attr({ .attr({
id: "socialMedia", id: "socialMedia",
class: "socialMedia" class: "socialMedia"
}) })
.appendTo($j('#socialBox')); .appendTo($j( isPixelegg? 'form' : '#socialBox'));
for(var i=0; i < _data.length; ++i) 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});
// });
//
//});

2
phpgwapi/templates/default/login.tpl
View File

@ -62,7 +62,7 @@
</tr> </tr>
<!-- END registration --> <!-- END registration -->
<tr> <tr>
<td id="socialBox"></td> <td id="socialBox" colspan="3"></td>
</tr> </tr>
</table> </table>
</form> </form>

2
phpgwapi/templates/idots/css/traditional.css
View File

@ -471,8 +471,8 @@ body {
background-color: white; background-color: white;
} }
#socialMedia { #socialMedia {
left: 273px;
position: relative; position: relative;
float:right;
} }
#loginScreenMessage { #loginScreenMessage {
text-align: center; text-align: center;