      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
        Toggle navigation

      </button>
      Chat Stuff

        <% if !current_user %>

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

<%= link_to "Sign in", login_path %>

      <% else %>

<%= link_to "Logout", logout_path, method: :delete %>

      <% end %>

      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
        Toggle navigation

      </button>
      Chat Stuff

        <% if !current_user %>
          <%= link_to login_path do %>
            <%= image_tag "http://connect.soundcloud.com/2/btn-connect-m.png", style: "margin-top: 10px" %>
      <% end %>
      <% else %>

<%= link_to "Logout", logout_path, method: :delete %>

      <% end %>

Add soundcloud button for login

Add soundcloud button for login


<% @questions.each do |question| %>

<%= question.question %>

<% end %>

<% @questions.each do |question| %>

<%= question.question %>

<%= link_to 'Answers', question_path(question) %>

<% end %>

Add link to answers for questions

Add link to answers for questions


<% @page_title = "Assignment: #{@assignment.name}" %>

  <%= link_to "Back to Chapter: #{@chapter.name}", @chapter  %>

<% if @logged_in_user.course_admin?(@course) %>
  | <%= link_to 'Edit this Assignment', edit_assignment_path(@assignment) %>
<% end %>

Assignment Description

  <%= raw @assignment.assignment %>

  Assignment Download:
  <%= link_to @assignment.assignment_file_name, @assignment.file_path %>

Your Submissions

<% @submissions.each do |submission| %>

<%= link_to submission.updated_at, submission %> - Score: <%= submission.score %>

<% end %>

<%= link_to "New Submission", new_assignment_submission_path(@assignment) %>

<% @page_title = "Assignment: #{@assignment.name}" %>

  <%= link_to "Back to Chapter: #{@chapter.name}", @chapter  %>

<% if @logged_in_user.course_admin?(@course) %>
  | <%= link_to 'Edit this Assignment', edit_assignment_path(@assignment) %>
<% end %>

Assignment Description

  <%= raw @assignment.assignment %>

  Assignment Download:
  <%= link_to @assignment.assignment_file_name, @assignment.file_path %>

Your Submissions

<% @submissions.each do |submission| %>

<%= link_to submission.updated_at, submission %>
	- <%= submission.user.name %>
	- Score: <%= submission.score %>

<% end %>

<%= link_to "New Submission", new_assignment_submission_path(@assignment) %>

Add user name to assignments list.

Add user name to assignments list.


Updates:

        <% render_posts(:limit => 5) do |post| %>

<%= link_to post.title, post.link %>

        <% end %>

Tags

        <% render_tags do |tag| %>

<%= link_to "#{tag} (#{tag.posts_count})", "/tags/#{tag.permalink}" %>

        <% end %>

<%= link_to "Admin", admin_root_path %>

Add admin link to sidebar

Add admin link to sidebar


      Readme

    <%
      raw_html = render_markup \
        @package.readme.cargo, \
        @package.readme.file_name
    %>

    <%= CGI.unescapeHTML( raw_html  ).html_safe %>

Add back margin to bottom of readme

Add back margin to bottom of readme


  <% @resources.each do |resource| %>
    <a href='/resources/<%= resource.id %>' class='dashboard-box-link'>

           <% if resource.curriculum.nickname == "Rails" %>

               <%= image_tag("back-end-engineering-icon.png", size: "80x80") %>

              <% elsif resource.curriculum.nickname == "Python" %>

               <%= image_tag("data-science-icon.png", size: "80x80") %>

           <% elsif resource.curriculum.nickname == "Front End" %>

               <%= image_tag("front-end-engineering-icon.png", size: "80x80") %>

           <% end %>

<%= resource.title %>

<%= resource.curriculum.nickname %>

<%= resource.description %>

  <% end %>

  <% @resources.each do |resource| %>
    <a href='/resources/<%= resource.id %>' class='dashboard-box-link'>

           <% if resource.curriculum.nickname == "Rails" %>

               <%= image_tag("back-end-engineering-icon.png", size: "80x80") %>

              <% elsif resource.curriculum.nickname == "Python" %>

               <%= image_tag("data-science-icon.png", size: "80x80") %>

           <% elsif resource.curriculum.nickname == "Front End" %>

               <%= image_tag("front-end-engineering-icon.png", size: "80x80") %>

           <% end %>

<%= resource.title %>

<%= resource.curriculum.nickname %>

<%= truncate( resource.description, length: 143) %>

  <% end %>

Add truncate to dashboard resource description


Vote on this <%= object.class.to_s.downcase %>:

      <%= form_tag('/vote', :method=>'post') do %>
        <%= hidden_field_tag "vote[value]", 1 %>
        <%= hidden_field_tag "vote[votable_id]", object.id %>
        <%= hidden_field_tag "vote[votable_type]", "#{object.class}" %>
        <%= hidden_field_tag "vote[voter_id]", current_user.id %>
        <%= submit_tag "+1" %>
      <% end %>

      <%= form_tag('/vote', :method=>'post') do %>
        <%= hidden_field_tag "vote[value]", -1 %>
        <%= hidden_field_tag "vote[votable_id]", object.id %>
        <%= hidden_field_tag "vote[votable_type]", "#{object.class}" %>
        <%= hidden_field_tag "vote[voter_id]", current_user.id %>
        <%= submit_tag "-1" %>
      <% end %>

      <%= form_tag('/vote', :method=>'post') do %>
        <%= hidden_field_tag "vote[value]", 1 %>
        <%= hidden_field_tag "vote[votable_id]", object.id %>
        <%= hidden_field_tag "vote[votable_type]", "#{object.class}" %>
        <%= hidden_field_tag "vote[voter_id]", current_user.id %>

<%= image_submit_tag("orange-arrow.png") %>

      <% end %>

    <%= object.vote_count %>

      <%= form_tag('/vote', :method=>'post') do %>
        <%= hidden_field_tag "vote[value]", -1 %>
        <%= hidden_field_tag "vote[votable_id]", object.id %>
        <%= hidden_field_tag "vote[votable_type]", "#{object.class}" %>
        <%= hidden_field_tag "vote[voter_id]", current_user.id %>

<%= image_submit_tag("orange-arrow.png") %>

      <% end %>

Change table for styling and add tags

Change table for styling and add tags


<div id="flyover_comment_<%= comment.id %>" class="flyover-comment">

    <%= comment.content %>

    By: <%= comment.commenter_name %> · <%= comment.created_at.strftime("%B %d, %Y %l:%M%P") %> · <%= edit_flyover_comment_link comment %> · <%= delete_flyover_comment_link comment %> · <%= flag_flyover_comment_link comment %> ·
    Last Updated At: <%= comment.last_updated_at.nil? ? "Never" : comment.last_updated_at  %>

  <%= flyover_comment_replies comment, collapsed: true if comment.parent_id.nil? %>

Move replies into comment partial to fix broken spec


<% if content_for?(:page_title) || content_for?(:page_actions) %>

    <% if content_for?(:page_title) %>

<%= yield :page_title %>

    <% end %>

    <% if content_for?(:page_actions) %>

        <%= yield :page_actions %>

    <% end %>

<% end %>

<% if content_for?(:page_title) || content_for?(:page_actions) %>

    <%= render_breadcrumbs %>

    <% if content_for?(:page_actions) %>

        <%= yield :page_actions %>

    <% end %>

<% end %>

Use new breadcrumbs in layout

Use new breadcrumbs in layout

This will make all breadcrumbs go away until we swap them over, but
otherwise this change will get lost in a hundred view changes.


<%
  block = properties['options']
  args = properties.except('options')
  collection = block.call(f.object)
  if collection.class.to_s.demodulize == 'ActiveRecord_Relation'
    properties['id_method'] ||= :id
    properties['name_method'] ||= :name
    collection = options_from_collection_for_select(
                    collection,
                    properties['id_method'],
                    properties['name_method'],
                    @resource_instance.send(attribute)
                  )

  elsif ['Hash', 'Array', 'HashWithIndifferentAccess'].include? collection.class.to_s.demodulize
    collection = options_for_select(collection)
  end
%>
<%= f.select attribute, collection, { include_blank: true }, args  %>

<% if !is_modal &&
  (
    properties['remote_resource'].nil? ||
    properties['remote_resource']
  ) %>
  <!-- if rendering the form inside a modal, so we don't have to
  manage infinited nested forms and if it's supposed to be
  created in relation model -->

  <%= render(
      'adminpanel/shared/create_remote_resource_button',
      belongs_request: true,
      remote_model: attribute.gsub('_id', '')
  ) %>
<% end %>

<%
  block = properties['options']
  args = properties.except('options')
  collection = block.call(f.object)
  if collection.class.to_s.demodulize == 'ActiveRecord_Relation'
    properties['id_method'] ||= :id
    properties['name_method'] ||= :name
    collection = options_from_collection_for_select(
                    collection,
                    properties['id_method'],
                    properties['name_method'],
                    @resource_instance.try(attribute)
                  )

  elsif ['Hash', 'Array', 'HashWithIndifferentAccess'].include? collection.class.to_s.demodulize
    collection = options_for_select(collection, @resource_instance.try(attribute))
  end
%>
<%= f.select attribute, collection, { include_blank: true }, args  %>

<% if !is_modal &&
  (
    properties['remote_resource'].nil? ||
    properties['remote_resource']
  ) %>
  <!-- if rendering the form inside a modal, so we don't have to
  manage infinited nested forms and if it's supposed to be
  created in relation model -->

  <%= render(
      'adminpanel/shared/create_remote_resource_button',
      belongs_request: true,
      remote_model: attribute.gsub('_id', '')
  ) %>
<% end %>

Add selected value to be displayed on select


<%= notice %>

  Name:

    <%= @user.name %>

  Age:
  <%= @user.age %>

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

<%= notice %>

  Name:
  <span class="rest-in-place"
        data-url=<%= url_for(@user) %>
        data-object="user"
        data-attribute="name">
    <%= @user.name %>

  Age:
  <%= @user.age %>

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

Fix markup of default rip field in test app.


Install GNU Wget for Windows

  <%= link_to 'Looking for a different operating system?', wget_path(choose: '1') %>

Important

    Requires Administrator Privileges!

<% wget_file = 'wget-1.11.4-1-bin.zip' %>

  Download <%= link_to wget_file, "http://downloads.sourceforge.net/gnuwin32/#{wget_file}" %>.

  Extract <%= wget_file %>.

  Copy wget.exe in <%= wget_file %>\bin\ toC:\Windows\

  Click the Windows Start Button.

  Click the search bar or Run... and type command and click Enter.

  Verify GNU Wget installation in the Command Prompt.

wget --version

  GNU Wget <%= wget_file.split('wget-').last.split('-').first %>

Install GNU Wget for Windows

  <%= link_to 'Looking for a different operating system?', wget_path(choose: '1') %>

Important

    Requires Administrator Privileges!

<% wget_file = 'wget-1.11.4-1-setup.exe' %>

  Download <%= link_to wget_file, "http://downloads.sourceforge.net/gnuwin32/#{wget_file}" %>.

  Double click <%= wget_file %> and follow installation instructions.

  Click the Windows Start Button.

  Click the search bar, type Command Prompt, right click Command Prompt, and select Run as Administrator.

  Add the installation directory to the user PATH environment variable.

setx PATH "C:\Program Files (x86)\GnuWin32\bin"

  Verify GNU Wget installation in the Command Prompt.

wget --version

  GNU Wget <%= wget_file.split('-setup.exe').first.split('wget-').last %>

Set PATH environment variable for windows.


<% flash.each do |type, message| %>
  <div class="alert alert-<%= type %>">
    ×

<%= message %>

<% end %>

<% flash.each do |type, message| %>
  <div class="alert alert-<%= type %> alert-block fade in flash-message">
    ×

<%= message %>

<% end %>

Add ability to close an alert

Add ability to close an alert


Archive

      <% @posts_by_month.each do |month, posts| %>

