<form action="<%= main_app.search_results_path %>" method="get" role="search" class="search">
  <%= t('search_box.label') %>
  <input class="search__input" id="search" required type="search" name="query" value="<%= params[:query] %>"
    placeholder="<%= t('search_box.placeholder') %>" />

  <button type="reset" class="search__clear">

    clear the search field
  </button>

  <button class="search__submit <%= 'search__submit--green' if search_in_page_header %>" type="submit">

    <%= t('search_box.button_text') %>
  </button>
</form>

<form data-dough-component="ClearInput" action="<%= main_app.search_results_path %>" method="get" role="search" class="search">
  <%= t('search_box.label') %>
  <input data-dough-clear-input class="search__input" id="search" required type="search" name="query" value="<%= params[:query] %>"
    placeholder="<%= t('search_box.placeholder') %>" />

  <button data-dough-clear-input-button type="reset" class="search__clear">

    clear the search field
  </button>

  <button class="search__submit <%= 'search__submit--green' if search_in_page_header %>" type="submit">

    <%= t('search_box.button_text') %>
  </button>
</form>

Add data-dough attributes to HTML component


  <form class="form-signin" role="form">

Please sign in

    <input type="email" class="form-control" placeholder="Email address" required autofocus>
    <input type="password" class="form-control" placeholder="Password" required>

        <input type="checkbox" value="remember-me"> Remember me

    <button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
  </form>

Change view name from index to signin

Change view name from index to signin


<% render_main_sidebar_menu; render_content_header_breadcrumb %>

      <%= link_to_new %>

          <%= tag.th Cdx::Site.human_attribute_name(:name) %>
          <%= tag.th Cdx::Site.human_attribute_name(:acronym) %>
          <%= tag.th Cdx::Site.human_attribute_name(:domain) %>
          <%= tag.th t('admin.actions.all') %>

        <% @collection.each do |object| %>

              <%= tag.td object.name %>
              <%= tag.td object.acronym %>
              <%= tag.td object.domain %>
              <%= tag.td link_to_edit(object) %>

        <% end %>

<% render_main_sidebar_menu; render_content_header_breadcrumb %>

      <%= link_to_new %>

          <%= tag.th Cdx::Site.human_attribute_name(:name) %>
          <%= tag.th Cdx::Site.human_attribute_name(:acronym) %>
          <%= tag.th Cdx::Site.human_attribute_name(:domain) %>
          <%= tag.th t('admin.actions.all') %>

        <% @collection.order(:name).each do |object| %>

              <%= tag.td object.name %>
              <%= tag.td object.acronym %>
              <%= tag.td object.domain %>
              <%= tag.td link_to_edit(object) %>

        <% end %>

Add order to Sites list

Add order to Sites list


Resend confirmation instructions

<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
  <%= devise_error_messages! %>

    <%= f.label :email %>

    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>

    <%= f.submit "Resend confirmation instructions" %>

<% end %>

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

Remove trailing whitespace from confirmation view

Though not a real issue, it was highlighted as an error by my commit
hooks, so I took the opportunity to fix it.


                    <%= event.hospitalities.first.name %>

                    <%= event.hospitalities.first.contact_person_home_phone %>

                    <%= event.hospitalities.first.contact_person_cell_phone %>

                    <%= event.hospitalities.first.address %>

                    <%= event.hospitalities.first.display_min_capacity %>

                    <%= event.hospitalities.first.display_max_capacity %>

                     [--]

<% event.hospitalities.each do |ev| %>
<% binding.pry %>

      <%= ev.name %>

      <%= ev.contact_person_home_phone %>

      <%= ev.contact_person_cell_phone %>

      <%= ev.address %>

      <%= ev.display_min_capacity %>

      <%= ev.display_max_capacity %>

       [--]

<% end %>

Set up partial to loop through each hospitality for an event


<div class="file-upload" data-<%= model_name %>-id="<%= model_instance.id %>">
  <%= form_for model_instance, :url    => update_route,
                               :method => "put",
                               :html   => { :class     => "file-upload",
                                            :id        => "#{model_name}-#{attribute_name}",
                                            :multipart => true } do |form| %>

        Current File

        <img src="<%= model_instance.send(attribute_name) %>" alt="Current Image Cannot be Displayed">

          Upload New File...
          <%= form.file_field attribute_name.to_sym %>

  <% end %>

<div class="file-upload" data-<%= model_name %>-id="<%= model_instance.id %>">
  <%= form_for model_instance, :url    => update_route,
                               :remote => true,
                               :method => "put",
                               :html   => { :class     => "file-upload",
                                            :id        => "#{model_name}-#{attribute_name}",
                                            :multipart => true } do |f| %>

        Current File

        <img src="<%= model_instance.send(attribute_name) %>" alt="Current Image Cannot be Displayed">

          Upload New File...
          <%= f.file_field attribute_name.to_sym %>

  <% end %>

Update File Upload Form for Remote

Update File Upload Form for Remote

Update the file upload form to ensure the form utilizes
data-remote="true" and the corresponding remotipart gem capabilities for
AJAX file upload.


	<form method="GET" action="<%= factlink_overview_path %>">
		<input id="factlink_search" type="text" class="search" name="s" placeholder="Search Factlink..." <%= params[:s] ? 'value="#{params[:s]}"' : "" %> >
	</form>

	<form method="GET" action="<%= factlink_overview_path %>">
		<input id="factlink_search" type="text" class="search" name="s" placeholder="Search Factlink..." value="<%= params[:s] ? params[:s] : '' %>" >
	</form>

Print the correct search params in the value field


Dear <%= @form["full_name"] %>

You’ve registered <%= @form["organisation_name"] %> as an organisation that receives funding directly from the EU. Your reference number is <%= @reference_number %>.

Your details will be passed to the government department responsible for the EU programme. They’ll contact you within 15 working days.

Email helpdesk.grants.registration@cabinetoffice.gov.uk if you have a question or need to change the details you submitted - do not try to register again. You’ll usually get a reply within 5 working days.

Regards

Grants Management Function, Cabinet Office

Do not reply to this email - it is an automatic message from an unmonitored account. Email helpdesk.grants.registration@cabinetoffice.gov.uk

Dear <%= @form["full_name"] %>

You’ve registered <%= @form["organisation_name"] %> as an organisation that receives funding directly from the EU. Your reference number is <%= @reference_number %>.

Your details have been passed to the government department responsible for the EU programme. They’ll contact you within 15 working days.

Email helpdesk.grants.registration@cabinetoffice.gov.uk if you have a question or need to change the details you submitted - do not try to register again. You’ll usually get a reply within 5 working days.

Regards

Grants Management Function, Cabinet Office

Do not reply to this email - it is an automatic message from an unmonitored account. Email helpdesk.grants.registration@cabinetoffice.gov.uk

Update wording for EU Funding confirmation email

Registrations are now being sent directly to the relevant department,
rather than Cabinet Office's Grants Management Function, therefore we
should update the email text to reflect this.


log4j.category.com.webtrends.streaming = ERROR, ERR

log4j.rootLogger=INFO, ROOT

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n

log4j.appender.ERR=org.apache.log4j.RollingFileAppender
log4j.appender.ERR.File=<%= @home_dir %>/logs/service-control.err.log
log4j.appender.ERR.MaxBackupIndex=3
log4j.appender.ERR.MaxFileSize=200MB
log4j.appender.ERR.layout=org.apache.log4j.PatternLayout
log4j.appender.ERR.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n

log4j.appender.ROOT=org.apache.log4j.RollingFileAppender
log4j.appender.ROOT.File=<%= @home_dir %>/logs/service-control.log
log4j.appender.ROOT.MaxBackupIndex=3
log4j.appender.ROOT.MaxFileSize=200MB
log4j.appender.ROOT.layout=org.apache.log4j.PatternLayout
log4j.appender.ROOT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n

log4j.category.com.webtrends.streaming = ERROR, ERR

log4j.rootLogger=INFO, ROOT

log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n

log4j.appender.ERR=org.apache.log4j.RollingFileAppender
log4j.appender.ERR.File=/var/log/storm/logs/service-control.err.log
log4j.appender.ERR.MaxBackupIndex=3
log4j.appender.ERR.MaxFileSize=200MB
log4j.appender.ERR.layout=org.apache.log4j.PatternLayout
log4j.appender.ERR.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n

log4j.appender.ROOT=org.apache.log4j.RollingFileAppender
log4j.appender.ROOT.File=/var/log/storm/logs/service-control.log
log4j.appender.ROOT.MaxBackupIndex=3
log4j.appender.ROOT.MaxFileSize=200MB
log4j.appender.ROOT.layout=org.apache.log4j.PatternLayout
log4j.appender.ROOT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n

Modify an additional log4j file in the wt_storm cookbook to use /var/log/storm


$('#ranking-table').replaceWith("<%= j(render partial: 'gobierto_budgets/places/ranking_table') %>")
$('.pagination').replaceWith("<%= j(paginate @ranking_items, remote: true) %>")

function updatePageUrl() {
  history.pushState(null, '', "<%= request.url %>");
}

function updateDataEndpointPath() {
  $('[data-ranking-url]').data('ranking-url', "<%= request.path %>");
}

updatePageUrl();
updateDataEndpointPath();

$('#ranking-table').replaceWith("<%= j(render partial: 'gobierto_budgets/places/ranking_table') %>")
$('.pagination').replaceWith("<%= j(paginate @ranking_items, remote: true) %>")

function updatePageUrl() {
  history.pushState({ turbolinks: {} }, '', "<%= request.url %>");
}

function updateDataEndpointPath() {
  $('[data-ranking-url]').data('ranking-url', "<%= request.path %>");
}

updatePageUrl();
updateDataEndpointPath();

Fix turbolinks issues with browser back button


Protected Areas coverage in 2017

  <div
    id="map-marine"
    class="map map--main"
    data-style="marine"
    data-bound-from="<%= map_bounds['from'] %>"
    data-bound-to="<%= map_bounds['to'] %>"
    data-hide-control="true"
    data-zoom-position="bottomleft">

Number of Marine Protected Areas

<counter :total="18300"></counter>

Percent of the ocean covered by protected areas

<counter :total="5.7"></counter>%

Total Area Protected

<counter :total="20500000"></counter>km²

    The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries.

Add disclaimer to the map on the marine page


<!DOCTYPE html>
<html>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <!-- <meta name="robots" content="index, follow"> -->
    <%# display_meta_tags site: @current_tenant.tenant_display_name %>
    <%= stylesheet_link_tag    "pwb_admin_panel/application", media: "all" %>
    <%= javascript_include_tag "pwb_admin_panel/application" %>
    <%= csrf_meta_tags %>
  </head>
  <body class="">
    <%= yield %>
  </body>
</html>

<!DOCTYPE html>
<html>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <title>PropertyWebBuilder Admin</title>
    <!-- <meta name="robots" content="index, follow"> -->
    <%# display_meta_tags site: @current_agency.tenant_display_name %>
    <%= stylesheet_link_tag    "pwb_admin_panel/application", media: "all" %>
    <%= javascript_include_tag "pwb_admin_panel/application" %>
    <%= csrf_meta_tags %>

    <base href="/" />
    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300' rel='stylesheet' type='text/css'>
    <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
  </head>
  <body class="">
    <%= yield %>
  </body>
</html>

Add google fonts for admin panel

Add google fonts for admin panel


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

SSLProtocol All -SSLv2 -SSLv3

SSLHonorCipherOrder On
SSLCipherSuite <%= node[:ssl][:ciphers] %>
<% if node[:lsb][:release].to_f < 16.04 -%>

SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
<% end -%>

SSLUseStapling On
SSLStaplingResponderTimeout 5
SSLStaplingErrorCacheTimeout 60
SSLStaplingReturnResponderErrors off
SSLStaplingFakeTryLater off
SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)

Header setifempty Strict-Transport-Security max-age=3600 env=HTTPS

Enable HSTS for all apache served SSL sites


include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                    ${CMAKE_CURRENT_BINARY_DIR})

