<% provide(:url, answers_path(@question)) %>

<% breadcrumb :new_answer, @team, @question %>

  <%= render "shared/answer_form" %>

Enunciado:

      <%= markdown(@question.description) %>

<% provide(:url, url_for(:action => 'create', :controller => 'answers')) %>

<% breadcrumb :new_answer, @team, @question %>

  <%= render "shared/answer_form" %>

Enunciado:

      <%= markdown(@question.description) %>

Fix bug in new answer view

Fix bug in new answer view


beta This part of GOV.UK is being rebuilt -  find out what this means

beta This part of GOV.UK is being rebuilt –  find out what this means

Use an en dash in the beta label.

Use an en dash in the beta label.

For consistency with the component from static
<https://github.com/alphagov/static/commit/c8e240491497>.

This is a quick fix, since I don’t have a lot of context around this
partial as compared to the component, so I don't know whether these are
intentionally separate implementations, or whether we should be updating
this code to use the component from `static`.


<% content_for :context, attachable.title %>
<% content_for :page_title, "Reorder attachments" %>
<% content_for :title, "Reorder attachments" %>
<% content_for :title_margin_bottom, 6 %>
<% content_for :back_link do %>
  <%= render "govuk_publishing_components/components/back_link", {
    href: attachable_attachments_path(attachable)
  } %>
<% end %>

    <%= form_tag [:order, :admin, typecast_for_attachable_routing(attachable), Attachment], method: :put do %>
      <%= render "govuk_publishing_components/components/reorderable_list", {
        items: attachable.attachments.includes(:attachment_data).map do |attachment|
          {
            id: attachment.id,
            title: attachment.title,
            description: attachment_attributes(attachment)
          }
        end
      } %>

      <%= render "govuk_publishing_components/components/button", {
        text: "Update order",
        margin_bottom: 8,
      } %>
    <% end %>

<% content_for :context, attachable.title %>
<% content_for :page_title, "Reorder attachments" %>
<% content_for :title, "Reorder attachments" %>
<% content_for :title_margin_bottom, 6 %>

    <%= form_tag [:order, :admin, typecast_for_attachable_routing(attachable), Attachment], method: :put do %>
      <%= render "govuk_publishing_components/components/reorderable_list", {
        items: attachable.attachments.includes(:attachment_data).map do |attachment|
          {
            id: attachment.id,
            title: attachment.title,
            description: attachment_attributes(attachment)
          }
        end
      } %>

        <%= render "govuk_publishing_components/components/button", {
          text: "Update order",
        } %>

        Cancel

    <% end %>

Replace attachment reorder back button with cancel button

In our like for like approach we're using cancel buttons instead of back buttons in the new design system pages


  Pushed to <var><%= github_event.payload.ref %></var> on <var><%= github_event.repo.name %></var>

<% github_event.payload.commits.each do |commit| %>

      <%= commit.message %>

<% end %>

Use list instead of blockquotes for better spacing


MPAs within national waters

  Marine Protected Areas (MPAs) can be created for a variety of purposes in different areas within the global ocean. There is a higher percentage of MPAs established within national waters than in ABNJ (relative to the size of area). In addition, a number of nations have extensive national waters around their overseas countries or territories (a territory or country that is a part of or dependent upon another state but is geographically distinct from that state). Much of the recent growth in MPA coverage has been driven by the establishment of very large MPAs created or expanded by a few overseas countries and territories. The <%= link_to 'USA', 'country/USA' %>, <%= link_to 'France', 'country/FRA' %> and <%= link_to 'United Kingdom', 'country/GB' %> and their overseas countries and territories make up over 50% of the area covered by MPAs while <%= link_to 'Australia', 'country/AUS' %> , <%= link_to 'Cook Islands', 'country/COK'%>, <%= link_to 'New Zealand', 'country/NZL' %> and <%= link_to 'Mexico', 'country/MEX' %> cover an additional 30%.

<interactive-treemap :json="<%= @nationalProtectedAreas %>"></interactive-treemap>

MPAs within national waters

  Marine Protected Areas (MPAs) can be created for a variety of purposes in different areas within the global ocean. There is a higher percentage of MPAs established within national waters than in ABNJ (relative to the size of area). In addition, a number of nations have extensive national waters around their overseas countries or territories (a territory or country that is a part of or dependent upon another state but is geographically distinct from that state). Much of the recent growth in MPA coverage has been driven by the establishment of very large MPAs created or expanded by a few overseas countries and territories. The <%= link_to 'USA', country_path('USA') %>, <%= link_to 'France', country_path('FRA') %> and <%= link_to 'United Kingdom', country_path('GB') %> and their overseas countries and territories make up over 50% of the area covered by MPAs while <%= link_to 'Australia', country_path('AUS') %> , <%= link_to 'Cook Islands', country_path('COK')%>, <%= link_to 'New Zealand', country_path('NZL') %> and <%= link_to 'Mexico', country_path('MEX') %> cover an additional 30%.

<interactive-treemap :json="<%= @nationalProtectedAreas %>"></interactive-treemap>

Use path helper to link to countries

Use path helper to link to countries


Caroline Rookes (Chief Executive)

  Caroline was appointed as Chief Executive of the Money Advice Service on 1
  February 2013. During a distinguished career in the Civil Service, recognised
  with a CBE in 2010, she has overseen a number of major developments to improve
  people’s personal finances. These include the introduction of automatic
  enrolment
  (the new duty on employers to enrol their staff automatically into a pension),
  the new NEST pension scheme, changes to private pension legislation and
  regulation, reviews of welfare benefits, and simplification of the pension tax
  regime.

Mark Fiander (Executive Director)

Mark is the Strategy
  and Innovation Director. Mark spent the first eleven years of his career at
  Unilever working across divisions in Sales, Marketing and Strategy. He then
  moved to The Royal Bank of Scotland where he headed up Customer Management and
  UK Marketing Operations. Mark then moved to BUPA before joining the Money
  Advice Service on 2 September 2011.

In this section:

  Background
  l Our
  board l
  Debt
    advice l
  Oversight,
    accountability and funding

Create static partial for article demo

Create static partial for article demo


  <!-- This code isn't final.  I need to add logic for an order having multiple items, name, etc -->
  <% if  !current_user.orders.blank? %>
    <% current_user.orders.each do |order| %>
    <!-- Here you should apply code that will Display the name of the order, clickable link for order details etc -->
      order.user_id
    <% end %>
  <% end %>

  <% current_user %>
  <% if  !current_user.orders.blank? %>
    <% current_user.orders.each do |order| %>

<%= order.item_id %>

    <% end %>
  <% end %>

Change order show page so it displays the correct information


<% if signed_in? %>

    You currently follow <%= pluralize(@user.friends_count, 'person') %>. Here are some beautiful pictures of your recent friends:

  <% @friends.each do |friend| %>

<%= image_tag("http://img.tweetimag.es/i/#{friend.screen_name}_m", :alt => friend.name).html_safe %>

  <% end %>

  <%= form_tag('/follows', :method => :post) do %>
    <%= label_tag 'list', 'Enter a Twitter list:'%>
    @<%= text_field_tag 'list', 'codeforamerica/fellows-2011', :size => 28 %>
    <%= submit_tag 'Follow all members of this list!', :name => 'follow' %>
    <%= label_tag 'follow', 'Note: This may take a few seconds to process, especially if you have a lot of friends.' %>
  <% end %>
  <%= form_tag('/sessions/destroy', :method => :delete) do %>
    <%= submit_tag 'Sign out' %>
  <% end %>
<% else %>

    Follow All is a simple Twitter app that allows you to enter the name of any
    public list on Twitter and then, with a single press of a button, follow all
    the members of that list.

    To get started, you'll need to authenticate with Twitter by pressing the
    button below.

  <%= form_tag('/sessions') do %>
    <%= image_submit_tag("sign-in-with-twitter.png") %>
  <% end %>
<% end %>

<% if signed_in? %>

    You currently follow <%= pluralize(@user.friends_count, 'person') %>. Here are some beautiful pictures of your recent friends:

  <% @friends.each do |friend| %>

<%= image_tag("http://img.tweetimag.es/i/#{friend.screen_name}_m", :alt => friend.name).html_safe %>

  <% end %>

  <%= form_tag('/follows', :method => :post) do %>
    <%= label_tag 'list', 'Enter a Twitter list:'%>
    @<%= text_field_tag 'list', 'codeforamerica/team', :size => 20 %>
    <%= submit_tag 'Follow all members of this list!', :name => 'follow' %>
    <%= label_tag 'follow', 'Note: This may take a few seconds to process, especially if you have a lot of friends.' %>
  <% end %>
  <%= form_tag('/sessions/destroy', :method => :delete) do %>
    <%= submit_tag 'Sign out' %>
  <% end %>
<% else %>

    Follow All is a simple Twitter app that allows you to enter the name of any
    public list on Twitter and then, with a single press of a button, follow all
    the members of that list.

    To get started, you'll need to authenticate with Twitter by pressing the
    button below.

  <%= form_tag('/sessions') do %>
    <%= image_submit_tag("sign-in-with-twitter.png") %>
  <% end %>
<% end %>

Change list to @codeforamerica/team (i.e. fellows-2011 ∪ staff)


<% if collections.any? %>

  <% collections.each do |collection| %>
    <% url = "t/fabric/collection/#{collection.name}" %>
    <li id="product_<%= collection.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">

  <% end %>
  <% reset_cycle("classes") %>

<% end %>

<% if collections.any? %>

  <% collections.each do |collection| %>
    <% url = "t/fabric/collection/#{collection.name}" %>
    <li id="product_<%= collection.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
      <%= collection.name %>

  <% end %>
  <% reset_cycle("classes") %>

<% end %>

Add collections controller and view.

Add collections controller and view.


<link rel="stylesheet" type="text/css" href="stylesheets/github.css" />

Code Review

      <%= format_commit_message commit["message"] %>

        <img class="portrait" height="24" width="24" src="<%= gravatar.image_url %>" />
        <%= commit["author"]["name"] %>

        commit
        <a href="<%= commit["url"] %>"><%= commit["id"] %>

    <%= Pygments.highlight diff, lexer: "diff", options: { linespans: "line", lineseparator: "" } %>

      Hyper made this

      Contribute

      License

Fix a bug that caused excessive whtiespace


Ask DBC

  <% if session[:current_user] %>
    <a href="/<%= session[:current_user] %>"> Profile
    Sign Out
  <% else %>
    Log in With Google
  <% end %>

Add Header With Link to Log In with Google


Resources

        Mailing List

        Robolectric 2.4 Javadocs

        Robolectric 3.0 Javadocs

        Robolectric 3.1 Javadocs

Resources

        Mailing List

        Blog

        Twitter

        Robolectric 3.1 Javadocs

        Robolectric 3.0 Javadocs

        Robolectric 2.4 Javadocs

Add blob and twitter back to docs.

Add blob and twitter back to docs.


<% section["sub_sections"].each do |sub_section| %>
  <% if sub_section["title"] %>
    <%= render "govuk_publishing_components/components/heading", {
      text: sub_section["title"],
      heading_level: 4,
      font_size: "s",
      margin_bottom: 4,
    } %>
  <% end %>

    <% sub_section["list"].each do | item | %>

        <% if item["featured_link"] %>
          <%= render 'govuk_publishing_components/components/action_link', {
            simple: true,
            href: item["url"],
            text: item["label"],
            margin_bottom: 1
          }%>
          <% item_description = item["description"] %>
          <% if item_description %>

              <%= item_description %>

          <% end %>
        <% else %>
          <%= link_to(
            item["label"],
            item["url"],
            class: "govuk-link covid__accordion-link"
          ) %>
        <% end %>

    <% end %>

<% end %>

<% section["sub_sections"].each do |sub_section| %>
  <% if sub_section["title"] %>
    <%= render "govuk_publishing_components/components/heading", {
      text: sub_section["title"],
      heading_level: 4,
      font_size: "s",
      margin_bottom: 4,
    } %>
  <% end %>

    <% sub_section["list"].each do | item | %>

        <% if item["featured_link"] %>
          <%= render 'govuk_publishing_components/components/action_link', {
            simple: true,
            href: item["url"],
            text: item["label"],
            margin_bottom: 1
          }%>
          <% item_description = item["description"] %>
          <% if item_description %>

              <%= item_description %>

          <% end %>
        <% else %>
          <%= link_to(
            item["label"],
            item["url"],
            class: "govuk-link covid__accordion-link",
            data: {
              track_category: "pageElementInteraction",
              track_action: "AccordionClick",
              track_label: item["url"],
            }
          ) %>
        <% end %>

    <% end %>