<%= link_to month.strftime('%B %Y'), blog_posts_archives_path(month.year, month.month) %>

      <% end %>

    <% if @tags.present? %>

Category

        <% @tags.each do |tag| %>

<%= link_to tag.name, tagged_blog_posts_path(tag.name) %>

        <% end %>

    <% end %>

    <% if @recent_posts.present? %>

Recent Posts

        <% @recent_posts.each do |post| %>

<%= link_to post.title, post_path(post) %>

        <% end %>

    <% end %>

  <%= render 'sidebar_content' %>

    <% if @recent_posts.present? %>

Recent Posts

        <% @recent_posts.each do |post| %>

<%= link_to post.title, post_path(post) %>

        <% end %>

    <% end %>

Archive

      <% @posts_by_month.each do |month, posts| %>

<%= link_to month.strftime('%B %Y'), blog_posts_archives_path(month.year, month.month) %>

      <% end %>

    <% if @tags.present? %>

Category

        <% @tags.each do |tag| %>

<%= link_to tag.name, tagged_blog_posts_path(tag.name) %>

        <% end %>

    <% end %>

  <%= render 'sidebar_content' %>

Reorder sidebar sections into something more logical.


<% person_members.each do |member| %>

				<%= member_heading(member) %>
				<% if member.authority? %>
				  Authority Member
				<% else %>
				  Non-Authority Member
				<% end %>

				<% policies = Policy.find_all_policies_for_member_id(member.hbx_member_id).sort_by{ |p| p.subscriber.coverage_start }.reverse %>
				<% policies.each do |policy| %>

<%= render 'policy_detail', p: policy if  policy_market(policy) == "Individual" || (can? :read, :all) %>

				<% end %>

<% end %>

<% person_members.each do |member| %>

				<%= member_heading(member) %>
				<% if member.authority? %>
				  Authority Member
				<% else %>
				  Non-Authority Member
				<% end %>

			<% policies = Policy.find_all_policies_for_member_id(member.hbx_member_id) %>

				<% policies.each do |policy| %>

<%= render 'policy_detail', p: policy if  policy_market(policy) == "Individual" || (can? :read, :all) %>

				<% end %>

<% end %>

Revert "policy sort on people show"

Revert "policy sort on people show"

This reverts commit 40d0f8106abebc38d32813b985006f6792615bf9.


Welcome

My name is Jordan I am an engineer currently developing at Amazon Web Services in Seattle, WA.

The stack used to power this site is awesome and open-source so you should check out the code on my Github profile (linked above).

Please feel free to reach out to me via the avenues provided on the Contact page for any matter professional or personal.

Enjoy your stay and don't get lost. . .

Add table for aesthetic distinction

Add table for aesthetic distinction


<%= Diffy::CSS %>

.diff {
  ul {
    background: transparent;
  }
}

<%= Diffy::CSS %>

.diff {
  $symbol-spacing: 1.5em;

  del {
    text-decoration: line-through;
  }
  ul {
    background: transparent;
    padding-left: $symbol-spacing;
  }
  span.symbol {
    display: inline-block;
    margin-left: -$symbol-spacing;
    width: $symbol-spacing;
    font-weight: bold;
  }
}

Improve diffing UI based on user feedback

The results from the content design survey weren't totally conclusive but the
eventual winner was "+/- at the start of the rows with a strike through for
deletions".

The only point of confusion around this option was the +/- sit a little too
close to the rest of the body copy, and thus looks a bit like the markdown
itself. Increase the margin between the two.


<%= form_for(@meeting) do |f| %>
  <% if @meeting.errors.any? %>

<%= pluralize(@meeting.errors.count, "error") %> prohibited this meeting from being saved:

      <% @meeting.errors.full_messages.each do |message| %>

<%= message %>

      <% end %>

  <% end %>

      <%= f.label :date %>
      <%= f.date_field :date, class: 'form-control' %>

      <%= f.label :description %>
      <%= f.text_area :description, height: '6', class: 'form-control' %>

      <%= f.submit %>

<% end %>

<%= form_for(@meeting) do |f| %>
  <% if @meeting.errors.any? %>

<%= pluralize(@meeting.errors.count, "error") %> prohibited this meeting from being saved:

      <% @meeting.errors.full_messages.each do |message| %>

<%= message %>

      <% end %>

  <% end %>

      <%= f.label :date %>
      <%= f.date_field :date, class: 'form-control' %>

      <%= f.label :description %>
      <%= f.text_area :description, height: '6', class: 'form-control' %>

      <%= f.submit class: 'btn btn-success' %>

<% end %>

Add class to submit button to make it green like the other buttons


<% content_for :title, "Editing '#{@question.title.truncate(50)}'" %>

Edit Question

<%= render 'form', is_edit: true %>

<% if SiteSetting['AskingGuidance'] %>
  <% content_for :sidebar do %>

Hints and Tips

        <%= raw(sanitize(QuestionsController.renderer.render(SiteSetting['AnsweringGuidance']), scrubber: scrubber)) %>

  <% end %>
<% end %>

<% content_for :title, "Editing '#{@question.title.truncate(50)}'" %>

Edit Question

<%= render 'posts/image_upload' %>

<%= render 'form', is_edit: true %>

<% if SiteSetting['AskingGuidance'] %>
  <% content_for :sidebar do %>

Hints and Tips

        <%= raw(sanitize(QuestionsController.renderer.render(SiteSetting['AnsweringGuidance']), scrubber: scrubber)) %>

  <% end %>
<% end %>

Add image upload to question edit

Add image upload to question edit


<% content_for :head do %>
  <link rel='alternate' type='application/json' href='<%= sections_url(format: :json) %>' title='Section list in JSON format' />
<% end %>

All sections

        Section
        Chapters

          Section title
          <% if TradeTariffFrontend.download_pdf_enabled? %>

<%= link_to 'Trade Tariff PDF (94MB)', download_latest_pdf_url, rel: 'nofollow', target: '_blank' %>

          <% end %>

      <%= render @sections %>

<% content_for :head do %>
  <link rel='alternate' type='application/json' href='<%= sections_url(format: :json) %>' title='Section list in JSON format' />
<% end %>

All sections

        Section
        Chapters

          Section title
          <% if TradeTariffFrontend.download_pdf_enabled? %>

<%= link_to '[BETA] Trade Tariff PDF (94MB)', download_latest_pdf_url, rel: 'nofollow', target: '_blank' %>

          <% end %>

      <%= render @sections %>

Add beta flag on pdf download

Add beta flag on pdf download


<?xml version="1.0" encoding="UTF-8"?>
<module>
  <inherits name='org.realityforge.gwt.datatypes.Datatypes'/>

  <inherits name="com.google.gwt.json.JSON"/>
  <inherits name="org.realityforge.replicant.Replicant"/>

  <source path='client'/>
  <source path='shared'/>
</module>

<?xml version="1.0" encoding="UTF-8"?>
<module>
  <inherits name='org.realityforge.gwt.datatypes.Datatypes'/>

  <inherits name="com.google.gwt.json.JSON"/>
  <inherits name="org.realityforge.replicant.Replicant"/>

<%
packages =
  [
    repository.gwt.client_data_type_package,
    repository.gwt.client_event_package,
    repository.gwt.client_entity_package,
    repository.gwt.client_service_package,
    repository.gwt.shared_data_type_package,
    repository.gwt.shared_service_package,
    repository.imit.client_ioc_package,
    repository.imit.client_comm_package,
    repository.imit.shared_comm_package
  ]

  prefix = repository.imit.model_module.gsub(/\.[^\.]+$/,'')
%>
  <source path=''>