<%- Dir.glob(target_directory + '/*_tests.cpp').each do |test_file| %>
<%- basename = test_file[0..-5].gsub(target_directory + '/', '') %>
add_executable(<%= basename %> <%= basename + '.cpp' %>)
target_link_libraries(<%= basename %> ${TEST_LINK_LIBRARIES} QtTest)
add_test(<%= basename %> <%= basename %>)

<%- end %>

include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                    ${CMAKE_CURRENT_BINARY_DIR})

<%- Dir.glob(target_directory + '/*_tests.cpp').each do |test_file| %>
<%- dirname = target_directory[(TESTS_DIR.length + 1)..-1] %>
<%- basename = test_file[(target_directory.length + 1)..-5] %>
add_executable(<%= basename %> <%= basename + '.cpp' %>)
target_link_libraries(<%= basename %>
                      ${TEST_LINK_LIBRARIES}
                      ${QT_QTTEST_LIBRARY})
add_test(<%= [dirname, basename].compact.join('/') %> <%= basename %>)

<%- end %>

Test names follow subdirectories; full QtTest library path used


<div ng-controller="sortCtrl" ng-app="smart_management"
  data-plural-model-name = "<%= plural_model_name %>">

  <%= render 'table' %>

  Add a new

<div ng-controller="sortCtrl" ng-app="smart_management"
  data-plural-model-name = "<%= plural_model_name %>">

<%= plural_model_name.capitalize %>

  <%= render 'table' %>

  Add a new

Add the name of models

Add the name of models


<%= search_form_for @q, url: collection_path do |f| %>

  <%= f.label :id_eq, 'ID igual a' %>
  <%= f.text_field :id_eq %>
  <%= f.label :numero_eq %>
  <%= f.text_field :numero_eq %>
  <%= f.label :autor_eq %>
  <%= f.text_field :autor_eq %>
  <% #TODO: Add tags to this form with the javascript part %>
  <%= f.label :tags_id_eq, 'Tags' %>
  <%= f.select(:tags_id_eq, Tag.all.map { |t| [t.name, t.id] }, {:multiple => true}, {:class  => 'chzn-select'}) %>
  <%= f.label :pases_descripcion_cont %>
  <%= f.text_field :pases_descripcion_cont %>
  <%= f.label :primer_pase_area_name_cont %>
  <%= f.text_field :primer_pase_area_name_cont %>
  <%= f.label :ultimo_pase_area_name_cont %>
  <%= f.text_field :ultimo_pase_area_name_cont %>

  <%= f.label :pases_ingreso_gteq, 'Ingresada entre:'%>
  <%= f.text_field :pases_ingreso_gteq, :class => 'datepicker' %>
  <%= f.label :pases_ingreso_lteq, 'y' %>
  <%= f.text_field :pases_ingreso_lteq, :class => 'datepicker' %>

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

<%= search_form_for @q, url: collection_path do |f| %>

  <%= f.label :id_eq, 'ID igual a' %>
  <%= f.text_field :id_eq %>
  <%= f.label :numero_eq %>
  <%= f.text_field :numero_eq %>
  <%= f.label :autor_eq %>
  <%= f.text_field :autor_eq %>
  <% #TODO: Add tags to this form with the javascript part %>
  <%= f.label :tags_id_eq, 'Tags' %>
  <%= f.select :tags_id_in, options_from_collection_for_select(Tag.all, :id, :name),
      {}, class: 'chzn-select', multiple: true %>
  <%= f.label :pases_descripcion_cont %>
  <%= f.text_field :pases_descripcion_cont %>
  <%= f.label :primer_pase_area_name_cont %>
  <%= f.text_field :primer_pase_area_name_cont %>
  <%= f.label :ultimo_pase_area_name_cont %>
  <%= f.text_field :ultimo_pase_area_name_cont %>

  <%= f.label :pases_ingreso_gteq, 'Ingresada entre:'%>
  <%= f.text_field :pases_ingreso_gteq, :class => 'datepicker' %>
  <%= f.label :pases_ingreso_lteq, 'y' %>
  <%= f.text_field :pases_ingreso_lteq, :class => 'datepicker' %>

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

Fix select for collection on search.

Fix select for collection on search.


<%= link_to span_tag(t('cms.views.sites.create_new_site')), new_cms_admin_site_path, :class => 'big button' %>

<%= t('cms.sections.sites') %>

  <% @cms_sites.each do |cms_site| %>
    <li id='cms_site_<%= cms_site.id %>'>

          <%= link_to t('cms.views.edit'), edit_cms_admin_site_path(cms_site) %>
          <%= link_to t('cms.views.delete'), cms_admin_site_path(cms_site), :method => :delete, :confirm => t('cms.views.are_you_sure') %>

          <%= link_to cms_site.label, edit_cms_admin_site_path(cms_site) %>

            <%= link_to cms_site.hostname, "http://#{cms_site.hostname}/cms-admin" %>

  <% end %>

<%= link_to span_tag(t('cms.views.sites.create_new_site')), new_cms_admin_site_path, :class => 'big button' %>

<%= t('cms.sections.sites') %>

  <% @cms_sites.each do |cms_site| %>
    <li id='cms_site_<%= cms_site.id %>'>

          <%= link_to 'Admin', cms_admin_pages_url(:host => cms_site.hostname, :port => request.port) %>
          <%= link_to t('cms.views.edit'), edit_cms_admin_site_path(cms_site) %>
          <%= link_to t('cms.views.delete'), cms_admin_site_path(cms_site), :method => :delete, :confirm => t('cms.views.are_you_sure') %>

          <%= link_to cms_site.label, edit_cms_admin_site_path(cms_site) %>

            <%= link_to cms_site.hostname, cms_html_url(:host => cms_site.hostname, :port => request.port), :target => '_blank' %>

  <% end %>

Add better links to the sites index view


<%= class_name.camelize.pluralize %>

  <a class="button slide" href="<%%= url_for :controller => :<%= name.camelize %>, :action => :new %>">New

    <%% @<%= name.downcase.pluralize %>.each do |obj| %>
    <% if self.attributes? %>

          <a class="slide" href="<%%= url_for :action => :show, :id => obj.object %>">
            <%%= obj.<%= attributes[0] %> %>

    <% else %>

          Some list entry...

    <% end %>
    <%% end %>

<%= name.camelize.pluralize %>

  <a class="button slide" href="<%%= url_for :controller => :<%= name.camelize %>, :action => :new %>">New

    <%% @<%= name.downcase.pluralize %>.each do |<%= name.downcase %>| %>
    <% if self.attributes? %>

          <a class="slide" href="<%%= url_for :action => :show, :id => <%= name.downcase %>.object %>">
            <%%= <%= name.downcase %>.<%= attributes[0] %> %>

    <% else %>

          Some list entry...

    <% end %>
    <%% end %>

Use name in block when creating list items


<% if defined?(@project.name) && !@project.name.blank?
     display_name = @project.name
   else
     display_name = "(Name Unknown)"
   end %>

Project Badge Status for <%= display_name %>

<%= render 'form', project: @project, is_disabled: true %>

<%= link_to 'Back', projects_path %>
<% if logged_in? %>
  <%= link_to 'Edit', edit_project_path(@project) %>
  <%= link_to 'Remove', @project, method: :delete, data: { confirm: 'Are you sure?' } %>
<% end %>

Project Badge Status for <%=
    @project.try(:name).presence || '(Name Unknown)' %>

<%= render 'form', project: @project, is_disabled: true %>

<%= link_to 'Back', projects_path %>
<% if logged_in? %>
  <%= link_to 'Edit', edit_project_path(@project) %>
  <%= link_to 'Remove', @project, method: :delete, data: { confirm: 'Are you sure?' } %>
<% end %>

Use better idiom for handling not-present


      Carrier
      Carrier Group ID
      Carrier Pol #
      Plan
      Coverage Type
      Metal level
      Effective date

    <%= table_empty_to_human if elected_plans.count < 1 %>
    <% elected_plans.each do |p| %>

      <%= p.carrier.name %>
      <%= p.carrier_employer_group_id %>
      <%= p.carrier_policy_number %>
      <%= link_to p.plan_name, plan_path(p) %>
      <%= p.coverage_type %>
      <%= p.metal_level %>
      <%= p.original_effective_date %>

    <% end %>

      Carrier
      Carrier Group ID
      Carrier Pol #
      Plan
      Coverage Type
      Metal level
      Effective date

    <%= table_empty_to_human if elected_plans.count < 1 %>
    <% elected_plans.each do |p| %>

      <%= p.carrier.name %>
      <%= p.carrier_employer_group_id %>
      <%= p.carrier_policy_number %>
      <%= link_to p.plan_name, plan_path(p.plan) %>
      <%= p.coverage_type %>
      <%= p.metal_level %>
      <%= p.original_effective_date %>

    <% end %>

Fix plan link on employer show page.

Fix plan link on employer show page.


<% if @conflicting_document %>

Edit policy

This document has been updated by another user since you started editing it.

Please review conflicts between the two versions and incorporate any changes before pressing save again.

Your version of the policy

        <%= render partial: "form", locals: {document: @document} %>

Current saved version

        <%= render partial: "conflict", locals: {document: @conflicting_document} %>

<% else %>

Edit policy

      <%= render partial: "form", locals: {document: @document} %>

<% end %>

<% if @conflicting_document %>

Edit <%= @document.type.titleize %>

This document has been updated by another user since you started editing it.

Please review conflicts between the two versions and incorporate any changes before pressing save again.

Your version

        <%= render partial: "form", locals: {document: @document} %>

Current saved version

        <%= render partial: "conflict", locals: {document: @conflicting_document} %>

<% else %>

Edit <%= @document.type.titleize %>

      <%= render partial: "form", locals: {document: @document} %>

<% end %>

