Cleaning up some paths.
Handling root_url if not ending w /, using http: for all cross-site references.
This commit is contained in:
parent
215d6a8504
commit
c92f80b2eb
2 changed files with 3 additions and 3 deletions
|
|
@ -26,7 +26,7 @@
|
|||
<!--[if IE]>
|
||||
= javascript_include_tag "/javascripts/ie.js"
|
||||
<![endif]-->
|
||||
= javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"
|
||||
= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"
|
||||
|
||||
:javascript
|
||||
!window.jQuery && document.write(unescape('%3Cscript src="/javascripts/vendor/jquery144.min.js"%3E%3C/script%3E'))
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
|
||||
%li= link_to 'github', "https://github.com/diaspora/diaspora"
|
||||
%li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
|
||||
%li= link_to t('layouts.header.code'), "#{root_url}source.tar.gz"
|
||||
%li= link_to t('layouts.header.code'), "#{root_url.chomp('/')}/source.tar.gz"
|
||||
%li= link_to t('.whats_new'), 'https://github.com/diaspora/diaspora/wiki/Changelog'
|
||||
|
||||
-if !@landing_page && request.url.match(/joindiaspora.com/)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:hm='http://host-meta.net/xrd/1.0'>
|
||||
<hm:Host><%= AppConfig[:pod_uri].host %></hm:Host>
|
||||
<Link rel='lrdd'
|
||||
template='<%= AppConfig[:pod_url] %>webfinger?q={uri}'>
|
||||
template='<%= AppConfig[:pod_url].chomp("/") %>/webfinger?q={uri}'>
|
||||
<Title>Resource Descriptor</Title>
|
||||
</Link>
|
||||
</XRD>
|
||||
|
|
|
|||
Loading…
Reference in a new issue