<% end %>

Add tracking for accordion links

Add tracking for accordion links

The data-module="track-click" is already applied on the parent therefore is not required here.


First Comment Title or Author

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Optio, aspernatur, quia modi minima debitis tempora ducimus quam vero impedit alias earum nemo error tenetur sed.

Date or details about this post

Another One

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Optio, aspernatur, quia modi minima debitis tempora ducimus quam vero impedit alias earum nemo error tenetur sed.

Date or details about this post

Change closing h2 tag to p tag on comment detail

This commit changes the closing h2 tag to a closing p tag on the comment
detail section of the comment source.


source 'https://rubygems.org'

gem 'adhearsion', '~> <%= Adhearsion::VERSION.split('.')[0,2].join('.') %>'

# Adhearsion depends on the Punchblock library, but here you can specify the major version your application depends on.
# Exercise care when updating the major version, since you might encounter API compatability in parts of your Adhearsion application that rely on the Punchblock API.
# On occasion, an update of Adhearsion might necessitate an update to Punchblock. You will have to manually allow that here, and take care in the upgrade.
gem 'punchblock', '~> <%= require "punchblock/version"; Punchblock::VERSION.split('.')[0,2].join('.') %>'

# This is here by default due to deprecation of #ask and #menu.
# See http://adhearsion.com/docs/common_problems#toc_3 for details
gem 'adhearsion-asr'

#
# Check http://ahnhub.com for a list of plugins you can use in your app.
# To use them, simply add them here and run `bundle install`.
#

group :development, :test do
  gem 'rspec'
end

source 'https://rubygems.org'

gem 'adhearsion', '~> <%= Adhearsion::VERSION.split('.')[0,2].join('.') %>'

# Exercise care when updating the Punchblock major version, since Adhearsion
# apps sometimes make use of underlying features from the Punchblock API.
# Occasionally an update of Adhearsion will necessitate an update to
# Punchblock; in those cases update this line and test your app thoroughly.
gem 'punchblock', '~> <%= require "punchblock/version"; Punchblock::VERSION.split('.')[0,2].join('.') %>'

# This is here by default due to deprecation of #ask and #menu.
# See http://adhearsion.com/docs/common_problems#toc_3 for details
gem 'adhearsion-asr'

#
# Check http://ahnhub.com for a list of plugins you can use in your app.
# To use them, simply add them here and run `bundle install`.
#

group :development, :test do
  gem 'rspec'
end

Simplify advice and fit within 80 chars

Simplify advice and fit within 80 chars


<%
to_rotate_hourly = @service_port_map.keys
unless to_rotate_hourly.empty?
%>
<%=
to_rotate_hourly.map { |name| "#{ @log_dir }/cdn-#{ name }.log" }.join("\n")
-%>

{
  su root deploy
  rotate 3
  dateext
  dateformat -%Y%m%d-%s
  compress
  size 1
  missingok
  postrotate
    invoke-rc.d rsyslog reload >/dev/null 2>&1 || true
    sleep 10
  endscript
}
<% end %>

<%
to_rotate_hourly = @service_port_map.keys
unless to_rotate_hourly.empty?
%>
<%=
to_rotate_hourly.map { |name| "#{ @log_dir }/cdn-#{ name }.log" }.join("\n")
-%>

{
  su root deploy
  rotate 3
  dateext
  dateformat -%Y%m%d-%s
  compress
  size 1
  copytruncate
  missingok
}
<% end %>

Use copytruncate to rotate CDN logs

Use copytruncate to rotate CDN logs

cf9fd75 moved CDN logs from the `logs-cdn` machine class to
`monitoring`, and also changed the frequency of log rotation from
daily to hourly.

On staging, traffic on the govuk CDN is so slow that frequently an
hour passes with no traffic.  In consequence, the logs are frequently
rotated between checks.  This causes a critical alert as the expected
log file does not exist.

The `copytruncate` option in logrotate causes it to leave the original
file in place, but truncate it.  This solves the alert problem.  As
it's the original file, we don't need to reload rsyslog, as its
current file handles will still be valid.


<% provide(:title, "Anmeldung zum #{current_contest_title}") %>

Für den Landeswettbewerb in Moskau braucht keine erneute Anmeldung ausgefüllt werden! Alle weitergeleiteten Teilnehmer erhalten Ende Januar eine E-Mail mit weiteren Informationen.

Hier kannst du dein Vorspiel für den Regionalwettbewerb <%= JUMU_YEAR %> anmelden. Bei Fragen oder Problemen erreichst du uns am einfachsten über das <%= link_to "Kontaktformular", contact_path %>.

<%= render 'noscript' %>

<%= simple_form_for(@performance, html: { class: "form-horizontal" }) do |form| %>
  <%= render 'performance_fields', { f: form, show_hints: true } %>

    <%= form.button :submit, "Anmeldung absenden", class: "btn-primary" %>

<% end %>

<% provide(:title, "Anmeldung zum #{current_contest_title}") %>

Für den Landeswettbewerb braucht übrigens keine erneute Anmeldung ausgefüllt werden. Alle weitergeleiteten Teilnehmer erhalten rechtzeitig eine E-Mail mit weiteren Informationen.

Hier kannst du dein Vorspiel für den Regionalwettbewerb <%= JUMU_YEAR %> anmelden. Bei Fragen oder Problemen erreichst du uns am einfachsten über das <%= link_to "Kontaktformular", contact_path %>.

<%= render 'noscript' %>

<%= simple_form_for(@performance, html: { class: "form-horizontal" }) do |form| %>
  <%= render 'performance_fields', { f: form, show_hints: true } %>

    <%= form.button :submit, "Anmeldung absenden", class: "btn-primary" %>

<% end %>

Make info text about single signup on signup page less alarmist and year-agnostic


<% content_for :breadcrumbs do %>

<a href="<%= new_scrapbook_search_path(current_scrapbook) %>">Search

Saved roles

<% end %>

Your work search activities

<% current_scrapbook.occupations.each do |occupation| %>
  <section id="<%=occupation.id%>">
    <%= render "occupations/details", occupation: occupation %>

<% end %>

<a href="<%= new_scrapbook_search_path(current_scrapbook) %>" class="link-back">Search again

<% content_for :breadcrumbs do %>

<a href="<%= new_scrapbook_search_path(current_scrapbook) %>">Search

Saved roles

<% end %>

Your work search activities

<% current_scrapbook.occupations.each do |occupation| %>
  <section id="<%=occupation.id%>">
    <%= render "occupations/details", occupation: occupation %>

Remove from list

<% end %>

<a href="<%= new_scrapbook_search_path(current_scrapbook) %>" class="link-back">Search again

Add non-functional "Remove from list" link


<%= link_to petition.action, petition_path(petition) %>

<%= signature_count(:default, petition.signature_count) %>

<%= link_to petition.action, petition_path(petition) %>

<% case petition.state %>
<% when "open" %>

<%= signature_count(:default, petition.signature_count) %>

<% when "closed" %>

<%= signature_count(:default, petition.signature_count) %>, now closed

<% when "rejected" %>

Rejected

<% end %>

Handle petition states on 'All petitions' list


<%-
  settings = {
    apiUrl: application_base_url,
    csrfToken: form_authenticity_token
  }
  if signed_in?
    settings[:userId] = current_user.id
    settings[:email] = current_user.email
    settings[:displayName] = current_user.display_name
    settings[:oauth_consumer_key] = params[:oauth_consumer_key]
  end
%>
<script type="text/javascript">
  window.DEFAULT_SETTINGS = <%= settings.to_json.html_safe %>;
  window.DEFAULT_JWT = '<%= signed_in? ? jwt_token : "" %>';
</script>

<%-
  settings = {
    apiUrl: application_base_url,
    csrfToken: form_authenticity_token
  }
  if signed_in?
    settings[:userId] = current_user.id
    settings[:email] = current_user.email
    settings[:displayName] = current_user.display_name
    settings[:oauthConsumerKey] = params[:oauth_consumer_key]
  end
%>
<script type="text/javascript">
  window.DEFAULT_SETTINGS = <%= settings.to_json.html_safe %>;
  window.DEFAULT_JWT = '<%= signed_in? ? jwt_token : "" %>';
</script>

Use consistent case for settings

Use consistent case for settings


# Stream replication recovery configuration

# Specifies whether to start the server as a standby. In streaming replication,
# this parameter must to be set to on.
standby_mode          = 'on'

# Specifies a connection string which is used for the standby server to connect
# with the primary.
primary_conninfo      = 'host=<%= master_host %> port=<%= master_port %> user=postgres'

# Specifies a trigger file whose presence should cause streaming replication to
# end (i.e., failover)
trigger_file = '/var/lib/postgresql/<%= version %>/trigger'

# Specifies a command to load archive segments from the WAL archive. If
# wal_keep_segments is a high enough number to retain the WAL segments
# required for the standby server, this may not be necessary. But
# a large workload can cause segments to be recycled before the standby
# is fully synchronized, requiring you to start again from a new base backup.
restore_command = '<%= real_restore_command %>'

# Stream replication recovery configuration

# Specifies whether to start the server as a standby. In streaming replication,
# this parameter must to be set to on.
standby_mode          = 'on'

# Specifies a connection string which is used for the standby server to connect
# with the primary.
primary_conninfo      = 'host=<%= master_host %> port=<%= master_port %> user=postgres'

# Specifies a trigger file whose presence should cause streaming replication to
# end (i.e., failover)
trigger_file = '/var/lib/postgresql/<%= version %>/main/trigger'

# Specifies a command to load archive segments from the WAL archive. If
# wal_keep_segments is a high enough number to retain the WAL segments
# required for the standby server, this may not be necessary. But
# a large workload can cause segments to be recycled before the standby
# is fully synchronized, requiring you to start again from a new base backup.
restore_command = '<%= real_restore_command %>'

Put trigger file in the main cluster.

Put trigger file in the main cluster.


description "GOV.UK application: <%= @title %>"

# ideally we'd use the "manual" stanza to disable job startup in
# development, but this stanza was only added in upstart 0.6.7 and
# lucid runs upstart 0.6.5.
<%- if @enable_service -%>
<%- if @depends_on_nfs -%>
start on stopped mountall-net
<%- else -%>
start on runlevel [2345]
<%- end -%>
<%- end -%>
stop on runlevel [!2345]

respawn

# If the app respawns more than 5 times in 20 seconds, it has deeper problems
# and should be killed off.
respawn limit 5 20

script

  exec govuk_setenv "<%= @title %>" govuk_spinup \
    >>/var/log/<%= @title %>/upstart.out.log \
    2>>/var/log/<%= @title %>/upstart.err.log
end script
<%- if @upstart_post_start_script -%>

post-start script
  <%= @upstart_post_start_script %>
end script
<%- end -%>

description "GOV.UK application: <%= @title %>"

<%- if !@enable_service -%>
manual
<%- end -%>

<%- if @depends_on_nfs -%>
start on stopped mountall-net
<%- else -%>
start on runlevel [2345]
<%- end -%>
stop on runlevel [!2345]

respawn

# If the app respawns more than 5 times in 20 seconds, it has deeper problems
# and should be killed off.
respawn limit 5 20

script

  exec govuk_setenv "<%= @title %>" govuk_spinup \
    >>/var/log/<%= @title %>/upstart.out.log \
    2>>/var/log/<%= @title %>/upstart.err.log
end script
<%- if @upstart_post_start_script -%>

post-start script
  <%= @upstart_post_start_script %>
end script
<%- end -%>

Use the manual stanza to disable services

- We no longer use Lucid, so `manual` is supported.