Use the document type instead of "Policy" in view.


  <%= _("Search over

  {{number_of_requests}} requests and

  {{number_of_authorities}} authorities",
  :number_of_requests => number_with_delimiter(InfoRequest.visible.count),
  :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>

<form id="search_form" method="post" action="<%= search_redirect_path %>">

    <input id="query" type="text" size="30" name="query" title="type your search term here" >
    <input type="submit" value="<%= _('Search') %>">

</form>

  <%= _("Search over

  {{number_of_requests}} requests and

  {{number_of_authorities}} authorities",
  :number_of_requests => number_with_delimiter(InfoRequest.visible.count),
  :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>

<form id="search_form" method="GET" action="<%= search_redirect_path %>">

    <input id="query" type="text" size="30" name="query" title="type your search term here" >
    <input type="submit" value="<%= _('Search') %>">

</form>

Use 'GET' instead of 'POST' in frontpage search box.


Move

    <%= form_for(@user, url: {action: 'auth_local'}, html: { class: "card", role: "form", id: "login-form"}) do |f| %>

                    <input id="last_name" type="text" class="validate">
                    Username / Email

                    <input id="last_name" type="text" class="validate">
                    Password

                    <button class="waves-effect" id="btn-login">Iniciar Sesion</button>

¿No tienes una cuenta? <%= link_to "Registrate", new_user_path %>

    <% end %>

Move

    <%= form_for(@user, url: {action: 'auth_local'}, html: { class: "card", role: "form", id: "login-form"}) do |f| %>

            <%= flash[:error] %>

                    <%= f.text_field :email, class:"validate" %>
                    <%= f.label :email %>

                    <%= f.password_field :password, class:"validate" %>
                    <%= f.label :password %>

                    <%= f.submit "Iniciar Sesion", class: "waves-effect", id: "btn-login" %>

¿No tienes una cuenta? <%= link_to "Registrate", new_user_path %>

    <% end %>

Modify: Use the rails form helpers and integrate flash messages


<!doctype html>
<html>
  <head>
    <meta charset="utf-8">
    <title>Neighbor.ly Dashboard</title>
    <%= stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic' %>
    <%= stylesheet_link_tag 'neighborly-dashboard-application' %>
  </head>
  <body class='fixed'>
    <%= javascript_include_tag 'neighborly-dashboard-libs' %>
    <%= javascript_include_tag 'neighborly-dashboard-application' %>
    <%= javascript_include_tag 'neighborly-dashboard-templates' %>
  </body>
</html>

<!doctype html>
<html>
  <head>
    <meta charset="utf-8">
    <title>Neighbor.ly Dashboard</title>
    <%= stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,300italic,400italic,600italic' %>
    <%= stylesheet_link_tag 'neighborly-dashboard-application' %>
  </head>
  <body class='fixed'>
    <%= javascript_include_tag 'fix_bind_phantomjs' if Rails.env.test? %>
    <%= javascript_include_tag 'neighborly-dashboard-libs' %>
    <%= javascript_include_tag 'neighborly-dashboard-application' %>
    <%= javascript_include_tag 'neighborly-dashboard-templates' %>
  </body>
</html>

Add fix phantomjs hack to application layout

This is neccessary since the features specs built with capybara are requested
by poltergeist that uses phantomjs.


<%
   # Clients of this partial can override the following variables:
   search_action_path ||= nil
   remote ||= false
   form_html ||=  {id: 'search-form',
                   class: 'form-inline'}
   search_types ||= ['Any', 'Username', 'Email']
%>

<%= lev_form_for :search,
                 url: search_action_path,
                 remote: remote,
                 html: form_html do |f| %>

  Search for
  <%= f.search_field :terms, style: 'width:300px' %>
  in
  <%= f.select :type, search_types, {}, {style: 'width: 150px'} %>

  <%= f.submit 'Search', class: 'btn btn-primary' %>

<% end %>

<%
   # Clients of this partial can override the following variables:
   search_action_path ||= nil
   results_list_id ||= 'search-results-list'
   method ||= :post
   remote ||= false
   form_html ||=  {id: 'search-form',
                   class: 'form-inline'}
   search_types ||= ['Any', 'Username', 'Email']
%>

<%= lev_form_for :search,
                 url: search_action_path,
                 remote: remote,
                 method: method,
                 html: form_html do |f| %>

  Search for
  <%= f.search_field :terms, style: 'width:300px' %>
  in
  <%= f.select :type, search_types, {}, {style: 'width: 150px'} %>

  <%= f.submit 'Search', class: 'btn btn-primary' %>

<% end %>

<div id=<%= results_list_id %>>

Allow apps to specify the search method and list id


<% title "Jobs Monitoring", "Running jobs and statistics" %>

			#
			Status
			Dashboard
			Chart

		<% @enqueued_jobs.each_with_index do |job, index| %>
			<tr class="<%= 'info' if job.status == :running %>">
				<%= index + 1 %>
				<%= job.status_with_duration %>
				<%= job.dashboard_name %>
				<%= job.chart_name %>

		<% end %>

Add missing view for jobs admin

Add missing view for jobs admin


        <%= comment.author.username %>
          <%= comment.created_at %>

<%= comment.content %>

  <% if comment.author_id == session[:user_id] %>

<%= link_to 'Edit', edit_comment_path(comment) %>

<% end %>

  <% comment.comments.each do |subComment| %>
      <%= render partial: "comments/show", locals: {comment: subComment} %>
      <% end %>

Add sub-comments to comments show

Add sub-comments to comments show


<%= @question.title %>

  points: <%= @question.votes.count %>
  <% if logged_in? %>
    <%= render partial: "votes/vote_buttons", locals: {question: @question, votable_type: "Question", votable_id: @question.id} %>

  <% end %>

<%= @question.body %>

  <% if @question.user_id == current_user.id %>
    <%= button_to "Edit", {action: "edit"}, method: "get" %>
    <%= button_to "Delete", @question, {method: "delete", confirm: "Are you sure you want to delete this question?"} %>
  <% end %>

  <%= render template: "answers/new.html.erb", locals: { question: @question, answer: @answer} %>
    <% @question.answers.each do |answer| %>

<%= answer.body %>
<%= button_to 'Edit',edit_question_answer_path(@question, answer), :method => :get %>

    <% end %>

=======

<%= @question.title %>

  points: <%= @question.votes.count %>
  <% if logged_in? %>
    <%= render partial: "votes/vote_buttons", locals: {question: @question, votable_type: "Question", votable_id: @question.id} %>

  <% end %>

<%= @question.body %>

  <% if logged_in? && @question.user_id == current_user.id %>
    <%= button_to "Edit", {action: "edit"}, method: "get" %>
    <%= button_to "Delete", @question, {method: "delete", confirm: "Are you sure you want to delete this question?"} %>
  <% end %>

  <%= render template: "answers/new.html.erb", locals: { question: @question, answer: @answer} %>
    <% @question.answers.each do |answer| %>

<%= answer.body %>
<%= button_to 'Edit',edit_question_answer_path(@question, answer), :method => :get %>

    <% end %>

=======

Add logged_in? condition when checking whether current user is author of a question.


<% content_for :js do %>
    <%= headjs_include_tag "plugins/jquery.min", "front/login" %>
  <% end %>

  <% content_for :head do %>
    <%= stylesheet_link_tag('reset.css','front/sessions') %>
  <% end %>

Welcome to CartoDB

Enter your account information to start mapping

    <%= form_tag create_session_path do %>

Please login

      <%= label_tag :email, 'e-mail' %>
      <%= text_field_tag :email, '', :class => (flash[:alert] ? 'error' : nil) %>

        <%= label_tag :password, 'password' %>
        <%= password_field_tag :password, '', :class => (flash[:alert] ? 'error' : nil) %>

      <%= link_to "Did you forget your password?", forget_password_url, :class => "forget" if forget_password_url.present? %>
      <%= submit_tag 'Log in', :class => "login" %>
      <% if flash[:alert] || @login_error %>

<%= flash[:alert] || @login_error %>

      <% end %>
    <% end %>

CartoDB is a product from Vizzuality

<% content_for :js do %>
    <%= headjs_include_tag "plugins/jquery.min", "front/login" %>
  <% end %>

  <% content_for :head do %>
    <%= stylesheet_link_tag('reset.css','front/sessions') %>
  <% end %>

Welcome to CartoDB

Enter your account information to start mapping

    <%= form_tag create_session_path do %>

Please login

      <%= label_tag :email, 'e-mail' %>
      <%= text_field_tag :email, '', :class => (flash[:alert] || @login_error ? 'error' : nil) %>

        <%= label_tag :password, 'password' %>
        <%= password_field_tag :password, '', :class => (flash[:alert] || @login_error ? 'error' : nil) %>

      <%= link_to "Did you forget your password?", forget_password_url, :class => "forget" if forget_password_url.present? %>
      <%= submit_tag 'Log in', :class => "login" %>
      <% if flash[:alert] || @login_error %>

<%= flash[:alert] || @login_error %>

      <% end %>
    <% end %>

CartoDB is a product from Vizzuality

Check @login_error in login form

Check @login_error in login form


It seems you've tried to access an event with the wrong URL.
<<<<<<< HEAD
<% if defined?(event_link) %>
  Please try <%= event_link %>
<% else %>
  Could not generate a valid link for you. Please notify your system administrator.
<% end %>
=======
<% if event_link %>
  Please try <%= event_link %>
<% else %>
  Could not generate a valid link for you. Please notify your system administrator.
<% end %>
>>>>>>> cdbb3ba... Add missing event template and fix tests

It seems you've tried to access an event with the wrong URL.
<% if defined?(event_link) %>
  Please try <%= event_link %>
<% else %>
  Could not generate a valid link for you. Please notify your system administrator.
<% end %>

Add missing event template and fix tests

Conflicts:

	webapp/app/views/shared/_missing_event.erb


define contact {
       contact_name                             <%= @name %>
       alias                                    Campfire Pseudo Contact
       service_notification_period              24x7
       host_notification_period                 24x7
       service_notification_options             w,c,r,f
       host_notification_options                d,r,u,f,s
       service_notification_commands            notify-service-by-campfire
       host_notification_commands               notify-host-by-campfire
}

# 'notify-host-by-campfire' command definition
define command{
    command_name    notify-host-by-campfire
    command_line    /usr/local/bin/campfire_nagios -s <%= @campfire_subdomain %> -t <%= @campfire_token %> -r <%= @campfire_room %> -m "[nagios] $NOTIFICATIONTYPE$ : $HOSTDISPLAYNAME$ is $HOSTSTATE$"
    }

# 'notify-service-by-campfire' command definition
define command{
    command_name    notify-service-by-campfire
    command_line    /usr/local/bin/campfire_nagios -s <%= @campfire_subdomain %> -t <%= @campfire_token %> -r <%= @campfire_room %> -m "[nagios] $SERVICESTATE$: $SERVICEDESC$ on $HOSTALIAS$"
    }

define contact {
       contact_name                             <%= @name %>
       alias                                    Campfire Pseudo Contact
       service_notification_period              24x7
       host_notification_period                 24x7
       service_notification_options             w,c,r,f
       host_notification_options                d,r,u,f,s
       service_notification_commands            notify-service-by-campfire
       host_notification_commands               notify-host-by-campfire
}

# 'notify-host-by-campfire' command definition
define command{
    command_name    notify-host-by-campfire
    command_line    /usr/local/bin/campfire_nagios -s <%= @campfire_subdomain %> -t <%= @campfire_token %> -r "<%= @campfire_room %>" -m "[nagios] $NOTIFICATIONTYPE$ : $HOSTDISPLAYNAME$ is $HOSTSTATE$"
    }

# 'notify-service-by-campfire' command definition
define command{
    command_name    notify-service-by-campfire
    command_line    /usr/local/bin/campfire_nagios -s <%= @campfire_subdomain %> -t <%= @campfire_token %> -r "<%= @campfire_room %>" -m "[nagios] $SERVICESTATE$: $SERVICEDESC$ on $HOSTALIAS$"
    }

Allow multi-word room names for Campfire

This has been silently failing since I changed the room which Nagios
alerts get sent to. The cause of this is that the room name has changed
from one word (Zeitgeist) which does to require quoting to "GOV.UK
Monitoring Alerts" which would need to be quoted.

The addition of some quotes fixes this.


<%- case @markup
    when :markdown -%>
  platforms :jruby do
    gem 'BlueCloth'
  end

  platforms :ruby do
    gem 'bluecloth', '>= 2.0.0'
  end
<%- when :textile -%>
  gem 'RedCloth'
<%- end -%>
  gem 'yard', '<%= @yard_dependency %>'

<%- case @markup
    when :markdown -%>
  gem 'kramdown'
<%- when :textile -%>
  gem 'RedCloth'
<%- end -%>
  gem 'yard', '<%= @yard_dependency %>'

Use kramdown to render markdown for YARD.


/* DO NOT EDIT: File is auto-generated */
package <%= to_package(repository.iris_audit.qualified_audit_context_util_name) %>;

@javax.annotation.Generated( "Domgen" )
public final class <%= repository.iris_audit.audit_context_util_name %>
{
  @javax.annotation.Nonnull
  private static final ThreadLocal<String> c_context = new ThreadLocal<>();

  /**
   * Specify the user that current action is audited under.
   *
   * @param username the username.
   */
  public static void set( @javax.annotation.Nonnull final String username )
  {
    c_context.set( username );
  }

  public static void clear()
  {
    c_context.set( null );
  }

  @javax.annotation.Nullable
  public static String get()
  {
    return c_context.get();
  }
}

/* DO NOT EDIT: File is auto-generated */
package <%= to_package(repository.iris_audit.qualified_audit_context_util_name) %>;

@javax.annotation.Generated( "Domgen" )
public final class <%= repository.iris_audit.audit_context_util_name %>
{
  @javax.annotation.Nonnull
  private static final ThreadLocal<String> c_context = new ThreadLocal<>();

  private <%= repository.iris_audit.audit_context_util_name %>()
  {
  }

  /**
   * Specify the user that current action is audited under.
   *
   * @param username the username.
   */
  public static void set( @javax.annotation.Nonnull final String username )
  {
    c_context.set( username );
  }

  public static void clear()
  {
    c_context.set( null );
  }

  @javax.annotation.Nullable
  public static String get()
  {
    return c_context.get();
  }
}

Add private constructor to utility class


$("#medications").html("<%= escape_javascript(
  render "table", treatable: @treatable, medications: @medications
) %>");

$("#medications").html("<%= escape_javascript(
  render "table", patient: @patient, treatable: @treatable, medications: @medications
) %>");

Fix canceling a medication form

Fix canceling a medication form


<% # Overridden in order to adjust the hyperlink generated, eventually adding data source specific links
   # header bar for doc items in index view -%>

  <% # main title container for doc partial view -%>

      <%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %>
      <%= link_to document[:title].present? ? document[:title][0] : document.id, document.id %>

  <% # bookmark functions for items/docs -%>
  <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>

<% # Overridden in order to adjust the hyperlink generated, eventually adding data source specific links
   # header bar for doc items in index view -%>

  <% # main title container for doc partial view -%>

      <%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %>
      <%= link_to document[:title].present? ? document[:title][0] : document.id, document.id, :target => '_blank' %>

  <% # bookmark functions for items/docs -%>
  <%= render_index_doc_actions document, :wrapping_class => "documentFunctions span2" %>

Add target _blank to doc title links

Add target _blank to doc title links


<% content_for :title do %>
    <% "OpenSplitTime: Sign Up" %>
<% end %>

<%= t('.sign_up') %>

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

<% content_for :title do %>
    <% "OpenSplitTime: Sign Up" %>
<% end %>

<%= t('.sign_up') %>

      <%= link_to(fab_icon("facebook-square", text: " Sign up with Facebook"),
                  user_facebook_omniauth_authorize_path,
                  class: "btn btn-facebook btn-block") %>

Sign up with your Email

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

Add Facebook link on signup page

Add Facebook link on signup page


<%= @lesson_obj.name.present? ? @lesson_obj.name : "New lesson" %>

      <%= active_link_to "Cancel".html_safe, delete_lesson_path(id: @lesson_obj.id, method: :delete), class: "SubHeader__tool Button Button--small Button--light Button--outline Button--icon Button--icon--trash Button--no-label" %>
      <%= active_link_to "Save as Draft", '#', class: "SubHeader__tool Button Button--small Button--light Button--icon Button--icon--document Button--outline Button--icon-document" %>
      <%= active_link_to "Publish Lessson", publish_lesson_path(id: @lesson_obj.id, method: :put), class: "SubHeader__tool Button Button--small Button--icon Button--icon Button--icon--locked Button--dark Button--disabled" %>

<%= @lesson_obj.name.present? ? @lesson_obj.name : "New lesson" %>

      <%= active_link_to "Cancel".html_safe, delete_lesson_path(id: @lesson_obj.id), method: :delete, class: "SubHeader__tool Button Button--small Button--light Button--outline Button--icon Button--icon--trash Button--no-label" %>
      <%= active_link_to "Publish Lessson", publish_lesson_path(id: @lesson_obj.id, method: :put), class: "SubHeader__tool Button Button--small Button--icon Button--icon Button--icon--locked Button--dark Button--disabled" %>

Remove save as draft button

Remove save as draft button


---
- scm:
    name: smokey_Smokey_Deploy
    scm:
        - git:
            url: git@github.com:alphagov/smokey.git
            branches:
              - release

- job:
    name: Smokey_Deploy
    display-name: Smokey_Deploy
    project-type: freestyle
    properties:
        - github:
            url: https://github.com/alphagov/smokey/
    scm:
      - smokey_Smokey_Deploy
    builders:
        - shell: |
            export DEPLOY_TO=monitoring-1.management.<%= @environment -%>
            sh -x deploy.sh
    triggers:
        - timed: 'H 9 * * *'

---
- scm:
    name: smokey_Smokey_Deploy
    scm:
        - git:
            url: git@github.com:alphagov/smokey.git
            branches:
              - master

- job:
    name: Smokey_Deploy
    display-name: Smokey_Deploy
    project-type: freestyle
    properties:
        - github:
            url: https://github.com/alphagov/smokey/
    scm:
      - smokey_Smokey_Deploy
    builders:
        - shell: |
            export DEPLOY_TO=monitoring-1.management.<%= @environment -%>
            sh -x deploy.sh
    triggers:
        - timed: 'H 9 * * *'

Deploy Smokey from the master branch

Deploy Smokey from the master branch

Smokey doesn't have a release branch. It's deployed from master
in all environments.


<%= render partial: "recipes/recipe_options" if user_signed_in? %>

  <% recipes.each do |recipe| %>

      <%= link_to recipe.name, recipe %>
      <%= image_tag(recipe.photo_path, size: "190x100", alt: "#{recipe.name} photo", title: 'recipe photo' ) %>
      <%= link_to image_tag("delete-icon.png", size:"16", title: "Delete recipe"), recipe_path(recipe), method: :delete, data: {confirm: "Are you sure!"} if policy(recipe).destroy? %>

<%= render partial: "recipes/review_stars", locals: {stars: recipe.average_stars, url: recipe_recipe_reviews_path(recipe)} %>

<%= link_to pluralize(recipe.number_of_reviews, 'review'), recipe_recipe_reviews_path(recipe) %>

      <%= render partial: "recipes/favorite", locals: {recipe: recipe} %>

  <% end %>

<%= render partial: "recipes/recipe_options" if user_signed_in? %>

  <% recipes.each do |recipe| %>

      <%= link_to recipe.name, recipe %>
      <%= image_tag(recipe.photo_path, size: "190x100", alt: "#{recipe.name} photo", title: 'recipe photo' ) %>
      <%= link_to image_tag("delete-icon.png", size:"16", title: "Delete recipe"), recipe_path(recipe), method: :delete, data: {confirm: "Are you sure!"} if policy(recipe).destroy? %>

<%= render partial: "recipes/review_stars", locals: {stars: recipe.average_stars, url: recipe_recipe_reviews_path(recipe)} %>

<%= link_to pluralize(recipe.number_of_reviews, 'review'), recipe_recipe_reviews_path(recipe) %>

  <% end %>

Remove Favorite checkbox from index page.


My Votes

Ward <%= @user.ward_id %> - <%= @user.ward.name %>

			Number
			Title
			My Vote

	<% if @votes == nil %>

You have no votes. Get Voting!

	<% else %>
		<% @votes.each do |vote| %>

				<%= link_to vote.item.number, item_path(vote.item) %>
				<%= link_to vote.item.title, item_path(vote.item) %>
				<td class="vote-<%=vote.vote.downcase %>">
					<%= vote.vote %>

		<% end %>
	<% end %>

<%= paginate @votes %>

My Votes

<% if @ward != nil %>

My Ward: Ward <%= @ward.ward_number %> - <%= @ward.name %>

My Councillor: <%= link_to("#{@councillor.first_name} #{@councillor.last_name}", councillor_path(@councillor)) %>

<% else %>

Add your address to your profile to find out your ward and councillor!

<% end %>

<% if @votes == nil %>

You have no votes. Get Voting!

<% else %>

					Number
					Title
					My Vote

				<% @votes.each do |vote| %>

						<%= link_to vote.item.number, item_path(vote.item) %>
						<%= link_to vote.item.title, item_path(vote.item) %>
						<td class="vote-<%=vote.vote.downcase %>">
							<%= vote.vote %>

				<% end %>

<% end %>

<%= paginate @votes %>

Add user's ward and councillo to view

Add user's ward and councillo to view

- add conditional to show a message, instead of table, if user has no votes


<h2 id="<%= dom_id(category) %>"><%= category.name_with_code %>

<%= category.description.html_safe %>

  <%= link_to t('categories.filter'), category.proposals_path %>

<%= render partial: 'subcategory', collection: category.subcategories %>

<h2 id="<%= dom_id(category) %>"><%= category.name_with_code %>

<%= category.description.html_safe %>

<%= render partial: 'subcategory', collection: category.subcategories %>

Remove view proposals from category in documents


<% error_class = @resource.errors.has_key?(:reviewer) ? ' error has-error' : '' -%>
<div id="edition_reviewer_input" class="form-group<%= error_class %>">
  Reviewer
  <%= f.select :reviewer, User.enabled.order_by([[:name, :asc]]).collect{ |p| [p.name, p.name] }, { :include_blank => true }, { :class => "form-control input-md-3 #{error_class}", :disabled => @resource.locked_for_edits?, "data-module" => 'assignee-select'} %>
  <% if @resource.errors.has_key?(:reviewer) -%>

    <% @resource.errors[:reviewer].each do |error| -%>

<%= error %>

    <% end -%>

  <% end -%>

<%= form_group(f, :reviewer) do %>
  <%= f.select :reviewer, User.enabled.order_by([[:name, :asc]]).collect{ |p| [p.name, p.name] }, { :include_blank => true }, { :class => "form-control input-md-3", :disabled => @resource.locked_for_edits?, "data-module" => 'assignee-select'} %>
<% end %>

Update edition reviewer field HTML structure

The reviewer field does not have model-level validation against it.
However, the business logic of the field (e.g. the Reviewer cannot also
be the Assignee) is validated by the ReviewerValidator class.

Because of this we want to apply the same validation message display,
and HTML structure as all other model-level validation fields for
consistency. We use the newly created `FormHelper` class to achieve
this.


var response = <%= raw @response.to_json %>;
<% if session[:mobile_view] %>
  window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
<% else %>
  app.flashMessages._flash(response.message, response.success);
  if(response.success){
    $("#new_conversation").removeClass('form_do_not_clear').clearForm();
    window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
  }
<% end %>

var response = <%= raw @response.to_json %>;
<% if session[:mobile_view] %>
  window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
<% else %>
  if(response.success){
    app.flashMessages.success(response.message);
    $("#new_conversation").removeClass('form_do_not_clear').clearForm();
    window.location.href = "<%= conversations_path(conversation_id: @conversation.id) %>";
  } else {
    app.flashMessages.error(response.message);
  }
<% end %>

Use the correct flash message for new conversations


Update your expenses!

<%= form_tag("/expensesheets", method: "PATCH") do %>
  Housing
  <%= text_field_tag 'expense[housing]', @expenses['Housing'].amount %>
  Transportation
  <%= text_field_tag 'expense[amount[2]]' %>
  Food
  <%= text_field_tag 'expense[amount[3]]' %>
  Phone
  <%= text_field_tag 'expense[amount[4]]' %>
  Misc.
  <%= text_field_tag 'expense[amount[5]]' %>
  <%= button_tag 'Add Expenses', html: {:class => "button round"} %>
<% end %>

Update your expenses!

<%= form_tag("/expensesheets", method: "PATCH") do %>
  Housing
  <%= text_field_tag 'expense[housing]', @expenses['Housing'].amount %>
  Transportation
  <%= text_field_tag 'expense[transportation]', @expenses['Transportation'].amount %>
  Food
  <%= text_field_tag 'expense[food]', @expenses['Food'].amount %>
  Phone
  <%= text_field_tag 'expense[phone]', @expenses['Phone'].amount %>
  Misc.
  <%= text_field_tag 'expense[misc]', @expenses['Misc'].amount %>
  <%= button_tag 'Add Expenses', html: {:class => "button round"} %>
<% end %>

Complete various expense types for edit form


<% any_tags = Alchemy::Attachment.tag_counts.any? %>
<% content_for(:toolbar) do %>

    <% if can? :create, Alchemy::Attachment %>
      <%= render 'alchemy/admin/uploader/button',
        redirect_url: alchemy.admin_attachments_path,
        model_class: Alchemy::Attachment,
        file_attribute: 'file' %>
    <% end %>

<% end %>
<div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
  <%= resources_header %>
  <%= render partial: 'files_list' %>
  <% if any_tags %>

    <div id="tag_list" class="<%= params[:tagged_with].present? ? 'filtered' : '' %>">
      <%= render partial: 'tag_list' %>

  <% end %>

<% any_tags = Alchemy::Attachment.tag_counts.any? %>

<% content_for(:toolbar) do %>

    <% if can? :create, Alchemy::Attachment %>
      <%= render 'alchemy/admin/uploader/button',
        redirect_url: alchemy.admin_attachments_path,
        model_class: Alchemy::Attachment,
        file_attribute: 'file' %>
    <% end %>

  <%= render 'alchemy/admin/partials/search_form' %>
<% end %>

<div id="archive_all" class="<%= any_tags ? 'with_tag_filter ' : nil %>resources-table-wrapper">
  <%= resources_header %>
  <%= render partial: 'files_list' %>
  <% if any_tags %>

    <div id="tag_list" class="<%= params[:tagged_with].present? ? 'filtered' : '' %>">
      <%= render partial: 'tag_list' %>

  <% end %>

Add lost search form back to file archive

Since fadf052a101567ab7967fc23a91392e82b2c046d the search form is missing from file archive.

Fixes #1004


    <table class="table purchase-shipments-table" data-shipment-table-for="<%= pd.id %>">

          Quantity
          Date Received

        <%= pd_f.fields_for :purchase_shipments do |ps_f| %>
          <%= render partial: "purchases/purchase_shipment_fields", locals: { form: ps_f, record: ps_f.object } %>
        <% end %>

            Quantity remaining:
            <%= pd.quantity_remaining %>

            <%= button_tag "Save", type: :submit, class: "btn btn-primary", title: "Save Changes" %>

            <%= link_to_add_association_fields(pd_f, :purchase_shipments) do %>
               Add Shipment
            <% end %>

Expand shipments table a bit

Expand shipments table a bit


# Hostgroup definitions
# Automatically generated by Chef

define hostgroup {
  hostgroup_name all
  alias all
  members *
}

<% @roles.each do |r| -%>
define hostgroup {
  hostgroup_name <%= r %>
  alias <%= r %>
}
<% end -%>

<% @environments.each do |e| -%>
define hostgroup {
  hostgroup_name <%= e %>
  alias <%= e %>
}
<% end -%>

<% if node['nagios']['multi_os_monitoring'] == true -%>
<% @os.each do |o| -%>
define hostgroup {
	hostgroup_name <%= o %>
	alias <%= o %>
}
<% end -%>
<% end -%>

# Hostgroup definitions
# Automatically generated by Chef

define hostgroup {
  hostgroup_name all
  alias all
  members *
}

<% @roles.each do |r| -%>
define hostgroup {
  hostgroup_name <%= r %>
  alias <%= r %>
}
<% end -%>

<% @environments.each do |e| -%>
define hostgroup {
  hostgroup_name <%= e %>
  alias <%= e %>
}
<% end -%>

<% if os.any? -%>
<% @os.each do |o| -%>
define hostgroup {
	hostgroup_name <%= o %>
	alias <%= o %>
}
<% end -%>
<% end -%>

Switch to any? to check if there are values in the OS array

Former-commit-id: d1955dead4c7cf78c6fdf3bba5b9ce8e57efc578 [formerly 33930c3de64bd69aef953eb98849763ff93714a9] [formerly b0af79e2fd2c9c988d12b5dd315216ed45a3ec13 [formerly c091cd0c4982a73aa3897a81c4ea7f40a9a670c8 [formerly cff9407d67788dd0522d90b61ab4fefd91e322f1]]]
Former-commit-id: c5e775f17e4ba0c9830c93e4ff7bcb10f21fd135 [formerly b0336d5e6d8af74adb1197fbd2ad6162bb14469c]
Former-commit-id: 2eb22bf50e642eb37f6fc4ac77a8413174a61ee3
Former-commit-id: 0597bff12cced2de447d82a3beb17836a98df866


# Hostgroup definitions
#
# Autogenerated by Chef.

define hostgroup {
  hostgroup_name all
  alias all
  members *
}

<% @hostgroups.each do |h| -%>
define hostgroup {
  hostgroup_name <%= h %>
  alias <%= h %>
}

<% end -%>

<% @search_hostgroups.each do |hostgroup| -%>
define hostgroup {
  hostgroup_name <%= hostgroup %>
  alias <%= hostgroup %>
<% if @search_nodes[hostgroup].length > 0 -%>
  members        <%= @search_nodes[hostgroup] %>
<% else -%>
  members        empty
<% end -%>
}

<% end -%>

# Hostgroup definitions
#
# Autogenerated by Chef.

define hostgroup {
  hostgroup_name all
  alias all
  members *
}

<% @hostgroups.sort.each do |h| -%>
define hostgroup {
  hostgroup_name <%= h %>
  alias <%= h %>
}

<% end -%>

<% @search_hostgroups.sort.each do |hostgroup| -%>
define hostgroup {
  hostgroup_name <%= hostgroup %>
  alias <%= hostgroup %>
<% if @search_nodes[hostgroup].length > 0 -%>
  members        <%= @search_nodes[hostgroup] %>
<% else -%>
  members        empty
<% end -%>
}

<% end -%>

Sort the results so the host groups print out in A -> Z order.  This makes it a lot easier to troubleshoot.

Former-commit-id: c71d3d694328a4c14905e5b78b8b2dd10a3dee5f [formerly 140927b22a5d1a30ed120ddaf97e9cba6d60715c] [formerly 075dcd77ef07e643f44587416fbe49af5e0865ad [formerly fbf86c576b88cdd75b302aa8d8e9cb995f82592f [formerly 07f0bd675d1373f9c5038e266eb26be40c9e84c1]]]
Former-commit-id: 6817b94e0cbb064ed918bf03f3d6ab2fcbb3cc79 [formerly fe0a3f618e8954b6b75b89989dfb554cd200dfc9]
Former-commit-id: 0080f9097f69105f36b0f446899e1ab6064d9f08
Former-commit-id: e40ad9095ba6680f9d3b10c4e863097bfe091b62


<fieldset data-hook="credit_card">
  <% if payment.source && payment.source.transaction_id && payment.source.transaction_response && payment.source.transaction_response.payment %>
    <legend align="center"><%= Spree.t(:credit_card) %></legend>

<%= Spree.t(:transaction) %>:

<%= link_to payment.source.transaction_id, "https://app.paymill.com/transactions/#{payment.source.transaction_id}", target: "_blank" %>

<%= Spree.t(:card) %>:

XXXX-XXXX-XXXX-<%= payment.source.transaction_response.payment.last4.to_s %>

<%= Spree.t(:expiration) %>:

<%= payment.source.transaction_response.payment.expire_month %>/<%= payment.source.transaction_response.payment.expire_year %>

  <% else %>
    <legend align="center">No payment details available</legend>
  <% end %>
</fieldset>

<fieldset data-hook="credit_card">
  <% if payment.source && payment.source.transaction_id && payment.source.transaction_response && payment.source.transaction_response.payment %>
    <legend align="center"><%= Spree.t(:credit_card) %></legend>

<%= Spree.t(:transaction) %>:

<%= link_to payment.source.transaction_id, "https://app.paymill.com/transactions/#{payment.source.transaction_id}", target: "_blank" %>

<%= Spree.t(:card) %>:

          <% if payment.source.transaction_response.payment.kind_of?(Paymill::Payment) %>

XXXX-XXXX-XXXX-<%= payment.source.transaction_response.payment.last4.to_s %>

          <% else %>

XXXX-XXXX-XXXX-<%= payment.source.transaction_response.payment["last4"] %>

          <% end %>

<%= Spree.t(:expiration) %>:

<%= payment.source.transaction_response.payment.expire_month %>/<%= payment.source.transaction_response.payment.expire_year %>

  <% else %>
    <legend align="center">No payment details available</legend>
  <% end %>
</fieldset>

Fix orders which may be stored as a hash


# This file is managed by Chef.
# Do NOT modify this file directly.

<% @command_aliases.each do |a| -%>
Cmnd_Alias <%= a[:name].upcase %> = <%= a[:command_list].join(', ') %>
<% end -%>
<% @env_keep_add.each do |env_keep| -%>
Defaults    env_keep += "<%= env_keep %>"
<% end -%>
<% @env_keep_subtract.each do |env_keep| -%>
Defaults    env_keep -= "<%= env_keep %>"
<% end -%>
<% @commands.each do |command| -%>
<% if @sudoer %><%= @sudoer %> <%= @host %>=(<%= @runas %>) <%= 'NOEXEC:' if @noexec %><%= 'NOPASSWD:' if @nopasswd.to_s == 'true' %><%= 'SETENV:' if @setenv.to_s == 'true' %><%= command %><% end -%>
<% end -%>
<% unless @defaults.empty? %>
Defaults:<%= @sudoer %> <%= @defaults.join(',') %>
<% end -%>

# This file is managed by Chef.
# Do NOT modify this file directly.

<% @command_aliases.each do |a| -%>
Cmnd_Alias <%= a[:name].upcase %> = <%= a[:command_list].join(', ') %>
<% end -%>
<% @env_keep_add.each do |env_keep| -%>
Defaults    env_keep += "<%= env_keep %>"
<% end -%>
<% @env_keep_subtract.each do |env_keep| -%>
Defaults    env_keep -= "<%= env_keep %>"
<% end -%>
<% @commands.each do |command| -%>
<% unless @sudoer.empty? %><%= @sudoer %> <%= @host %>=(<%= @runas %>) <%= 'NOEXEC:' if @noexec %><%= 'NOPASSWD:' if @nopasswd.to_s == 'true' %><%= 'SETENV:' if @setenv.to_s == 'true' %><%= command %><% end -%>
<% end -%>
<% unless @defaults.empty? %>
Defaults:<%= @sudoer %> <%= @defaults.join(',') %>
<% end -%>

Fix template to match the updated version in the cookbook

This fixes an issue when writing out env_keep only configs. Found this via a super test suite against 14.0.159

Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>


  <% flash.each do |key, value| %>
    <div class="<%= flash_class(key) %> fade in">
      ×
      <%= value %>

  <% end %>

  <% flash.each do |key, value| %>
    <%- unless key.to_s == 'timedout' %>
      <div class="<%= flash_class(key) %> fade in">
        ×
        <%= value %>

    <%- end %>
  <% end %>

Remove the Flash for :timedout Boolean

Remove the Flash for :timedout Boolean

Add a conditional to remove the extraneous 'true/false' value that is
showing up due to Devise using the flash object as a way to maintain
whether the User has been timed out (and it showing up as 'true/false'
in the view).


            Manage your GOV.UK email preferences including unsubscribing

          Provided by
          GOV.UK

          This email was sent to [[EMAIL_ADDRESS]]

Fix gov.uk link in email footer

Fix gov.uk link in email footer

Linking to https://gov.uk causes an unnecessary redirect to
https://www.gov.uk, so just link directly to that.


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

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

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

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

Question: avg(last_1d):avg:log_cache.blackbox.http_reliability{*} * 100 < 99

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

Update log-cache reliability to page on a shorter time frame

- intended to be equivalent error budget
- improve handling of alerts

Signed-off-by: Max Eshleman <6f7b922bfebb79853afba1e583c95453c7298bf0@pivotal.io>


    <meta itemprop="datePublished" content="<%= schema_date(blog_post.published_at) %>">
    <%= blog_post.published_at.strftime("%B %e %G") %>
    <a href="<%= active_blog_post_path(blog_post.cached_slug) %>" itemscope itemprop="url">∞

    <%= blog_post.title %>

    <%= markdown(blog_post.body) %>

    <meta itemprop="datePublished" content="<%= schema_date(blog_post.published_at) %>">
    <%= blog_post.published_at.strftime("%B %e %G") %>
    <% if blog_post.new_record? %>
      ∞
    <% else %>
      <a href="<%= active_blog_post_path(blog_post.cached_slug) %>" itemscope itemprop="url">∞
    <% end %>

    <%= blog_post.title %>

    <%= markdown(blog_post.body || "") %>

Make the blog_post partial a bit more resilient


#!/bin/sh

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

for prefix in chef-server chef-repository chef-git git lists munin osm-blog osmf-crm osmf-ledgersmb wiki-wiki.osmfoundation.org osqa otrs sotm svn switch2osm trac wiki-board.osmfoundation.org wiki-dwg.osmfoundation.org wiki-wiki.openstreetmap.org
do
  /usr/local/bin/expire-backups --days=3 --weeks=3 --months=3 /store/backup $prefix
done

/usr/local/bin/expire-backups --weeks=5 /store/backup osm

/usr/local/bin/expire-backups --months=3 /store/backup nominatim

#!/bin/sh

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

for prefix in chef-server chef-repository chef-git forum git lists munin osm-blog osmf-crm osmf-ledgersmb wiki-wiki.osmfoundation.org osqa otrs sotm svn switch2osm trac wiki-board.osmfoundation.org wiki-dwg.osmfoundation.org wiki-wiki.openstreetmap.org
do
  /usr/local/bin/expire-backups --days=3 --weeks=3 --months=3 /store/backup $prefix
done

/usr/local/bin/expire-backups --weeks=5 /store/backup osm

/usr/local/bin/expire-backups --months=3 /store/backup nominatim

Add forum to backup expiry list

Add forum to backup expiry list


<% if flash[:notice] %>

<%= flash[:notice] %>

<% end %>
<% if flash[:error] %>

<%= flash[:error] %>

<% end %>

Remove flash[:error] block from public messages template

The app doesn't generate flash[:error] messages for public consumption
so there's no need to have this code in the messages template.


Channel Hookup

        Channel
        Dim
        Position
        Unit#
        Instrument Type
        Purpose
        Color
        Gobo
        Accessories

      <% @equipment.each do |equip| %>
        <tr id="CH-Row<%= equip.id %>">
          <%= equip.channel %>
          <%= equip.dimmer %>
          <%= equip.position %>
          <%= equip.unit_number %>
          <%= equip.instrument_type %>
          <%= equip.purpose %>
          <%= equip.color %>
          <%= equip.gobo_1 %> <%= equip.gobo_2 %>
          <%= equip.accessories %>

      <% end %>

Create channel hook up partial

Create channel hook up partial


/* DO NOT EDIT: File is auto-generated */
package <%= to_package(repository.gwt.qualified_aggregate_module_name) %>;

@javax.annotation.Generated( "Domgen" )
@java.lang.SuppressWarnings( { "UnusedDeclaration", "JavaDoc" } )
public class <%= repository.gwt.aggregate_module_name %>
  extends com.google.gwt.inject.client.AbstractGinModule
{
  @java.lang.Override
  protected void configure()
  {
<% if repository.gwt_rpc? -%>
    install( new <%= repository.gwt_rpc.qualified_rpc_services_module_name %>() );
<% end -%>
<% if repository.imit? -%>
    install( new org.realityforge.replicant.client.gwt.ReplicantGinModule() );
    install( new <%= repository.imit.qualified_services_module_name %>() );
<% end -%>
  }
}

/* DO NOT EDIT: File is auto-generated */
package <%= to_package(repository.gwt.qualified_aggregate_module_name) %>;

@javax.annotation.Generated( "Domgen" )
@java.lang.SuppressWarnings( { "UnusedDeclaration", "JavaDoc" } )
public class <%= repository.gwt.aggregate_module_name %>
  extends com.google.gwt.inject.client.AbstractGinModule
{
  private final boolean _standalone;

  public <%= repository.gwt.aggregate_module_name %>()
  {
    this( true );
  }

  public <%= repository.gwt.aggregate_module_name %>( final boolean standalone )
  {
    _standalone = standalone;
  }

  @java.lang.Override
  protected void configure()
  {
<% if repository.gwt_rpc? -%>
    install( new <%= repository.gwt_rpc.qualified_rpc_services_module_name %>() );
<% end -%>
<% if repository.imit? -%>
    if ( _standalone )
    {
      install( new org.realityforge.replicant.client.gwt.ReplicantGinModule() );
    }
    install( new <%= repository.imit.qualified_services_module_name %>() );
<% end -%>
  }
}

Add the ability to optionally exclude the addition of replicant support module. This makes it easy to integrate multiple modules that expose replicant services.


<%
  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter)).any? ? " class='#{css.join(' ')}'" : nil
  dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil

  if menu_branch.in_menu?
