eacee54846
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684, using the well-defined semantics of the uri object. The pod_url is normalized using module URI's functions, always with a trailing /. The diaspora-handle will always reflect the pod_url with this patch i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se; previous code stripped the www. prefix. If this is a problem, it should be addressed by another setting, since one cannot presume that www.domain.tld resolves to the same address as domain.tld.
29 lines
727 B
Text
29 lines
727 B
Text
-# Copyright (c) 2010, Diaspora Inc. This file is
|
|
-# licensed under the Affero General Public License version 3 or later. See
|
|
-# the COPYRIGHT file.
|
|
|
|
.floating.login_form
|
|
%h3
|
|
= t('.login')
|
|
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
|
|
#user
|
|
%p.username
|
|
= f.label :username , t('username')
|
|
= f.text_field :username
|
|
%p.user_network
|
|
="@#{APP_CONFIG[:pod_uri].host}/"
|
|
|
|
%p
|
|
= f.label :password , t('password')
|
|
= f.password_field :password
|
|
= f.submit t('.sign_in')
|
|
|
|
%p
|
|
= render :partial => "devise/shared/links"
|
|
|
|
.alpha-warning
|
|
%h1
|
|
= t('.alpha_software')
|
|
|
|
%h3
|
|
= t('.bugs_and_feedback_mobile')
|