<%= @matches %> {
  <%- if @user && @group -%>
  su <%= @user -%> <%= @group %>
  <%- end -%>
  daily
  missingok
  rotate <%= @days_to_keep %>
  compress
  <%- if @delaycompress -%>
  delaycompress
  <%- end -%>
  <%- if @rotate_if_empty -%>
  ifempty
  <%- else -%>
  notifempty
  <%- end -%>
  <%- if @copytruncate -%>
  copytruncate
  <%- end -%>
  <%- if @create -%>
  create <%= @create %>
  <%- end -%>
  <%- if @sharedscripts -%>
  sharedscripts
  <%- end -%>
  <%- if @prerotate -%>
  prerotate
    <%= @prerotate %>
  endscript
  <%- end -%>
  <%- if @postrotate -%>
  postrotate
    <%= @postrotate %>
  endscript
  <%- end -%>
  <%- if @maxsize -%>
  maxsize <%= @maxsize %>
  <%- end -%>
}

<%= @matches %> {
  <%- if @user && @group -%>
  su <%= @user -%> <%= @group %>
  <%- end -%>
  daily
  missingok
  rotate <%= @days_to_keep %>
  compress
  <%- if @delaycompress -%>
  delaycompress
  <%- end -%>
  <%- if @rotate_if_empty -%>
  ifempty
  <%- else -%>
  notifempty
  <%- end -%>
  <%- if @copytruncate -%>
  copytruncate
  <%- end -%>
  <%- if @create -%>
  create <%= @create %>
  <%- end -%>
  <%- if @sharedscripts -%>
  sharedscripts
  <%- end -%>
  <%- if @prerotate -%>
  prerotate
    <%= @prerotate %>
  endscript
  <%- end -%>
  <%- if @postrotate -%>
  postrotate
    <%= @postrotate %>
  endscript
  <%- end -%>
  <%- if @maxsize -%>
  maxsize <%= @maxsize %>
  <%- end -%>
  firstaction
    # Remove empty .1 log files. There seems to be an issue where logrotate
    # will refuse to rotate the logs if an empty .1 log file exists.
    find <%= @matches %>* -wholename '/var/log/*' -name '*.1' -size 0 -delete
  endscript
}

Remove empty .1 log files before rotating

There seems to be a problem with logrotate whereby it will refuse
to rotate the log files if an empty .1 log file exists. This leads to
increase disk space being used by log files and can cause the disk to
fill up.

This fix should mean that all empty .1 log files are deleted before
logrotate runs which should allow it to finish successfully.


        <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path %>

        <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path %>

        <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path %>

        <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path %>

        <%= render partial: 'catalog/search_form' %>

        <li <%= 'class=active' if current_page?(hyrax.root_path) %>>
          <%= link_to t(:'hyrax.controls.home'), hyrax.root_path, aria: current_page?(hyrax.root_path) ? {current: 'page'} : nil %>

        <li <%= 'class=active' if current_page?(hyrax.about_path) %>>
          <%= link_to t(:'hyrax.controls.about'), hyrax.about_path, aria: current_page?(hyrax.about_path) ? {current: 'page'} : nil %>

        <li <%= 'class=active' if current_page?(hyrax.help_path) %>>
          <%= link_to t(:'hyrax.controls.help'), hyrax.help_path, aria: current_page?(hyrax.help_path) ? {current: 'page'} : nil %>

        <li <%= 'class=active' if current_page?(hyrax.contact_path) %>>
          <%= link_to t(:'hyrax.controls.contact'), hyrax.contact_path, aria: current_page?(hyrax.contact_path) ? {current: 'page'} : nil %>

        <%= render partial: 'catalog/search_form' %>

Add aria-current=page attribute to static page links in navigation for improved accessibility


We help events reach a more diverse audience. And we help you to find these events.

Because diversity is what makes communities whole.

  <%= link_to events_path, class:"front-apply attendee" do %>

Attendees

Find and apply for upcoming events.

  <% end %>

  <%= link_to new_event_path, class: "front-apply organizer" do %>

Organizers

Submit your upcoming events.

  <% end %>

Revert "fixed lonely dots on frontpage"

Revert "fixed lonely dots on frontpage"

This reverts commit 82e0499b29d142adf0a7d921ac675397aaf9c0f6.


New Word

<%= render 'form' %>

<%= link_to 'Back', word_list_path(@word_list) %>

<%= t(:New_thing, thing: Word.model_name.human) %>

<%= render 'form' %>

<%= link_to t(:Back), word_list_path(@word_list) %>

Add locale for new words

Add locale for new words


#!/usr/bin/env bash

# Use:
# $0 CERTNAME

# Example:
# $0 storage0.internal.staging.swh.network

set -x

CERTNAME=$1
puppet node deactivate $CERTNAME
puppet cert clean $CERTNAME
systemctl restart apache2

#!/usr/bin/env bash

# Use:
# $0 CERTNAME ...

# Example:
# $0 storage0.internal.staging.swh.network db0.internal.staging.swh.network

set -x

puppet node clean $@
puppet cert clean $@
systemctl restart apache2

Improve puppet clean script to clean up exported resources as well

And make the script multi input parametric


        Money Advice Service

      <%= render 'shared/social_links' %>

Convert small mas logo to icon

Convert small mas logo to icon


<% id ||= "failures" %>
<% title ||= "Error codes (web)" %>
<section id="<%= id %>" class="failures">

<%= title %>

Data source: DVLA database

Shows errors that have been logged in the web transaction. More than one error may be logged per user.

Split text across two lines

Split text across two lines


<%= page_heading :h1, 'Submit a Game' %>

<%= render 'form' %>

<%= page_heading :h1, 'Submit a Game' %>

    Wondering about Winnitron game requirements?

      Check out our wiki.

<%= render 'form' %>

Add link to requirements on games/new

Add link to requirements on games/new


      <input class="stack-search" placeholder="Search <%= @stacks.size %> stacks" />

Name

Environment

Deploy URL

      <% @stacks.each do |stack| %>
        <li class="search-item" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>">
          <%= link_to stack_path(stack), class: 'commits-path' do %>
            <%= stack.repo_name %>
            <%= stack.environment.capitalize %>
            <%= stack.deploy_url %>
          <% end %>

      <% end %>

    <%= link_to 'Add a stack', new_stack_path, class: 'btn' %>

      <input class="stack-search" placeholder="Search <%= @stacks.size %> stacks" />

Name

Environment

Deploy URL

      <% @stacks.each do |stack| %>
        <li class="search-item" data-search="<%= stack.repo_name %> <%= stack.environment %> <%= stack.deploy_url %>" data-stack-id="<%= stack.id %>">
          <%= link_to stack_path(stack), class: 'commits-path' do %>
            <%= stack.repo_name %>
            <%= stack.environment.capitalize %>
            <%= stack.deploy_url %>
          <% end %>

      <% end %>

    <%= link_to 'Add a stack', new_stack_path, class: 'btn' %>

Add stack ids in stacks index for debugging purpose


<% text_for :title do %>
  Find out what support you can get if you’re affected by coronavirus
<% end %>

<% text_for :meta_description do %>
  Find advice and support about redundancy and your rights, being out of work, paying rent or bills, and mental health.
<% end %>

