Browse files

Merge branch 'develop'

  • Loading branch information...
2 parents dc5352f + 45c4fed commit 320c61556542e5598939c61279f8e93c04abec62 @shadowhand shadowhand committed Jan 10, 2012
View
11 application/classes/view/team/index.php
@@ -14,4 +14,15 @@ class View_Team_Index extends Kostache_Layout {
* @var boolean show the banner space on template
*/
public $banner_exists = FALSE;
+
+ /**
+ * Email link for team@kohanaframework.org
+ *
+ * @return string
+ */
+ public function team_at_kohanaframework()
+ {
+ return HTML::mailto('team@kohanaframework.org');
+ }
+
}
View
6 application/templates/home/social.mustache
@@ -22,9 +22,9 @@
</a>
</li>
<li>
- <a href="http://www.facebook.com/group.php?gid=140164501435" id="facebook" class="icon">
- <h3>Facebook</h3>
- Join the Facebook group and find other users.
+ <a href="https://www.odesk.com/groups/kohana" id="odesk" class="icon">
+ <h3>oDesk</h3>
+ Find and hire Kohana developers on oDesk.
</a>
</li>
<li>
View
3 application/templates/team/index.mustache
@@ -4,7 +4,8 @@
Kohana is <a href="http://en.wikipedia.org/wiki/Open_source_software">
open source software</a> and a member of the
<a href="http://sfconservancy.org/">Software Freedom Conservancy</a>,
- developed by a team of volunteers.
+ developed by a team of volunteers. Need to get in touch? You can email
+ us at {{&team_at_kohanaframework}}.
</p>
<div class="cols">
<div>
View
2 public/assets/css/style.css
@@ -311,7 +311,7 @@ Lists: Community (Homepage)
#community li a#forum { background-image: url('../img/icon/forum.png'); }
#community li a#irc { background-image: url('../img/icon/irc.png'); }
#community li a#github { background-image: url('../img/icon/github.png'); }
-#community li a#facebook { background-image: url('../img/icon/facebook.png'); }
+#community li a#odesk { background-image: url('../img/icon/odesk.png'); }
#community li a#stackoverflow { background-image: url('../img/icon/stackoverflow.png'); }
#community li a#ohloh { background-image: url('../img/icon/ohloh.png'); }
View
BIN public/assets/img/icon/facebook.png
Deleted file not rendered
View
BIN public/assets/img/icon/odesk.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 320c615

Please sign in to comment.