Skip to content

Commit edb5242

Browse files
committed
move new teacher form to marketing site
fixes CNVS-22581 test plan - setup open registration - in console set root_account setting - a = Account.root_accounts.active.find(id) - a.settings[:fft_registration_url] = "http://www.canvaslms.com/try-canvas?lead_source_description=canvas.instructure.com_fft_canvas_" - a.save! - click on "I'm a teacher" YOUR_CANVAS/register_from_website - it should redirect to canvaslms try canvas link - remove setting - it should bring up form to register locally Change-Id: I14f6daacffceda4dd25b4829558f9f9472618104 Reviewed-on: https://gerrit.instructure.com/61446 Reviewed-by: Jacob Fugal <jacob@instructure.com> QA-Review: August Thornton <august@instructure.com> Product-Review: Rob Orton <rob@instructure.com> Tested-by: Jenkins
1 parent 65b7ac1 commit edb5242

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

app/models/account.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ def default_locale(recurse = false)
176176
add_setting :login_handle_name, root_only: true
177177
add_setting :change_password_url, root_only: true
178178
add_setting :unknown_user_url, root_only: true
179+
add_setting :fft_registration_url, root_only: true
179180

180181
add_setting :restrict_student_future_view, :boolean => true, :default => false, :inheritable => true
181182
add_setting :restrict_student_past_view, :boolean => true, :default => false, :inheritable => true

app/views/users/new.html.erb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
<h2 id="registration_video"><a href="http://vimeo.com/35336470" title="Play the Canvas introduction video">Watch a Video</a></h2>
1818
<div id="registration_options">
1919
<h2>Sign up now, it's free!</h2>
20-
<a href="#" id="signup_teacher" class="signup_link" data-template="teacherDialog" title="Teacher Signup">I'm a Teacher</a>
20+
<% if (url = @domain_root_account.settings[:fft_registration_url]) %>
21+
<a id="signup_teacher" href=<%= url %> title="Teacher Signup">I'm a Teacher</a>
22+
<% else %>
23+
<a href="#" id="signup_teacher" class="signup_link" data-template="teacherDialog" title="Teacher Signup">I'm a Teacher</a>
24+
<% end %>
2125
<a href="#" id="signup_student" class="signup_link" data-template="studentDialog" title="Student Signup">I'm a Student</a>
2226
<%= link_to_parent_signup(@domain_root_account.parent_auth_type) %>
2327
</div>

0 commit comments

Comments
 (0)