From 09ac50aaac31d12de0b214842adae89c7a8cc1d9 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 9 Aug 2011 15:36:59 -0700
Subject: [PATCH] Let html photo view render for phones, get rid of duplicate
 host-meta view

---
 app/views/publics/host_meta.erb                   | 2 +-
 app/views/publics/host_meta.html.erb              | 9 ---------
 app/views/publics/{photo.html.haml => photo.haml} | 0
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 app/views/publics/host_meta.html.erb
 rename app/views/publics/{photo.html.haml => photo.haml} (100%)

diff --git a/app/views/publics/host_meta.erb b/app/views/publics/host_meta.erb
index 5bb6786c5..fa8cd9879 100644
--- a/app/views/publics/host_meta.erb
+++ b/app/views/publics/host_meta.erb
@@ -3,7 +3,7 @@
      xmlns:hm='http://host-meta.net/xrd/1.0'>
      <hm:Host><%= AppConfig[:pod_uri].authority %></hm:Host>
   <Link rel='lrdd'
-        template='<%= AppConfig[:pod_url].chomp("/") %>/webfinger?q={uri}'>
+        template='<%= AppConfig[:pod_url] %>webfinger?q={uri}'>
     <Title>Resource Descriptor</Title>
   </Link>
 </XRD>
diff --git a/app/views/publics/host_meta.html.erb b/app/views/publics/host_meta.html.erb
deleted file mode 100644
index fa8cd9879..000000000
--- a/app/views/publics/host_meta.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
-     xmlns:hm='http://host-meta.net/xrd/1.0'>
-     <hm:Host><%= AppConfig[:pod_uri].authority %></hm:Host>
-  <Link rel='lrdd'
-        template='<%= AppConfig[:pod_url] %>webfinger?q={uri}'>
-    <Title>Resource Descriptor</Title>
-  </Link>
-</XRD>
diff --git a/app/views/publics/photo.html.haml b/app/views/publics/photo.haml
similarity index 100%
rename from app/views/publics/photo.html.haml
rename to app/views/publics/photo.haml