koalagator 4.1.0 → 5.0.0

data/app/views/calagator/admin/curations/_form.html.erb

@@ -0,0 +1,56 @@
+<%= form_with model: curation, url: (curation.new_record? ? admin_curations_path : admin_curation_path(curation)) do |form| %>
+  <div class="flex flex-col items-start">
+    <%= form.label :name, class: "font-bold required" %>
+    <%= form.text_field :name, required: true, oninput: "formatNameField(event)", pattern: "[a-z0-9_\-]+" %>
+  </div>
+
+  <div class="flex flex-col items-start">
+    <%= form.label :display_name, class: "font-bold required" %>
+    <%= form.text_field :display_name, required: true %>
+  </div>
+
+  <div class="flex flex-col items-start">
+    <%= form.label :description, class: "font-bold" %>
+    <%= form.text_area :description %>
+  </div>
+
+  <div class="flex flex-col items-start">
+    <%= form.label :priority, class: "font-bold required" %>
+    <%= form.number_field :priority, required: true %>
+  </div>
+
+  <div class="flex flex-col items-start">
+    <%= form.label :unlisted, class: "font-bold required" %>
+    <%= form.check_box :unlisted %>
+  </div>
+
+  <fieldset style="margin-top: 1rem;">
+    <legend class="font-bold">Tag Filters</legend>
+    <p>Configure tags, comma separated, to configure the curated events.</p>
+    
+    <div class="flex flex-col items-start mb-2">
+      <%= form.label :block_list, class: "font-bold" %>
+      <%= form.text_field :block_list, value: curation.block_list.to_s %>
+      <span>Events with any of these tags will <strong>always</strong> be excluded.</span>
+    </div>
+
+    <div class="flex flex-col items-start mb-2">
+      <%= form.label :require_list, class: "font-bold" %>
+      <%= form.text_field :require_list, value: curation.require_list.to_s %>
+      <span>Events <strong>must</strong> have one of these tags to be included.</span>
+    </div>
+
+    <div class="flex flex-col items-start mb-2">
+      <%= form.label :deny_list, class: "font-bold" %>
+      <%= form.text_field :deny_list, value: curation.deny_list.to_s %>
+      <span>Events with any of these tags will be excluded.</span>
+    </div>
+    
+    <div class="flex flex-col items-start mb-2">
+      <%= form.label :allow_list, class: "font-bold" %>
+      <%= form.text_field :allow_list, value: curation.allow_list.to_s %>
+      <span>Events with any of these tags will be included, <strong>overriding</strong> the deny list.</span>
+    </div>
+  </fieldset>
+  <%= form.submit %>
+<% end %>

data/app/views/calagator/admin/curations/_index.html.erb

@@ -0,0 +1,12 @@
+<tr>
+  <td><%= curation.priority %></td>
+  <td><%= !curation.unlisted %></td>
+  <td><%= curation.name %></td>
+  <td><%= curation.display_name %></td>
+  <td><%= curation.description %></td>
+  <td>
+    <%= link_to "Edit", edit_admin_curation_path(curation) %>
+    |
+    <%= button_to "Destroy", destroy_user_session_path, method: :delete, class: "a-like", form_class: "inline", data: { confirm: "Are you sure?" } %>
+  </td>
+</tr>

data/app/views/calagator/admin/curations/edit.html.erb

@@ -0,0 +1,2 @@
+<h2>Edit Curation</h2>
+<%= render partial: "form", locals: {curation: @curation} %>

data/app/views/calagator/admin/curations/index.html.erb

@@ -0,0 +1,21 @@
+<h2>
+  <%= link_to "Admin", admin_path %> / Curations
+</h2>
+<div class="flex flex-col items-start">
+  <%= link_to "New Curation", new_admin_curation_path %>
+  <table class="w-auto">
+    <thead>
+      <tr>
+        <th>Priority</th>
+        <th>Listed?</th>
+        <th>Name</th>
+        <th>Display Name</th>
+        <th>Description</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: "index", collection: @curations, as: :curation %>
+    </tbody>
+  </table>
+</div>

data/app/views/calagator/admin/curations/new.html.erb

@@ -0,0 +1,2 @@
+<h2>New Curation</h2>
+<%= render partial: "form", locals: {curation: @curation} %>

data/app/views/calagator/admin/index.html.erb