<% govspeak_for :body do %>
  Use this service to find out what help and advice you can get from the government and other organisations. You can use it for yourself or someone else.

  You can find support with:

  * what to do if you’re feeling unsafe where you live, or if you’re worried about someone else
  * paying your bills, rent, or mortgage
  * getting food
  * being made redundant or unemployed, or not having any work
  * what to do if you’re worried about going in to work
  * having somewhere to live
  * mental health and wellbeing, including information for children

  ^If you need medical help, [go to NHS 111 online](https://111.nhs.uk/service/COVID-19).

  You will not get direct support from the government or organisations through this service.
<% end %>

<% text_for :title do %>
  Find out what support you can get if you’re affected by coronavirus
<% end %>

<% text_for :meta_description do %>
  Find advice and support about redundancy and your rights, being out of work, paying rent or bills, and mental health.
<% end %>

<% govspeak_for :body do %>
  Use this service to find out what help and advice you can get from the government and other organisations. You can use it for yourself or someone else.

  You can find support with:

  * what to do if you’re feeling unsafe where you live, or if you’re worried about someone else
  * paying your bills, rent, or mortgage
  * getting food
  * being made redundant or unemployed, or not having any work
  * what to do if you’re worried about going in to work
  * self-isolating
  * having somewhere to live
  * mental health and wellbeing, including information for children

  ^If you need medical help, [go to NHS 111 online](https://111.nhs.uk/service/COVID-19).

  You will not get direct support from the government or organisations through this service.
<% end %>

Add self isolating as separate bullet

Add self isolating as separate bullet

To make it clear you can get support with that here and match the way we are separating out the questions


<%= render_region :header do -%>
  Header
<% end -%>

  <%= render_region :content, tag: :article do %>
    Add content here
  <% end %>

Add ids to default template in install generator


doctype html
html
  head
    title= page_title
    meta charset="utf-8"
    = stylesheet_link_tag :application, :media => 'all'
    = csrf_meta_tags

  body class=body_class
    = render 'flashes'
    = yield

    = javascript_include_tag :application
    = yield :javascript

doctype html
html
  head
    title= page_title
    meta charset="utf-8"
    = stylesheet_link_tag :application, :media => 'all'
    = csrf_meta_tags

  body class=body_class
    = render 'application/flashes'
    = yield

    = javascript_include_tag :application
    = yield :javascript

Fix flash partial in application layout

Fix flash partial in application layout


The [Buildkite Elastic CI Stack](https://github.com/buildkite/elastic-ci-stack-for-aws)
gives you a private, autoscaling Buildkite Agent cluster. Use it to parallelize
legacy tests across hundreds of nodes, run tests and deployments for all your
Linux-based services and apps, or run AWS ops tasks.

The latest build of the stack template can be launched in your AWS account with
the following button:

Make it open in a new windows

Make it open in a new windows


<%= form_for supporting_page, url: supporting_page.persisted? ? admin_edition_supporting_page_path(@edition, supporting_page.id) : admin_edition_supporting_pages_path(@edition), as: disabled ? :disabled_supporting_page : :supporting_page do |form| %>
  <%= form.errors %>
  <%= form.hidden_field :lock_version %>
  <%= form.text_field :title, disabled: disabled %>
  <%= form.text_area :body, disabled: disabled, class: disabled ? "" : "previewable" %>

  <%= render partial: "admin/admin/attachment_fields", locals: { form: form, edition: supporting_page, parent_type: :supporting_page, show_inline_attachment_help: supporting_page.allows_inline_attachments? } %>

  <% unless disabled %>
    <%= form.save_or_cancel cancel: (supporting_page.new_record? ? admin_edition_path(@edition) : admin_supporting_page_path(supporting_page))%>
  <% end %>
<% end %>

<%= form_for supporting_page, url: supporting_page.persisted? ? admin_edition_supporting_page_path(@edition, supporting_page.id) : admin_edition_supporting_pages_path(@edition), as: disabled ? :disabled_supporting_page : :supporting_page do |form| %>
  <%= form.errors %>
  <%= form.hidden_field :lock_version %>
  <%= form.text_field :title, disabled: disabled %>
  <%= form.text_area :body, disabled: disabled, class: disabled ? "" : "previewable" %>

  <%= render partial: "admin/shared/attachment_fields", locals: { form: form, edition: supporting_page, parent_type: :supporting_page, show_inline_attachment_help: supporting_page.allows_inline_attachments? } %>

  <% unless disabled %>
    <%= form.save_or_cancel cancel: (supporting_page.new_record? ? admin_edition_path(@edition) : admin_supporting_page_path(supporting_page))%>
  <% end %>
<% end %>

Fix typo in form partial

Fix typo in form partial


Interviews

<% if @counts %>

By year

	<% for row in @counts %>

			<a href="/interviews/in/<%= row['year'] %>" title="View all the interviews from <%= row['year'] %>."><%= row['year'] %> (<%= row['count'] %> interview<% if row['count'] != 1 %>s<% end %>)

	<% end %>

<% end %>

<% if @categories %>

By category

		<% for category in @categories %>
			<a href="/interviews/<%= category.slug %>/" rel="<%= category.slug %>" title="View all of the '<%= category.slug %>' interviews."><%= category.slug %>
		<% end %>

<% end %>

Interviews

There are currently <%= @counts['total'] %> interviews on the site.

By year

	<% for year, count in @counts['years'] %>

			<a href="/interviews/in/<%= year %>" title="View all the interviews from <%= year %>."><%= year %> (<%= count %> interview<% if count != 1 %>s<% end %>)

	<% end %>

By category

		<% for category in @categories %>
			<a href="/interviews/<%= category.slug %>/" rel="<%= category.slug %>" title="View all of the '<%= category.slug %>' interviews."><%= category.slug %>
		<% end %>

Use the new count variables, and show a total count.


<%= t('new_article.subject') %>

	<%= form_for :article, url: '/articles' do |f| %>

		<% if @article && @article.errors.any? %>

					<% @article.errors.full_messages.each do |msg| %>

<%= msg %>

					<% end %>

		<% end %>

			<%= f.label :title %>

			<%= f.text_field :title %>

			<%= f.label :text %>

			<%= f.text_area :text %>

			<%= f.submit %>

	<% end %>

<%= t('new_article.subject') %>

	<%= form_for :article, url: '/articles' do |f| %>

		<% if @article && @article.errors.any? %>

					<% @article.errors.full_messages.each do |msg| %>

<%= msg %>

					<% end %>

		<% end %>

			<%= f.label :title %>

			<%= f.text_field :title %>

			<%= f.label :text %>

			<%= f.text_area :text %>

			<%= f.submit 'Create article' %>

	<% end %>

Change submit button text on new article page


<!DOCTYPE html>

    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />

    <title><%= content_for?(:title) ? yield(:title) : "Wine" %></title>

    <%= stylesheet_link_tag    "application" %>
    <%= javascript_include_tag "vendor/modernizr" %>
    <%= csrf_meta_tags %>

Wine Tasting App

Tutorial

      <% if session[:user_id] %>

My Events

<a href='/users/<%="#{session[:user_id]}"%>/edit'>My Account

Log Out

      <% end %>

      <%= yield %>
      <%= javascript_include_tag "application" %>

Add tutorial link to home layout page

Add tutorial link to home layout page


<% if details.show_live_stream? %>
  <%= render partial: 'coronavirus_landing_page/components/landing_page/live_stream', locals: {
    details: details.live_stream
  } %>
<% else %>

      <%= render "govuk_publishing_components/components/heading", {
        text: "The next live press conference will be shown here",
        heading_level: 2,
        font_size: 19,
        inverse: true,
        margin_bottom: 0
      } %>

          View past coronavirus press conferences on YouTube

<% end %>

<% if details.show_live_stream? %>
  <%= render partial: 'coronavirus_landing_page/components/landing_page/live_stream', locals: {
    details: details.live_stream
  } %>
<% else %>

      <%= render "govuk_publishing_components/components/heading", {
        text: details.live_stream["previous_videos"]["next_conference_text"],
        heading_level: 2,
        font_size: 19,
        inverse: true,
        margin_bottom: 0
      } %>

        <a href="<%= details.live_stream["previous_videos"]["url"] %>" class="govuk-link covid__page-header-link">
          <%= details.live_stream["previous_videos"]["previous_videos_text"] %>

<% end %>

Add previous video text from content item


Listing <%= plural_table_name %>

  <% attributes.each do |attribute| -%>
      <%= attribute.human_name %>
  <% end -%>

    <%%= content_tag_for(:tr, @<%= plural_table_name %>) do |<%= singular_table_name %>| %>
  <% attributes.each do |attribute| -%>
      <%%= <%= singular_table_name %>.<%= attribute.name %> %>
  <% end -%>
      <%%= link_to 'Show', <%= singular_table_name %> %>
      <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %>
      <%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %>
    <%% end %>

<%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>

Fix indention issue in generated template


<div class="doll-block" id="<%= doll.id %>">

<%= doll.name %>

	<button class="pin-it">pin it</button>
	<button class="story">story</button>

	OWW!

 <%= doll.pins %>

<%= doll.story %>

	<button action="/doll/<%= doll.id %>"  name="_method" value="delete">delete</button>

<div class="doll-block" id="<%= doll.id %>">

<%= doll.name %>

	<button class="pin-it">pin it</button>

	OWW!

 <%= doll.pins %>

<%= doll.story %>

	<button action="/doll/<%= doll.id %>"  name="_method" value="delete">delete</button>

Remove story button from doll block

Remove story button from doll block


<% set_meta_tags(title: 'Accessibility Statement') %>

<% content_for(:editorial) do %>
  <% if Feature.active?(:accessibility_statement) %>

Accessibility Statement

  <% end %>
<% end %>

<%= render template: '/static_pages/show' %>

Add EN template and feature toggle for accessibility statement


  <%= render 'subscribe' %>

    <% @categories.each do |cat| %>

<%= cat.name.camelize %>

        <a class="dropdown-toggle" id="catDD<%= cat.id %>" href="#" role="button" data-toggle="dropdown">

        <ul class="dropdown-menu" role="menu" aria-labelledby="catDD<%= cat.id %>">

<%= link_to "Mark as read", "#" %>

<%= link_to "Refresh feeds", "#" %>

          <% unless cat.name == Category.default %>

<%= link_to "Remove category", "#", :'data-id' => cat.id, :class => "rm-cat" %>

          <% end %>

        <%= render 'feeds_title', feeds: cat.feeds %>

    <% end %>

  <%= render 'subscribe' %>

     <%= link_to '/' do %>Latest Entries<% end %>

    <% @categories.each do |cat| %>

<%= cat.name.camelize %>

        <a class="dropdown-toggle" id="catDD<%= cat.id %>" href="#" role="button" data-toggle="dropdown">

        <ul class="dropdown-menu" role="menu" aria-labelledby="catDD<%= cat.id %>">

<%= link_to "Mark as read", "#" %>

<%= link_to "Refresh feeds", "#" %>

          <% unless cat.name == Category.default %>

<%= link_to "Remove category", "#", :'data-id' => cat.id, :class => "rm-cat" %>

          <% end %>

        <%= render 'feeds_title', feeds: cat.feeds %>

    <% end %>

Add link to index page.

Add link to index page.


<%= link_to "\##{quote.id}", quote %>

  <% if quote.description? %>

<%= quote.description %>

  <% end %>

    <% quote.lines.each do |line| %>
      <% if line.action? %>

      <% else %>

      <% end %>

      <a href="/quotes/person/<%= line.person.name %>"><%= line.person.name %>
      <%= auto_link(line.body) %>

    <% end %>

    <%= link_to 'Edit', edit_quote_path(quote) %> |
    <%= link_to 'Delete', quote, confirm: 'Are you sure?', method: :delete %>

<%= link_to "\##{quote.id}", quote %>

  <% if quote.description? %>

<%= auto_link(quote.description) %>

  <% end %>

    <% quote.lines.each do |line| %>
      <% if line.action? %>

      <% else %>

      <% end %>

      <a href="/quotes/person/<%= line.person.name %>"><%= line.person.name %>
      <%= auto_link(line.body) %>

    <% end %>

    <%= link_to 'Edit', edit_quote_path(quote) %> |
    <%= link_to 'Delete', quote, confirm: 'Are you sure?', method: :delete %>

Use auto_link for quote description

Use auto_link for quote description


<% text_for :title do %>
  You’ll need a visa to come to the UK
<% end %>

<% govspeak_for :body do %>
  <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>

  <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>

  Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.

  If you want to live in the UK permanently, you must apply for a [family of a settled person visa](/join-family-in-uk) if your partner is any of the following:

  - a British citizen
  - settled in the UK
  - someone with humanitarian protection, for example if they have refugee status
<% end %>

<% text_for :title do %>
  You’ll need a visa to come to the UK
<% end %>

<% govspeak_for :body do %>
  <%= render partial: 'stateless_or_refugee', locals: {calculator: calculator} %>

  <%= render partial: 'estonia_or_latvia', locals: {calculator: calculator} %>

  Apply for a [Marriage Visitor visa](/marriage-visa) if you and your partner want to get married or enter into a civil partnership in the UK.

  If you want to live in the UK permanently, you must apply for a [family visa](/join-family-in-uk) if your partner:

  + is a British citizen
  + is settled in the UK (called having ‘indefinite leave to remain’)
  + has settled or pre-settled status under the EU Settlement Scheme
  + has a Turkish worker or businessperson visa
<% end %>

Update outcome for visa national marriage outcome


<?xml version='1.0' encoding='UTF-8'?>
<project>
<%= githubProject(
  repoUser:    @user,
  repoName:    "dotty",
  repoRef:     @branch,
  description: "PR validation",
  nodeRestriction: "public",
  params: [
    {:name => "_scabot_pr", :desc => "For internal use by Scabot."}
  ],
  jvmVersion: 8,
  jvmFlavor:  "openjdk",
  buildNameScript: setValidateBuildNameScript)
%>
</project>

<?xml version='1.0' encoding='UTF-8'?>
<project>
<%= githubProject(
  repoUser:    @user,
  repoName:    "dotty",
  repoRef:     @branch,
  description: "PR validation",
  nodeRestriction: "public",
  params: [
    {:name => "_scabot_pr", :desc => "For internal use by Scabot."}
  ],
  jvmVersion: 8,
  jvmFlavor:  "openjdk",
  buildNameScript: setValidateBuildNameScript)
%>
  <publishers>
    <hudson.tasks.ArtifactArchiver>
      <artifacts>tests/partest-generated/**</artifacts>
      <allowEmptyArchive>false</allowEmptyArchive>
      <onlyIfSuccessful>false</onlyIfSuccessful>
      <fingerprint>false</fingerprint>
      <defaultExcludes>true</defaultExcludes>
    </hudson.tasks.ArtifactArchiver>
  </publishers>
</project>

Archive bootstrapped partest output dir

Archive bootstrapped partest output dir


<%= t('profile.one') %>

<% if (@profile.subject.tag_list.count > 0) or (is_owner?) %>
  <%= render :partial => "tags" %>
<% end %>

<% if (!is_personal_empty?) or(is_owner?) %>
  <%= render :partial => "personal" %>
<% end %>

<% if (!is_contact_empty?) or(is_owner?) %>
  <%= render :partial => "contact" %>
<% end %>

<% if (@profile.experience?) or(is_owner?) %>
  <%= render :partial => "experience" %>
<% end %>

<% if is_owner? %>

    <%= t('avatar.profile_change') %>

      <%= link_to (image_tag('edit_icon.png', :class=>"unborder")), :controller => "avatars", :action => "index" %>

<% end %>

Fix stray box in profile view

Fix stray box in profile view


<a href="<%= courses_path %>" class="menu-item-title">
  <%= @current_user.menu_data[:group_memberships_count].zero? ? t('links.courses', "Courses") : t('links.courses_and_groups', "Courses & Groups") -%>

      <%= render(:partial => "shared/menu_courses", :locals => menu_courses_locals) %>
      <%= render(:partial => "shared/menu_section", :locals => menu_groups_locals) %>
      <%= render(:partial => "shared/menu_section", :locals => menu_accounts_locals) %>

<a href="<%= dashboard_path %>" class="menu-item-title">
  <%= @current_user.menu_data[:group_memberships_count].zero? ? t('links.courses', "Courses") : t('links.courses_and_groups', "Courses & Groups") -%>

      <%= render(:partial => "shared/menu_courses", :locals => menu_courses_locals) %>
      <%= render(:partial => "shared/menu_section", :locals => menu_groups_locals) %>
      <%= render(:partial => "shared/menu_section", :locals => menu_accounts_locals) %>

Revert "update behavior of "courses" link in main navigation."

we're going to readdress this when we redo the dashboard. refs #10453

This reverts commit f24d71c6ee0f614fc0d92414d9e5162f3a58144f.

Change-Id: I5002b187aecf9a35154804564a5df463d50e073e
Reviewed-on: https://gerrit.instructure.com/13920
Tested-by: Jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@instructure.com>
Reviewed-by: Joe Tanner <16a9a54ddf4259952e3c118c763138e83693d7fd@instructure.com>


<%= link_to new_event_instance_path do %>
  <button class="button-add">Add an event</button>
<% end %>

<% @events.each do |event| %>

<%= link_to event.name, event %>

<% end %>

<% events_columns = @events.in_groups(4, false) %>
<%= link_to new_event_instance_path do %>
  <button class="button-add">Add an event</button>
<% end %>

    <% events_columns[0].each do |event| %>

<%= link_to event.name, event %>

    <% end %>

    <% events_columns[1].each do |event| %>

<%= link_to event.name, event %>

    <% end %>

    <% events_columns[2].each do |event| %>

<%= link_to event.name, event %>

    <% end %>

    <% events_columns[3].each do |event| %>

<%= link_to event.name, event %>

    <% end %>

Add columns to Events index page

Add columns to Events index page


    <form role="form" action="<%= search_path %>" method="get">

            <%= label_tag :course, "I'm looking for a course..." %>
            <%= text_field_tag :course, params[:course], :class => 'form-control', :placeholder => "biology, sociology, Oxford, China..." %>

            <%= submit_tag "Search!", :name => nil, :class => "btn btn-default" %>

    </form>

<% if params[:course] != nil && params[:course] != '' %>

    <% if @courses.count > 0 %>

Results

    <%= render @courses %>

        <%= will_paginate @courses, renderer: BootstrapPagination::Rails %>

    <% else %>

Nothing turned up!

    <% end %>

<% end %>

    <form role="form" action="<%= search_path %>" method="get">

            <%= label_tag :course, "I'm looking for a course..." %>
            <%= text_field_tag :course, params[:course], :class => 'form-control', :placeholder => "biology, sociology, Oxford, China..." %>

            <%= submit_tag "Search!", :name => nil, :class => "btn btn-default" %>

    </form>

    <% if ENV['DEMO_MODE'] == 'true' %>

DEMO MODE

Use these credentials to log in as an admin:

        Email: <%= ENV['DEMO_USER'] %>

        Password: <%= ENV['DEMO_PASS'] %>

    <% end %>

<% if params[:course] != nil && params[:course] != '' %>

    <% if @courses.count > 0 %>

Results

    <%= render @courses %>

        <%= will_paginate @courses, renderer: BootstrapPagination::Rails %>

    <% else %>

Nothing turned up!

    <% end %>

<% end %>

Add option for demo mode

Add option for demo mode


<%= display_header title: 'Taxons', breadcrumbs: ['Taxons'] do %>
  <%= link_to 'Add a taxon', new_taxon_path, class: 'btn btn-lg btn-default' %>
<% end %>

      Title
      Content ID

    <%= render partial: 'shared/table_filter' %>

    <% taxons.each do |taxon| %>

        <%= taxon['title'] %>
        <%= taxon['content_id'] %>
        <%= link_to 'View tagged content', taxon_path(taxon['content_id']), class: 'view-tagged-content' %>
        <%= link_to 'Edit taxon', edit_taxon_path(taxon['content_id']) %>
        <%= link_to 'Delete', taxon_path(taxon['content_id']),
            method: :delete,
            data: { confirm: I18n.t('messages.views.confirm') },
            class: 'btn btn-danger' %>

    <% end %>

<%= display_header title: 'Taxons', breadcrumbs: ['Taxons'] do %>
  <%= link_to 'Add a taxon', new_taxon_path, class: 'btn btn-lg btn-default' %>
<% end %>

      Title
      Content ID

    <%= render partial: 'shared/table_filter' %>

    <% taxons.each do |taxon| %>

        <%= taxon['title'] %>
        <%= link_to taxon['content_id'], "#{website_url('/api/content' + taxon['base_path'])}" %>
        <%= link_to 'View tagged content', taxon_path(taxon['content_id']), class: 'view-tagged-content' %>
        <%= link_to 'Edit taxon', edit_taxon_path(taxon['content_id']) %>
        <%= link_to 'Delete', taxon_path(taxon['content_id']),
            method: :delete,
            data: { confirm: I18n.t('messages.views.confirm') },
            class: 'btn btn-danger' %>

    <% end %>

Add link to content store in taxons list

It's convenient to see the content store representation for these
taxons. The content ID values aren't currently linked to anything so
let's have them point to the content store until a better alternative
emerges.


<%= display_header title: t('views.taxons.title'), breadcrumbs: [t('navigation.taxons')] do %>
  <%= link_to new_taxon_path, class: 'btn btn-default' do %>

      <%= I18n.t('views.taxons.add_taxon') %>

  <% end %>
<% end %>

<%= render 'taxons/search', query: query %>

      Taxon

    <% taxons.each do |taxon| %>

        <%= taxon.internal_name %>
        <%= link_to I18n.t('views.taxons.view'), taxon_path(taxon.content_id) %>
        <%= link_to I18n.t('views.taxons.edit'), edit_taxon_path(taxon.content_id) %>

    <% end %>

<%= paginate search_results, theme: 'twitter-bootstrap-3' %>

<%= display_header title: t('views.taxons.title'), breadcrumbs: [t('navigation.taxons')] do %>
  <%= link_to new_taxon_path, class: 'btn btn-default' do %>

      <%= I18n.t('views.taxons.add_taxon') %>

  <% end %>
<% end %>

<%= render 'taxons/search', query: query %>

      Taxon

    <% taxons.each do |taxon| %>

        <%= taxon.internal_name %>
        <%= link_to I18n.t('views.taxons.view'), taxon_path(taxon.content_id) %>
        <%= link_to I18n.t('views.taxons.edit'), edit_taxon_path(taxon.content_id) %>
        <%= link_to I18n.t('views.taxons.move_content'), new_taxon_migration_path(source_content_id: taxon.content_id) %>

    <% end %>

<%= paginate search_results, theme: 'twitter-bootstrap-3' %>

Add 'Move content' links to the taxons index page

Links to 'Move content' were added to the taxons index page to make this
option easier to find.

Trello: https://trello.com/c/vpviEqKv/372-content-tagger-increase-the-prominence-of-the-move-content-link


Topics

    <% @topics.each do |topic| %>

<%= link_to( topic.title , topic_path(topic), :'data-no-turbolink' => true) %>

<%= topic.description %>

    <% end %>

Add header to topics index page

Add header to topics index page


<%= notice %>

<%= @picture.yaml_output %>

Other fields

    User:
    <%= @picture.photographer %>

    Year:
    <%= @picture.year %>

  <%= link_to 'Edit', edit_picture_path(@picture) %> |
  <%= link_to 'Back', pictures_path %>

  <%= link_to 'Add another picture', new_picture_path %>

Add a quicker way to add more

Add a quicker way to add more


Welcome to the Smell of Water

This site is currently under construction...

          The book can be purchased

          <%= link_to("here", "http://www.amazon.com/Smell-Water-twelve-year-old-soldiers-determination/dp/0692407502/ref=sr_1_1?ie=UTF8&qid=1446148539&sr=8-1&keywords=the+smell+of+water", :target => '_blank') %>.

        Welcome to

        The Smell

        of Water

The Book

The Authors

Events

Books in the Works

Contact Us

Photos

      <%= image_tag("email.png", :alt => "email", :class => "image") %>
      <%= image_tag("facebook.png", :alt => "facebook", :class => "image") %>
      <%= image_tag("twitter.png", :alt => "twitter", :class => "image") %>

# <%= link_to("here", "http://www.amazon.com/Smell-Water-twelve-year-old-soldiers-determination/dp/0692407502/ref=sr_1_1?ie=UTF8&qid=1446148539&sr=8-1&keywords=the+smell+of+water", :target => '_blank') %>.

Add HTML for title and menu bar

Add HTML for title and menu bar


Welcome to the Qualification Viewer

<%= link_to "Search qualifications", qualifications_path%>

Welcome to QualificationsViewer!

    <button class="btn btn-block"><%= link_to "Search Qualifications", qualifications_path%></button>

Create divs in welcome view

Create divs in welcome view


<%= form_tag action: 'message' do %>

Suggest a change to <%= @filename %>

  <%= fa_icon 'question-circle' %>
  <%= t 'help.edit' %>

<%= hidden_field_tag "filename", @filename %>

<%= render 'edit_form' %>

<% end %>

<%= form_tag action: 'message' do %>

  <a class='btn btn-success' href='/new/<%= @branch%>'>
    <%= fa_icon 'plus' %>
    Create new file instead

Suggest a change to <%= @filename %>

  <%= fa_icon 'question-circle' %>
  <%= t 'help.edit' %>

<%= hidden_field_tag "filename", @filename %>

<%= render 'edit_form' %>

<% end %>

Add link to create new file instead

Add link to create new file instead


,
      <%= indentation %><%= attribute_name %>_attributes: [:_destroy, :id, <%= permissible %><%= recurse %>]

,
      <%= indentation %><%= defined?(ActiveRecord::ATTRIBUTES_REMOVED) ? attribute_name.pluralize : "#{attribute_name}_attributes"  %>: [:_destroy, :id, <%= permissible %><%= recurse %>]

Make shift fix to not use _attributes

Make shift fix to not use _attributes


Help Us Launch!

Launching a track takes a lot of work and we'd love your help!

  In order to launch we need:

At least 10 problems.

Add a language icon or logo.

Documentation to cover things like documentation and tests.

    At least one person who is willing to check exercism regularly to review new solutions that people submit.

    This will ensure that the track gets off on the right foot.

Add track implementors and other designated code reviewers as mentors to the track.

Toggle active to true in config.json

We always welcome help to get a new track up and running.

  Check out the <a href="<%= track.repository %>/issues/<%= track.checklist_issue %>">Launch Checklist to see what still needs to be done.

Fix help launch view for new tracks

Fix help launch view for new tracks


<%= link_to RacingAssociation.current.short_name, root_path %>

          <% if @posts.present? %>
<%=
            link_to "Mailing Lists", mailing_lists_path %>
<% end %>
<%=
            link_to "Schedule", schedule_path, class: "schedule_link" %>

<%=
            link_to "Results", results_path, class: "results_link" %>
<%
            if mobile_browser? %>
<%=
              link_to "Mobile", mobile_site: "1" %>
<%
            end %>

<%= link_to RacingAssociation.current.short_name, root_path %>

<%= link_to "Join #{RacingAssociation.current.short_name}", membership_new_path %>
<%- if @posts.present? -%>
<%=
            link_to "Mailing Lists", mailing_lists_path %>
<%- end -%>
<%=
            link_to "Schedule", schedule_path, class: "schedule_link" %>

<%=
            link_to "Results", results_path, class: "results_link" %>
<%
            if mobile_browser? %>
<%=
              link_to "Mobile", mobile_site: "1" %>
<%
            end %>

Add Join link to navbar

Add Join link to navbar


<% page_title "People" %>
<% page_class "people-index" %>

    <%= render partial: 'shared/heading',
              locals: { type: "People",
                        heading: "All ministers & senior officials on Inside Government" } %>

      <% @people.group_by {|p| (p.surname || '-').first.upcase }.sort.each do |letter, people_group| %>
        <div class="alphabetical-row" id="people_<%= letter.downcase %>">

<%= letter %>

          <% people_group.each do |person| %>
            <%= content_tag_for :li, person do %>
              <%= person.link %>
            <% end %>
          <% end %>

      <% end %>

<% page_title "People" %>
<% page_class "people-index" %>

    <%= render partial: 'shared/heading',
              locals: { type: "People",
                        heading: "All ministers & senior officials on Inside Government".html_safe,
                        big: true } %>

      <% @people.group_by {|p| (p.surname || '-').first.upcase }.sort.each do |letter, people_group| %>
        <div class="alphabetical-row" id="people_<%= letter.downcase %>">

<%= letter %>

          <% people_group.each do |person| %>
            <%= content_tag_for :li, person do %>
              <%= person.link %>
            <% end %>
          <% end %>

      <% end %>

Fix entities on people index page

Fix entities on people index page


<!DOCTYPE html>

    <%= render :partial => "shared/head" %>

Please authenticate with GitHub to continue using the Issues application.

         <%= t('auth.github_html') %>

<!DOCTYPE html>

    <%= render :partial => "shared/head" %>

I Got Issues Teams, Buckets, and Issues

Please authenticate with GitHub to continue using the Issues application.

         <%= t('auth.github_html') %>

Add header to new session page

Add header to new session page


<%= render partial: 'layouts/alert' %>

        <%= form_tag url: "sessions_create" do %>

              <%= text_field_tag :email, nil, placeholder: "Email" %>

              <%= password_field_tag :password, nil, placeholder: "Password" %>

              <%= submit_tag "Login", class: "button expand"%>

              <%= link_to "Sign up", new_user_path %>

        <% end %>

<%= render partial: 'layouts/alert' %>

        <%= form_tag login_path do %>

              <%= text_field_tag :email, nil, placeholder: "Email" %>

              <%= password_field_tag :password, nil, placeholder: "Password" %>

              <%= submit_tag "Login", class: "button expand"%>

              <%= link_to "Sign up", new_user_path %>

        <% end %>

Change form_tag syntax to be betters. Pass tests


<!DOCTYPE html>

  <title>GoBug</title>

    <%= javascript_include_tag 'application' %>

    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">

    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">

    <link rel="stylesheet" href="/stylesheets/splash.css">

    <%= csrf_meta_tags %>

GoBug

    <%= search_form_for [@trip, @search] do |f| %>

       <%= f.text_field :location_name_cont, placeholder: "What Place Does Your Heart Desire", class: 'location' %>

         <%= f.submit 'On my way', class: 'btn btn-default' %>

  <% end %>

<!DOCTYPE html>

  <title>GoBug</title>

    <%= javascript_include_tag 'application' %>

    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">

    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">

    <link rel="stylesheet" href="/stylesheets/splash.css">

    <%= csrf_meta_tags %>

GoBug

<%= search_form_for @search do |f| %>

    <%= f.text_field :description, placeholder: "Search Keyword" %>

    <%= f.text_field :location_name_cont, placeholder: "Location", class: "location" %>

  <%= f.submit "Search" %>
  <% end %>

Add keyword search to splah page

Add keyword search to splah page


Let's play 500!

  <% @game.hands[:south].each do |card| %>

<%= card.to_s %>

  <% end %>

Let's play 500!

First, we will deal the cards.

Your cards:

  <% @game.hands[:south].each do |card| %>

<%= card.to_s %>

  <% end %>

Now is the bidding phase.

West passes.

North passes.

East passes.

It is now your chance to make a bid.

For now, let's ignore trump suits.

For now, you must make a bid. You cannot pass.

<select>
  <option>6</option>
  <option>7</option>
  <option>8</option>
  <option>9</option>
  <option>10</option>
</select>
<select>
  <option disabled>Spades</option>
  <option disabled>Hearts</option>
  <option disabled>Clubs</option>
  <option disabled>Diamonds</option>
  <option>No Trumps</option>
</select>

Add select element for making a bid

Add select element for making a bid


Hello Guardian

<% if !current_user %>
  <%= link_to 'Register', new_user_registration_path %>
  <%= link_to 'Login', new_user_session_path %>

<% else %>
    <%= button_to "Walk Me Home", new_event_path, method: :get %>
<% end %>

Add whitespace to hoe index

Add whitespace to hoe index


<%= @post.title %> - <%= @post.address %>

<%= @post.content %>

Comments

  <%= comments_tree_for @comments %>

<%= link_to "Add Comment", new_post_comment_path(@post) %>

<%= @post.title %> - <%= @post.address %>

<%= @post.content %>

<% @post.tags.each do |tag| %>
  <%= link_to tag.name, tagged_url(:tag => tag.name) %>
<% end %>

Comments

  <%= comments_tree_for @comments %>

<%= link_to "Add Comment", new_post_comment_path(@post) %>

Add show tags on post description

Add show tags on post description


This is where each individual user profile info will go.  Will have to make it so that users can only see their own profile.

 Username: <%= @user.username%>

 Email: <%= @user.email%>

 Password: <%= @user.password%>

Add basic embedded ruby that displays a users personal information when on their own page


<%= @user.name %>

Next family member's payments...

Your payments include...

<%= @user.name %>

Next family member's payments...

Your payments include the following...

Add bootstrap classes to divs on User show page


## Description:
 Read reliabilty from LogCache fell to {{value}}%

 ## Possible Causes:
## Potential Solutions:
Please refer to our [on call playbook](https://github.com/cloudfoundry/log-cache-rampup/wiki/On-call-Playbook)

##Feedback:
 Have feedback for this alert? [File an issue](https://github.com/pivotal-cf/datadog-config/issues/new) <%= logcache_email %>

<%= environment %> CF: LogCache Reliability is {{value}}%

Question: avg(last_2h):avg:log_cache.blackbox.http_reliability{*} * 100 < 88

Add warning monitor for log cache reliability to keep us informed

- interim while we figure out how to show when the _process_ was last rolled, not the VM in our blackbox job

[#162959287]


#!/bin/bash -e
# Generate an SSH key for the admin user
ADMIN_USER='admin'
ADMIN_EMAIL='admin@localhost'
ADMIN_PASSWORD='<%= rand(36**16).to_s(36) %>'
ADMIN_FULLNAME='Created for puppet'
ADMIN_SSH_KEY='/home/jenkinsworker/.ssh/id_rsa'
JENKINS_CLI='/usr/lib/jenkins/jenkins-cli.jar'
PUPPET_HELPER='/usr/lib/jenkins/puppet_helper.groovy'
HELPER="java -jar $JENKINS_CLI -s http://127.0.0.1:8080 groovy $PUPPET_HELPER"
DONEFILE='/usr/lib/jenkins/jenkins-bootstrap.done'
ADMIN_PUBKEY="$(cat ${ADMIN_SSH_KEY}.pub)"

# Wait for Jenkins to be available
ready () {
  res=$(curl -s 127.0.0.1:8080 | grep html | wc -l 2> /dev/null)
}

ready
while [ "${res}" -lt "1" ]
do
  echo "Waiting for Jenkins to respond"
  sleep 10
  ready
done

# Create the admin user, passing no credentials
$HELPER create_or_update_user "$ADMIN_USER" "$ADMIN_EMAIL" "$ADMIN_PASSWORD" "$ADMIN_FULLNAME" "$ADMIN_PUBKEY"

# Enable security. After this, credentials will be required.
$HELPER set_security full_control

touch $DONEFILE

#!/bin/bash -e
# Generate an SSH key for the admin user
ADMIN_USER='admin'
ADMIN_EMAIL='admin@localhost'
ADMIN_PASSWORD='<%= rand(36**16).to_s(36) %>'
ADMIN_FULLNAME='Created for puppet'
ADMIN_SSH_KEY='/home/jenkinsworker/.ssh/id_rsa'
JENKINS_CLI='/usr/lib/jenkins/jenkins-cli.jar'
PUPPET_HELPER='/usr/lib/jenkins/puppet_helper.groovy'
HELPER="java -jar $JENKINS_CLI -s http://127.0.0.1:8080 groovy $PUPPET_HELPER"
DONEFILE='/usr/lib/jenkins/jenkins-bootstrap.done'
ADMIN_PUBKEY="$(cat ${ADMIN_SSH_KEY}.pub)"

# Wait for Jenkins to be available
ready () {
  res=$(curl -s 127.0.0.1:8080 | grep "Please wait" | wc -l 2> /dev/null)
}

ready
while [ "${res}" -gt "0" ]
do
  echo "Waiting for Jenkins to respond"
  sleep 10
  ready
done

# Create the admin user, passing no credentials
$HELPER create_or_update_user "$ADMIN_USER" "$ADMIN_EMAIL" "$ADMIN_PASSWORD" "$ADMIN_FULLNAME" "$ADMIN_PUBKEY"

# Enable security. After this, credentials will be required.
$HELPER set_security full_control

touch $DONEFILE

Tweak waiting for jenkins loop

Tweak waiting for jenkins loop


<%
  # hardcoding data that is expected to be in the Content Item
  nhs_banner = {
    "sections" => [
      {
        "heading" => "If you have no symptoms:",
        "markdown" => "Check if you should get [regular rapid lateral flow tests](/getting-tested-for-coronavirus).",
      },
      {
        "heading" => "If you have coronavirus symptoms:",
        "markdown" => "- [get a PCR test](/get-coronavirus-test)\n- stay at home",
      }
    ]
  }
%>

    <%= render "govuk_publishing_components/components/organisation_logo", {
      organisation: {
        name: "nhs",
        url: "https://www.nhs.uk/",
        image: {
          url: image_url("nhs-logo.svg"),
          alt_text: "NHS"
        }
      }
    } %>

  <% nhs_banner["sections"].each do |section| %>
    <%= render "govuk_publishing_components/components/heading", {
      text: section["heading"],
      heading_level: 2,
      font_size: "m",
      margin_bottom: 4,
    } if section["heading"].present? %>

    <%= render_govspeak(section["markdown"]) if section["markdown"].present? %>
  <% end %>

Remove NHS Banner hardcoded copy

Remove NHS Banner hardcoded copy

Once this copy is within the Content Item this hardcoding is no longer
necessary. This must not be deployed until
https://github.com/alphagov/govuk-coronavirus-content/pull/587 has been
merged and published as part of the content item.


<% if flash.any? %>

    <% user_facing_flashes.each do |key, value| -%>
      <div class="flash-<%= key %>"><%= value %>

    <% end -%>

<% end %>

Swap flash id for a class

Swap flash id for a class

- Generally speaking, it’s best practice to style off class’s instead of id’s.
- The flash key is already being output as a class; this unifies the two.


Railsn00bs

  <%= link_to(
    'Join the Railn00bs slack community!',
    'https://railsn00bs-slack.herokuapp.com/'
    )
  %>

  <%= link_to(
    'Check out the Railn00bs community projects',
    'https://railsn00bs-wall.herokuapp.com/'
    )
  %>

  <%= link_to(
    'Check out the Railsn00bs github',
    'https://github.com/Railsn00bs'
    )
  %>

Add a link to the Railsn00bs github

Add a link to the Railsn00bs github


  <% for iteration in project.iterations.find( :all, :order => "start_date DESC" ) -%>

      <%= link_to iteration.name, iteration_path( project, iteration ) %>
      <% if project.iterations.find_current == iteration -%>
        (<%= link_to "current", current_iterations_path( project ) %>)
      <% end -%>

  <% end -%>

  <% for iteration in project.iterations.find( :all, :order => "start_date DESC" ) -%>

      <%= link_to iteration.name, iteration_path( project, iteration ) %>
      <% if project.iterations.current == iteration -%>
        (<%= link_to "current", current_iterations_path( project ) %>)
      <% end -%>

  <% end -%>

Extend the project iterations association to be able to find the previous, current, and backlog iterations


<%= render '/hello/shared/settings' %>

Confirm Password to Continue

<%= form_for current_user, url: hello.sudo_mode_path, html: {class: "form-horizontal", role: "form"} do |f| %>

    <%= f.label :username, class: "col-sm-4 control-label" %>

        <%= current_user.username %>

    <%= f.label :password, class: "col-sm-4 control-label" %>

      <%= f.password_field :password, class: "form-control", placeholder: "Password" %>

      <%= f.submit "Confirm Password", class: "btn btn-danger" %>

<% end %>

Add sidebar on sudo mode template

Feature: Add sidebar on sudo mode template


# DO NOT EDIT - This file is being maintained by Chef

instance_name = prometheus.openstreetmap.org

[server]
root_url = https://prometheus.openstreetmap.org/

[security]
admin_user = admin
admin_password = <%= @passwords[:grafana_admin] %>

[smtp]
enabled = true
host = localhost:25
skip_verify = true
from_address = admins@openstreetmap.org
from_name = Prometheus

[auth.anonymous]
enabled = true
org_name = OpenStreetMap
org_role = Viewer

Enable read only anonymous access to prometheus


<%
parent_class = ActiveRecord::Migration
parent_class = parent_class[5.0] if Rails::VERSION::MAJOR >= 5
-%>
class CreateActiveAdminComments < <%= parent_class.to_s %>
  def self.up
    create_table :active_admin_comments do |t|
      t.string :namespace
      t.text   :body
      t.string :resource_id,   null: false
      t.string :resource_type, null: false
      t.references :author, polymorphic: true
      <%- if Rails::VERSION::MAJOR >= 5 -%>
      t.timestamps
      <%- else -%>
      t.timestamps null: false
      <%- end -%>
    end
    add_index :active_admin_comments, [:namespace]
    <%- unless Rails::VERSION::MAJOR >= 5 -%>

    add_index :active_admin_comments, [:author_type, :author_id]
    <%- end -%>

    add_index :active_admin_comments, [:resource_type, :resource_id]
  end

  def self.down
    drop_table :active_admin_comments
  end
end

Indent Ruby code in ERB template

Indent Ruby code in ERB template


describe '<%= cookbook_name %>::default' do
  # The Inspec reference, with examples and extensive documentation, can be
  # found at https://docs.chef.io/inspec_reference.html
  it 'does something' do
    skip 'Replace this with meaningful tests'
  end
end

Remove trailing whitespace from code_gen/skeleton


/*
* Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
*/
/****************************************************************************
* Specify the authentication parameters for admin user
****************************************************************************/
var auth = {};
auth.admin_user = '<%= @keystone_admin_user %>';
auth.admin_password = '<%= @keystone_admin_password %>';
auth.admin_token = '';
auth.admin_tenant_name = '<%= @keystone_admin_tenant_name %>';
module.exports = auth;

Add blank lines as shown by the corresponding upstream file


# Managed by Chef! :heart_eyes_cat:

TAGS=""

<% @languages.map(&:strip).reject(&:empty?).each do |lang| %>
TAGS="$TAGS,language_<%= lang %>:true"
<% end %>

export TAGS

# Managed by Chef! :heart_eyes_cat:

TAGS="packer_chef_solo_time:<%= Time.now.utc.iso8601 %>"

<% @languages.map(&:strip).reject(&:empty?).each do |lang| %>
TAGS="$TAGS,language_<%= lang %>:true"
<% end %>

export TAGS

Add a timestamp from inside chef kinda for funsies


<%= notice %>

Upcoming Meetings

<% if @meetings.size == 0 %>

No meetings have been scheduled yet! Follow @TestRubyPDX on Twitter and you'll be the first to know when we announce one.

<% else %>
  <%= render 'list' %>
<% end %>

<%= notice %>

Upcoming Meetings

Unless otherwise noted, all meetings are held at the office of Renew Financial on the 8th floor of 400 SW 6th Ave., Portland, OR 97202.

<% if @meetings.size == 0 %>

No meetings have been scheduled yet! Follow @TestRubyPDX on Twitter and you'll be the first to know when we announce one.

<% else %>
  <%= render 'list' %>
<% end %>

Add address info to the upcoming meetings page


Messages

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_NEW) %>">
  			<%= link_to "New Messages (#{current_user.messages.where('to_user_id = ? AND opened_at IS NULL', current_user.id).count})", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_NEW) %>

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_OLD) %>">
  			<%= link_to "Inbox", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_OLD) %>

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_SENT) %>">
  			<%= link_to "Sent", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_SENT) %>