-%>
  <div<%= css -%><%= dom_id -%>>
    <%= link_to menu_branch.title, menu_branch.url %>

    <%= render :partial => "/shared/menu",
               :collection => children,
               :locals => {
                 :hide_children => hide_children,
                 :sibling_count => children.size - 1,
                 :css => "",
                 :dom_id => ""
               } unless hide_children or
                        menu_branch.parent_id.present? or
                        (children = menu_branch.children.collect{|c| c if c.in_menu?}.compact).empty?

    -%>
  </div>
<% end -%>

<%
  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter)).any? ? " class='#{css.join(' ')}'" : nil
  dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil

  if menu_branch.in_menu?
-%>
  <div<%= css -%><%= dom_id -%>>
    <%= link_to menu_branch.title, menu_branch.url %>

    <% unless hide_children or
              menu_branch.parent_id.present? or
              (children = menu_branch.children.collect{|c| c if c.in_menu?}.compact).empty? %>
      <nav id='<%= dom_id ||= "menu" %>' class='<%= css ||= "menu" %>clearfix'>
        <%=
          render :partial => "/shared/menu_branch",
                 :collection => children,
                 :locals => {
                   :hide_children => hide_children,
                   :sibling_count => children.size - 1
                 } -%>
      </nav>
    <% end %>
  </div>