<% packages.select{|p|p =~ /^#{Regexp.escape(prefix)}/}.each do |pkg| -%>
    <include name="<%= pkg.gsub("#{prefix}.",'').gsub('.','/') %>/**/*.java"/>
<% end -%>
  </source>
</module>

Use more restrictive include paths

Use more restrictive include paths


My Events

Upcoming Events

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

<%= link_to event.name, event%>

  <% end %>

Past Events

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

<%= link_to event.name, event%>

  <% end %>

<%= link_to "Create New Event", new_event_path %>

Update user events view to reflect controller refactoring


<% page_title "#{@organisation.name} News" %>

  <%= render 'header', organisation: @organisation, title: "#{@organisation.name} News" %>

    <% if @news_articles.any? %>
      <% @news_articles.each do |news_article| %>
        <%= render partial: "announcements/news_article", locals: { news_article: news_article, display: "default" } %>
      <% end %>
    <% else %>

There are no <%= @organisation.name %> news articles at present.

    <% end %>

Use an existing class rather than a style.


#!/bin/bash
. /etc/default/rkhunter
OUTPUT=`/usr/bin/nice -n 19 /usr/bin/rkhunter --cronjob --report-warnings-only`
if [ "$OUTPUT" == "" ]; then
  OUTPUT="No warnings found"
fi
CODE=$?
# Force everything that isn't OK to be a WARNING
if [ $CODE -gt 0 ]; then
  CODE=1
fi
printf "<%= @fqdn %>\trkhunter warnings\t$CODE\t$OUTPUT\n" | /usr/sbin/send_nsca -H alert.cluster >/dev/null
exit $?

#!/bin/bash
. /etc/default/rkhunter
OUTPUT=`/usr/bin/nice -n 19 /usr/bin/rkhunter --cronjob --report-warnings-only`
CODE=$?
if [ "$OUTPUT" == "" ]; then
  OUTPUT="No warnings found"
fi
# Force everything that isn't OK to be a WARNING
if [ $CODE -gt 0 ]; then
  CODE=1
fi
printf "<%= @fqdn %>\trkhunter warnings\t$CODE\t$OUTPUT\n" | /usr/sbin/send_nsca -H alert.cluster >/dev/null
exit $?

Fix exit code check for rkhunter passive alert

The variable `$CODE` was being assigned later than it should have
been to check the result of the rkhunter run.

This means that we ended up in the state where rkhunter exited with
a non-zero exit code because it found something which it considered
a warning, but the Icinga alert had a code of zero (OK).


    Livro selecionado

<%= @book.title %>

<%= link_to 'Visão geral', book_path(@book.uuid) %>

<%= link_to 'Metadados', edit_book_path(@book.uuid) %>

<%= link_to 'Textos', book_texts_path(@book.uuid) %>

<%= link_to 'Colaboradores', book_collaborators_path(@book.uuid) %>

<%= link_to 'PDF', book_path(@book.uuid, :format => "pdf")  %>

Add PDF to book menu

Add PDF to book menu


  <% if @reviewer %>

      <%= link_to "Review", new_parcel_review_path(parcel) %>

  <% else %>

<%= button_to 'details', parcel_path(parcel), method: 'get'%>

<%= button_to 'match', parcel_trips_path(parcel), method: :get %>

<%= button_to 'Edit', edit_parcel_path(parcel.id), method: 'get' %>

 <%= button_to 'Delete', parcel_path(parcel.id), method: 'delete' %>

  <% end %>

<%= parcel.description %>

<%= parcel.destination_address.city %>

    <%= parcel.deliver_by %>

   <%= link_to "Review #{parcel.trip.driver.username} as Driver", "new_parcel_review_path(#{parcel.trip.driver_id})" %>

Add review driver link to parcels summary on user profile


  <%= form_for submission,
               url: { controller: 'results',
                      action: 'update_remark_request',
                      id: submission.id,
                      assignment_id: assignment.id },
               html: { method: :get },
               remote: true do |f| %>
    <%= f.text_area :remark_request, cols: 50, rows: 5,
                    id: 'remark_request_text_area',
                    onkeydown: 'enableRemarkRequestButtons();' %>

      <%= hidden_field_tag 'real_commit', 'Submit' %>
      <%= f.submit t(:save_changes),
                   onclick: "jQuery('#real_commit').val('Save');",
                   disabled: true,
                   id: 'remark_request_save',
                   data: { disable_with: t('working') } %>
      <%= f.submit t(:submit_request),
                   data: { disable_with: t('working') },
                   id: 'remark_request_submit',
                   confirm: t(:confirm_remark_submit) %>

  <% end %>

  <%= form_for submission,
               url: { controller: 'results',
                      action: 'update_remark_request',
                      id: submission.id,
                      assignment_id: assignment.id },
               html: { method: :get },
               remote: true do |f| %>
    <%= f.text_area :remark_request, cols: 50, rows: 5,
                    id: 'remark_request_text_area',
                    onkeydown: 'enableRemarkRequestButtons();' %>

      <%= hidden_field_tag 'real_commit', 'Submit' %>
      <%=# f.submit t(:save_changes),
         #          onclick: "jQuery('#real_commit').val('Save');",
         #          disabled: true,
         #          id: 'remark_request_save',
         #          data: { disable_with: t('working') }
      %>
      <%= f.submit t(:submit_request),
                   data: { disable_with: t('working') },
                   id: 'remark_request_submit',
                   confirm: t(:confirm_remark_submit) %>

  <% end %>

Remove save button from remark request

Remove save button from remark request


<%= @article.title %>

<%= @article.text %>

Comments:

<% @article.comments.each do |comment| %>

<%= comment.text %>

<% end %>

Write a comment:

<%= form_for ([@article, @article.comments.build]) do |f| %>

      <%= f.label :text %>

      <%= f.text_area :text %>

      <%= f.submit %>

<% end %>

Add display of comments and an opportunity to write comments


<%= render layout: 'products/breadcrumbs' do %>

<%= link_to @product.title, product_path(@product.name, type: @type) %>

Edit

<% end %>

    <%= @product.name %>

<%= bootstrap_form_for(@product, as: :product, url: product_path(@product.name, type: @type)) do |f| %>
    <%= render "form_git", f: f, type: @type, product: @product if @product.git_repo? %>
    <%= render "form_manifest", f: f, product: @product %>

      <%= f.submit 'Submit' %>

<% end %>

<%= link_to 'Back', product_path(@product.name, type: @type), class: 'btn btn-default' %>

<%= render layout: 'products/breadcrumbs' do %>

<%= link_to @product.title, product_path(@product.name, type: @type) %>

Edit

<% end %>

    <%= @product.name %>

<%= bootstrap_form_for(@product, as: :product, url: product_path(@product.name, type: @type)) do |f| %>
    <%= render "form_git", f: f, type: @type, product: @product if @product.git_repo? %>
    <%= render "form_manifest", f: f, product: @product %>

      <%= f.submit 'Save' %>

<% end %>

<%= link_to 'Back', product_path(@product.name, type: @type), class: 'btn btn-default' %>

Change button to say Save instead of Submit


<%= @snippet.content.html_safe %>
<%= @snippet.user.username if @snippet.user %>

  <% @stories.each do |story| %>

<%= link_to story.title, "/" %>

  <% end %>

<%= @snippet.content.html_safe %>
<%= @snippet.user.username if @snippet.user %>
<%=link_to "Submit a story for this snippet", new_story_path(snippet_id: @snippet.id) %>

  <% if @stories.count != 0 %>
    <% @stories.each do |story| %>

<%= link_to story.title, story_path(story) %>

    <% end %>
  <% else %>
    There are currently no stories for this snippet.
  <% end %>

Add link to submit a story for snippet

Add link to submit a story for snippet


    <%= erb :"submissions/user_actions", locals: { submission: submission } %>

    <% if current_user.owns?(submission) %>
      <a
        href="https://twitter.com/intent/tweet?text=I just submitted the <%= submission.track_id %> <%= submission.slug %> exercise at @exercism_io - Leave me a nitpick at http://exercism.io/submissions/<%= submission.key %>"
        class="btn btn-default"
        data-toggle="tooltip"
        data-placement="bottom"
        title="Share with Twitter"
        target="_blank">

    <% end %>
    <a
      href="<%= language_path_for_slug(submission.problem.track_id, submission.user_exercise.slug) %>"
      class="btn btn-default"
      data-toggle="tooltip"
      data-placement="bottom"
      title="View other submissions">

    <% if next_submission %>
      <a
        href="/submissions/<%= next_submission.key %>"
        class="btn btn-default next-submission">
        Next Submission

    <% end %>

    <%= view_count_for(submission) %>

    <%= erb :"submissions/user_actions", locals: { submission: submission } %>

    <% if current_user.owns?(submission) %>
      <a
        href="https://twitter.com/intent/tweet?text=I just submitted the <%= submission.track_id %> <%= submission.slug %> exercise at @exercism_io - Leave me a nitpick at http://exercism.io/submissions/<%= submission.key %>"
        class="btn btn-default"
        data-toggle="tooltip"
        data-placement="bottom"
        title="Share with Twitter"
        target="_blank">

    <% end %>
    <a
      href="<%= language_path_for_slug(submission.problem.track_id, submission.problem.slug) %>"
      class="btn btn-default"
      data-toggle="tooltip"
      data-placement="bottom"
      title="View other submissions">

    <% if next_submission %>
      <a
        href="/submissions/<%= next_submission.key %>"
        class="btn btn-default next-submission">
        Next Submission

    <% end %>

    <%= view_count_for(submission) %>

Use problem slug rather than relying on related exercise


<% @masthead_title = "Server Error" %>

The application encountered an error trying to process your reqeust

Please try your request again later, or perform a new search to find the item you're looking for.
    If the problem continues, please send feedback
    to help us investigate the problem.

<% @masthead_title = "Server Error" %>

The application encountered an error trying to process your request

Please try your request again later, or perform a new search to find the item you're looking for.
    If the problem continues, please send feedback
    to help us investigate the problem.

Fix a typo in the error page

Fix a typo in the error page

fixes #756


Part of <%= list_of_links_to_topics(@document.topics) %>.

<% if @document.respond_to?(:countries) && @document.countries.any? %>

Applies to <%= list_of_links_to_countries(@document.countries) %>.

<% end %>

  <% if @document.nation_inapplicabilities.any? %>
  <%= render partial: 'policies/inapplicable_nations', locals: { document: @document } %>
<% end %>

  Updated <%= absolute_date(@policy.updated_at, class: 'updated_at') %>
  <%= render partial: 'documents/change_notes', locals: {document: @document} %>

Part of <%= list_of_links_to_topics(@document.topics) %>.

<% if @document.respond_to?(:countries) && @document.countries.any? %>

Applies to <%= list_of_links_to_countries(@document.countries) %>.

<% end %>

  <% if @document.nation_inapplicabilities.any? %>
  <%= render partial: 'policies/inapplicable_nations', locals: { document: @document } %>
<% end %>

  <%= render partial: 'documents/change_notes', locals: {
    document: @document,
    title: "Updated #{absolute_date(@policy.updated_at, class: 'updated_at')}".html_safe
  } %>

Use guidance style change notes on policy pages.

Use the date-heading style of change notes that has been used on
guidance pages as it is simpler to understand and cleaner.


We’ve developed a beautiful widget for the web.
<input type="hidden" role="uploadcare-uploader" />
It can do everything from drag-and-drop to selecting photos from various social networking sites like Facebook.
<input type="hidden" role="uploadcare-uploader" data-tabs="url file" />

Draggable:

We’ve developed a beautiful widget for the web.
<input type="hidden" role="uploadcare-uploader" />
It can do everything from drag-and-drop to selecting photos from various social networking sites like Facebook.
<input type="hidden" role="uploadcare-uploader" data-tabs="facebook file url" />

Draggable:

Reorder test widget tabs for great good

Reorder test widget tabs for great good


      <%= 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"
          }
        }
      } %>

    <%= render "govuk_publishing_components/components/heading", {
      text: nhs_banner["header"],
      margin_bottom: 6,
      font_size: "m"
    } %>

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

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

      <%= 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"
          }
        }
      } %>

    <%= render "govuk_publishing_components/components/heading", {
      text: nhs_banner["header"],
      margin_bottom: 6,
      font_size: "m"
    } %>

    <% nhs_banner["sections"].each do |section| %>
      <% if section["heading"].present? && section["url"].present? %>

          <a class="govuk-link" href="<%= section["url"] %>"><%= section["heading"] %>

      <% else %>
        <%= render "govuk_publishing_components/components/heading", {
          text: section["heading"],
          heading_level: 3,
          font_size: "s",
          margin_bottom: 4,
        } if section["heading"].present? %>
      <% end %>

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

Allow links in NHS section

Allow links in NHS section

This change allows the addition of links in the NHS section. These
links are not H3 elements, but are styled as though they are so as
not to interfere with the overall page design.

This improves the user experience by allowing simple, clean copy to
be created that has a single link to the desired action.

The use of links in headers is not typically done on GOV.UK and may
create some accessibility issues if done. To avoid this situation,
we style the links as though they are H3 elements.


  <%= render :partial => 'shared/welcome_navigation', :locals => { :club => discussion_board.club } %>

    <%= best_in_place_if can?(:update, discussion_board), discussion_board, :name, :type => :input, :html_attrs => { :rows => '1' } %>

    <%= best_in_place_if can?(:update, discussion_board), discussion_board, :description, :type => :textarea, :html_attrs => { :rows => '10' } %>

      <%- if discussion_board.topics.blank? %>

No Topics Yet
          - Go Ahead and
          <%- if can? :create, discussion_board.topics.build %>
            <a href="<%= new_discussion_board_topic_path(discussion_board) %>" class="create-first-topic-link">Create the First!
          <%- else %>
            <a href="<%= subscribe_to_club_path(discussion_board.club) %>" class="create-first-topic-link">Create the First!
          <%- end %>

      <%- else %>

          <%= render :partial => 'topics/list', :locals => { :discussion_board => discussion_board } %>

      <%- end %>

  <%= render :partial => 'shared/welcome_navigation', :locals => { :club => discussion_board.club } %>

<%= discussion_board.name %>

<%= discussion_board.description %>

      <%- if discussion_board.topics.blank? %>

No Topics Yet
          - Go Ahead and
          <%- if can? :create, discussion_board.topics.build %>
            <a href="<%= new_discussion_board_topic_path(discussion_board) %>" class="create-first-topic-link">Create the First!
          <%- else %>
            <a href="<%= subscribe_to_club_path(discussion_board.club) %>" class="create-first-topic-link">Create the First!
          <%- end %>

      <%- else %>

          <%= render :partial => 'topics/list', :locals => { :discussion_board => discussion_board } %>

      <%- end %>

Update Discussion Board View for Mercury

Update the Discussion Board view to include the required classes for the
Mercury edit.


Is there anything wrong with this page?

Help us improve GOV.UK by telling us:

  <form accept-charset="UTF-8" action="/feedback" method="post">

<input name="utf8" type="hidden" value="✓">

    <input id="url" name="url" type="hidden" value="<%= h request.url %>">

    What you were doing
    <input id="what_doing" name="what_doing" type="text" />

    What went wrong
    <input id="what_wrong" name="what_wrong" type="text" />

<button name="commit" type="submit" class="button">Send</button>

  </form>

Last updated: <%= last_updated_date.strftime('%e %B %Y') %>

Add report a problem form

Add report a problem form


Help: IRC

IRC is the best way to contact the creator. The official Danbooru IRC channel is at irc.synirc.net/miezaru-illuminati. Ask for rq. However Moe's IRC channel is located at irc.rizon.net/moe-imouto

<% content_for :subnavbar do %>

<%= link_to "Help", :action => "index" %>

<% end %>

Help: IRC

IRC is the best way to contact the creator. yande.re's IRC channel is located at irc.rizon.net/moe-imouto

<% content_for :subnavbar do %>

<%= link_to "Help", :action => "index" %>

<% end %>

Fix wording in `Help: IRC`.

Fix wording in `Help: IRC`.


  <%= link_to 'Home',
              root_path,
              { class: 'pure-menu-heading', id: 'homepage_link' }
  %>

    <% if user_signed_in? %>

        <%= link_to 'My profile', user_path(current_user),
          { class: 'pure-menu-selected', id: 'my_profile_link' } %>

        <%= link_to 'Log out', destroy_user_session_path, :method => :delete %>

    <% else %>

