Skip to content

Commit 400d1c2

Browse files
committed
Merge pull request #33 from heiglandreas/feature/team
Adds fontawesome to team-page
2 parents 5169556 + d30dacf commit 400d1c2

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

Diff for: src/module/Phpug/public/css/phpugteam.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#team dt {clear: both; width:100px; height:100px; display:inline-block; margin: 10px;padding:0px;}
22
#team dd {display:inline-block;height:100px;}
3-
#team .email {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/mail.png) center no-repeat;}
4-
#team .twitter {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/twitter.png) center no-repeat;}
5-
#team .googleplus {text-indent:-10000px;display:inline-block;width:32px;height:32px;background: transparent url(../img/google+.png) center no-repeat;}
3+
#team dd a, #team dd a:hover, #team dd a:active, #team dd a:visited, #team dd a:link {
4+
color: black;
5+
}

Diff for: src/module/Phpug/src/Phpug/Controller/IndexController.php

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public function teamAction()
105105
'name' => 'Andreas Heigl',
106106
'twitter' => 'heiglandreas',
107107
'google+' => '104738361153508561515',
108+
'github' => 'heiglandreas'
108109
),
109110
'[email protected]' => array(
110111
'name' => 'Christian Nielebock',

Diff for: src/module/Phpug/view/phpug/index/team.phtml

+13-7
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,24 @@ $this->headLink()->appendStylesheet($this->basePath() . '/css/phpug/phpugteam.cs
99
<dt><?php echo $this->gravatar(trim($mail), array('img_size'=>'100'))?></dt>
1010
<dd>
1111
<h3><?php echo $person['name']; ?></h3>
12-
<?php echo $this->mailto($mail, null, array('class' => 'email'))?>
12+
<?php echo $this->mailto($mail, '<i class="fa fa-envelope-o fa-2x"></i>', array('title' => 'Send Email to ' . $person['name']))?>
1313
<?php if ( isset($person['twitter']) ) :?>
14-
<a class="twitter" href="http://twitter.com/<?php echo $person['twitter']; ?>">
15-
<?php echo $person['twitter']; ?>
14+
<a title="Go to the Twitter-account of <?php echo $person['name']; ?>" href="http://twitter.com/!#<?php echo $person['twitter']; ?>">
15+
<i class="fa fa-twitter fa-2x"></i>
1616
</a>
1717
<?php endif; ?>
1818
<?php if ( isset($person['google+']) ) :?>
19-
<a class="googleplus" href="https://plus.google.com/<?php echo $person['google+']; ?>">
20-
Google+
21-
</a>
19+
<a title="Go to the google+-account of <?php echo $person['name']; ?>" href="https://plus.google.com/<?php echo $person['google+']; ?>">
20+
<i class="fa fa-google-plus fa-2x"></i>
21+
</a>
22+
<?php endif; ?>
23+
<?php if ( isset($person['github']) ) :?>
24+
<a title="Go to the github-account of <?php echo $person['name']; ?>" href="https://github.com/<?php echo $person['github']; ?>">
25+
<i class="fa fa-github fa-2x"></i>
26+
</a>
2227
<?php endif; ?>
2328
</dd>
2429
<?php endforeach; ?>
2530
</dl>
26-
</div>
31+
</div>
32+

0 commit comments

Comments
 (0)