<% end -%>

Fix circular reference introduced by the last commit


<%= @artefact.name %>

      <%= link_to "/#{@artefact.slug}", published_url(@artefact) %>
      <span class="state state-<%= @artefact.state %>"><%= @artefact.state %>

  <li class="<%= "active" if controller.action_name == "edit" %>">
    <%= link_to "Edit", edit_artefact_path(@artefact) %>

  <li class="<%= "active" if controller.action_name == "history" %>">
    <%= link_to "History", history_artefact_path(@artefact) %>

  <li class="<%= "active" if controller.action_name == "archive" %>">
    <%= link_to "Archive", archive_artefact_path(@artefact) %>

Add spacing beneath artefact tabs

Add spacing beneath artefact tabs

The well and the tabs were too close together.


  <% if logged_in? %>
    <%= form_for answer, url: answer_votes_path(answer), method: :post do |f| %>
      <%= hidden_field_tag 'vote', 'up' %>
      <%= f.submit '+' %>
    <% end %>

      <%= answer.net_votes %>
      <%= answer.content %>
      <% if current_user == answer.user %>
      <%= link_to 'delete', "/questions/#{answer.question.id}/answers/#{answer.id}", method: :delete %>
      <% end %>

    <%= form_for answer, url: answer_votes_path(answer), method: :post do |f| %>
      <%= hidden_field_tag 'vote', 'down' %>
      <%= f.submit '-' %>
    <% end %>
  <% end %>

    by <%= answer.user.username %>

      <%=render partial: "/comments/comment", locals: {comments: answer.comments}%>

  <%= form_for answer, url: answer_votes_path(answer), method: :post do |f| %>
    <%= hidden_field_tag 'vote', 'up' %>
    <%= f.submit '+' %>
  <% end %>

    <%= answer.net_votes %>
    <%= answer.content %>
    <% if current_user == answer.user %>
    <%= link_to 'delete', "/questions/#{answer.question.id}/answers/#{answer.id}", method: :delete %>
    <% end %>

  <%= form_for answer, url: answer_votes_path(answer), method: :post do |f| %>
    <%= hidden_field_tag 'vote', 'down' %>
    <%= f.submit '-' %>
  <% end %>

    by <%= answer.user.username %>

      <%=render partial: "/comments/comment", locals: {comments: answer.comments}%>

