marco/cccs-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump to FontAwesome5, add Mastodon link

Browse source
This commit is contained in:
Stefan Schlott 2019-02-27 13:47:22 +01:00
parent 5aead2c01b
commit 4adc4a90d4
48 changed files with 13731 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
layouts/article_body.html
View file

@ -8,10 +8,10 @@
<% end %></h1>
<p>
<ul class="unstyled inline">
<li><i class="icon-calendar" title="Datum"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
<% if @item[:author] %><li><i class="icon-pencil" title="Autor"></i> <%= @item[:author] %></li><% end %>
<% if @item[:refers_to] %><li><i class="icon-cogs" title="Zugehöriges Projekt"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
<li><i class="icon-bookmark" title="Permalink"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
<li><i class="fas fa-calendar-alt" title="Datum"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
<% if @item[:author] %><li><i class="fas fa-pencil-alt" title="Autor"></i> <%= @item[:author] %></li><% end %>
<% if @item[:refers_to] %><li><i class="fas fa-cogs" title="Zugehöriges Projekt"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
<li><i class="fas fa-bookmark" title="Permalink"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
</ul>
</header>
<hr>

11
layouts/default.html
View file

@ -26,7 +26,7 @@
<div class="navbar-inner">
<div class="nav-collapse collapse">
<ul class="nav span11">
<li><a<%= menu_active_if("main")%> href="/"><i class="icon-home"></i></a>
<li><a<%= menu_active_if("main")%> href="/"><i class="fas fa-home"></i></a>
<li><a<%= menu_active_if("about")%> href="/about/">Wir über uns</a>
<li><a<%= menu_active_if("events")%> href="/events/">Veranstaltungen</a>
<li><a<%= menu_active_if("activities")%> href="/activities/">Aktivitäten</a>
@ -57,9 +57,7 @@
</div>
</div>
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="fas fa-bars"></span>
</a>
</div>
</div>
@ -70,8 +68,9 @@
</div>
<footer>
<ul class="horizontal">
<li class="icon-twitter-sign"><a href="https://twitter.com/cccs_de/">twitter</a></li>
<li class="icon-github"><a href="https://github.com/cccs/">github</a></li>
<li class="fab fa-twitter-square"><a href="https://twitter.com/cccs_de/">twitter</a></li>
<li class="fab fa-mastodon"><a rel="me" href="https://chaos.social/@cccs">Mastodon</a></li>
<li class="fab fa-github"><a href="https://github.com/cccs/">github</a></li>
<li class="pull-right"><a href="/imprint">Impressum <img alt="(CC) by-nc-sa" src="/img/cc-by-nc-sa-small.png" /></a></li>
</ul>
</footer>

16
layouts/event_header.erb
View file