Messages

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_NEW) %>">
  			<%= link_to "New Messages (#{Message.where('to_user_id = ? AND opened_at IS NULL', current_user.id).count})", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_NEW) %>

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_OLD) %>">
  			<%= link_to "Inbox", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_OLD) %>

  		<li class="<%= get_nav_link_class('messages', MessagesController::SESSION_FILTER_TYPE_VAR, MessagesController::MESSAGE_TYPE_SENT) %>">
  			<%= link_to "Sent", user_messages_path(current_user, :filter => MessagesController::MESSAGE_TYPE_SENT) %>

Fix count of new messages in sidebar

Fix count of new messages in sidebar


<%
  #--
#   Copyright (C) 2013 Gitorious AS
#
#   This program is free software: you can redistribute it and/or modify
#   it under the terms of the GNU Affero General Public License as published by
#   the Free Software Foundation, either version 3 of the License, or
#   (at your option) any later version.
#
#   This program is distributed in the hope that it will be useful,
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#   GNU Affero General Public License for more details.
#
#   You should have received a copy of the GNU Affero General Public License
#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
#++
  %>

  <%= f.label :flow_token, "Flow token", :class => "control-label" %>

    <%= f.text_field :flow_token, :class => "input-xlarge" %>

    Your flow's token can be found be clicking on the gear icon in your flow.

  <button class="btn btn-primary" type="submit">Save flowdock details</button>