Allow users to see buttons but be forced to sign-in


<% anchor = 'tabs' %>
<div class="row" id="<%= anchor %>">
  <% (item.tabs.keys).reject { |x| skip.include?(x) }.tap do |tabs|
    tabs.each do |tab| %>
      <% is_current = tab == params[:tab] %>
      <div class="tab col-md-2 <%= 'tab-current' if is_current %>">
        <%= link_to_unless(is_current, tab.titlecase, "#{tab}##{anchor}") %>

    <% end if tabs.count > 1
    end %>

<% anchor = 'tabs' %>
<div class="row" id="<%= anchor %>">
  <% (item.tabs.keys).reject { |x| skip.include?(x) }.tap do |tabs|
    tabs.each do |tab| %>
      <% unless tab == params[:tab] %>
        <a    class="tab col-md-2" href="<%= tab %>#<%= anchor %>" >
          <%= tab.titlecase %>

      <% else %>

          <%= tab.titlecase %>

      <% end %>
    <% end if tabs.count > 1
    end %>

Make the whole tab the <a>. Slightly repetative, but more clear.


<% page_title @corporate_information_page.title %>
<% page_class "corporate-information-pages-show organisation-page" %>

<%= organisation_wrapper(@organisation) do %>

        <%= render_corporate_info_header_for(@organisation, @corporate_information_page) %>
        <%= render 'shared/govspeak_header_contents', markdown: @corporate_information_page.body %>

        <%= content_tag :p, class: 'homepage-link' do %>
          <%= link_to "#{@organisation.name} homepage", organisation_path(@organisation) %>
        <% end %>

          <%= render partial: 'shared/available_languages', locals: {object: @corporate_information_page } %>

<%= @corporate_information_page.title %>

          <%= @corporate_information_page.summary %>

          <%= govspeak_edition_to_html @corporate_information_page %>

<% end %>

<% page_title @corporate_information_page.title, @organisation.name %>
<% page_class "corporate-information-pages-show organisation-page" %>

<%= organisation_wrapper(@organisation) do %>

        <%= render_corporate_info_header_for(@organisation, @corporate_information_page) %>
        <%= render 'shared/govspeak_header_contents', markdown: @corporate_information_page.body %>

        <%= content_tag :p, class: 'homepage-link' do %>
          <%= link_to "#{@organisation.name} homepage", organisation_path(@organisation) %>
        <% end %>

          <%= render partial: 'shared/available_languages', locals: {object: @corporate_information_page } %>

<%= @corporate_information_page.title %>

          <%= @corporate_information_page.summary %>

          <%= govspeak_edition_to_html @corporate_information_page %>

<% end %>

Append organisation name to corp info page TITLE

https://www.pivotaltracker.com/story/show/54023167


<script type="text/javascript">
  /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
  var disqus_shortname = '<%= Monologue.disqus_shortname%>'; // required: replace example with your forum shortname

  <% if Rails.env.development?  %>
  var disqus_developer = 1; // developer mode is on
  <% end %>

  /* * * DON'T EDIT BELOW THIS LINE * * */
  (function () {
    var dsq = document.createElement('script');
    dsq.type = 'text/javascript';
    dsq.async = true;
    dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
  })();
</script>

<script type="text/javascript">
  /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
  var disqus_shortname = '<%= Monologue.disqus_shortname%>'; // required: replace example with your forum shortname

  <% if Rails.env.development?  %>
  var disqus_developer = 1; // developer mode is on
  <% end %>

  /* * * DON'T EDIT BELOW THIS LINE * * */
  (function () {
    var dsq = document.createElement('script');
    dsq.type = 'text/javascript';
    dsq.async = true;
    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
  })();
</script>

Make Disqus embed.js URL protocol relative

Allow embed.js to be loaded on http or https sites


<%#encoding: UTF-8%>
// variant autocompletion

$(document).ready(function() {
  window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
})

formatVariantResult = function(variant) {
  if (variant["images"][0] != undefined && variant["images"][0].image != undefined) {
    variant.image = variant.images[0].image.mini_url
  }
  return variantTemplate({ variant: variant })
}

$.fn.variantAutocomplete = function() {
  this.parent().children(".options_placeholder").attr('id', this.parent().data('index'))
  this.select2({
    placeholder: "Select a variant",
    minimumInputLength: 4,
    ajax: {
      url: Spree.routes.variants_search,
      datatype: 'json',
      data: function(term, page) {
        return {
          q: {
            "product_name_or_sku": term
          }
        }
      },
      results: function (data, page) {
        return { results: data }
      }
    },
    formatResult: formatVariantResult,
    formatSelection: function (variant) {
      $(this.element).parent().children('.options_placeholder').html(variant.options_text)
      return variant.name;
    }
  })
}