@ -7,17 +7,17 @@
<% end %>
<% end %>
<ul class="iconlist">
<li class="icon-calendar" title="Datum">
<li class="fas fa-calendar-alt" title="Datum">
<span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%dT%H:%M") %>"><%= @item[:startdate].strftime("%d.%m.%Y, %H:%M") %> Uhr</span>
<% if !@item[:public] %>(nicht öffentlich)<% end %>
</li>
<% if !heading %>
<li class="icon-comment" title="Thema">
<li class="fas fa-comment" title="Thema">
<span itemprop="name"><%= item[:title] %></span>
</li>
<% end %>
<% if @item[:speakers] %>
<li class="icon-male commaseparated" title="Referent">
<li class="fas fa-male commaseparated" title="Referent">
<ul>
<% @item[:speakers].each do |speaker| %>
<li itemprop="performer" itemscope itemtype="http://schema.org/Person">
@ -28,7 +28,7 @@
</li>
<% end %>
<% if @item[:superevent] %>
<li class="icon-comments-alt" itemprop="superEvent" itemscope itemtype="http://schema.org/Event" title="Veranstaltung">
<li class="fas fa-comments-alt" itemprop="superEvent" itemscope itemtype="http://schema.org/Event" title="Veranstaltung">
<% if @item[:superevent][:url] %>
<a itemprop="url" href="<%= @item[:superevent][:url] %>"><span itemprop="name"><%= @item[:superevent][:title] %></span></a>
<% else %>
@ -37,7 +37,7 @@
</li>
<% end %>
<% if @item[:location] %>
<li class="icon-compass commaseparated" title="Ort">
<li class="fas fa-compass commaseparated" title="Ort">
<ul itemprop="location" itemscope itemtype="http://schema.org/Location">
<li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %></li>
<% if item[:location][:details] %><li><%= item[:location][:details] %></li><% end %>
@ -62,7 +62,7 @@
</li>
<% end %>
<% if @items["#{@item.identifier}aushang/"] || @items["#{@item.identifier}flyer/"] %>
<li class="icon-bullhorn commaseparated" title="Aushang, Flyer, etc.">
<li class="fas fa-bullhorn commaseparated" title="Aushang, Flyer, etc.">
<ul>
<% if @items["#{@item.identifier}aushang/"] %><li><a href="<%= @items["#{@item.identifier}aushang/"].path %>">Aushang (PDF)</a></li><%end%>
<% if @items["#{@item.identifier}flyer/"] %><li><a href="<%= @items["#{@item.identifier}flyer/"].path %>">Flyer (PDF)</a></li><%end%>
@ -70,10 +70,10 @@
</li>
<% end %>
<% if @item[:audio] %>
<li class="icon-music" title="Audiomitschnitt"><% if @item[:audio][/^https?:/] %><a href="<%= @item[:audio] %>">Audiomitschnitt</a><% else %><%= datalink(@item[:audio], 'Audiomitschnitt') %><% end %></li>
<li class="fas fa-music" title="Audiomitschnitt"><% if @item[:audio][/^https?:/] %><a href="<%= @item[:audio] %>">Audiomitschnitt</a><% else %><%= datalink(@item[:audio], 'Audiomitschnitt') %><% end %></li>
<% end %>
<% if @item[:material] %>
<li class="icon-pencil commaseparated" title="Begleitmaterial und Folien">
<li class="fas fa-pencil commaseparated" title="Begleitmaterial und Folien">
<ul>
<% @item[:material].each do |m| %>
<li><% if m[:file] %><%= datalink(m[:file], m[:title]) %><%else%><a href="<%= m[:link] %>"><%= m[:title] %></a><%end%></li>

8
layouts/item_intro.erb
View file

@ -7,10 +7,10 @@
<%if @item[:kind]=='article' %>
<p>
<ul class="unstyled inline">
<li><i class="icon-calendar"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
<% if @item[:author] %><li><i class="icon-pencil"></i> <%= @item[:author] %></li><% end %>
<% if @item[:refers_to] %><li><i class="icon-cogs"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
<li><i class="icon-bookmark"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
<li><i class="fas fa-calendar-alt"></i> <time itemprop="dateCreated" datetime="<%= @item[:created_at].strftime("%Y-%m-%d") %>"><%= @item[:created_at].strftime("%d.%m.%Y") %></time></li>
<% if @item[:author] %><li><i class="fas fa-pencil-alt"></i> <%= @item[:author] %></li><% end %>
<% if @item[:refers_to] %><li><i class="fas fa-cogs"></i> <a href="<%= @items[sanitize_path(@item[:refers_to])].path() %>"><%= @items[sanitize_path(@item[:refers_to])][:title] %></a></li><% end %>
<li><i class="fas fa-bookmark"></i> <a itemprop="url" href="<%= item.path() %>">Permalink</a></li>
</ul>
<% end %>
</header>

4
layouts/pager.erb
View file

@ -1,8 +1,8 @@
<div class="pager">
<% if @linkprev %>
<a href="<%= @linkprev.link %>" class="pull-left icon-circle-arrow-left">&nbsp;<%= @linkprev.title %></a>
<a href="<%= @linkprev.link %>" class="pull-left fas fa-circle-arrow-left">&nbsp;<%= @linkprev.title %></a>
<% end %>
<% if @linknext %>
<a href="<%= @linknext.link %>" class="pull-right icon-circle-arrow-right">&nbsp;<%= @linknext.title %></a>
<a href="<%= @linknext.link %>" class="pull-right fas fa-circle-arrow-right">&nbsp;<%= @linknext.title %></a>
<% end %>
</div>