Add form for Flowdock service

Add form for Flowdock service


  <% form_for :user, :url => {:controller => controller, :action => action} do |f| -%>

    <%= f.error_messages -%>

    <%= f.label :user_name %>
    <%= f.text_field :user_name %>

    <%= f.label :user_number %>
    <%= f.text_field :user_number %>

    <%= f.label :last_name %>
    <%= f.text_field :last_name %>

    <%= f.label :first_name %>
    <%= f.text_field :first_name %>

    <input type="hidden" id="user_role" name="user[role]" value="<%= role %>" />

    Submit
    <%= f.submit 'Submit', :name => 'submit' %>

  <% end %>

<%= link_to 'Cancel', :controller => controller %>

  <% form_for :user, :url => {:controller => controller, :action => action} do |f| -%>

    <%= f.error_messages -%>

    <%= f.label :user_name %>
    <%= f.text_field :user_name %>

    <%= f.label :user_number %>
    <%= f.text_field :user_number %>

    <%= f.label :last_name %>
    <%= f.text_field :last_name %>

    <%= f.label :first_name %>
    <%= f.text_field :first_name %>

    <input type="hidden" id="user_role" name="user[role]" value="<%= role %>" />

    <%= f.submit 'Submit', :name => 'submit' %>

  <% end %>