@@ -1,8 +1,12 @@
-<h2>Calagator Admin Tools</h2>
+<h2><%= distro_name %> Admin Tools</h2>
 
 <ul>
   <li><%= link_to "Recent changes", '/changes' %></li>
   <li><%= link_to "Squash duplicate events", duplicates_events_path %></li>
-  <li><%= link_to "Squash duplicate vennues", duplicates_venues_path %></li>
+  <li><%= link_to "Squash duplicate venues", duplicates_venues_path %></li>
   <li><%= link_to "Lock events", admin_events_path %></li>
+  <% if Calagator.devise_enabled %>
+    <li><%= link_to "Manage users", admin_users_path %></li>
+  <% end %>
+  <li><%= link_to "Manage curations", admin_curations_path %></li>
 </ul>

data/app/views/calagator/admin/users/_form.html.erb

@@ -0,0 +1,28 @@
+<%= form_with model: user, url: user.new_record? ? admin_users_path : admin_user_path(user) do |form| %>
+  <div class="flex flex-col max-w-content">
+    <%= form.label :email %>
+    <%= form.email_field :email %>
+  </div>
+
+  <div class="flex flex-col max-w-content">
+    <%= form.label :name %>
+    <%= form.text_field :name %>
+  </div>
+
+  <div class="flex flex-col max-w-content">
+    <%= form.label :display_name %>
+    <%= form.text_field :display_name %>
+  </div>
+
+  <div>
+    <%= form.label :admin %>
+    <%= form.check_box :admin %>
+  </div>
+
+  <div class="flex gap-2">
+    <%= form.submit %>
+    <%= link_to admin_users_path do %>
+      <button type="button">Cancel</button>
+    <% end %>
+  </div>
+<% end %>

data/app/views/calagator/admin/users/edit.html.erb

@@ -0,0 +1,7 @@
+<div>
+  <h2>Editing User</h2>
+  <%= render partial: "form", locals: {user: @user} %>
+  <% unless @user.admin? || @user == current_user %>
+    <%= button_to "Delete User", admin_user_path(@user), method: :delete, data: { confirm: "Are you sure?" }, form_class: "mt-2" %>
+  <% end %>
+</div>

data/app/views/calagator/admin/users/index.html.erb

@@ -0,0 +1,38 @@
+<h2>
+  <%= link_to "Admin", admin_path %> / Users
+</h2>
+
+<div class="flex flex-col items-start">
+  <%= link_to "Invite User", new_admin_user_path %>
+  <%= will_paginate @users %>
+  <table class="w-auto">
+    <thead>
+      <tr>
+        <th>ID</th>
+        <th>Email</th>
+        <th>Name</th>
+        <th>Display Name</th>
+        <th>Admin?</th>
+        <th>Created At</th>
+        <th>Updated At</th>
+        <th>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @users.each do |user| %>
+        <tr>
+          <td><%= user.id %></td>
+          <td><%= user.email %></td>
+          <td><%= user.name %></td>
+          <td><%= user.display_name %></td>
+          <td><%= user.admin %></td>
+          <td><%= user.created_at %></td>
+          <td><%= user.updated_at %></td>
+          <td>
+            <%= link_to "Edit", edit_admin_user_path(user) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/calagator/admin/users/invite.html.erb

@@ -0,0 +1,19 @@
+<p>
+  User <strong><%= @user.name %></strong> has been created.
+</p>
+
+<p>
+  If email has been properly set up on this instance, they should receive an email shortly instructing them to reset their password.
+</p>
+
+<p>
+  Otherwise, you can manually provide them with the following link:
+</p>
+
+<p>
+  <code><%= "#{root_url}users/password/edit?reset_password_token=#{params[:token]}" %></code>
+</p>
+
+<%= link_to admin_users_path do %>
+  <button type="button">Back</button>
+<% end %>

data/app/views/calagator/admin/users/new.html.erb

@@ -0,0 +1,3 @@
+<div>
+  <%= render partial: "form", locals: {user: @user} %>
+</div>

data/app/views/calagator/curations/show.html.erb

@@ -0,0 +1,17 @@
+<%= content_for :title, @curation.display_name %>
+
+<h2 class="font-bold"><%= @curation.display_name %></h2>
+<div id="curation_description">
+  <%== markdown @curation.description %>
+  <hr class="hr-sm">
+</div>
+<%= render partial: "calagator/events/index", locals: {
+    browse: @browse,
+    links: {
+      ical: curation_url(@curation.name, format: :ics, protocol: :webcal),
+      atom: curation_url(@curation.name, format: :atom),
+      google: "https://www.google.com/calendar/render?cid=" + curation_url(@curation.name, format: :ics, protocol: :webcal),
+      ical_export: curation_path(@curation.name, format: :ics),
+    }
+  }
+%>

