Skip to content
Browse files

Merge branch 'master' of github.com:MathieuGilbert/yeg-rubyists

  • Loading branch information...
2 parents aa74855 + aa6b6ee commit 27b896f1926effd427b7ecc04ccb132aafd9c5b2 Ryan Jones committed Apr 9, 2012
Showing with 12 additions and 5 deletions.
  1. +2 −0 app/assets/stylesheets/custom.css.scss
  2. +4 −1 app/models/data_parser.rb
  3. +6 −4 app/views/layouts/_header.html.haml
View
2 app/assets/stylesheets/custom.css.scss
@@ -21,6 +21,8 @@ $footer-height: 30px;
}
@mixin fancy-links {
+ color: #FFFFFF;
+
a {
color: #FFFFFF;
text-decoration: none;
View
5 app/models/data_parser.rb
@@ -156,7 +156,10 @@ def self.get_tweets
def self.parse_event_message(html)
# this is a block of html tags... grunt it out
- target_string = "to master at"
+
+ # Trying to retrieve the RepoURL in:
+ # ... UserName pushed to BranchName at RepoURL..."
+ target_string = "<span>pushed</span>"
target_index = html.index(target_string) + target_string.length
start_index = html.index("<a", target_index)
target_string = "</a>"
View
10 app/views/layouts/_header.html.haml
@@ -5,11 +5,13 @@
.controls
- if member_signed_in? && current_member.admin?
- = link_to 'Admin | ', admin_path
-
+ = link_to 'Admin', admin_path
+ |
- if !member_signed_in?
- = link_to 'Sign up | ', new_member_registration_path
+ = link_to 'Sign up', new_member_registration_path
+ |
= link_to 'Sign in', member_session_path
- else
- = link_to 'Edit Account |', edit_member_registration_path
+ = link_to 'Edit Account', edit_member_registration_path
+ |
= link_to 'Sign out', destroy_member_session_path

0 comments on commit 27b896f

Please sign in to comment.
Something went wrong with that request. Please try again.