<%= link_to 'Cancel', :controller => controller %>

Remove 'Submit' label of submit button

Remove 'Submit' label of submit button


<% if @fax_result.successful? %>
Your application has been submitted!
<% else %>
Thanks! We didn't actually submit submit your application. Here's why:

<%= @fax_result.message %>
<% end %>

<a href="/applications/<%= @application.unique_key %>">Click here to view your application.

<% if @fax_result.successful? %>
Your application has been submitted!
<% else %>
Thanks! We didn't actually submit your application. Here's why:

<%= @fax_result.message %>
<% end %>

<a href="/applications/<%= @application.unique_key %>">Click here to view your application.

Remove extraneous word from view

Remove extraneous word from view


  <%= past_foreign_secretaries_image.each_slice(4) do |row| %>

    <% row.each do | name, info| %>

        <%= render "govuk_publishing_components/components/image_card", {
          href: info[:href],
          image_src: image_path(info[:image_src]),
          image_loading: "lazy",
          heading_text: info[:heading_text],
          heading_level: 3,
          extra_links: service_date(info[:service]),
          extra_links_no_indent: true
        } %>

    <%end%>

  <% end %>

  <%= past_foreign_secretaries_image.each_slice(4) do |row| %>

    <% row.each do | name, info| %>

        <%= render "govuk_publishing_components/components/image_card", {
          href: info[:href],
          image_src: image_path(info[:image_src]),
          image_loading: "lazy",
          heading_text: info[:heading_text],
          heading_level: 3,
          extra_details: service_date(info[:service]),
          extra_details_no_indent: true
        } %>

    <%end%>

  <% end %>

Fix image_card params for past_foreign_secretaries

Similar problem to c7a192159, see message there for more detail


<!DOCTYPE html>
<html lang="en">
<head>
  <meta charset="utf-8" />
  <base target="_top">
  <title>Redirecting…</title>
  <%= javascript_include_tag('shopify_app/redirect', crossorigin: 'anonymous', integrity: true) %>
</head>
<body>
  <%=
  content_tag(:div, nil,
    name: 'redirection-target',
    data: {
      target: {
        myshopifyUrl: "https://#{current_shopify_domain}",
        url: url,
      },
    },
  )
  %>
</body>
</html>

<!DOCTYPE html>
<html lang="en">
<head>
  <meta charset="utf-8" />
  <base target="_top">
  <title>Redirecting…</title>
  <%= javascript_include_tag('shopify_app/redirect', crossorigin: 'anonymous', integrity: true) %>
</head>
<body>
  <%=
  content_tag(:div, nil,
    id: 'redirection-target',
    data: {
      target: {
        myshopifyUrl: "https://#{current_shopify_domain}",
        url: url,
      },
    },
  )
  %>
</body>
</html>

Change div name property to id

Change div name property to id


<%= div_for swf, :class => 'content_size' do %>

    <%= link_to thumb_for(swf, 130),
                download_document_path(swf),
        :type => swf.type,
                :title => swf.title,
                :path => document_path(swf) %>

          <%= truncate_name(swf.title, :length => 35) %>

        <%= simple_format auto_link(swf.description) %>

<iframe src="<%= swf.file %>" width="470" height="352.5">...

<% end %>

Add swf partial from Social_Stream

Add swf partial from Social_Stream


# Generated by Puppet

<Plugin "tail">
 <File "<%= @filename %>">
  Instance "<%= @instance %>"
<% @matches.each do |match| -%>
  <Match>
   Regex "<%= match['regex'] %>"
   DSType "<%= match['dstype'] %>"
   Type "<%= match['type'] %>"
   Instance "<%= match['instance'] %>"
  </Match>
<% end -%>
 </File>
</Plugin>

# Generated by Puppet

<Plugin "tail">
 <File "<%= @filename %>">
  Instance "<%= @instance %>"
<% @matches.each do |match| -%>
  <Match>
   Regex "<%= match['regex'] %>"
   ExcludeRegex "<%= match['excluderegex'] %>"
   DSType "<%= match['dstype'] %>"
   Type "<%= match['type'] %>"
   Instance "<%= match['instance'] %>"
  </Match>
<% end -%>
 </File>
</Plugin>

Add ExcludeRegex option to tail module

Add ExcludeRegex option to tail module


  Admin > <%= link_to @settings.site_name, root_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'website' %>">
    <%= link_to "Website", admin_website_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'campaigns' %>">
    <%= link_to "Campaigns", admin_campaigns_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'payments' %>">
    <%= link_to "Payment Settings", admin_processor_setup_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'notifications' %>">
    <%= link_to "Notification Settings", admin_notification_setup_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  Admin > <%= link_to @settings.site_name, root_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'campaigns' %>">
    <%= link_to "Campaigns", admin_campaigns_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'website' %>">
    <%= link_to "Website", admin_website_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'payments' %>">
    <%= link_to "Payment Settings", admin_processor_setup_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

  <li class="<%= 'active' if active == 'notifications' %>">
    <%= link_to "Notification Settings", admin_notification_setup_path, :class => 'show_loader', :'data-loader' => "admin_header" %>

Move campaigns tab to first tab

Move campaigns tab to first tab


  <%= render :partial => "bucket", :collection => @buckets %>

    <button class="js-issues-archive" href="<%= archive_prioritized_issues_path %>">Archive closed issues</button>
    <%= link_to "Set this as your default team", set_team_path(:team_id => @team.id) %>

Add link to set default team in buckets view


<%= notice %>

Journal Entry For: <%= @journal.date %>

      <%= simple_format @journal.entry %>

    <%= link_to 'Edit', edit_journal_path(@journal), class: "button round" %> |
    <%= link_to 'Back', journals_path, class: "button round" %>

<%= notice %>

Journal Entry For: <%= @journal.date %>

      <%= simple_format @journal.entry %>

    <%= link_to 'Edit', edit_journal_path(@journal), class: "button round" %>
    <%= link_to 'Back', journals_path, class: "button round" %>

Remove | as separator as the links are now buttons


service rsync
{
	disable         = no
	socket_type     = stream
	wait            = no
	user            = root
	server          = /usr/bin/rsync
	server_args     = --daemon
	log_on_failure  += USERID
}

service rsync
{
    disable         = no
    socket_type     = stream
    wait            = no
    user            = root
    server          = /usr/bin/rsync
    server_args     = --daemon
    cps = 512 10
    flags = IPv4
    per_source = UNLIMITED
    log_on_failure  += USERID
}

Set rsync parameters for nailgun rsync server

Set xinetd parameters for nailgun rsyncd server
as it is configured by separate template

Change-Id: I2e3ccb467d03d4c6f84865b76b649f9455442785
Closes-bug: #1322577


    HTTP
Status
    Path
    Count
    <% if current_user.can_edit?(@site.organisation) %>
      Action
    <% end %>

  <% max = hits.first.count %>

  <% hits.each do |hit| %>

        <abbr title="<%= "#{hit.http_status} — #{Rack::Utils::HTTP_STATUS_CODES[hit.http_status.to_i]}" %>">
          <%= hit.http_status %>

          <%= render partial: 'bar_chart_row', locals: { count: hit.count, max: max, status: hit.http_status } %>
          <%= link_to_hit(hit, @site.default_host) %>

      <%= number_with_delimiter hit.count %>
      <% if current_user.can_edit?(@site.organisation) %>

          <%= link_to 'Check mapping', site_mapping_find_path(@site, path: hit.path), class: 'btn btn-mini' %>

      <% end %>

  <% end %>