data/app/views/calagator/events/_index.html.erb

@@ -0,0 +1,59 @@
+<% links ||= {} %>
+<div class='list_description'>
+  <h2>Viewing <strong><%= browse.events.size %></strong>
+  <%= browse.date ? 'filtered' : 'future' %> events
+  <%= events_sort_label(browse.order) %></h2>
+</div>
+
+<div id='list_filters' class='sidebar'>
+
+  <h3 class='first'>Filter:</h3>
+
+  <%= form_tag events_url, :method => 'get' do  -%>
+
+  <div id="date_filter">
+    <h4>by date</h4>
+    <div id='start_calendar'>
+      <label for='date_start'>From</label>
+      <%= text_field_tag 'date[start]', browse.start_date, :id => 'date_start', :class => 'date_picker' %>
+    </div>
+    <div id='end_calendar'>
+      <label for='date_end'>To</label>
+      <%= text_field_tag 'date[end]', browse.end_date, :id => 'date_end', :class => 'date_picker' %>
+    </div>
+  </div>
+  <div id='time_filter'>
+  <h4>by time</h4>
+    <div id='start_time_picker'>
+      <label for="time_start">Begins after:</label>
+      <%= text_field_tag 'time[start]', browse.start_time, :id => 'filter_time_start', :class => 'time_picker_filter' %>
+    </div>
+    <div id='end_time_picker'>
+      <label for="time_end">Ends before:</label>
+      <%= text_field_tag 'time[end]', browse.end_time, :id => 'filter_time_end', :class => 'time_picker_filter' %>
+    </div>
+  </div>
+  <div>
+    <label for="commit">&nbsp;</label>
+    <%= submit_tag 'Filter' %>
+    <span class="clear_filter"><%= link_to 'Reset', events_url %></span>
+  </div>
+  <% end %>
+
+  <h3>Subscribe to</h3>
+  <ul>
+    <li><%= link_to "iCalendar feed", links[:ical] %></li>
+    <li><%= link_to "Atom feed", links[:atom] %></li>
+    <li><%= link_to "Google Calendar", links[:google] %></li>
+  </ul>
+
+  <h3>Export to</h3>
+  <ul>
+    <li><%= link_to "iCalendar file", links[:ical_export] %></li>
+  </ul>
+
+</div>
+
+<div class='list_items'>
+  <%= render :partial => 'calagator/events/table', :locals => { :events => browse.events } %>
+</div>

data/app/views/calagator/events/_item.html.erb

@@ -82,7 +82,16 @@ html_classes << " contentbar" if has_contentbar
     <% if event.persisted? %>
       <h3>Share</h3>
       <div class="share">