<%= link_to "Register", new_user_registration_path %>

<%= link_to "Log in", new_user_session_path %>

    <% end %>

        <%= link_to 'uploadstuffto.me',
                    root_path,
                    { class: 'pure-menu-selected', id: 'homepage_link' }
        %>

    <% if user_signed_in? %>

        <%= link_to 'My profile', user_path(current_user),
          { class: 'pure-menu-selected', id: 'my_profile_link' } %>

        <%= link_to 'Log out', destroy_user_session_path, :method => :delete %>

    <% else %>

<%= link_to "Register", new_user_registration_path %>

<%= link_to "Log in", new_user_session_path %>

    <% end %>

Change wording of main home button and give hover effect


Fix timezone was never stored in localStorage


Same-sex partnerships in Ecuador are known as ‘union de hecho’.

Contact the relevant local authorities in Ecuador to find out about local laws, including what documents you’ll need.

##What you need to do

You’ll be asked for an affirmation or affidavit document to prove that you’re allowed to enter into this partnership.

To swear an affirmation or affidavit, [make an appointment at the British Embassy Quito](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-quito/oaths-affirmations-and-affidavits/slot_picker).

You’ll need to bring your passport and pay a fee.

##Naturalisation of your partner if they move to the UK

Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.

## Fees

<%= render partial: 'consular_fees_table_items.govspeak.erb',
    collection: calculator.services,
    as: :service,
    locals: { calculator: calculator } %>

You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).

<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>

Contact the relevant local authorities in Ecuador to find out about local laws, including what documents you’ll need.

##What you need to do

You’ll be asked for an affirmation or affidavit document to prove that you’re allowed to marry.

To swear an affirmation or affidavit, [make an appointment at the British Embassy Quito](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-quito/oaths-affirmations-and-affidavits/slot_picker).

You’ll need to bring your passport and pay a fee.

##Naturalisation of your partner if they move to the UK

Your partner can apply to [become a British citizen](/becoming-a-british-citizen/if-your-spouse-is-a-british-citizen) once they’ve lived in the UK for 3 years.

## Fees

<%= render partial: 'consular_fees_table_items.govspeak.erb',
    collection: calculator.services,
    as: :service,
    locals: { calculator: calculator } %>

You normally have to pay fees for consular services in the local currency - these are shown in the list of [consular fees for Ecuador](/government/publications/ecuador-consular-fees).

<%= render partial: 'how_to_pay.govspeak.erb', locals: {calculator: calculator} %>

Replace 'civil partnership' with 'marry'

Replacing reference to civil partnership with marry across all Ecuador same sex outcomes


  location <%= location %> {
<% if @location_cfg_prepend -%<% location_cfg_prepend.each do |key,value| -%>
    <%= key %> <%= value %>;
<% end -%><% end -%>
    alias  <%= location_alias %>;
<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
    <%= key %> <%= value %>;
<% end -%><% end -%>
  }

  location <%= location %> {
<% if @location_cfg_prepend -%><% location_cfg_prepend.each do |key,value| -%>
    <%= key %> <%= value %>;
<% end -%><% end -%>
    alias  <%= location_alias %>;
<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
    <%= key %> <%= value %>;
<% end -%><% end -%>
  }

Fix syntax error in ERB template

Fix syntax error in ERB template


<VirtualHost *:80>
        ServerName "graphite"
        ProxyPass / http://localhost:<%= node['graphite']['uwsgi']['port'] %>/
        ProxyPassReverse / http://localhost:<%= node['graphite']['uwsgi']['port'] %>/
        <Location />
          Order allow,deny
          Allow from all
        </Location>
</VirtualHost>

Add untested apache example template

Add untested apache example template

This is not really intended to be used directly but as a starting point
for those developing wrapper cookbooks.


#!/bin/sh

# PROVIDE: chef
# REQUIRE: LOGIN
# KEYWORD: shutdown

. /etc/rc.subr

name="chef"
pidfile="<%= node["chef_client"]["run_path"] %>/${name}.pid"
command="<%= @client_bin %>"
command_interpreter="<%= RbConfig.ruby %>"
command_args="-i <%= node["chef_client"]["interval"] %> -s <%= node["chef_client"]["splay"] %> -d -P <%= node["chef_client"]["run_path"] %>/${name}.pid"
load_rc_config $name
run_rc_command "$1"

#!/bin/sh

# PROVIDE: chef
# REQUIRE: LOGIN
# KEYWORD: shutdown

. /etc/rc.subr

name="chef"
pidfile="<%= node["chef_client"]["run_path"] %>/${name}.pid"
command="<%= @client_bin %>"
command_interpreter="<%= RbConfig.ruby %>"
command_args="-i <%= node["chef_client"]["interval"] %> -s <%= node["chef_client"]["splay"] %> -d -P ${pidfile}"
load_rc_config $name
run_rc_command "$1"

Remove duplication from rc.d script template for FreeBSD


<%
  heading ||= false
  country_guidance ||= false
  accordion_contents = []
  number_of_accordion_sections = accordions.length
%>
<% accordions.each do | section | %>
  <% content = capture do %>
    <%# this element captures an override from the accordion that the last item has margin 0 %>

      <%= render partial: 'coronavirus_landing_page/components/shared/section', locals: { section: section } %>

  <% end %>
  <%
    accordion_contents << {
      heading: {
        text: section["title"],
      },
      content: {
        html: content,
      },
      data_attributes: {
        toggle_attribute: "data-track-action",
        when_closed_text: "accordionClosed",
        when_open_text: "accordionOpened",
        track_category: "pageElementInteraction",
        track_action: "accordionClosed",
        track_label: section["title"],
        track_dimension: number_of_accordion_sections,
        track_dimension_index: 26
      }
    }
  %>
<% end %>
<%= render "govuk_publishing_components/components/heading", {
  text: heading,
  padding: true,
} if heading %>

    <%= render 'govuk_publishing_components/components/accordion', {
      data_attributes: {
        module: "govuk-accordion"
      },
      items: accordion_contents,
      margin_bottom: 3
    } %>

<%
  heading ||= false
  country_guidance ||= false
  accordion_contents = []
  number_of_accordion_sections = accordions.length
%>
<% accordions.each do | section | %>
  <% content = capture do %>
    <%# this element captures an override from the accordion that the last item has margin 0 %>

      <%= render partial: 'coronavirus_landing_page/components/shared/section', locals: { section: section } %>

  <% end %>
  <%
    accordion_contents << {
      heading: {
        text: section["title"],
      },
      content: {
        html: content,
      },
      data_attributes: {
        toggle_attribute: "data-track-action",
        when_closed_text: "accordionClosed",
        when_open_text: "accordionOpened",
        track_category: "pageElementInteraction",
        track_action: "accordionClosed",
        track_label: section["title"],
        track_dimension: number_of_accordion_sections,
        track_dimension_index: 26
      }
    }
  %>
<% end %>
<%= render "govuk_publishing_components/components/heading", {
  text: heading,
  margin_bottom: 3,
} if heading %>

    <%= render 'govuk_publishing_components/components/accordion', {
      data_attributes: {
        module: "govuk-accordion"
      },
      items: accordion_contents,
      margin_bottom: 3
    } %>

Tweak alignment of accordion title

Tweak alignment of accordion title


  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :role => 'form'}) do |f| %>

Sign in

    <%= devise_error_messages! %>

      <%- if devise_mapping.registerable? %>
        <%= link_to 'Sign up', new_registration_path(resource_name), class: 'right'  %>
      <% end -%>
      <%= f.label :email %>
      <%= f.email_field :email, :autofocus => true, class: 'form-control' %>

      <%- if devise_mapping.recoverable? %>
        <%= link_to "Forgot password?", new_password_path(resource_name), class: 'right' %>
      <% end -%>
      <%= f.label :password %>
      <%= f.password_field :password, class: 'form-control' %>

      <%= f.submit 'Sign in', :class => 'button right' %>
      <% if devise_mapping.rememberable? -%>

            <%= f.check_box :remember_me %> Remember me

      <% end -%>
  <% end %>

  <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :role => 'form'}) do |f| %>

Sign in

    <%= devise_error_messages! %>

      <%- if devise_mapping.registerable? %>
        <%= link_to 'Sign up', new_registration_path(resource_name), class: 'right'  %>
      <% end -%>
      <%= f.label :email %>
      <%= f.email_field :email, :autofocus => true, class: 'form-control' %>

      <%- if devise_mapping.recoverable? %>
        <%= link_to "Forgot password?", new_password_path(resource_name), class: 'right', tabindex: '-1' %>
      <% end -%>
      <%= f.label :password %>
      <%= f.password_field :password, class: 'form-control' %>

      <%= f.submit 'Sign in', :class => 'button right' %>
      <% if devise_mapping.rememberable? -%>

            <%= f.check_box :remember_me %> Remember me

      <% end -%>
  <% end %>

Fix tab bug in sign in

Fix tab bug in sign in


<% content_for :breadcrumb do %>

<%= link_to "Home", root_path %>

Documentation

<% end %>

How to build your Rails application with Simple Form and Bootstrap

Create your new Rails application: rails new my_new_app

Open the generated Gemfile and add the Simple Form dependency: gem 'simple_form'

Bundle install

Install the Simple Form, using the --bootstrap option: rails generate simple_form:install --bootstrap

Now you have a new Rails application using Simple Form and configured to use Bootstrap

<% content_for :breadcrumb do %>

<%= link_to "Home", root_path %>

Documentation

<% end %>

How to build your Rails application with Simple Form and Bootstrap

Create your new Rails application: rails new my_new_app

Open the generated Gemfile and add the Simple Form dependency: gem 'simple_form'

Install the dependencies: bundle install

Install the Simple Form, using the --bootstrap option: rails generate simple_form:install --bootstrap

Now you have a new Rails application using Simple Form and configured to use Bootstrap

Use the code tag to wrap the examples.

Use the code tag to wrap the examples.


<%# navigation styled for Bootstrap 3.0 %>

      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
        Toggle navigation

      </button>
      <%= link_to 'REFUGE restrooms', root_path, class: 'navbar-brand' %>

        <%= render 'layouts/navigation_links' %>

Improve formatting of navigation partial

Changed newlines and indentation to make this partial easier to read.


<!DOCTYPE html>

  <title>Mountain Chat</title>

  <%= stylesheet_link_tag    'application', media: 'all' %>
  <%= javascript_include_tag 'application' %>
  <%= csrf_meta_tags %>

Mountain Chat Header

<%= yield %>

    <% if current_user %>

Welcome, <%= current_user.name %>

    <% else %>

<%= link_to 'Login', new_session_path %>

||

<%= link_to 'Signup', new_user_path %>

    <% end %>

<!DOCTYPE html>

  <title>Mountain Chat</title>

  <%= stylesheet_link_tag    'application', media: 'all' %>
  <%= javascript_include_tag 'application' %>
  <%= csrf_meta_tags %>

Mountain Chat Header

<%= yield %>

    <% if current_user %>

Welcome, <%= current_user.name %>

||

<%= link_to("Log Out", session_path(current_user), method: :delete) %>

    <% else %>

<%= link_to 'Login', new_session_path %>

||

<%= link_to 'Signup', new_user_path %>

    <% end %>

Include link to successfull log out

Include link to successfull log out


<!DOCTYPE html>

    <title><%= yield :title %> - GOV.UK</title>
    <%= stylesheet_link_tag 'application' %>
    <%= stylesheet_link_tag 'print', :media => :print %>
    <%= yield :head %>
    <%= render partial: 'govuk_component/analytics_meta_tags', locals: { content_item: @content_item } %>
    <%= javascript_include_tag 'application.js', integrity: true, crossorigin: 'anonymous' %>
    <% if @meta_section %>
      <meta name="govuk:section" content="<%= @meta_section %>">
    <% end %>

    <div id="wrapper" class="answer <%= yield :wrapper_class %>">
      <%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_item %>

        <%= yield %>

          <%= render 'govuk_publishing_components/components/contextual_sidebar', content_item: @content_item %>

      <%= render 'govuk_publishing_components/components/feedback' %>