<%#encoding: UTF-8%>
// variant autocompletion

$(document).ready(function() {
  window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
})

formatVariantResult = function(variant) {
  if (variant["images"][0] != undefined && variant["images"][0].image != undefined) {
    variant.image = variant.images[0].image.mini_url
  }
  return variantTemplate({ variant: variant })
}

$.fn.variantAutocomplete = function() {
  this.parent().children(".options_placeholder").attr('id', this.parent().data('index'))
  this.select2({
    placeholder: "Select a variant",
    minimumInputLength: 4,
    ajax: {
      url: Spree.routes.variants_search,
      datatype: 'json',
      data: function(term, page) {
        return {
          q: {
            "products_name_or_sku": term
          }
        }
      },
      results: function (data, page) {
        return { results: data }
      }
    },
    formatResult: formatVariantResult,
    formatSelection: function (variant) {
      $(this.element).parent().children('.options_placeholder').html(variant.options_text)
      return variant.name;
    }
  })
}

Correct products_name_or_sku key in variant autocomplete


<%= csrf_meta_tag %>
<link href='https://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
<meta charset="utf-8" />

<!-- added for use on small devices like phones -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

<!-- Twitter card metadata -->
<%= yield :twitter_meta %>
<!-- Google Scholar metadata -->
<%= yield :gscholar_meta %>

<title><%= content_for?(:page_title) ? yield(:page_title) : default_page_title %></title>

<!-- application css -->
<%= stylesheet_link_tag 'application' %>

<!-- application js -->
<%= javascript_include_tag 'application' %>

<!-- Google Analytics -->
<%= render partial: '/ga', formats: [:html] %>

<!-- for extras, e.g., a favicon -->
<%= render partial: '/head_tag_extras', formats: [:html] %>

<%= csrf_meta_tag %>
<meta charset="utf-8" />

<!-- added for use on small devices like phones -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

<!-- Twitter card metadata -->
<%= yield :twitter_meta %>
<!-- Google Scholar metadata -->
<%= yield :gscholar_meta %>

<title><%= content_for?(:page_title) ? yield(:page_title) : default_page_title %></title>

<!-- application css -->
<%= stylesheet_link_tag 'application' %>

<!-- application js -->
<%= javascript_include_tag 'application' %>

<!-- Google Analytics -->
<%= render partial: '/ga', formats: [:html] %>

<!-- for extras, e.g., a favicon -->
<%= render partial: '/head_tag_extras', formats: [:html] %>

Remove unused CSS web font import for Lato


<!DOCTYPE html>

    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />

Welcome to example.com, <%= @user.name %>

      You have successfully signed up to example.com,
      your username is: <%= @user.login %>.

      To login to the site, just follow this link: <%= @url %>.

Thanks for joining and have a great day!

<!DOCTYPE html>

    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />

Welcome to example.com, <%= @user.first_name %>

      You have successfully signed up to example.com,
      your username is: <%= @user.email %>.

      To login to the site, just follow this link: <%= @url %>.

Thanks for joining and have a great day!

Fix user name in welcome email

Fix user name in welcome email


<% content_for :page_title, "Local Authorities" %>

<% breadcrumb :local_authorities %>

Local Authorities

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

<% if @authorities.any? %>

            <%= render partial: "govuk_admin_template/table_filter_form" %>

            <%= @authorities.count %>
            <%= 'local authorities'.pluralize(@authorities.count) %>

      <% @authorities.each do |authority| %>

            <%= link_to authority.name, local_authority_services_path(authority.slug), class: 'js-open-on-submit name' %>

              <%= authority.broken_link_count %>
              <%= 'Broken link'.pluralize(authority.broken_link_count) %>

      <% end %>

<% else %>

No local authorities found

<% end %>

<% content_for :page_title, "Local Authorities" %>

<% breadcrumb :local_authorities %>

Local Authorities

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

<% if @authorities.any? %>

            <%= render partial: 'govuk_admin_template/table_filter_form', locals: { placeholder: 'Search for a council here' } %>

            <%= @authorities.count %>
            <%= 'local authorities'.pluralize(@authorities.count) %>

      <% @authorities.each do |authority| %>

            <%= link_to authority.name, local_authority_services_path(authority.slug), class: 'js-open-on-submit name' %>

              <%= authority.broken_link_count %>
              <%= 'Broken link'.pluralize(authority.broken_link_count) %>

      <% end %>

<% else %>

No local authorities found

<% end %>

Update placeholder text in LocalAuthority filter


<%= t(:routes_by_region) %>

 <%- @regions.each do |region| %>

      <%= link_to(region.name, route_region_path(region)) %>

  <%- end %>

Add container for route list.

Add container for route list.


---
- job:
    name: search_index_checks
    display-name: Search index checks
    project-type: freestyle
    description: |
      This job monitors the GOV.UK search indexes and sends data to statsd.
    logrotate:
      numToKeep: 10
    triggers:
        - timed: 'H/10 * * * *'
    properties:
        - build-discarder:
            days-to-keep: 30
            artifact-num-to-keep: 5
    builders:
        - shell: ssh deploy@$(govuk_node_list -c search --single-node) "cd /var/apps/rummager && govuk_setenv rummager bundle exec rake rummager:monitor_indices"
    wrappers:
      - ansicolor:
          colormap: xterm
      - timestamps

---
- job:
    name: search_index_checks
    display-name: Search index checks
    project-type: freestyle
    description: |
      This job monitors the GOV.UK search indexes and sends data to statsd.
    logrotate:
      numToKeep: 10
    triggers:
        - timed: 'H/10 * * * *'
    properties:
        - build-discarder:
            days-to-keep: 30
            artifact-num-to-keep: 5
    builders:
      - trigger-builds:
          - project: run-rake-task
            block: true
            predefined-parameters: |
              TARGET_APPLICATION=rummager
              MACHINE_CLASS=search
              RAKE_TASK=rummager:monitor_indices
    wrappers:
      - ansicolor:
          colormap: xterm
      - timestamps

Use run-rake-task in search_index_checks job


<%= link_to 'Back', spots_path %>

<%= @spot.name %>

<%= link_to 'Edit', edit_spot_path(@spot) %>

<%= @spot.address %>

<%= @spot.phone %>

<% if @spot.website %>
<%= @spot.website %>

<% end %>
<%#= show_price(@spot.price) %>

<%= show_photo(@spot.photo) if @spot.photo %>

<%= button_to "Leave Comment", new_spot_comment_path(@spot), method: :get %>
<% @spot.comments.each do |comment| %>
	<%= comment.body %>

<% end %>

<%= link_to 'Back', spots_path %>

<%= @spot.name %>

<%= link_to 'Edit', edit_spot_path(@spot) %>

<%= button_to "Delete", @spot, method: :delete, action: 'destroy' %>
<%= button_to "Edit", edit_spot_path(@spot), method: :get %>

<%= @spot.address %>

<%= @spot.phone %>

<% if @spot.website %>
<%= @spot.website %>

<% end %>
<%#= show_price(@spot.price) %>

<%= show_photo(@spot.photo) if @spot.photo %>

<%= button_to "Leave Comment", new_spot_comment_path(@spot), method: :get %>
<% @spot.comments.each do |comment| %>
	<%= comment.body %>

<% end %>

Add edit/delete option for spot show

Add edit/delete option for spot show


<%= section.section %> <%= section.filename %>

<%= section.description %>

    <% if section.modifiers.any? %>

        <% section.modifiers.each do |modifier| %>

<%= modifier.name %> - <%= modifier.description %>

        <% end %>

    <% end %>

    <%= example_html.html_safe %>

  <% section.modifiers.each do |modifier| %>

      <%= modifier.name %>
      <%= example_html.sub('$modifier_class', " #{modifier.class_name}").html_safe %>

  <% end %>

<%= section.section %> <%= section.filename %>

<%= section.description %>

    <% if section.modifiers.any? %>

        <% section.modifiers.each do |modifier| %>

<%= modifier.name %> - <%= modifier.description %>

        <% end %>

    <% end %>

    <%= example_html.html_safe %>

  <% section.modifiers.each do |modifier| %>

      <%= modifier.name %>
      <%= example_html.gsub('$modifier_class', "#{modifier.class_name}").html_safe %>

  <% end %>

Make the modifier_class replacement global so that it replaces all instances within the example_html. Allows for generation of a displayed code example alongside the rendered html within the same example_html block.


            <%= link_to 'About', about_page_path %>

            <%= link_to 'Privacy', privacy_page_path %>

            <%= link_to 'Terms', terms_page_path %>

						Follow us

							<%= link_to 'MailpennyHQ', 'https://twitter.com/MailpennyHQ' %>

							<%= link_to 'Mailpenny', 'https://angel.co/mailpenny' %>

Remove redundent classes and divs, and rename footer links class to social


<%= link_to "Home", root_path %>

    <% if user_signed_in? %>

<%= link_to "Add Resource", new_resource_path %>

<%= link_to "Add Language", new_language_path %>

<%= link_to "Add Course", new_course_path %>

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

    <% else %>

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

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

    <% end %>

<%= link_to "Home", root_path %>

    <% if user_signed_in? %>

<%= link_to "Add Resource", new_resource_path %>

<%= link_to "Languages", languages_path %>

<%= link_to "Courses", courses_path %>

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

    <% else %>

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

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

    <% end %>

Remove Add course and Add language link.:


<!DOCTYPE html>
<html>
<head>
  <title>CfeMoney</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>How much has your school been robbed?</title>
  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
  <%= csrf_meta_tags %>
  <!-- Latest compiled and minified CSS -->
	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">

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

	<!-- Latest compiled and minified JavaScript -->
	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>

  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>

  <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
  <link href='http://fonts.googleapis.com/css?family=Walter+Turncoat' rel='stylesheet' type='text/css'>

</head>
<body>

<%= yield %>

</body>
</html>

Add links to bootstrap, jquery, and google font


<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

    <title><%= h(yield(:title) || "Untitled") %></title>
    <%= stylesheet_link_tag 'application' %>
    <%= javascript_include_tag :defaults %>
    <%= yield(:head) %>

      <%- flash.each do |name, msg| -%>
        <%= content_tag :div, msg, :id => "flash_#{name}" %>
      <%- end -%>

      <%- if show_title? -%>

<%=h yield(:title) %>

      <%- end -%>

      <%= yield %>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

    <title><%= h(yield(:title) || "Untitled") %></title>
    <%= stylesheet_link_tag 'application' %>
    <%= javascript_include_tag 'jquery-1.3.2.min', 'application' %>
    <%= yield(:head) %>

      <%- flash.each do |name, msg| -%>
        <%= content_tag :div, msg, :id => "flash_#{name}" %>
      <%- end -%>

      <%- if show_title? -%>

<%=h yield(:title) %>

      <%- end -%>

      <%= yield %>

Replace prototype with jquery in the application layout


<%= form_for :user, :url => spree.user_session_path do |f| %>

      <%= f.label :email, t(:email) %>

      <%= f.email_field :email, :class => 'title', :tabindex => 1 %>

      <%= f.label :password, t(:password) %>

      <%= f.password_field :password, :class => 'title', :tabindex => 2 %>

      <%= f.check_box :remember_me %>
      <%= f.label :remember_me, t(:remember_me) %>

<%= f.submit t(:login), :class => 'button primary' %>

<% end %>

<%= form_for :user, :url => spree.user_session_path do |f| %>

      <%= f.label :email, t(:email) %>

      <%= f.email_field :email, :class => 'title', :tabindex => 1 %>

      <%= f.label :password, t(:password) %>

      <%= f.password_field :password, :class => 'title', :tabindex => 2 %>

      <%= f.check_box :remember_me %>
      <%= f.label :remember_me, t(:remember_me) %>

<%= f.submit t(:login), :class => 'button primary', :tabindex => 3 %>

<% end %>

Set tabindex on submit button to 3

Set tabindex on submit button to 3

This is so it tabs through as email -> password -> login


---
- scm:
    name: build_fpm_package
    scm:
        - git:
            url: https://github.com/alphagov/packager
            branches:
              - master

