-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Overhauled company data source to simplify and better handle x509 certificates. Restructured Nanoc identifiers to be simpler and more consistent. Clarified requirement and creation of the web_id attribute. Simplified helpers by moving some (NOT YET ALL) item creation code to Nanoc data sources (#86). Restructured relevant text helpers to directly extend String class. Remove spurious text helper methods that were already provided by activesupport. Remove the to_slug helper method. Updated many hard-coded item identifier references to use site config. Introduced WIP personal profile pages, replacing author pages. Updated account_service_item render call on the company page, missed in 8dbe352 Updated rules to use the new identifiers.
- Loading branch information
Showing
36 changed files
with
652 additions
and
297 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -841,7 +841,7 @@ main { | |
} | ||
} | ||
|
||
.teammember { | ||
.vcard { | ||
.photo { | ||
margin-bottom: 0; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
--- | ||
title: Posts by Chris Chapman | ||
kind: redirect | ||
redirect_to_id: '/static/people/chris-chapman/index.*' | ||
redirect_to_id: '/company/people/chris-chapman' | ||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
--- | ||
title: Posts by Katie Chapman | ||
kind: redirect | ||
redirect_to_id: '/static/people/katie-chapman/index.*' | ||
redirect_to_id: '/company/people/katie-chapman' | ||
--- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- | ||
title: People | ||
description: People somehow connected to Pentandra. | ||
--- | ||
|
||
<div class="group"> | ||
|
||
<h1>People</h1> | ||
|
||
<div class="bd"> | ||
|
||
<p class="big"> | ||
|
||
Here are listed people that have some sort of connection to our work or | ||
that we have mentioned in our writings. Think of this as an index of | ||
people at the back of a book. Mentioning does not imply endorsement in | ||
either direction. | ||
|
||
</p> | ||
|
||
<p class="bigger"> | ||
|
||
If you're only looking for members of our company, please check out | ||
<%= link_to('our company roster', | ||
@items['/static/company/index.*'], | ||
fragment: 'our-roster') %>. | ||
|
||
</p> | ||
|
||
</div> | ||
|
||
</div> | ||
|
||
<div class="loud noted section" resource="pentandra:related-people" typeof="foaf:Group"> | ||
<% sorted_members.each_with_index do |person, index| %> | ||
<%= render('/partials/personcard.*', person: person, index: index) %> | ||
<% end %> | ||
</div> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
<% member = member_by_name(@member_name) %> | ||
<%= atom_feed(alternate_url: path_to_profile_page(member, absolute: true), | ||
author_name: member[:name], | ||
author_name: @member_name, | ||
author_uri: member[:web_id], | ||
icon: path_to(member, rep: :photo), | ||
entries: posts_by_author(member[:name]), | ||
content_proc: ->(post) { post.compiled_content(rep: :feed_entry) }, | ||
excerpt_proc: ->(post) { post_summary(post.reps.fetch(:feed_entry)) }, | ||
limit: 10) | ||
limit: @limit || 10) | ||
%> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
<link about="" typeof="foaf:PersonalProfileDocument" /> | ||
<article property="foaf:maker foaf:primaryTopic" typeof="foaf:Person" resource="<%= @item.fetch(:web_id) %>"> | ||
<%# Ideas for this page | ||
phone number link | ||
personal about me stuff | ||
favorite drink | ||
rss feeds | ||
pgp keys | ||
interests, personal drivers, goals | ||
longer description | ||
CV/resume? | ||
roles in other organizations | ||
links to social media profiles and other sites or webid profiles | ||
nicknames? | ||
preferred time zone, language | ||
%> | ||
<div class="section"> | ||
<header> | ||
<h1 class="flush"><span property="rdfs:label schema:name foaf:name"><%= @item[:name] %></span></h1> | ||
</header> | ||
|
||
<div class="bd"> | ||
<p class="big"><%= @item.fetch(:description) %></p> | ||
|
||
<dl> | ||
<dt>Title</dt> | ||
<dd><%= @item.fetch(:title) %></dd> | ||
<dt>WebID</dt> | ||
<dd><a href="<%= @item.fetch(:web_id) %>" class="uri"><%= @item.fetch(:web_id) %></a></dd> | ||
</dl> | ||
|
||
<% if @item.key?(:pkey) %> | ||
<div id="pkey" prefix="<%= prefix_mappings_for(:cert, :xsd) %>"> | ||
<% @item[:pkey].each do |pkey| %> | ||
<div id="pkey_<%= pkey.fetch(:sha1)[0..8] %>" property="cert:key" typeof="cert:RSAPublicKey"> | ||
WebID SHA1 fingerprint: <pre class="small"><samp class="identifier"><%= pkey.fetch(:sha1).upcase.scan(/../).join(':') %></samp></pre> | ||
<span property="cert:modulus" datatype="xsd:hexBinary" content="<%= pkey.fetch(:modulus) %>"></span> | ||
<span property="cert:exponent" datatype="xsd:nonNegativeInteger" content="<%= pkey.fetch(:exponent) %>"></span> | ||
</div> | ||
<% end %> | ||
</div> | ||
<% end %> | ||
|
||
<img src="<%# path_to(@item, rep: :fpr_qrcode) %>" /> | ||
|
||
</div> | ||
|
||
<aside class="aside"> | ||
<figure id="photo"> | ||
<img class="photo framed" src="<%= path_to(@item, rep: :photo) %>" alt="Photo of <%= @item[:name] %>" property="schema:image foaf:img" /> | ||
</figure> | ||
|
||
<figure class="aside section img" id="vcard"> | ||
<a href="<%= path_to(@item, rep: :vcard) %>" title="Click to download my vCard"> | ||
<img src="<%= path_to(@item, rep: :qrcode) %>" alt="machine-readable QR code with embedded vCard for <%= @item[:name] %>" /> | ||
</a> | ||
<figcaption class="bold">My vCard</figcaption> | ||
</figure> | ||
</aside> | ||
|
||
</div> | ||
|
||
<% author_posts = posts_by_author(@item[:name], published_weblog) %> | ||
<section id="my-posts" class="noted group" property="schema:hasPart" resource="pentandra-blog:posts_by_<%= @item[:name].parameterize(separator: '_') %>" typeof="schema:ItemList"> | ||
<h2>My blog posts</h2> | ||
<link property="schema:itemListOrder" resource="schema:itemListOrderDescending" /> | ||
<meta property="schema:numberOfItems" content="<%= h author_posts.length %>" datatype="schema:Integer" /> | ||
<% author_posts.each_with_index do |post, index| %> | ||
<%= render('/blog/partials/summary.*', item: post, position: index + 1) %> | ||
<% end %> | ||
</section> | ||
</article> |
Oops, something went wrong.