<!DOCTYPE html>

    <title><%= yield :title %> - GOV.UK</title>
    <%= stylesheet_link_tag 'application' %>
    <%= stylesheet_link_tag 'print', :media => :print %>
    <%= yield :head %>
    <%= render 'govuk_publishing_components/components/meta_tags', content_item: @content_item %>
    <%= javascript_include_tag 'application.js', integrity: true, crossorigin: 'anonymous' %>
    <% if @meta_section %>
      <meta name="govuk:section" content="<%= @meta_section %>">
    <% end %>

    <div id="wrapper" class="answer <%= yield :wrapper_class %>">
      <%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_item %>

        <%= yield %>

          <%= render 'govuk_publishing_components/components/contextual_sidebar', content_item: @content_item %>

      <%= render 'govuk_publishing_components/components/feedback' %>

Use the meta tags component from the gem

This replaces the analytics meta tags component from Static with the
new [meta tags
component](https://github.com/alphagov/govuk_publishing_components/pull/
278) in the gem. There should be no changes in behaviour.

https://trello.com/c/pU7YINt1


<!DOCTYPE html>
<html>
<head>
  <title>RailsAngular</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>
</head>
<body>

<%= yield %>

</body>
</html>

<!DOCTYPE html>
<html>
<head>
  <title>RailsAngular</title>
  <%= stylesheet_link_tag    'application', media: 'all' %>
  <%= csrf_meta_tags %>
</head>
<body>

<%= yield %>

</body>
</html>

Remove turbolinks references since it can interfere with angular


Contact the [relevant local authorities](http://www.dha.gov.za/index.php/civic-services/marriage-certificates) in South Africa to find out about local marriage laws, including what documents you’ll need.

^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.^

The UK doesn’t issue certificates of no impediment (CNIs) for marriages in Commonwealth countries. The British High Commission in Pretoria or the Consulate General in Cape Town can provide a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.

Contact the High Commission and Consulate General to arrange to collect a letter.

$C
<southafrica.consulate@fco.gov.uk>
$C

The letter must be signed and stamped by a member of the consular staff.

Contact the [relevant local authorities](http://www.dha.gov.za/index.php/civic-services/marriage-certificates) in South Africa to find out about local marriage laws, including what documents you’ll need.

^You should [get legal advice](/government/collections/list-of-lawyers) and check the [travel advice for South Africa](/foreign-travel-advice/south-africa) before making any plans.^

The UK doesn’t issue certificates of no impediment (CNIs) for marriages in Commonwealth countries. You can get a letter to explain this if you’re asked to provide a CNI or a similar document to prove you’re allowed to marry.

Book an appointment to collect a letter at the [British Consulate General in Cape Town](https://www.consular-appointments.service.gov.uk/fco/#!/british-consulate-general-cape-town/providing-an-informative-note/slot_picker) or the [British High Commission in Pretoria](https://www.consular-appointments.service.gov.uk/fco/#!/british-high-commission-pretoria/providing-an-informative-note/slot_picker).

The letter is free. If you can't go to an appointment, you can ask a friend or family member to make an appointment and collect it for you.

Add appointment link for explanatory letter


#!/bin/bash

set -e -u -x

RUN_DIR=/var/vcap/sys/run/gitlab-runner
LOG_DIR=/var/vcap/sys/log/gitlab-runner
STORE_DIR=/var/vcap/store/gitlab-runner
PACKAGE_DIR=/var/vcap/packages/gitlab-ci-multi-runner
WORK_DIR=${STORE_DIR}/work
PIDFILE=$RUN_DIR/pid

source /var/vcap/jobs/gitlab-runner/helpers/pid_utils.sh

PATH=$PATH:/var/vcap/packages/git/bin/

case $1 in

  start)
    pid_guard $PIDFILE "gitlab-runner"

    mkdir -p $RUN_DIR $LOG_DIR $STORE_DIR $WORK_DIR
    chown -R vcap:vcap $RUN_DIR $LOG_DIR $STORE_DIR

    echo $$ > $PIDFILE
    exec chpst $PACKAGE_DIR/bin/gitlab-ci-multi-runner run \
      --config /var/vcap/store/gitlab-runner/config.toml \
      --working-directory $WORK_DIR \
      1>>$LOG_DIR/stdout.log \
      2>>$LOG_DIR/stderr.log

    ;;

  stop)
    kill_and_wait $PIDFILE

    ;;

  *)
    echo "Usage: $0 {start|stop}"

    ;;

esac

#!/bin/bash

set -e -u -x

RUN_DIR=/var/vcap/sys/run/gitlab-runner
LOG_DIR=/var/vcap/sys/log/gitlab-runner
STORE_DIR=/var/vcap/store/gitlab-runner
PACKAGE_DIR=/var/vcap/packages/gitlab-ci-multi-runner
WORK_DIR=${STORE_DIR}/work
PIDFILE=$RUN_DIR/pid

source /var/vcap/jobs/gitlab-runner/helpers/pid_utils.sh

