Commit 7840737a546d9aa834d9bd5d61893c1d912c9a2f
1 parent
9a16d8ca
Exists in
master
and in
29 other branches
Revert "Removing url from site_info form"
This reverts commit 866d64b6ca3bf756f34f9d9e034dab22cf588658. This commit broke features/environment_name.feature :(
Showing
3 changed files
with
3 additions
and
4 deletions
Show diff stats
app/views/account/signup.rhtml
| ... | ... | @@ -2,10 +2,10 @@ |
| 2 | 2 | <div id='thanks-for-signing'> |
| 3 | 3 | <%= _("<h1>Welcome to %s!</h1> |
| 4 | 4 | <h3>Thanks for signing up, we're thrilled to have you on our social network!</h3> |
| 5 | - <p>Firstly, some tips for getting started:</p> | |
| 5 | + <p>Firsty, some tips for getting started:</p> | |
| 6 | 6 | <h4>Confirm your account!</h4> |
| 7 | 7 | <p>You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.</p> |
| 8 | - <p>You won't appear as an <a href=\"%s\" target=\"_blank\">user</a> until your account is confirmed.</p> | |
| 8 | + <p>You won't appear as a <a href=\"%s\" target=\"_blank\">user</a> until your account is confirmed.</p> | |
| 9 | 9 | <h4>What to do next?</h4> |
| 10 | 10 | <p><a href=\"/doc/user/editing-person-info\" target=\"_blank\">Customize your profile</a>. Upload an avatar and sign up for activity notifications under Account.</p> |
| 11 | 11 | <p>Learn the guidelines. Read the <a href=\"/doc\" target=\"_blank\">Documentation</a> for more details on how to use new social network!</p> | ... | ... |
app/views/admin_panel/site_info.rhtml
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | |
| 5 | 5 | <%= render :file => 'shared/tiny_mce' %> |
| 6 | 6 | |
| 7 | -<% labelled_form_for :environment, @environment do |f| %> | |
| 7 | +<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %> | |
| 8 | 8 | <% tabs = [] %> |
| 9 | 9 | <% tabs << {:title => _('Site info'), :id => 'site-info', |
| 10 | 10 | :content => (render :partial => 'site_info', :locals => {:f => f})} %> | ... | ... |