-
Notifications
You must be signed in to change notification settings - Fork 61
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Mobile support with failback spike #188
Open
abhitrivedi
wants to merge
9
commits into
professor:master
Choose a base branch
from
abhitrivedi:mobile_support_with_failback_spike
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c09b6a2
app controller only
davliu a0c7869
people search and welcome page mobile compatible
davliu 82dd873
adding mobile resolver
abhitrivedi 0bd7d6c
adding layout for mobile and home page
abhitrivedi 688d1d0
adding people search layout
abhitrivedi 2e7a9ff
rspec
abhitrivedi 4d9b317
mobile.css
abhitrivedi 7f7e261
Merge branch 'master' into mobile_support_with_failback_spike
abhitrivedi 3db95aa
pulling changes from master
abhitrivedi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,3 +43,6 @@ push*.dat | |
|
||
# Vagrant files | ||
.vagrant | ||
|
||
*.swp | ||
*seeds.rb | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
<html xmlns="http://www.w3.org/1999/xhtml"> | ||
<head> | ||
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/> | ||
<meta content="Carnegie Mellon University" name="author"> | ||
<meta content="index,follow" name="robots"> | ||
<meta content="31 days" name="revisit-after"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> | ||
|
||
<%# stylesheet_link_tag '/cmu_sv_standard_v4/reset.css', :media => "all", :rel => "stylesheet" %> | ||
<%= stylesheet_link_tag 'site' %> | ||
<%= stylesheet_link_tag 'twiki' %> | ||
<%= csrf_meta_tag %> | ||
<%= javascript_include_tag 'http://code.jquery.com/jquery-1.9.0.min.js', | ||
'http://code.jquery.com/ui/1.10.0/jquery-ui.min.js', | ||
"jquery_ujs.js", | ||
"application" %> | ||
<link rel="stylesheet" href='http://code.jquery.com/ui/1.10.0/themes/base/jquery-ui.css' type="text/css" media="all"/> | ||
|
||
<%= yield :tablesorter %> | ||
|
||
<%= stylesheet_link_tag '/cmu_sv_standard_v4/mobile' %> | ||
<!--[if gte IE 5.5000]><![if lt IE 7]> | ||
<%= stylesheet_link_tag '/cmu_sv_standard_v4/ie.css', :media => "screen", :rel => "stylesheet" %> | ||
<![endif]><![endif]--><!--[if gte IE 7]><![if lt IE 8]> | ||
<%= stylesheet_link_tag '/cmu_sv_standard_v4/ie7.css', :media => "screen", :rel => "stylesheet" %> | ||
<![endif]><![endif]--> | ||
<%= stylesheet_link_tag '/cmu_sv_standard_v4/khaki-content.css', :media => "screen", :rel => "stylesheet" %> | ||
<%= stylesheet_link_tag '/cmu_sv_standard_v4/print.css', :media => "print" %> | ||
<%= stylesheet_link_tag 'site_print.css', :media => "print" %> | ||
<%= stylesheet_link_tag 'scaffold' %> | ||
|
||
<title><%= (title = yield :title) ? title : 'Silicon Valley Campus - Carnegie Mellon University' %></title> | ||
<%= yield :javascript %> | ||
<%= yield :head %> | ||
</head> | ||
|
||
<body> | ||
<%= yield %> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
<div id="nav"> | ||
<%# link_to image_tag("/images/whiteboard.jpg", :alt => "Whiteboard logo", :border => 0, :width => "30%"), root_path %> | ||
<%= link_to image_tag("/images/whiteboard.jpg", :alt => "Whiteboard logo", :border => 0), root_path %> | ||
<ul> | ||
<li class="standard"><a href="/people">People</a></li> | ||
<li class="standard"><a href="/courses">Courses</a></li> | ||
<ul> | ||
<li class="standard"> | ||
<a href=<%= "/courses/semester/#{AcademicCalendar.current_semester()}#{AcademicCalendar.current_semester_year()}" %>><%= AcademicCalendar.current_semester() %> <%= AcademicCalendar.current_semester_year() %> | ||
Courses</a></li> | ||
|
||
<% if AcademicCalendar.next_semester_is_soon %> | ||
<li class="standard"> | ||
<a href=<%= "/courses/semester/#{AcademicCalendar.next_semester()}#{AcademicCalendar.next_semester_year}" %>><%= AcademicCalendar.next_semester() %> <%= AcademicCalendar.next_semester_year %> | ||
Courses</a></li> | ||
<% end %> | ||
</ul> | ||
<li class="standard"><%= link_to "Presentations", today_presentations_url, :class => "Lv1NavLink" %></li> | ||
<% if current_user %> | ||
<li class="standard"><%= link_to "My Deliverables", my_deliverables_path(current_user.twiki_name), :class => "Lv1NavLink" %></li> | ||
<li class="standard"><%= link_to "My Teams", my_teams_path(current_user.twiki_name), :class => "Lv1NavLink" %></li> | ||
<li class="standard"><%= link_to "Logout " + current_user.first_name, destroy_user_session_path, :class => "Lv1NavLink" %></li> | ||
<% else %> | ||
<li class="standard"><font color="#626262">My Deliverables (Login required)</font></li> | ||
<li class="standard"><font color="#626262">My Teams (Login required)</font></li> | ||
<li class="standard"><%= link_to "Login ", user_omniauth_authorize_path(:google_apps), :class => "Lv1NavLink" %></li> | ||
<% end %> | ||
</ul> | ||
<div class="hr"> | ||
<hr> | ||
</div> | ||
<%= yield :left_nav %> | ||
<% if @is_in_grade_book %> | ||
<%= render :partial=>"layouts/grade_book_menu" %> | ||
<% end %> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
<% content_for :title, 'Whiteboard LMS for CMU-SV (Mobile)' %> | ||
|
||
<%# render :partial=>'rss_feeds/index', :locals => {:rss_feeds => @rss_feeds} %> | ||
|
||
<h1>Whiteboard.sv.cmu.edu</h1> | ||
|
||
<form action="<%= search_index_path %>" id="searchform" method="get" role="search"> | ||
<div> | ||
<label for="s" class="screen-reader-text">Search for:</label> | ||
<input type="text" id="query" name="query" value=""> | ||
<input type="submit" value="Search" id="searchsubmit"> | ||
(Note: searches through curriculum pages) | ||
</div> | ||
</form> | ||
|
||
<% if current_user %> | ||
<table class="layout_table"> | ||
<tr> | ||
<td> | ||
<%= render :partial => "/courses/my_courses" %> | ||
</td> | ||
<td> | ||
<h1>Pages</h1> | ||
<%= link_to "Orientation", "/pages/orientation" %> | ||
</td> | ||
</tr> | ||
</table> | ||
<% end %> | ||
|
||
|
||
<% if current_user && (current_user.is_staff || current_user.is_admin) %> | ||
<h2>Faculty views</h2> | ||
<p><a href="/teams">All teams</a></p> | ||
<h2>Admin notes</h2> | ||
<p>The current semester is <%= current_semester() %>. The current time is <%= l Time.now, :format => :chatty %> </p> | ||
<% end %> | ||
|
||
<h2>New features</h2> | ||
<p><%= link_to "New Features", new_features_path %></p> | ||
<p><%= link_to "Google Mailing Lists", mailing_lists_path %></p> | ||
|
||
<% if current_user && current_user.is_admin %> | ||
<h2>Admin only</h2> | ||
<p><%= link_to "Config", config_path %></p> | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,15 +144,15 @@ | |
factory :your_name_here, :parent => :person do | ||
is_student 1 | ||
is_part_time 0 | ||
graduation_year "2012" | ||
graduation_year "2013" | ||
masters_program "SE" | ||
masters_track "Tech" | ||
twiki_name "FirstLast" | ||
first_name "First" | ||
last_name "Last" | ||
human_name "Your Name" | ||
email "your.email@sv.cmu.edu" | ||
webiso_account "your.name@andrew.cmu.edu" | ||
twiki_name "DavidLiu" | ||
first_name "David" | ||
last_name "Liu" | ||
human_name "David Liu" | ||
email "david.liu@sv.cmu.edu" | ||
webiso_account "david.liu@andrew.cmu.edu" | ||
end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note to self: Ignore this commit There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You're right. This should not have been checked in. Our Bad. |
||
|
||
end | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note to self: verify this change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please ignore this file as well. seeds.rb should not be part of .gitignore