# Add all packages' /bin $PATH
for package_dir in $(ls -d /var/vcap/packages/*); do
  for package_bin_dir in $(ls -d ${package_dir}/bin); do
    export PATH=${package_bin_dir}:$PATH
  done
done

case $1 in

  start)
    pid_guard $PIDFILE "gitlab-runner"

    mkdir -p $RUN_DIR $LOG_DIR $STORE_DIR $WORK_DIR
    chown -R vcap:vcap $RUN_DIR $LOG_DIR $STORE_DIR

    echo $$ > $PIDFILE
    exec chpst $PACKAGE_DIR/bin/gitlab-ci-multi-runner run \
      --config /var/vcap/store/gitlab-runner/config.toml \
      --working-directory $WORK_DIR \
      1>>$LOG_DIR/stdout.log \
      2>>$LOG_DIR/stderr.log

    ;;

  stop)
    kill_and_wait $PIDFILE

    ;;

  *)
    echo "Usage: $0 {start|stop}"

    ;;

esac

Add all packge bin dirs to path

Add all packge bin dirs to path


<%
  items ||= []
  see_more_link ||= false
  small ||= false
  margin_bottom ||= false
  component_size = "app-c-topic-list--small" if small
  margin_bottom_class = "app-c-topic-list--margin-bottom" if margin_bottom

  brand ||= false
  brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
%>
<% if items.any? %>
  <ol class="app-c-topic-list <%= component_size %> <%= brand_helper.brand_class %> <%= margin_bottom_class %>">
    <% items.each do |item| %>

        <%=
          link_to(
            item[:text],
            item[:path],
            data: item[:data_attributes],
            class: "app-c-topic-list__link app-c-topic-list__link--no-underline #{brand_helper.color_class}"
          )
        %>

    <% end %>
    <% if see_more_link %>

        <%=
          link_to(
            see_more_link[:text],
            see_more_link[:path],
            data: see_more_link[:data_attributes],
            class: "app-c-topic-list__link #{brand_helper.color_class}"
          )
        %>

    <% end %>

<% end %>

<%
  items ||= []
  see_more_link ||= false
  small ||= false
  margin_bottom ||= false
  component_size = "app-c-topic-list--small" if small
  margin_bottom_class = "app-c-topic-list--margin-bottom" if margin_bottom

  brand ||= false
  brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
%>
<% if items.any? %>
  <ol class="app-c-topic-list <%= component_size %> <%= brand_helper.brand_class %> <%= margin_bottom_class %>">
    <% items.each do |item| %>

        <%=
          link_to(
            item[:text],
            item[:path],
            data: item[:data_attributes],
            class: "govuk-link app-c-topic-list__link app-c-topic-list__link--no-underline #{brand_helper.color_class}"
          )
        %>

    <% end %>
    <% if see_more_link %>

        <%=
          link_to(
            see_more_link[:text],
            see_more_link[:path],
            data: see_more_link[:data_attributes],
            class: "govuk-link app-c-topic-list__link #{brand_helper.color_class}"
          )
        %>

    <% end %>

<% end %>

Add govuk-link class to topic list component


<%= render 'shared/error_messages', object: f.object %>

        <%= f.label :name, class: 'control-label' %>

            <%= f.text_field :name, class: 'span11' %>

        <%= f.label :value, class: 'control-label' %>

            <%= f.text_field :value, class: 'span11' %>

        <%= f.label :descr, class: 'control-label' %>

            <%= f.text_area :descr, class: 'span11', rows: '4' %>

            <%= f.button t("_BTN_SAVE"), class: "btn btn-primary" %>
            <%= f.button t('_BTN_SAVE_AND_CONTINUE'), class: 'btn btn-success', name: 'continue', value: 'continue' %>
            <%= link_to t("_BTN_CANCEL"), settings_path, class: "btn" %>

<%= render 'shared/error_messages', object: f.object %>

        <%= f.label :name, class: 'control-label' %>

            <%= f.text_field :name, class: 'span11' %>

        <%= f.label :value, class: 'control-label' %>

            <%= f.text_area :value, class: 'span11', rows: 6 %>

        <%= f.label :descr, class: 'control-label' %>

            <%= f.text_area :descr, class: 'span11', rows: 2 %>

            <%= f.button t("_BTN_SAVE"), class: "btn btn-primary" %>
            <%= f.button t('_BTN_SAVE_AND_CONTINUE'), class: 'btn btn-success', name: 'continue', value: 'continue' %>
            <%= link_to t("_BTN_CANCEL"), settings_path, class: "btn" %>

Change settins value to text_area

Change settins value to text_area


			<% @uploads.each do |upload| %>
				<%= action_thumbnail_tag({:class => 'span3 doc_thumbnail', :icon => "fa fa-upload", :title => upload.original_filename, :path => upload_path(upload)}) do %>
					<%= content_tag "address" do %>
					<% end %>
					<%= format_field("File Status", upload.file_status_type.name) %>
					<%= format_field("Num. rows processed", format_as_integer(upload.num_rows_processed)) %>
					<%= format_field("Num. rows added", format_as_integer(upload.num_rows_added)) %>
					<%= format_field("Num. rows skipped", format_as_integer(upload.num_rows_skipped)) %>
					<%= format_field("Num. rows replaced", format_as_integer(upload.num_rows_replaced)) %>
					<%= format_field("Num. rows failed", format_as_integer(upload.num_rows_failed)) %>
				<% end %>
			<% end %>

			<% @uploads.each do |upload| %>
				<%= action_thumbnail_tag({:class => 'span3 doc_thumbnail', :icon => "fa fa-upload", :title => upload.original_filename, :path => upload_path(upload)}) do %>
					<%= content_tag "address" do %>
					<% end %>
					<%= format_field("File Status", upload.file_status_type.name) %>
					<%= format_field("Num. rows processed", format_as_integer(upload.num_rows_processed)) %>
					<%= format_field("Num. rows added", format_as_integer(upload.num_rows_added)) %>
					<%= format_field("Num. rows skipped", format_as_integer(upload.num_rows_skipped)) %>
					<%= format_field("Num. rows replaced", format_as_integer(upload.num_rows_replaced)) %>
					<%= format_field("Num. rows failed", format_as_integer(upload.num_rows_failed)) %>
					<%= format_field("Total Processing Time", format_as_integer((upload.processing_completed_at - upload.processing_started_at)/60)) %>
				<% end %>
			<% end %>

Add total processing time to upload thumbnail


<div<% unless activity.trackable.nil? %> id="activity-<%= activity.trackable.id %>"<% end %> class="activity<% unless activity.first? %> hidden<% end %>">

  <%= link_to activity.owner.username, activity.owner %> <%= render_activity activity %>

<div id="activity-<%= activity.id %>" class="activity<% unless activity.first? %> hidden<% end %>">

  <%= link_to activity.owner.username, activity.owner %> <%= render_activity activity %>

Use correct ID in activity partial

Use correct ID in activity partial


<% id ||= "availability" %>
<% title ||= "Service availability" %>
<section id="<%= id %>" class="graph availability">

<%= title %>

Data source: Pingdom

Page load time measures the time taken for a sample page within the service to load.

Uptime measures the percentage of time that the service was observed to be available.

Page load time

Uptime

Add link to uptime guidance

Add link to uptime guidance


News

  <%= render partial: "news_articles/list", locals: {news_articles: @news_articles} %>

Speeches

  <%= render partial: "speeches/list", locals: {speeches: @speeches} %>

Use divs for the grid layout.

Use divs for the grid layout.

Adding styles that affect the box model (e.g. padding, margin) to elements with the grid classes (g1, g2 et al) can screw with the layout as the grid uses percentage based sizes.


<!DOCTYPE html>

  <title><%= @constants.site_title %></title>
  <%= stylesheet_link_tag    "application", media: "all" %>
  <%= javascript_include_tag "application" %>
  <%= stylesheet_link_tag "/assets/" << params[:controller] %>
  <%= csrf_meta_tags %>

  <%= render :partial => "partials/navigation" %>

  <%= content_for :top %>

    <% if flash[:error] %>

          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
          <%= flash[:error] %>

    <% end %>
  	<%= yield %>

© BAA 2014

<!DOCTYPE html>

  <title><%= @constants.site_title %></title>
  <%= stylesheet_link_tag    "application", media: "all" %>
  <%= javascript_include_tag "application" %>
  <%= stylesheet_link_tag "/assets/" << params[:controller] %>
  <%= csrf_meta_tags %>

  <%= render :partial => "partials/navigation" %>

  <%= content_for :top %>

    <% if flash[:error] %>

        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
        <%= flash[:error] %>

    <% end %>

    <%= if flash[:info] %>

          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
          <%= flash[:info] %>

    <% end %>

    <%= if flash[:success] %>

          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
          <%= flash[:success] %>

    <% end %>

  	<%= yield %>

© BAA 2014

Add new flash banners for future use

Add new flash banners for future use


<!DOCTYPE html>
<html>
<head>
  <title>LiveAction</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>
</head>
<body>

<%= yield %>

</body>
</html>

<!DOCTYPE html>

  <title>LiveAction</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>

<%= link_to "Home", root_path %>

<%= link_to "Login", new_session_path %>

<%= link_to "Register", new_user_path %>

	<%= yield %>

Add navbar with links to home/login/register


<!DOCTYPE html>
<html>
<head>
  <title>OnlyChaiPrototype</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>
</head>
<body>

<%= yield %>

</body>
</html>

<!DOCTYPE html>

  <title>OnlyChaiPrototype</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>

My Site

Menu

Right Button Active

          Right Button Dropdown

First link in dropdown

Active link in dropdown

Left Nav Button

<%= yield %>

Add nav bar to application layout

Add nav bar to application layout


      <%= @recipe.body %>

      submitted by: <%= @recipe.user.username %>

<% if @comments %>
  <% @comments.each do |comment| %>

      <%=  comment.body %>

      submitted by: <%= comment.user.username %>

  <% end %>
<% end %>

      <%= @recipe.body %>

      submitted by: <%= @recipe.user.username %>

<% if @comments %>
  <% @comments.each do |comment| %>

  <% end %>
<% end %>

Change based on group plan

Change based on group plan


  <%= render :partial => "common_details", :object => relation_details %>

  <% unless relation_details.relation_members.empty? %>

      <%= t'browse.relation_details.members' %>

          <%= render :partial => "relation_member", :collection => relation_details.relation_members %>

  <% end %>

  <% unless relation_details.containing_relation_members.empty? %>

      <%= t'browse.relation_details.part_of' %>

          <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %>

  <% end %>

Align relation membership details to the top.


    Sign In

    <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
      <%= render 'application/form_errors', record: resource %>

      <fieldset>
        <%= f.label :first_name %>
        <%= f.text_field :first_name, autofocus: true %>
      </fieldset>

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

      <fieldset>
        <%= f.label :email %>
        <%= f.email_field :email %>
      </fieldset>

      <fieldset>
        <%= f.label :password %>
        <%= f.password_field :password %>
      </fieldset>

      <fieldset>
        <%= f.label :password_confirmation %>
        <%= f.password_field :password_confirmation %>
      </fieldset>

      <%= f.submit 'Sign up', class: 'button primary' %>
    <% end %>

    <%= render 'devise/shared/links' %>

    Sign Up

    <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
      <%= render 'application/form_errors', record: resource %>

      <fieldset>
        <%= f.label :first_name %>
        <%= f.text_field :first_name, autofocus: true %>
      </fieldset>

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

      <fieldset>
        <%= f.label :email %>
        <%= f.email_field :email %>
      </fieldset>

      <fieldset>
        <%= f.label :password %>
        <%= f.password_field :password %>
      </fieldset>

      <fieldset>
        <%= f.label :password_confirmation %>
        <%= f.password_field :password_confirmation %>
      </fieldset>

      <%= f.submit 'Sign up', class: 'button primary' %>
    <% end %>

    <%= render 'devise/shared/links' %>

Change Sign In to Sign Up on registration page.


    HMRC manuals

Employment Income Manual

Organisation

HM Revenue & Customs

Sectors

Employment

Collections

Tax guidance

        Manual updated:<time datetime="2014-01-23T00:00:00+01:00">23 January 2014</time>

Main contents

<%= @document['details']['manual-section-id'] %> <%= @document['title'] %>

Move the space to outside of the strong

Move the space to outside of the strong


  <%= render :partial => 'ask'%>

    <% if session[:categories].size > 0 %>

        OK, I'm going to look for things related to
        <%= @terms.map{|x| "#{h(x)}"}.join(' and ').html_safe %>
        that have <%= [@quantity].map{|x| "#{x.to_s}"}.join(' and ').html_safe %>
        as inputs.

      <%= render :partial => 'thinking'%>
    <% else %>
      <%= render :partial => 'no_results'%>
    <% end %>

  <%= render :partial => 'ask'%>

    <% if session[:categories] && session[:categories].size > 0 %>

        OK, I'm going to look for things related to
        <%= @terms.map{|x| "#{h(x)}"}.join(' and ').html_safe %>
        that have <%= [@quantity].map{|x| "#{x.to_s}"}.join(' and ').html_safe %>
        as inputs.

      <%= render :partial => 'thinking'%>
    <% else %>
      <%= render :partial => 'no_results'%>
    <% end %>

Check categories list is set before trying to use it. APP-487


<% page_title "Cabinet ministers ordering" %>

<%= form_for admin_cabinet_ministers_path, method: :put do |form| %>

        <fieldset id="minister_ordering" class="sortable">
          <legend>Cabinet ministers ordering</legend>
          <%= ministers_role_ordering_fields(form, @cabinet_minister_roles) %>
          <%= form.save_or_cancel cancel: admin_cabinet_ministers_path %>
        </fieldset>

<% end %>

Add page title and fix indentation

Add page title and fix indentation


<%= form_tag update_multiple_site_mappings_path(@site), id: 'bulk-editing-modal', class: 'modal hide' do %>

    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

      <%= http_status_name(@bulk.http_status) %> mappings

    <%= render partial: 'edit_multiple_redirect',
               locals: {
                       modal: true,
                       new_url: @bulk.new_url,
                       new_url_error: @new_url_error,
                       http_status: @bulk.http_status } %>
    <%= render partial: 'edit_multiple_table',
               locals: { modal: true,
                         mappings: @bulk.mappings,
                         site: @site } %>

    Cancel
    <%= submit_tag 'Save', class: 'btn btn-success' %>

<% end %>

  <%= form_tag update_multiple_site_mappings_path(@site), class: 'modal-dialog', role: 'form' do %>

        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>

          <%= http_status_name(@bulk.http_status) %> mappings

        <%= render partial: 'edit_multiple_redirect',
                   locals: {
                           modal: true,
                           new_url: @bulk.new_url,
                           new_url_error: @new_url_error,
                           http_status: @bulk.http_status } %>
        <%= render partial: 'edit_multiple_table',
                   locals: { modal: true,
                             mappings: @bulk.mappings,
                             site: @site } %>

        Cancel
        <%= submit_tag 'Save', class: 'btn btn-success' %>

  <% end %>

Update modal syntax to bootstrap 3

Update modal syntax to bootstrap 3

* Mostly adding new wrappers
* Visibility of modal is now managed using the aria attributes
* Move form onto one of the internal wrappers to maintain form aria role


[user]
	name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
	email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[core]
	excludesfile = ~/.gitignore
	editor = vim
  eol = lf
  autocrlf = false
  compression = 9
  loosecompression = 1
[color]
	diff = auto
	status = auto
	branch = auto
[apply]
	whitespace = nowarn
[alias]
	ff = pull --ff-only
  ff-merge = merge --ff-only
	recommit = commit --amend
  workdir-or-cwd = !echo $PWD
  workdir = rev-parse --show-toplevel
  prune = fetch --all --prune
  in-develop = log master..develop --pretty='format:%s' --no-merges
  deploy = push origin HEAD:develop
  log-branch = log --no-merges --first-parent
  cleanup = !git branch --merged master | grep -v master | xargs git branch -d
[push]
	default = upstream
[rebase]
  autosquash = true
<% if File.exist?('/usr/bin/bcompare') %>
[merge]
  tool = bc3
<% end %>

[user]
	name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
	email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
  signingkey = 435FA52B
[commit]
  gpgsign = true
[core]
	excludesfile = ~/.gitignore
	editor = vim
  eol = lf
  autocrlf = false
  compression = 9
  loosecompression = 1
[color]
	diff = auto
	status = auto
	branch = auto
[apply]
	whitespace = nowarn
[alias]
	ff = pull --ff-only
  ff-merge = merge --ff-only
	recommit = commit --amend
  workdir-or-cwd = !echo $PWD
  workdir = rev-parse --show-toplevel
  prune = fetch --all --prune
  in-develop = log master..develop --pretty='format:%s' --no-merges
  deploy = push origin HEAD:develop
  log-branch = log --no-merges --first-parent
  cleanup = !git branch --merged master | grep -v master | xargs git branch -d
[push]
	default = upstream
[rebase]
  autosquash = true
<% if File.exist?('/usr/bin/bcompare') %>
[merge]
  tool = bc3
<% end %>

Add GPG signing by default for all commits


<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
################################################
#
#              Generated by Chef
#
################################################
-->
<configuration>
  <property>
    <name>hbase.rootdir</name>
    <value>hdfs://<%= node.chef_environment %>/hbase</value>
  </property>
  <property>
    <name>hbase.zookeeper.quorum</name>
    <value><%= @zk_hosts.map{ |s| float_host(s[:hostname]) + ":2181" }.join(",") %></value>
  </property>
  <property>
    <name>hbase.cluster.distributed</name>
    <value>true</value>
  </property>
  <property>
    <name>fail.fast.expired.active.master</name>
    <value><%= @master_hosts.length > 1 ? "true" : "false" %></value>
  </property>
  <property>
    <name>hbase.master.wait.on.regionservers.mintostart</name>
    <value><%= @rs_hosts.length/2+1 %></value>
  </property>
</configuration>

<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
################################################
#
#              Generated by Chef
#
################################################
-->
<configuration>
  <property>
    <name>hbase.rootdir</name>
    <value>hdfs://<%= node.chef_environment %>/hbase</value>
  </property>
  <property>
    <name>hbase.zookeeper.quorum</name>
    <value><%= @zk_hosts.map{ |s| float_host(s[:hostname]) + ":2181" }.join(",") %></value>
  </property>
  <property>
    <name>hbase.cluster.distributed</name>
    <value>true</value>
  </property>
  <property>
    <name>fail.fast.expired.active.master</name>
    <value><%= @master_hosts.length > 1 ? "true" : "false" %></value>
  </property>
  <property>
    <name>hbase.master.wait.on.regionservers.mintostart</name>
    <value><%= @rs_hosts.length/2+1 %></value>
  </property>
  <property>
    <name>hbase.regionserver.dns.interface</name>
    <value><%= node["bcpc"]["floating"]["interface"] %></value>
  </property>
  <property>
    <name>hbase.master.dns.interface</name>
    <value><%= node["bcpc"]["floating"]["interface"] %></value>
  </property>
</configuration>

Add in default bind interface for HBase

Add in default bind interface for HBase


<div class="fb-like" data-href="<%= current_page.url -%>" data-width="60" data-layout="box_count" data-action="recommend" data-show-faces="true" data-share="true">

<div class="fb-like" data-href="<%=data.site.base_url -%><%= current_page.url -%>" data-width="60" data-layout="box_count" data-action="recommend" data-show-faces="true" data-share="true">

Fix FB url for sharing

Fix FB url for sharing


Comment out logic that loops through the array of product/item_ids


  <%= link_to logo, root_path %>

<%= link_to "Home", root_path %>

      <% if signed_in? %>

<%= link_to "Profile", current_user %>

<%= link_to "Settings", edit_user_path(current_user) %>

<%= link_to "Subscriptions", subscriptions_user_path(current_user) %>

      <% end %>

<%= link_to "About", about_path %>

      <% if signed_in? %>

<%= link_to "Sign out", signout_path, method: :delete %>

      <% else %>

<%= link_to "Sign in", signin_path %>

      <% end %>

    <%= form_tag papers_search_path, :method => 'get' do %>
      <%= text_field_tag :q, params[:q] %>
      <%= submit_tag "Search", :name => nil %>
    <% end %>

  <%= link_to logo, root_path %>

<%= link_to "Home", root_path %>

      <% if signed_in? %>

<%= link_to "Profile", current_user %>

<%= link_to "Settings", edit_user_path(current_user) %>

<%= link_to "Subscriptions", subscriptions_user_path(current_user) %>

      <% end %>

<%= link_to "About", about_path %>

      <% if signed_in? %>

<%= link_to "Sign out", signout_path, method: :delete %>

      <% else %>

<%= link_to "Sign in", signin_path %>

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

      <% end %>

    <%= form_tag papers_search_path, :method => 'get' do %>
      <%= text_field_tag :q, params[:q] %>
      <%= submit_tag "Search", :name => nil %>
    <% end %>

Add sign up link on header

Add sign up link on header


<% if presented_manual.beta? %>
  <%= render 'govuk_publishing_components/components/phase_banner', phase: "beta" %>
<% end %>

<%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_store_manual %>

<header aria-labelledby="manual-title" class="<%= presented_manual.hmrc? ? 'hmrc' : nil %>">

    <% if presented_manual.hmrc? %>
      HMRC internal manual
    <% end %>

<%= presented_manual.title %>

    <%= render 'govuk_publishing_components/components/metadata', presented_manual.metadata %>

      <form action="/search/all" >
        Search this manual
        <input type='hidden' name="filter_manual[]" value="<%= presented_manual.url %>">
        <input id="search-box" class="in-manual-search-box" type="text" name="q"/>
        <button type="submit">search</button>
      </form>

        <%= link_to 'Give feedback about this page', 'https://www.gov.uk/contact/govuk', :class=> "feedback" %>

<% if presented_manual.beta? %>
  <%= render 'govuk_publishing_components/components/phase_banner', phase: "beta" %>
<% end %>

<%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_store_manual %>

<header aria-labelledby="manual-title" class="<%= presented_manual.hmrc? ? 'hmrc' : nil %>">

    <% if presented_manual.hmrc? %>
      HMRC internal manual
    <% end %>

<%= presented_manual.title %>

    <%= render 'govuk_publishing_components/components/metadata', presented_manual.metadata %>

      <form action="/search/all" >
        Search this manual
        <input type='hidden' name="manual[]" value="<%= presented_manual.url %>">
        <input id="search-box" class="in-manual-search-box" type="text" name="q"/>
        <button type="submit">search</button>
      </form>

        <%= link_to 'Give feedback about this page', 'https://www.gov.uk/contact/govuk', :class=> "feedback" %>

Use manual instead of filter_manual for search

This is a followup to https://github.com/alphagov/manuals-frontend/pull/616


<%= title('Courses') %>

Curriculum

          If you want to learn web development, you've come to the right place.  We found the best free resources out there and grouped them into the courses listed below so you don't have to waste time doing it yourself. We've also created projects for you to build along the way so you can really learn the material and boost your portfolio.

          The courses are designed to be completed in order, so start from the top and work your way down. The best part is, it's free!

      <% @courses.each do |course| %>
        <%= render 'course_card', course: CourseDecorator.new(course) %>
      <% end %>

Add container to curriculum page

Add container to curriculum page


<%
  @title = :sequence_add_title.t
  tabs = [
    link_with_query(:cancel_and_show.t(type: :observation),
                    @observation.show_link_args)
  ]
  @tabsets = { right: draw_tab_set(tabs) }
%>

<%= render(partial: "observation_title",
           locals: { observation: @observation }) %>

<%= form_for(:sequence, url: add_query_param(action: :create)) do |form| %>
  <%= render(partial: "form", locals: { form: form }) %>
<% end %>

<%
  @title = :sequence_add_title.t
  tabs = [
    link_with_query(:cancel_and_show.t(type: :observation),
                    @observation.show_link_args)
  ]
  @tabsets = { right: draw_tab_set(tabs) }
%>

<%= render(partial: "observation_title",
           locals: { observation: @observation }) %>
<%= form_for(
      :sequence,
      url: add_query_param(sequence_path(id: @observation.id))
    ) do |form| %>
  <%= render(partial: "form", locals: { form: form }) %>
<% end %>

Fix `new` form submit action

Fix `new` form submit action


server {
  listen      80;
  server_name <%= @server_name %>;
  root        <%= @blog_root %>/_site;
  autoindex   off;

  location ~ ^/(google.+\.html|robots\.txt) {  }

  location / {
    auth_basic 'Restricted';
    auth_basic_user_file /opt/nginx/.htpasswd;
  }
}

server {
  listen      80;
  listen      443 ssl;

  server_name <%= @server_name %>;
  root        <%= @blog_root %>/_site;
  autoindex   off;

  location ~ ^/(google.+\.html|robots\.txt) {  }

  location / {
    auth_basic 'Restricted';
    auth_basic_user_file /opt/nginx/.htpasswd;
  }
}

Enable SSL for draft blog.

Enable SSL for draft blog.


name: universe
channels: !!python/tuple
- defaults
dependencies:
- conda-forge::hdf5=1.8.17=9
- conda-forge::jasper=1.900.1=3
- conda-forge::jpeg=9b=0
- conda-forge::libpng=1.6.28=0
- conda-forge::libtiff=4.0.6=7
- conda-forge::opencv=3.1.0=np111py35_1
- libgcc=5.2.0=0
- libgfortran=3.0.0=1
- mkl=2017.0.1=0
- numpy=1.11.3=py35_0
- openssl=1.0.2j=0
- pip=9.0.1=py35_1
- python=3.5.2=0
- readline=6.2=2
- scipy=0.18.1=np111py35_1
- setuptools=27.2.0=py35_0
- six=1.10.0=py35_0
- sqlite=3.13.0=0
- tk=8.5.18=0
- wheel=0.29.0=py35_0
- xz=5.2.2=1
- zlib=1.2.8=3
prefix: <%= node['universe']['conda_prefix'] %>

name: universe
channels: !!python/tuple
- defaults
dependencies:
- conda-forge::hdf5=1.8.17=9
- conda-forge::jasper=1.900.1=3
- conda-forge::jpeg=9b=0
- conda-forge::libpng=1.6.28=0
- conda-forge::libtiff=4.0.6=7
- conda-forge::opencv=3.1.0=np111py35_1
- libgcc=5.2.0=0
- libgfortran=3.0.0=1
- mkl=2017.0.1=0
- numpy=1.11.3=py35_0
- openssl=1.0.2j=0
- pip=9.0.1=py35_1
- python=3.5.2=0
- readline=6.2=2
- scipy=0.18.1=np111py35_1
- setuptools=27.2.0=py35_0
- six=1.10.0=py35_0
- sqlite=3.13.0=0
- tk=8.5.18=0
- wheel=0.29.0=py35_0
- xz=5.2.2=1
- zlib=1.2.8=3
prefix: <%= node['universe']['conda_env'][:CONDA_PREFIX] %>

Update template to use new attribute values


Buildings

  <%= link_to "Add Building", new_admin_building_path, class: "btn btn-save" %>

  <% @buildings.each do |b| %>

	    <a href="<%= edit_admin_building_path(b.id) %>" class="user-link">
        <%= [b.street_address, b.zip_code, b.property_name].join(" | ") %>

  <% end %>

Buildings

  <%= link_to "Add Building", new_admin_building_path %>
  <% @buildings.each do |b| %>

	    <a href="<%= edit_admin_building_path(b.id) %>" class="user-link">
        <%= [b.street_address, b.zip_code, b.property_name].join(" | ") %>

  <% end %>

Use simple text link for Add Building instead of trying to style as a button


$('#markdownModal div.modal-body').replaceWith("<%= escape_javascript(render :partial => 'shared/markdown_help') %>");
// needs to be on one line or else css function goes wonky and doesn't work
$('#markdownModal').modal().css({width: 'auto', 'margin-left': function () {return -($(this).width() / 2);}});

$('#markdownModal div.modal-body').replaceWith("<%= escape_javascript(render :partial => 'shared/markdown_help') %>");
// needs to be on one line or else css function goes wonky and doesn't work
$('#markdownModal').modal();

Fix markdown help modal display

Fix markdown help modal display


# Generated by Chef
# host definitions

define host {
  use server
  address <%= node['ipaddress'] %>
  host_name <%= node['hostname'] %>
  hostgroups <%= node['nagios']['server_role'] %>
}

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

<% end -%>

Format change to fix writing out the erb

Former-commit-id: 7597cdfcb8fb270d559f8dea55f79baa40d35661 [formerly 9ed5520ef4bf675e1ff446c0e778eca8666d647d] [formerly 4af6b34f1350d2ee62c6eae5a7f77a4eff4fbeed [formerly cc9dbf3c3aa75dbabb9589219d5fa45102f2b1a0]]
Former-commit-id: 142b5e18f4e7c3d5a8065f474ab1343bab24c815 [formerly fc1a9fa43aa2bd9f1a353726eb001134806eb9e3]
Former-commit-id: 08745c803503b7368c288c9b1c101884d4d16371


<!-- Begin Impact Radius Tracking Code -->
<% if @order && @order.completed_at && @order.completed_at > 1.minute.ago && @order.send_to_impact_radius? %>

  <script type='text/javascript' src='<%= ENV['IMPACT_RADIUS_JS_URL'] %>'></script>
  <script type='text/javascript'>
    irEvent.setOrderId('<%= j @order.number %>');
    <% @order.line_items.each do |line_item| %>
    irEvent.addItem('<%= j line_item.variant.product.name %>', '<%= j line_item.variant.sku %>', '<%= line_item.price %>', '<%= line_item.quantity %>');
    <% end %>
    irEvent.setPromoCode("<%= j @order.all_adjustments.promotion.eligible.map{|a| a.source.promotion.code }.join(', ') %>");
    irEvent.setCustomerId("<%= j @order.email.first(50) %>");
    irEvent.setPostcode("<%= j @order.ship_address.zipcode %>");
    irEvent.setSubTotal("<%= @order.item_total %>");
    irEvent.setCurrency("<%= @order.currency || 'USD' %>");
    irEvent.fire();
  </script>

<% end %>
<!-- End Impact Radius Tracking Code -->

<!-- Begin Impact Radius Tracking Code -->
<% if @order && @order.completed_at && @order.completed_at > 1.minute.ago && @order.send_to_impact_radius? %>

  <script type='text/javascript' src='<%= ENV['IMPACT_RADIUS_JS_URL'] %>'></script>
  <script type='text/javascript'>
    irEvent.setOrderId('<%= j @order.number %>');
    <% @order.line_items.each do |line_item| %>
    irEvent.addItem('<%= j line_item.variant.product.name %>', '<%= j line_item.variant.sku %>', '<%= line_item.price %>', '<%= line_item.quantity %>');
    <% end %>
    irEvent.setPromoCode("<%= j @order.all_adjustments.promotion.eligible.map{|a| a.source.promotion.code }.join(', ') %>");
    irEvent.setCustomerId("<%= j @order.email.first(50) %>");
    irEvent.setPostcode("<%= j @order.ship_address.zipcode %>");
    irEvent.setSubTotal("<%= @order.item_total %>");
    irEvent.setCurrency("<%= @order.currency || 'USD' %>");
    <% if Rails.env.production? %>
      irEvent.fire();
    <% else %>
      // did not call irEvent.fire because not in production environment
    <% end %>
  </script>

<% end %>
<!-- End Impact Radius Tracking Code -->

Update to only send to IR in production.


<%= render :partial => "toplevel_tabs" %>

<ul class="tabstrip2">
	<%= tabstrip_li "Main", @questionnaire, :level => 2, :action => 'show' %>
	<% if logged_in? and logged_in_person.permitted?(@questionnaire, "edit") -%>
       <%= tabstrip_li "Edit", edit_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'edit', :disabled => @questionnaire.is_open %>
       <%= tabstrip_li "Customize", customize_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'customize', :disabled => @questionnaire.is_open %>
       <%= tabstrip_li "Export/Print", export_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'export' %>
	   <%= tabstrip_li "Share", share_questionnaire_path(@questionnaire),
						:level => 2, :action => 'share' %>
  <% end -%>
</ul>

<%= render :partial => "toplevel_tabs" %>

<ul class="tabstrip2">
	<%= tabstrip_li "Main", @questionnaire, :level => 2, :action => 'show' %>
	<% if logged_in? and logged_in_person.permitted?(@questionnaire, "edit") -%>
       <%= tabstrip_li "Edit", edit_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'edit', :disabled => @questionnaire.is_open %>
       <%= tabstrip_li "Customize", customize_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'customize' %>
       <%= tabstrip_li "Export/Print", export_questionnaire_path(@questionnaire),
                        :level => 2, :action => 'export' %>
	   <%= tabstrip_li "Share", share_questionnaire_path(@questionnaire),
						:level => 2, :action => 'share' %>
  <% end -%>
</ul>

Allow customize even when the survey is currently open


<% content_for :head do %>
  <title><%= t(:users, :scope => :admin) %> - <%= Settings.application.name %></title>
<% end %>

      ID
      Login
      Name
      Email
      Failed attempts
      Created
      Updated
      Role
      Actions

    <% @users.each do |user| %>

        <%= user.id %>
        <%= user.login %>
        <%= user.name %>
        <%= user.email %>
        <%= user.failed_attempts %>
        <%= user.created_at %>
        <%= user.updated_at %>
        <%= user.role.name %>
        edit/delete

    <% end %>

  <%= will_paginate @users, :container => false %>

    <%= page_entries_info @users %>

<% content_for :head do %>
  <title><%= t(:users, :scope => :admin) %> - <%= Settings.application.name %></title>
<% end %>

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

      ID
      Login
      Name
      Email
      Failed attempts
      Created
      Updated
      Role
      Actions

    <% @users.each do |user| %>

        <%= user.id %>
        <%= user.login %>
        <%= user.name %>
        <%= user.email %>
        <%= user.failed_attempts %>
        <%= user.created_at %>
        <%= user.updated_at %>
        <%= user.role.name %>
        edit/delete

    <% end %>

  <%= will_paginate @users, :container => false %>

    <%= page_entries_info @users %>

Add missing partial for flash_messages

Add missing partial for flash_messages


Cart Queued for Sending

  Patient Name:
  <%= @patient.patient_name %>

  Access Code:
  <%= format_token(@job_set.send_components[:access_code]) %>

  Date of Birth:
  <%= @patient.dob %>

<% if @job_set.logic_type == :send_to_site %>
<% else %>

  Email Address:
  <%= @job_set.send_components[:email_address] %>

<% end %>

<%= link_to("Print", {:controller => :exams, :action => :index, logic_type: @job_set.logic_type, :patient_id => @patient.id}.merge(@job_set.send_components), class: "btn btn-primary") %>

Cart Queued for Sending

  Patient Name:
  <%= @patient.patient_name %>

  Access Code:
  <%= format_token(@job_set.send_components[:access_code]) %>

  Date of Birth:
  <%= @patient.dob %>

<%= link_to("Print", {:controller => :exams, :action => :index, logic_type: @job_set.logic_type, :patient_id => @patient.id}.merge(@job_set.send_components), class: "btn btn-primary") %>

Remove email address from token info dialog


<%new_message_visble = message.unread?(current_user) ? 'new-message-visble' : ''%>
<li class="<%=  self_or_other(message) %>">

    <span class="new-message-hidden <%=new_message_visble%> label label-success absolute">
      NEW

        <%if message_interlocutor(message).image.exists?%>
          <%= image_tag message_interlocutor(message).image.url(:small)%>
        <%else%>
          <%= image_tag 'portraitplaceholder.png' %>
        <%end%>

<%= message.body %>

    <time>
      <span class="time-<%=message.id%>">
    </time>

<%new_message_visble = message.unread?(current_user) ? 'new-message-visble' : ''%>
<li class="<%=  self_or_other(message) %>">

    <span class="new-message-hidden <%=new_message_visble%> label label-success absolute">
      NEW

        <%if message_interlocutor(message).image.exists?%>
          <%= image_tag message_interlocutor(message).image.url(:small)%>
        <%else%>
          <%= image_tag 'portraitplaceholder.png' %>
        <%end%>

<%= message.body %>

    <time datetime="<%= message.created_at %>" title="<%= message.created_at.strftime("%d %b  %Y at %I:%M%p") %>">
      <%= message_interlocutor(message).name %> • <%= message.created_at.strftime("%H:%M %p") %>
    </time>

Revert "change message time display to use client time rather than server time"

This reverts commit 65910f497725172a5ef374ad4d23833988086be8.


<%# add navigation links to this file %>
<% if user_signed_in? %>

<%= link_to 'Edit account', edit_user_registration_path %>

<%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %>

<% else %>
<% end %>

<%# add navigation links to this file %>
<% if user_signed_in? %>

<%= link_to 'Edit data', events_url %>

<%= link_to 'Edit account', edit_user_registration_path %>

<%= link_to 'Sign out', destroy_user_session_path, :method=>'delete' %>

<% else %>
<% end %>

Add link to edit events data, visible to logged-in users.


<% current_version = project.versions.where("effective_date >= ?", Time.now).last %>
<% active = (current_version && Redmine::Activity::Fetcher.new(User.current, :project => project, :with_subprojects => true).events(Time.now - Setting.plugin_project_overview[:stale_num_days].to_i.days, Time.now).any?) %>

<% if active || @stale %>

	<%= link_to project.name, project_path(project) %>
	<%= active ? "Active" : "Stale" %>
	<%= current_version.name if current_version %>
	<%= progress_bar([current_version.closed_pourcent, current_version.completed_pourcent], :width => "100%") if current_version %>
	<%= current_version.due_date if current_version %>
	<% project.visible_custom_field_values.each do |custom_value| %>

	  	<% if !custom_value.value.blank? %>
	     	<%=h show_value(custom_value) %>
	  	<% end %>

  <% end %>

<% end %>

<% current_version = project.versions.where("effective_date >= ?", Time.now).last %>
<% active = (current_version && Redmine::Activity::Fetcher.new(User.current, :project => project, :with_subprojects => true).events(Time.now - Setting.plugin_project_overview[:stale_num_days].to_i.days, Time.now).any?) %>

<% if active || @stale %>

	<%= link_to project.name, project_path(project) %>
	<%= active ? "Active" : "Stale" %>
	<%= link_to_version(current_version) if current_version %>
	<%= progress_bar([current_version.closed_pourcent, current_version.completed_pourcent], :width => "100%") if current_version %>
	<%= current_version.due_date if current_version %>
	<% project.visible_custom_field_values.each do |custom_value| %>

	  	<% if !custom_value.value.blank? %>
	     	<%=h show_value(custom_value) %>
	  	<% end %>

  <% end %>

<% end %>

Add a helper link to project versions.

Add a helper link to project versions.


<div class="card <%= supply %>-card">

Select Energy Type

    <% Meter.meter_types.keys.each_with_index do |type| %>

        <% disabled = type == :electricty ? school.has_electricity? : school.has_gas? %>

        <div class="form-check <%= disabled ? "" : "disabled" %>">

            <input class="form-check-input" type="radio" name="supplyType"
                   id="supply-type-<%= type %>>" value="<%= type %>"
                   <%= supply == type ? "checked" : "" %>
                   <%= disabled ? "" : "disabled" %> >
            <%= type.capitalize %>

    <% end %>

    <% if school.both_supplies? %>
        We have both gas and electricity data for this school
    <% else %>
        We only have <%= school.meters.first.meter_type %> usage data for this school
    <% end %>

<div class="card <%= supply %>-card">

Select Energy Type

    <% Meter::CREATABLE_METER_TYPES.each_with_index do |type| %>

        <% disabled = type == :electricty ? school.has_electricity? : school.has_gas? %>

        <div class="form-check <%= disabled ? "" : "disabled" %>">

            <input class="form-check-input" type="radio" name="supplyType"
                   id="supply-type-<%= type %>>" value="<%= type %>"
                   <%= supply == type ? "checked" : "" %>
                   <%= disabled ? "" : "disabled" %> >
            <%= type.capitalize %>

    <% end %>

    <% if school.both_supplies? %>
        We have both gas and electricity data for this school
    <% else %>
        We only have <%= school.meters.first.meter_type %> usage data for this school
    <% end %>

Use creatable meter types for supply type selection


Your Mentoring Session

Scheduled For:<%= @timeslot.start %>

Mentor:

    <%= link_to image_tag(@timeslot.tutor.image) %>

<%= @timeslot.tutor.name %>.

Your Pupil:

    <% if @timeslot.student_id.nil? %>

A student has yet to sign up for this timeslot.

    <% else %>
      <%= link_to image_tag(@timeslot.student.image) %>

<%= @timeslot.student.name %>

    <% end %>

Your Mentoring Session

        Scheduled For: <%= @timeslot.start.strftime("%m/%d/%Y at %I:%M%p") %>

          <%= link_to( image_tag(@timeslot.tutor.image), :class => 'img-circle') %>

            <%= @timeslot.tutor.name %>

          Mentor

          <% if @timeslot.student_id.nil? %>

              A student has yet to sign up for this timeslot.

          <% else %>

              <%= link_to( image_tag(@timeslot.student.image), :class => 'img-circle') %>

                <%= @timeslot.student.name %>

              Your Pupil

          <% end %>

Add tags for styling of a tutor's timeslot show


<div id='topic' class='<%= @topic.locked? ? 'locked' : 'unlocked' %>'>

<%= link_to t('forem.forum.forums'), forums_path %> » <%= link_to @topic.forum.title, @topic.forum %> » <%= @topic.subject %>

  <menu>
    <% if @topic.can_be_replied_to? %>
      <%= link_to t(".reply"), new_topic_post_path(@topic) %>
    <% end %>
    <% if @topic.user == current_user || forem_admin? %>
      | <%= link_to t(".delete"), forum_topic_path(@forum, @topic), :method => :delete, :confirm => 'Are you sure?' %>
    <% end %>
  </menu>
  <%= paginate @posts %>

    <%= render :partial => "forem/posts/post", :collection => @posts %>

Remove h2 that was wrapping a h2

Remove h2 that was wrapping a h2