-        <a class="fb-share" href="#"
+        <a class="mastodon-share social-popover" href="#"
+          onclick="
+            window.open(
+              'https://mastodonshare.com/share?url='+encodeURIComponent('<%= shareable_event_url(event) %>'),
+              'facebook-share-dialog',
+              'width=626,height=436');
+            return false;">
+          Share
+        </a>
+        <a class="facebook-share social-popover" href="#"
           onclick="
             window.open(
               'https://www.facebook.com/sharer/sharer.php?u='+encodeURIComponent('<%= shareable_event_url(event) %>'),
@@ -91,8 +100,6 @@ html_classes << " contentbar" if has_contentbar
             return false;">
           Share
         </a>
-        <a href="https://twitter.com/share" class="twitter-share-button" data-url="<%= shareable_event_url(event) %>" data-text="<%= tweet_text(event) %>" data-related="calagator" data-dnt="true">Tweet</a>
-        <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
       </div>
     <% end %>
     <% unless event.tags.blank? -%>

data/app/views/calagator/events/_subnav.html.erb

@@ -1,8 +1,13 @@
-<div id="events_subnav" class="subnav">
+<div id="events_subnav" class="subnav flex justify-between">
     <ul class="clearfix">
-      <li><%= link_to 'Browse events', root_url,
+      <li><%= link_to 'Home', root_url,
               :class => subnav_class_for("site", "index") %>
       </li>
+      <%= render partial: "calagator/shared/subnav_curations", locals: { curations: Calagator::Curation.order_by_priority } %>
+      <%= render partial: "calagator/shared/subnav_pinned_venues", locals: { venues: Calagator::Venue.pinned } %>
+      <%= render partial: "calagator/events/subnav_custom" %>
+    </ul>
+    <ul>
       <li><%= link_to 'Add an event', new_event_url,
               :class => subnav_class_for("events", "new") %>
       </li>

data/app/views/calagator/events/index.atom.builder

@@ -26,7 +26,7 @@ cache_if(@perform_caching, Calagator::CacheObserver.daily_key_for("events_atom",
           entry.start_time(event.start_time.xmlschema)
           entry.end_time(event.end_time.xmlschema) if event.end_time
           entry.content(render(partial: "feed_item", locals: {event: event}, formats: [:html]), type: "html")
-          if event.venue&.latitude && event.venue&.longitude
+          if event.venue&.latitude && event.venue.longitude
             entry.georss :point, "#{event.venue.latitude} #{event.venue.longitude}"
           end
         end

data/app/views/calagator/events/index.html.erb

@@ -1,62 +1,11 @@
 <%= content_for :title, "Events" %>
 
-<% cache_if(@browse.default?, Calagator::CacheObserver.daily_key_for("events_index", request)) do %>
-<div class='list_description'>
-  <h2>Viewing <strong><%= @browse.events.size %></strong>
-  <%= @browse.date ? 'filtered' : 'future' %> events
-  <%= events_sort_label(@browse.order) %></h2>
-</div>
-
-<div id='list_filters' class='sidebar'>
-
-  <h3 class='first'>Filter:</h3>
-
-  <%= form_tag events_url, :method => 'get' do  -%>
-
-  <div id="date_filter">
-    <h4>by date</h4>
-    <div id='start_calendar'>
-      <label for='date_start'>From</label>
-      <%= text_field_tag 'date[start]', @browse.start_date, :id => 'date_start', :class => 'date_picker' %>
-    </div>
-    <div id='end_calendar'>
-      <label for='date_end'>To</label>
-      <%= text_field_tag 'date[end]', @browse.end_date, :id => 'date_end', :class => 'date_picker' %>
-    </div>
-  </div>
-  <div id='time_filter'>
-  <h4>by time</h4>
-    <div id='start_time_picker'>
-      <label for="time_start">Begins after:</label>
-      <%= text_field_tag 'time[start]', @browse.start_time, :id => 'filter_time_start', :class => 'time_picker_filter' %>
-    </div>
-    <div id='end_time_picker'>
-      <label for="time_end">Ends before:</label>
-      <%= text_field_tag 'time[end]', @browse.end_time, :id => 'filter_time_end', :class => 'time_picker_filter' %>
-    </div>
-  </div>
-  <div>
-    <label for="commit">&nbsp;</label>
-    <%= submit_tag 'Filter' %>
-    <span class="clear_filter"><%= link_to 'Reset', events_url %></span>
-  </div>
-  <% end %>
-
-  <h3>Subscribe to</h3>
-  <ul>
-    <li><%= link_to "iCalendar feed", icalendar_feed_link %></li>
-    <li><%= link_to "Atom feed", atom_feed_link %></li>
-    <li><%= link_to "Google Calendar", google_events_subscription_link %></li>
-  </ul>
-
-  <h3>Export to</h3>
-  <ul>
-    <li><%= link_to "iCalendar file", icalendar_export_link %></li>
-  </ul>
-
-</div>
-
-<div class='list_items'>
-  <%= render :partial => 'table', :locals => { :events => @browse.events } %>
-</div>
-<% end %>
+<% cache_if(@browse.default? && Calagator.cache_enabled, Calagator::CacheObserver.daily_key_for("events_index", request)) do %>
+<%= render partial: "index", locals: {browse: @browse, links: {
+    ical: icalendar_feed_link,
+    atom: atom_feed_link,
+    google: google_events_subscription_link,
+    ical_export: icalendar_export_link
+  }}
+%>
+<% end %>

data/app/views/calagator/events/show.html.erb

@@ -38,12 +38,14 @@
     <% if @event.locked %>
     <p>This event is currently locked and cannot be edited. Please contact an admin for assistance.</p>
     <% else %>
-    <p>
+    <span>
       You can 
       <%= link_to "edit", edit_event_url(@event) %>,
       <%= link_to "clone", clone_event_url(@event) %>,
-      or 
-      <%= link_to "delete", event_url(@event), method: :delete, data: { confirm: "Are you sure?" } %>
+      or
+    </span>
+    <%= button_to "delete", event_url(@event), method: :delete, data: { confirm: "Are you sure?" }, form_class: "inline", class: "a-like" %>
+    <span>
       this event.
     </p>
     <% end %>

data/app/views/calagator/shared/_calendar.html.erb

@@ -0,0 +1,7 @@
+<% content_for :head do %>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@3.3.0/event-calendar.min.css">
+  <%= stylesheet_link_tag "calagator/custom/calendar" %>
+  <%= javascript_import_module_tag "calendar/calendar" %>
+<% end %>
+
+<events-calendar id="calendar" src="<%= src %>"></events-calendar>

data/app/views/calagator/shared/_subnav_curations.html.erb

@@ -0,0 +1,5 @@
+<% curations.listed.each do |curation| %>
+  <li><%= link_to curation.display_name, curation_path(curation.name),
+    :class => subnav_class_for("curations", "show", curation.name) %>
+  </li>
+<% end %>

data/app/views/calagator/shared/_subnav_pinned_venues.html.erb

@@ -0,0 +1,5 @@
+<% venues.each do |venue| %>
+  <li><%= link_to venue.title, venue_path(venue),
+    :class => subnav_class_for("venues", "show", venue.id.to_s) %>
+  </li>
+<% end %>

data/app/views/calagator/site/_contact.html.erb

@@ -0,0 +1 @@
+<p><strong>Admin Email:</strong> <a href="mailto:<%= Calagator.administrator_email %>"><%= Calagator.administrator_email %></a></p>

data/app/views/calagator/site/_description.html.erb

@@ -1,8 +1,8 @@
 <div class='replace-this-text'>
-  <h2>Hi there.</h2>
+  <h2>G'day!</h2>
   <p>
     Make a new file <code>app/views/calagator/site/_description.html.erb</code> and describe your site there!
     <br/>
-    (This text comes from a file in that location in the calagator gem)
+    (This text comes from a file in that location in the <%= distro_name.downcase %> gem)
   </p>
 </div>

data/app/views/calagator/site/about.html.erb

@@ -9,4 +9,13 @@
     and <code>get_involved</code>. These are optional, of course, but if you don't want them remember to create your own
     <code>app/views/calagator/site/_sidebar_menu.html.erb</code> to override the existing view.
   </p>
+
+  <div class="replace-this-text">
+    <p>
+      Configure your contact details in the partial: <code>app/views/calagator/site/_contact.html.erb</code>.
+      This partial is used wherever it is suggested that a user contact the administrators for support.
+    </p>
+    <h2>Contact Details</h2>
+    <%= render partial: "calagator/site/contact" %>
+  </div>
 </div>

data/app/views/calagator/site/closed_registrations.html.erb

@@ -0,0 +1,2 @@
+Registrations on this instance are closed. Please contact the administrators for an account.
+<%= render partial: "calagator/site/contact" %>

data/app/views/calagator/site/embed.html.erb

@@ -0,0 +1,16 @@
+<%= render partial: "calagator/shared/calendar", locals: {src: params[:src]} %>
+
+<script>
+  function getView() {
+    if (window.matchMedia('(max-width: 945px)').matches) {
+      return 'listMonth'
+    }
+    return 'dayGridMonth'
+  }
+
+  const calendar = document.getElementById("calendar")
+  const resizeObserver = new ResizeObserver(() => {
+    calendar.setAttribute("view", getView())
+  })
+  resizeObserver.observe(calendar)
+</script>

data/app/views/calagator/site/index.html.erb

@@ -1,4 +1,4 @@
-<% cache(Calagator::CacheObserver.daily_key_for("site_index", request)) do %>
+<% cache_if(Calagator.cache_enabled, Calagator::CacheObserver.daily_key_for("site_index", request)) do %>
 <a href="#" id="homepage_sidebar_toggle" class="expander_toggle">Hi there. Learn about this site and how to use it...</a>
 <div id="homepage_sidebar">
   <div id="project_description">

data/app/views/calagator/sources/index.html.erb

@@ -10,7 +10,7 @@
   <tr class="<%= cycle 'odd', 'even' %>">
     <td>
       <%= link_to 'Show', source %> | 
-      <%= link_to 'Destroy', source, method: :delete, data: {confirm: 'Are you sure?' } %>
+      <%= button_to 'Destroy', source, class: "a-like", form_class: "inline", method: :delete, data: {confirm: 'Are you sure?' } %>
     </td>
     <td><%= source_url_link source %></td>
   </tr>

data/app/views/calagator/sources/show.html.erb

@@ -13,4 +13,4 @@
 </p>
 
 <%= link_to 'Back', sources_path %> |
-<%= link_to 'Destroy', @source, method: :delete, data: { confirm: 'Are you sure?' } %>
+<%= button_to 'Destroy', @source, class: "a-like", form_class: "inline", method: :delete, data: { confirm: 'Are you sure?' } %>

data/app/views/calagator/venues/_form.html.erb

@@ -39,7 +39,11 @@
                   :as => :boolean,
                   :hint => venue.location \
                             ? "([#{venue.latitude}, #{venue.longitude}] currently; if checked, we'll try again.)" \
-                            : "(if checked, we'll try to determine a map position for this venue.)" %>
+                            : "(If checked, we'll try to determine a map position for this venue.)" %>
+    <% end %>
+
+    <% if Calagator.devise_enabled && current_user&.admin? %>
+      <%= f.input :pinned, label: "Pinned to Navbar?", as: :boolean, hint: "(If checked, this venue will be featured in the navbar.)" %>
     <% end %>
 
     <li class='trap'>

data/app/views/calagator/venues/_subnav.html.erb

@@ -1,5 +1,13 @@
-<div id="venues_subnav" class="subnav">
+<div id="venues_subnav" class="subnav flex justify-between">
     <ul class="clearfix">
+      <li><%= link_to 'Home', root_url,
+              :class => subnav_class_for("site", "index") %>
+      </li>
+      <%= render partial: "calagator/shared/subnav_curations", locals: { curations: Calagator::Curation.order_by_priority } %>
+      <%= render partial: "calagator/shared/subnav_pinned_venues", locals: { venues: Calagator::Venue.pinned } %>
+      <%= render partial: "calagator/venues/subnav_custom" %>
+    </ul>
+    <ul>
       <li><%= link_to 'Browse venues', venues_url,
               :class => subnav_class_for("venues", "index") %>
       </li>

data/app/views/calagator/venues/show.html.erb

@@ -10,7 +10,7 @@
     <div id='edit_link'>
       <p>
         You can <%= link_to "edit", edit_venue_url(@venue) %>
-        or <%= link_to "delete", venue_url(@venue), method: :delete, data: { confirm: "Are you sure?" } %>
+        or <%= button_to "delete", venue_url(@venue), class: "a-like", form_class: "inline", method: :delete, data: { confirm: "Are you sure?" } %>
         this venue.
       </p>
     </div>

data/app/views/layouts/calagator/_devise.html.erb

@@ -0,0 +1,17 @@
+<div id="devise_header">
+  <% if current_user.present? %>
+    <% if current_user.admin? %>
+      <span>Signed in as <%= link_to display_username(current_user), admin_path %>
+    <% else %>
+      <span>Signed in as <%= display_username(current_user) %>
+    <% end %>
+    <span>-</span>
+    <%= button_to "Sign Out", destroy_user_session_path, method: :delete, class: "a-like", form_class: "inline" %>
+  <% else %>
+    <% if Calagator.open_registration %>
+      <%= link_to "Sign Up", new_user_registration_path %>
+      <span>or</span>
+    <% end %>
+    <%= link_to "Log In", new_user_session_path %>
+  <% end %>
+</div>

data/app/views/layouts/calagator/_footer.html.erb

@@ -1,6 +1,8 @@
       <div id="top_footer">
         <%= URI.parse(Calagator.url).host %>
-        <%= source_code_version %>
+        -
+        <%= Calagator::GEMSPEC %>
+        <%= Calagator::VERSION %>
         &nbsp;
         &nbsp;
         &nbsp;

data/app/views/layouts/calagator/_header.html.erb

@@ -9,6 +9,9 @@
             </ul>
           </div>
           <%= render partial: 'layouts/calagator/global_search' %>
+          <% if Calagator.devise_enabled %>
+            <%= render partial: 'layouts/calagator/devise' %>
+          <% end %>
         </div>
       </div>