- job:
    name: build_fpm_package
    display-name: Build fpm package
    project-type: freestyle
    properties:
        - build-discarder:
            days-to-keep: 30
            artifact-num-to-keep: 5
        - github:
            url: https://github.com/alphagov/packager/
    scm:
      - build_fpm_package
    parameters:
        - string:
            name: RECIPE
            description: The name of an fpm-cookery recipe
        - string:
            name: DISTRO
            description: Ubuntu distribution to target (trusty, xenial)
            default: trusty
    builders:
        - shell: |
            cd fpm/
            ./container-build.sh
    publishers:
        - archive:
            artifacts: 'build/*.deb'

---
- scm:
    name: build_fpm_package
    scm:
        - git:
            url: https://github.com/alphagov/packager
            branches:
              - master
            wipe-workspace: true

- job:
    name: build_fpm_package
    display-name: Build fpm package
    project-type: freestyle
    properties:
        - build-discarder:
            days-to-keep: 30
            artifact-num-to-keep: 5
        - github:
            url: https://github.com/alphagov/packager/
    scm:
      - build_fpm_package
    parameters:
        - string:
            name: RECIPE
            description: The name of an fpm-cookery recipe
        - string:
            name: DISTRO
            description: Ubuntu distribution to target (trusty, xenial)
            default: trusty
    builders:
        - shell: |
            cd fpm/
            ./container-build.sh
    publishers:
        - archive:
            artifacts: 'fpm/recipes/*/pkg/*.deb'

Fix the build_fpm_manager job config

Fix the build_fpm_manager job config

# Context
This job runs in a docker container that mounts the local system for sharing
the debian package. Archiving the *.deb files (artifacts) with "build/*.deb"
doesn't work - I assume this was a remnant of the pre-docker job config. The
debian is actually available locally with the "fpm" root and on the container
with the "build" root. In addition to this the workspace is not cleared. In
combination this results in the job failing (as it can't clear the workspace).
It also means that the created package is not archived by Jenkins.

# Decision
Wipe the workspace before starting and make sure the debian files are archived
using the Jenkins job config.

Co-authored-by: Conor Glynn <416485996da9123c1b84095b547f3d3f9b9a7705@digital.cabinet-office.gov.uk>


<%= link_to "Can I Afford This?", root_path %>

Menu

      <% if logged_in? %>

<%= link_to "My Profile", profile_path(session[:user_id]) %>

<%= link_to "Planned Purchases", userpurchases_path(session[:user_id]) %>

<%= link_to "Comparison", expensesheet_path(current_user) %>

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

      <% else %>

<%= link_to "Login", '/login', "data-reveal-id" => "firstModal" %>

<%= link_to "Sign up", new_user_path, "data-reveal-id" => "secondModal" %>

      <% end %>

<%= render "layouts/modal" %>

<%= link_to "Can I Afford This?", root_path %>

Menu

      <% if logged_in? %>

<%= link_to "My Profile", profile_path(session[:user_id]) %>

<%= link_to "Planned Purchases", userpurchases_path(session[:user_id]) %>

<%= link_to "Comparison", expensesheet_path(session[:user_id]) %>

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

      <% else %>

<%= link_to "Login", '/login', "data-reveal-id" => "firstModal" %>

<%= link_to "Sign up", new_user_path, "data-reveal-id" => "secondModal" %>

      <% end %>

<%= render "layouts/modal" %>

Change id call for route

Change id call for route


<%= cache proposal do %>

      <%= bcn_icon "localitzacio" %>
      <% if proposal.scope == "city" %>
        <%= I18n.t("components.filter_option.city") %>
      <% else %>
        <%= proposal.decorate.district_name %>
      <% end %>

    <%= category_icon(proposal.category) %> <%= proposal.category.decorate.name %>
    <%= proposal.subcategory.decorate.name %>

<% end %>

Add cache block to proposals meta

Add cache block to proposals meta


How much does NY State owe your school?

New York State continues	to	ignore the	settlement	of	a	landmark	school funding	lawsuit	that	requires	the	state	to	provide	billions	more	to	schools.
 More	than	$2	billion	is	now	owed.

Find out how much New York State is robbing your school.

	<%= render partial: 'search_section'  %>

Change div classes in header so title text moves above photo in mobile


&#10005

Upload Images

  <%= form_for(:asset, multipart: true, as: :asset, html: {id: 'multi-upload', class: 'dropzone'}) do |f| %>
  <% end %>

Fix close button on upload images

Fix close button on upload images


  <% @pets.each do |pet| %>
    <%=image_tag pet.photo.url(:custom)%>
  <% end %>

Kennels and boarding can be ruff.

 Use Swappaws to connect with pet lovers to watch your pets.

Create swappaws bio and include on the homepage


                Logo
                menu

                        Sass

                        Components

Hola

Change: Move the toolbar and the footer section
        to separate partials.


# If applied, this commit will...

# Why is this change needed?

# How does it address the issue?

# Provide links to any relevant tickets, articles or other resources

# ==== Emojis ====
# 🎉 :  tada : Add big feature
# ✨ : sparkles : Add small feature
# 👍  : +1 : improvement
# ♻ : recycle : refactoring
# 🎨 : art : when improving the format/structure of the code
# 🚀 : rocket : when improving performance
# 🚱 : non-potable_water : when plugging memory leaks
# 📝 : pencil: when writing docs
# 🐧 : penguin : when fixing something on Linux
# 🍎 : apple : when fixing something on macOS
# 🏁 : checkered_flag : when fixing something on Windows
# 🐛 : bug : when fixing a bug
# 🔥 : fire : when removing code or files
# 💚 : green_heart : when fixing the CI build
# ✅ : white_check_mark : when adding tests
# 👮 : cop : when dealing with security
# ⬆ : arrow_up : when upgrading dependencies
# ⬇ : arrow_down : when downgrading dependencies
# 👕 : shirt : when removing linter warnings

# If applied, this commit will...

# Why is this change needed?

# How does it address the issue?

# Provide links to any relevant tickets, articles or other resources

# ==== Emojis ====
# 🎉 :  tada : Add big feature
# ✨ : sparkles : Add small feature
# 👍  : +1 : improvement
# ♻ : recycle : refactoring
# 🎨 : art : when improving the format/structure of the code
# 🚀 : rocket : when improving performance
# 🚱 : non-potable_water : when plugging memory leaks
# 📝 : pencil: when writing docs
# :page_with_curl: : page_with_curl : when writing log
# 🐧 : penguin : when fixing something on Linux
# 🍎 : apple : when fixing something on macOS
# 🏁 : checkered_flag : when fixing something on Windows
# 🐛 : bug : when fixing a bug
# 🔥 : fire : when removing code or files
# 💚 : green_heart : when fixing the CI build
# ✅ : white_check_mark : when adding tests
# 👮 : cop : when dealing with security
# ⬆ : arrow_up : when upgrading dependencies
# ⬇ : arrow_down : when downgrading dependencies
# 👕 : shirt : when removing linter warnings

:+1: Update git commit template for writing log

Add writing log emoji


      <%= form_tag patients_path, method: 'get' do %>
        <%= search_field_tag :search, params[:search], size: 23, results: 5,
          autocorrect: 'off', placeholder: t('.search_patients') %>
      <% end %>

<%= t('.recent_patients') %>

    <% if @recent %>
    <% for patient in @recent %>

          <%= link_to truncate(patient.full_name, length: 15),
            patient_accessions_path(patient), title: patient.full_name %>

        <tt><%= t('.patient') %></tt>

    <% end %>
    <% end %>

      <%= form_tag patients_path, method: 'get', enforce_utf8: false do %>
        <%= search_field_tag :search, params[:search], size: 23, results: 5,
          autocorrect: 'off', placeholder: t('.search_patients') %>
      <% end %>

<%= t('.recent_patients') %>

    <% if @recent %>
    <% for patient in @recent %>

          <%= link_to truncate(patient.full_name, length: 15),
            patient_accessions_path(patient), title: patient.full_name %>

        <tt><%= t('.patient') %></tt>

    <% end %>
    <% end %>

Disable utf-8 enforcer, as we do not support IE<8


Welcome, <%= current_user.nick_name %>!

<%= flash[:no_show_access] %>

<%= flash[:no_access_create] %>

<% if logged_in? %>

     <button type="button" class="new-sound-trek btn btn-primary btn-lg black-background btn-block"><%= link_to "Create SoundTrek", "sound_treks#new", id: "create-sound-trek", :class => "new-link" %></button>

<% end %>

  <% if logged_in? %>

Happy Trekking, <%= current_user.nick_name %>!

  <% else %>

Happy Trekking!

  <% end %>

<%= flash[:no_show_access] %>

<%= flash[:no_access_create] %>

<% if logged_in? %>

     <button type="button" class="new-sound-trek btn btn-primary btn-lg black-background btn-block"><%= link_to "Create SoundTrek", "sound_treks#new", id: "create-sound-trek", :class => "new-link" %></button>

<% end %>

Edit welcome message on homepage

Edit welcome message on homepage


      <%= @server %>
      »
      <%= params[:host] %>

          List
          Probability
          Size
          Capacity
          Items

        <% @details.each do |attrs| %>

            <%= attrs[:name] %>
            <%= attrs[:probability] %>%
            <%= attrs[:size].to_human %>
            <%= attrs[:capacity].to_human %>
            <%= attrs[:items].to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse %>

        <% end %>

      <%= @server %>
      »
      <%= params[:host] %>

          List
          Probability
          Size
          Capacity
          Items

        <% @details.each do |attrs| %>

            <%= attrs[:name] %>
            <%= attrs[:probability] %>%
            <td class="ralign" data-value="<%= attrs[:size] %>"><%= attrs[:size].to_human %>
            <td class="ralign" data-value="<%= attrs[:capacity] %>"><%= attrs[:capacity].to_human %>
            <%= attrs[:items].to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse %>

        <% end %>

Add data-value attribute to fix sorting of size columns


Join — Create An Account

  <% if @user.errors.any? %>

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

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

<%= msg %>

      <% end %>

  <% end %>

  <%= form_for @user do |form| %>
  <fieldset>
<% if admin? -%>
    <legend>New user details</legend>
<% else -%>
    <legend>Your details</legend>
<% end -%>

      <%= form.label :name %>:

      <%= form.text_field :name, required: true %>

      <%= form.label :email %>:

      <%= form.email_field :email, required: true %>

      Kept under lock and key. We hate spam too!

      <%= form.label :password %>:

      <%= form.password_field :password, required: true %>

      <%= form.label :password_confirmation %>:

      <%= form.password_field :password_confirmation, required: true %>

    <%= submit_tag "Join!" %>
  </fieldset>
  <% end %>

Join — Create An Account

  <% if @user.errors.any? %>

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

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

<%= msg %>

      <% end %>

  <% end %>

  <%= form_for @user do |form| %>
  <fieldset>
<% if admin? -%>
    <legend>New user details</legend>
<% else -%>
    <legend>Your details</legend>
<% end -%>

      <%= form.label :name %>:

      <%= form.text_field :name, required: true %>

      <%= form.label :email %>:

      <%= form.email_field :email, required: true %>

      <%= form.label :password %>:

      <%= form.password_field :password, required: true %>

      <%= form.label :password_confirmation %>:

      <%= form.password_field :password_confirmation, required: true %>

    <%= submit_tag "Join!" %>
  </fieldset>
  <% end %>

Remove spam message (policy detail)

Remove spam message (policy detail)


      <%= render partial: "status_buttons", locals: { order: order } %>

      <% if order.pending? || order.shipped? %>
        <button class="btn btn-primary">Save</button>
      <% end %>

      <%= link_to "Cancel", orders_path, type: "button", class: "btn btn-default" %>

      <%= render partial: "status_buttons", locals: { order: order } %>

      <% if order.pending? || order.approved? || order.shipped? %>
        <button class="btn btn-primary">Save</button>
      <% end %>

      <%= link_to "Cancel", orders_path, type: "button", class: "btn btn-default" %>

Add status to show save button on approved