Skip to content
Extraits de code Groupes Projets
Valider 65deaba5 rédigé par maxwell's avatar maxwell
Parcourir les fichiers

MS IZ hcard, emptyfiles, routesw

parent 45abeb23
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 58 ajouts et 9 suppressions
Rakefile
+ 2
− 1
Voir le fichier @ 65deaba5
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
require File.expand_path('../config/application', __FILE__) require File.expand_path('../config/application', __FILE__)
require 'rake' require 'rake'
ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
GPGME::check_version({})
Rails::Application.load_tasks Rails::Application.load_tasks
app/controllers/publics_controller.rb
+ 2
− 0
Voir le fichier @ 65deaba5
...@@ -3,6 +3,8 @@ class PublicsController < ApplicationController ...@@ -3,6 +3,8 @@ class PublicsController < ApplicationController
include PublicsHelper include PublicsHelper
def hcard def hcard
@user = User.owner
render 'hcard'
end end
def host_meta def host_meta
......
app/views/publics/hcard.erb 0 → 100644
+ 39
− 0
Voir le fichier @ 65deaba5
<body id="hcard">
<div id="wrap">
<div id="core">
<dl id="site_nav_local_views">
<dt>Local views</dt>
<dd></dd>
</dl>
<div id="content">
<h1><%=@user.real_name%></h1>
<div id="content_inner">
<div id="i" class="entity_profile vcard author">
<h2>User profile</h2>
<dl class="entity_nickname">
<dt>Nickname</dt>
<dd>
<a href="<%=@user.url%>" rel="me" class="nickname url uid"><%= @user.real_name%></a>
</dd>
</dl>
<dl class="entity_fn">
<dt>Full name</dt>
<dd>
<span class="fn"><%= @user.real_name %></span>
</dd>
</dl>
<dl class="entity_url">
<dt>URL</dt>
<dd>
<a href="<%= @user.url%>" rel="me" class="url"><%= @user.url%></a>
</dd>
</dl>
<dl class="entity_note">
<dt>Note</dt>
<dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
</dl>
</div>
</div>
</div>
</div>
app/views/publics/webfinger.erb
+ 7
− 4
Voir le fichier @ 65deaba5
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>acct:<%=@user.email%></Subject> <Subject>acct:<%=@user.email%></Subject>
<Alias><%=@user.url%></Alias> <Alias>http://www.identi.ca/user/169966</Alias>
<!--<Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="<%=@user.url%>public/profile"/> <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="http://identi.ca/user/169966"/>
<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@user.url%>status_messages.atom"/> <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%@user.url%>hcard"/>
<!--<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@user.url%>status_messages.atom"/>
<Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%@user.url%>public/hcard"/> <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%@user.url%>public/hcard"/>
--!>
<Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://identi.ca/main/ostatussub?profile={uri}"/> <Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://identi.ca/main/ostatussub?profile={uri}"/>
--!>
</XRD> </XRD>
config/routes.rb
+ 1
− 0
Voir le fichier @ 65deaba5
...@@ -22,6 +22,7 @@ Diaspora::Application.routes.draw do |map| ...@@ -22,6 +22,7 @@ Diaspora::Application.routes.draw do |map|
match 'hubbub', :to => 'publics#hubbub' match 'hubbub', :to => 'publics#hubbub'
match '.well-known/host-meta', :to => 'publics#host_meta' match '.well-known/host-meta', :to => 'publics#host_meta'
match 'webfinger', :to => 'publics#webfinger' match 'webfinger', :to => 'publics#webfinger'
match 'hcard', :to => 'publics#hcard'
root :to => 'dashboards#index' root :to => 'dashboards#index'
end end
db/seeds/backer.rb
+ 2
− 1
Voir le fichier @ 65deaba5
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
# Mayor.create(:name => 'Daley', :city => citie # Mayor.create(:name => 'Daley', :city => citie
require 'config/environment' require 'config/environment'
ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__)
GPGME::check_version({})
def create(backer_number) def create(backer_number)
......
db/seeds/dev.rb
+ 3
− 2
Voir le fichier @ 65deaba5
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
# Mayor.create(:name => 'Daley', :city => citie # Mayor.create(:name => 'Daley', :city => citie
require 'config/environment' require 'config/environment'
ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__)
GPGME::check_version({})
# Create seed user # Create seed user
user = User.create( :email => "robert@joindiaspora.com", :password => "monkey", :profile => Profile.new( :first_name => "bobert", :last_name => "brin" )) user = User.create( :email => "robert@joindiaspora.com", :password => "evankorth", :profile => Profile.new( :first_name => "bobert", :last_name => "brin" ))
names = [ ["George", "Washington"], names = [ ["George", "Washington"],
["John", "Adams"], ["John", "Adams"],
......
db/seeds/tom.rb
+ 2
− 1
Voir le fichier @ 65deaba5
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
# Mayor.create(:name => 'Daley', :city => citie # Mayor.create(:name => 'Daley', :city => citie
require 'config/environment' require 'config/environment'
ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__)
GPGME::check_version({})
# Create seed user # Create seed user
user = User.create( :email => "tom@tom.joindiaspora.com", :password => "evankorth", :url => "http://tom.joindiaspora.com/", :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" )) user = User.create( :email => "tom@tom.joindiaspora.com", :password => "evankorth", :url => "http://tom.joindiaspora.com/", :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" ))
......
gpg/diaspora-development/EMPTY 0 → 100644
+ 0
− 0
Voir le fichier @ 65deaba5
gpg/diaspora-production/EMPTY 0 → 100644
+ 0
− 0
Voir le fichier @ 65deaba5
gpg/diaspora-test/EMPTY 0 → 100644
+ 0
− 0
Voir le fichier @ 65deaba5
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter