Merge branch 'master' of github.com:neocities/neocities

views/permanent_web.erb

@@ -13,7 +13,7 @@
     </p>
 
     <p>
-      This is still very early stage technology, so if you don't understand what this stuff is, don't worry about it for now. But if you'd like to read more about why we're interested in this new technology, please see our <a href="http://blog.neocities.org/neocities-joins-the-permanent-web.html">blog post</a> on the topic.
+      This is still very early stage technology, so if you don't understand what this stuff is, don't worry about it for now. But if you'd like to read more about why we're interested in this new technology, please see our <a href="https://blog.neocities.org/its-time-for-the-permanent-web.html">blog post</a> on the topic.
     </p>
 
     <p>

views/site.erb

@@ -21,11 +21,9 @@
     <div class="col col-50 profile-info">
       <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
       <p class="site-url"><a href="<%= site.uri %>"><%= site.host %></a></p>
-      <!--
       <% if site.latest_archive %>
-        <p><a href="<%= site.latest_archive.url %>" style="margin-right: 5px">IPFS Link</a><small style="font-size: 7pt"><a href="/permanent-web">(what is this?)</a></small></p>
+        <p><a href="<%= site.latest_archive.url %>" style="margin-right: 5px"><%= site.latest_archive.ipfs_hash %></a><small style="font-size: 7pt"><a href="/permanent-web">(what is this?)</a></small></p>
       <% end %>
-      -->
       <div class="stats">
         <div class="stat"><strong><%= site.views.format_large_number %></strong> <span>view<%= site.views == 1 ? '' : 's' %></span></div>
         <% follows_count = site.follows_dataset.count %>
@@ -38,11 +36,9 @@
           <a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a>
         <% end %>
 
-        <!--
         <% if current_site && current_site.id == site.id && site.latest_archive %>
           <a href="/site/<%= site.username %>/archives" class="btn-Action edit"><i class="fa fa-history" title="Archives"></i> Archives</a>
         <% end %>
-        -->
 
         <% if current_site && current_site != site %>
           <% is_following = current_site.is_following?(site) %>

views/site/archives.erb

@@ -23,7 +23,13 @@
       </table>
 
       <p>
-        Note: This is a very early preview release of a new technology! We're still figuring things out. We may stop hosting archives without notice. <a href="/permanent-web">Learn how you can host your own copies of these archives</a>.
+        This is a very early, experimental preview release of a new technology! We're still figuring things out. We may stop hosting archives without notice. <a href="/permanent-web">Learn how you can host your own copies of these archives</a>.
+      </p>
+      <p>
+        Archives are captured once every 24 hours, so if you don't see your latest changes, check back later.
+      </p>
+      <p>
+        The URLs are using <a href="https://github.com/neocities/hshca">hshca</a>, a standard for using cryptographic hashes with subdomains.
       </p>
     <% end %>
   </article>