Add missing hits table template

Add missing hits table template

- Hits table missing from previous commit


Remove orginal footer nav to replace with social media nav


<%= t :signatures -%>

      <%= form_tag filter_action_page_path(@actionPage), method: 'get' do %>

          <%= collection_select nil, :institution_id, @top_institutions, :id, :name,
          { prompt: t(:filter_by_institution),
            selected: @institution ? @institution.id : "" },
          { class: 'form-control institution',
            style: 'width: 100%',
            "aria-label": t(:filter_by_institution),
            "data-institutions": @institutions.to_json(only: [:id, :name]) }
          -%>
          <% if @institution %>
            <%= link_to 'remove filter', action_page_path, class: 'pull-right small' -%>
          <% end %>

        <%= submit_tag 'Filter', class: 'eff-button' %>
      <% end %>

    <% if @institution %>

<%= @institution.name %>

<%= @institution_signature_count %> signatures

    <% end %>

    <%= render(partial: "tools/signatures", layout: false) %>

    <% if @institution and @institution_signature_count != '0' -%>
      <%= link_to 'Download CSV', institution_action_page_path(@actionPage, @institution, :format => 'csv') -%>
    <% end -%>

Remove link to CSV download from petition actions


#
# This file is managed by puppet class 'uwsgi'
#
# uWSGI Emperor process Upstart script
#
description "uWSGI Emperor"
start on runlevel [2345]
stop on runlevel [!2345]

respawn

pre-start script
    uwsgilog="<%= @log_file %>"
    uwsgipid="<%= @pidfile %>"
    uwsgisocket="<%= @socket %>"
    uwsgilogddir="${uwsgilogd%/*}"
    uwsgipiddir="${uwsgipid%/*}"
    uwsgisocketdir="${uwsgisocket%/*}"
    mkdir -p "$uwsgipiddir"
    mkdir -p "$uwsgisocketdir"
    mkdir -p "$uwsgilogdir"
end script
exec uwsgi --die-on-term --ini <%= @config_file %>

#
# This file is managed by puppet class 'uwsgi'
#
# uWSGI Emperor process Upstart script
#
description "uWSGI Emperor"
start on runlevel [2345]
stop on runlevel [!2345]

respawn

pre-start script
    uwsgilog="<%= @log_file %>"
    uwsgipid="<%= @pidfile %>"
    uwsgisocket="<%= @socket %>"
    uwsgilogdir="${uwsgilog%/*}"
    uwsgipiddir="${uwsgipid%/*}"
    uwsgisocketdir="${uwsgisocket%/*}"
    mkdir -p "$uwsgipiddir"
    mkdir -p "$uwsgisocketdir"
    mkdir -p "$uwsgilogdir"
end script
exec uwsgi --die-on-term --ini <%= @config_file %>

Fix typo in Upstart script

Fix typo in Upstart script


Saving…

Changes Autosaved at <%= DateTime.now.in_time_zone%>

  <%= link_to 'Back to My Datasets', stash_engine.dashboard_path , id: 'dashboard_path', class: 'o-button__icon-left', role: 'button' %>
  <%= link_to 'Proceed to Upload', stash_engine.upload_resource_path(@resource), id: 'upload_path', class: 'o-button__icon-right', role: 'button' %>

  <%= link_to 'Back to My Datasets', stash_engine.dashboard_path , id: 'dashboard_path', class: 'o-button__icon-left', role: 'button' %>

Saving…

All Progress Saved.

  <%= link_to 'Proceed to Upload', stash_engine.upload_resource_path(@resource), id: 'upload_path', class: 'o-button__icon-right', role: 'button' %>

Streamline notification text to 'Saving...' and 'All progress saved.'


<% provide(:title, "Hem") %>

Alla böcker (<%= @books.count %>)

      <%= render @books %>

    <%= will_paginate @books, previous_label: t("föregående"), next_label: t("nästa")%>

Fix layout bug for previous/next-button in the home page


This is where each individual user profile info will go.  Will have to make it so that users can only see their own profile.

<%= link_to "Edit", edit_user_path %> | <%= link_to "Delete", @user, method: :delete %>

 Username: <%= @user.username%>

 Email: <%= @user.email%>

This is where each individual user profile info will go.

<%= link_to "Edit", edit_user_path %> | <%= link_to "Delete", @user, method: :delete %>

 Username: <%= @user.username%>

 Email: <%= @user.email%>

Update user show page with brief message


# Host definitions
#
# Autogenerated by Chef.

<% @nodes.each do |n| -%>
define host {
  use server
  address <%= n['ipaddress'] %>
  host_name <%= n['hostname'] %>
  <% if node['nagios']['multi_environment_monitoring'] -%>
  <% if n.run_list.roles.nil? || n.run_list.roles.length == 0 -%>
  hostgroups all,<%= n.os %>,<%= n.chef_environment %>
  <% if node['nagios']['non_alerting_environments'].include?("#{n.chef_environment}") -%>
  notifications_enabled 0
  <% end -%>
  <% else -%>
  hostgroups <%= n.run_list.roles.to_a.join(",") %>,<%= n.os %>,<%= n.chef_environment %>
  <% if node['nagios']['non_alerting_environments'].include?("#{n.chef_environment}") -%>
  notifications_enabled 0
  <% end -%>
  <% end -%>
  <% elsif -%>
  <% if n.run_list.roles.nil? || n.run_list.roles.length == 0 -%>
  hostgroups all,<%= n.os %>
  <% else -%>
  hostgroups <%= n.run_list.roles.to_a.join(",") %>,<%= n['os'] %>
  <% end -%>
  <% end -%>
}

<% end -%>
<% @unmanaged_hosts.each do |n| -%>
define host {
  use server
  address <%= n['address'] %>
  host_name <%= n['id'] %>
  hostgroups <%= n['hostgroups'].join(",") %>
  notifications_enabled <%= n['notifications'] %>
}

<% end -%>

# Host definitions
#
# Autogenerated by Chef.

<% @nodes.each do |n| -%>
define host {
  use server
  address <%= n['ipaddress'] %>
  host_name <%= n['hostname'] %>
  <% if node['nagios']['multi_environment_monitoring'] -%>
  <% if n.run_list.roles.nil? || n.run_list.roles.length == 0 -%>
  hostgroups all,<%= n.os %>,<%= n.chef_environment %>
  <% else -%>
  hostgroups <%= n.run_list.roles.to_a.join(",") %>,<%= n.os %>,<%= n.chef_environment %>
  <% end -%>
  <% elsif -%>
  <% if n.run_list.roles.nil? || n.run_list.roles.length == 0 -%>
  hostgroups all,<%= n.os %>
  <% else -%>
  hostgroups <%= n.run_list.roles.to_a.join(",") %>,<%= n['os'] %>
  <% end -%>
  <% end -%>
}

<% end -%>
<% @unmanaged_hosts.each do |n| -%>
define host {
  use server
  address <%= n['address'] %>
  host_name <%= n['id'] %>
  hostgroups <%= n['hostgroups'].join(",") %>
  notifications_enabled <%= n['notifications'] %>
}

<% end -%>

Remove the non-alerting host logic. It doesn't really work at the moment.


<% set_meta_tags(title:       article.title,
                 description: article.description,
                 canonical:   article.canonical_url,
                 alternate:   article.alternate_options) %>

<% content_for(:context_bar) do %>
  <% if @breadcrumbs.present? %>
    <%= render 'shared/breadcrumbs', breadcrumbs: @breadcrumbs %>
  <% elsif article.categories.present? %>
    <%= render 'shared/related_categories', categories: article.categories %>
  <% end %>
<% end %>

      <%= heading_tag article.title %>
      <%= article.content %>

      <%= render 'shared/related_links', article: @article, categories: related_content %>

      <%= render 'shared/feedback_panel', article: @article %>

  <%= render 'shared/nav',
             categories:        category_navigation,
             active_categories: active_categories
  %>

<% content_for(:alternate_link) do %>
  <% article.footer_alternate_options.each do |locale, url| %>
    <%= link_to(url, id: "#{locale}Link", lang: locale, class: 'footer-secondary__link') do %>

      <%= t("locales.#{locale}") %>
    <% end %>
  <% end %>
<% end %>

<% set_meta_tags(title:       article.title,
                 description: article.description,
                 canonical:   article.canonical_url,
                 alternate:   article.alternate_options) %>

<% content_for(:context_bar) do %>
  <% if @breadcrumbs.present? %>
    <%= render 'shared/breadcrumbs', breadcrumbs: @breadcrumbs %>
  <% elsif article.categories.present? %>
    <%= render 'shared/related_categories', categories: article.categories %>
  <% end %>
<% end %>

      <%= heading_tag article.title %>
      <%= article.content %>

      <%= render 'shared/related_links', article: @article, categories: related_content %>

      <% if Feature.active?(:feedback) %>
        <%= render 'shared/feedback_panel', article: article %>
      <% end %>

  <%= render 'shared/nav',
             categories:        category_navigation,
             active_categories: active_categories
  %>

<% content_for(:alternate_link) do %>
  <% article.footer_alternate_options.each do |locale, url| %>
    <%= link_to(url, id: "#{locale}Link", lang: locale, class: 'footer-secondary__link') do %>

      <%= t("locales.#{locale}") %>
    <% end %>
  <% end %>
<% end %>

Put the feedback panel on articles behind a feature toggle.


loading

<form class="search-form">
	<input class="search-field" type="text" />
</form>

<input type='button' id='programs' class='button' value='Add programs' name='programs' />

loading

	<form class="search-form">
		<fieldset class='with-icon'>

			<input type='text' value='' />
		</fieldset>
	</form>

    Menu

		<input type='button' id='programs' class='button stroke loud' value='Add programs' name='programs'/>

Change elements to use mapbox css

Change elements to use mapbox css

Search bar uses mapbox class with-icon.  Map div is in center quiet div.  Menu is in pin-right pad div.  Change add programs button to be stroke loud.


Agape Ladies Sunday School Class

Brentwood Baptist Church

Prayer Requests      Sunday Lesson

Spiritual Walk

Everything Social

Email Directory

Brentwood News

Add Sunday Lesson to top div.

Add Sunday Lesson to top div.


<%= hydration('gameMeta', @game_meta) %>

<ng-view>

</ng-view>

		You are <%= @game.picked_champion %>!
		<%= @current_battle.question_text %>
		<% @current_battle.possible_answers.each do |possible| %>
    		<%= link_to possible, controller: :games, action: :check_answer, game_id: @game.id, battle_id: @current_battle.id, chosen_answer: possible %>
		<% end %>

<%= hydration('gameMeta', @game_meta) %>

<ng-view>

</ng-view>

		You are <%= @game.picked_champion %>!
		<%= @current_battle.question_text %>
		<% @current_battle.possible_answers.each do |possible| %>
			<%= link_to(image_tag("http://ddragon.leagueoflegends.com/cdn/4.4.3/img/item/#{possible[1]}.png"), controller: :games, action: :check_answer, game_id: @game.id, battle_id: @current_battle.id, chosen_answer: possible[0]) %>
		<% end %>

Add images to game show page

Add images to game show page


  <%= render 'form' %>
  <%= render 'partner' %>

  <%= link_to 'Edit', edit_user_path(@user) %> |
  <%= link_to 'Back', users_path %>

Change name of id for user show page

Change name of id for user show page


  </GlobalNamingResources>

  <Service name="Catalina">

    <Connector port="<%= @http_port %>" protocol="HTTP/1.1"
               connectionTimeout="20000"
               redirectPort="8445" />
    <Connector port="<%= @ajp_port %>" protocol="AJP/1.3" redirectPort="8445" />

    <%= tomcat_engine %>

  </Service>
</Server>

  </GlobalNamingResources>

  <Service name="Catalina">

    <Connector port="<%= @http_port %>" protocol="HTTP/1.1"
               connectionTimeout="20000"
               redirectPort="8445" />
    <Connector port="<%= @ajp_port %>" protocol="AJP/1.3" redirectPort="8445" />

    <%= @tomcat_engine %>

  </Service>
</Server>

Add Puppet 4 compatability fixes

Add Puppet 4 compatability fixes