Added different favicons for each environment and cleaned up files
This commit is contained in:
Godwin
@@ -1,34 +0,0 @@
|
||||
= form_for @event do |f|
|
||||
- if @event.errors.any?
|
||||
#error_explanation
|
||||
%h2= "#{pluralize(@event.errors.count, "error")} prohibited this event from being saved:"
|
||||
%ul
|
||||
- @event.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.field
|
||||
= f.label :title
|
||||
= f.text_field :title
|
||||
.field
|
||||
= f.label :slug
|
||||
= f.text_field :slug
|
||||
.field
|
||||
= f.label :event_type_id
|
||||
= f.number_field :event_type_id
|
||||
.field
|
||||
= f.label :conference
|
||||
= f.text_field :conference
|
||||
.field
|
||||
= f.label :info
|
||||
= f.text_area :info
|
||||
.field
|
||||
= f.label :location
|
||||
= f.text_field :location
|
||||
.field
|
||||
= f.label :start_time
|
||||
= f.datetime_select :start_time
|
||||
.field
|
||||
= f.label :end_time
|
||||
= f.datetime_select :end_time
|
||||
.actions
|
||||
= f.submit 'Save'
|
||||
@@ -1,22 +0,0 @@
|
||||
= render 'conferences/page_header', :page_key => (@event ? 'Edit_Event' : 'New_Event')
|
||||
%article
|
||||
= form_tag save_event_path(@this_conference.slug), class: 'composition' do
|
||||
= row do
|
||||
= columns(medium: 9) do
|
||||
= (hidden_field_tag :event_id, @event.id) if @event
|
||||
.text-field.input-field.big
|
||||
= label_tag :title
|
||||
= text_field_tag :title, @event ? @event.title : nil, :required => true
|
||||
= columns(medium: 3) do
|
||||
.select-field.input-field
|
||||
= label_tag :event_type do
|
||||
= select_tag :event_type, options_for_select([:event, :meal], @event ? @event.event_type : nil), :include_blank => true
|
||||
=_'forms.labels.generic.event_type'
|
||||
= row do
|
||||
= columns(medium: 12) do
|
||||
.text-area-field.input-field
|
||||
= label_tag :info
|
||||
= text_area_tag :info, @event ? @event.info : nil, :required => true
|
||||
= columns(medium: 12) do
|
||||
.actions.right
|
||||
= button_tag :save, :value => :save
|
||||
@@ -1,33 +0,0 @@
|
||||
%h1 Listing events
|
||||
|
||||
%table
|
||||
%tr
|
||||
%th Title
|
||||
%th Slug
|
||||
%th Event type
|
||||
%th Conference
|
||||
%th Info
|
||||
%th Location
|
||||
%th Start time
|
||||
%th End time
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
|
||||
- @events.each do |event|
|
||||
%tr
|
||||
%td= event.title
|
||||
%td= event.slug
|
||||
%td= event.event_type_id
|
||||
%td= event.conference
|
||||
%td= event.info
|
||||
%td= event.location
|
||||
%td= event.start_time
|
||||
%td= event.end_time
|
||||
%td= link_to 'Show', event
|
||||
%td= link_to 'Edit', edit_event_path(event)
|
||||
%td= link_to 'Destroy', event, :method => :delete, :data => { :confirm => 'Are you sure?' }
|
||||
|
||||
%br
|
||||
|
||||
= link_to 'New Event', new_event_path
|
||||
@@ -1,5 +0,0 @@
|
||||
%h1 New event
|
||||
|
||||
= render 'form'
|
||||
|
||||
= link_to 'Back', events_path
|
||||
@@ -1,30 +0,0 @@
|
||||
%p#notice= notice
|
||||
|
||||
%p
|
||||
%b Title:
|
||||
= @event.title
|
||||
%p
|
||||
%b Slug:
|
||||
= @event.slug
|
||||
%p
|
||||
%b Event type:
|
||||
= @event.event_type_id
|
||||
%p
|
||||
%b Conference:
|
||||
= @event.conference
|
||||
%p
|
||||
%b Info:
|
||||
= @event.info
|
||||
%p
|
||||
%b Location:
|
||||
= @event.location
|
||||
%p
|
||||
%b Start time:
|
||||
= @event.start_time
|
||||
%p
|
||||
%b End time:
|
||||
= @event.end_time
|
||||
|
||||
= link_to 'Edit', edit_event_path(@event)
|
||||
\|
|
||||
= link_to 'Back', events_path
|
||||
@@ -8,8 +8,8 @@
|
||||
%meta{ name: 'description', content: (yield_or_default :description, I18n.t('page_descriptions.home')) }
|
||||
= csrf_meta_tags
|
||||
= stylesheets
|
||||
%link{ href: asset_path('favicon.ico'), rel: 'shortcut icon', type: 'image/x-icon' }
|
||||
%link{ href: asset_path('favicon.ico'), rel: 'icon', type: 'image/x-icon' }
|
||||
%link{ href: asset_path(@favicon), rel: 'shortcut icon', type: 'image/x-icon' }
|
||||
%link{ href: asset_path(@favicon), rel: 'icon', type: 'image/x-icon' }
|
||||
- @alt_lang_urls.each do |locale, url|
|
||||
%link{ rel: :alternate, hreflang: locale, href: url }
|
||||
- if content_for?(:og_image)
|
||||
@@ -18,15 +18,13 @@
|
||||
%meta{property: 'og:title', content: title}
|
||||
%meta{property: 'og:type', content: 'website'}
|
||||
%meta{property: 'og:image', content: og_image}
|
||||
%meta{name: "theme-color", content: @theme_colour}
|
||||
= yield :head
|
||||
|
||||
%body{ class: page_style }
|
||||
#primary-content
|
||||
= render 'shared/navbar'
|
||||
%main#main
|
||||
- if content_for?(:side_bar)
|
||||
%nav#side-bar
|
||||
= yield :side_bar
|
||||
%header#banner=yield :banner
|
||||
- if @submenu
|
||||
=row do
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
= form_for @location do |f|
|
||||
- if @location.errors.any?
|
||||
#error_explanation
|
||||
%h2= "#{pluralize(@location.errors.count, "error")} prohibited this location from being saved:"
|
||||
%ul
|
||||
- @location.errors.full_messages.each do |msg|
|
||||
%li= msg
|
||||
|
||||
.field
|
||||
= f.label :title
|
||||
= f.text_field :title
|
||||
.field
|
||||
= f.label :address
|
||||
= f.text_field :address
|
||||
.field
|
||||
= f.label :latitude
|
||||
= f.text_field :latitude
|
||||
.field
|
||||
= f.label :longitude
|
||||
= f.text_field :longitude
|
||||
.actions
|
||||
= f.submit 'Save'
|
||||
@@ -1,7 +0,0 @@
|
||||
%h1 Editing location
|
||||
|
||||
= render 'form'
|
||||
|
||||
= link_to 'Show', @location
|
||||
\|
|
||||
= link_to 'Back', locations_path
|
||||
@@ -1,25 +0,0 @@
|
||||
%h1 Listing locations
|
||||
|
||||
%table
|
||||
%tr
|
||||
%th Title
|
||||
%th Address
|
||||
%th Latitude
|
||||
%th Longitude
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
|
||||
- @locations.each do |location|
|
||||
%tr
|
||||
%td= location.title
|
||||
%td= location.address
|
||||
%td= location.latitude
|
||||
%td= location.longitude
|
||||
%td= link_to 'Show', location
|
||||
%td= link_to 'Edit', edit_location_path(location)
|
||||
%td= link_to 'Destroy', location, :method => :delete, :data => { :confirm => 'Are you sure?' }
|
||||
|
||||
%br
|
||||
|
||||
= link_to 'New Location', new_location_path
|
||||
@@ -1,5 +0,0 @@
|
||||
%h1 New location
|
||||
|
||||
= render 'form'
|
||||
|
||||
= link_to 'Back', locations_path
|
||||
@@ -1,18 +0,0 @@
|
||||
%p#notice= notice
|
||||
|
||||
%p
|
||||
%b Title:
|
||||
= @location.title
|
||||
%p
|
||||
%b Address:
|
||||
= @location.address
|
||||
%p
|
||||
%b Latitude:
|
||||
= @location.latitude
|
||||
%p
|
||||
%b Longitude:
|
||||
= @location.longitude
|
||||
|
||||
= link_to 'Edit', edit_location_path(@location)
|
||||
\|
|
||||
= link_to 'Back', locations_path
|
||||
@@ -1,20 +0,0 @@
|
||||
= form_for @organization do |f|
|
||||
.columns
|
||||
= f.text_field :name
|
||||
= f.text_field :slug
|
||||
|
||||
.columns.medium-4.small-text-centered
|
||||
= f.image_field :avatar, @organization.avatar_url
|
||||
.columns.medium-8
|
||||
= f.email_field :email_address
|
||||
= f.fields_for :locations do |b|
|
||||
= field_set_tag 'Location' do
|
||||
= b.country_select :country, {help: 'Select a Country'}
|
||||
- cc = @organization.locations && @organization.locations[b.index].country ? @organization.locations[b.index].country : 'US'
|
||||
= b.subregion_select :territory, cc, html: {class: @organization.locations[b.index].country ? 'can' : 'cant', data: {:country => cc}}
|
||||
= b.text_field :city
|
||||
= b.text_field :street
|
||||
= b.text_field :postal_code
|
||||
.columns
|
||||
= f.text_area :info
|
||||
= f.actions :save
|
||||
@@ -1,6 +0,0 @@
|
||||
= link_to organization do
|
||||
%figure.org-mini-preview{:class => (organization.avatar.is_landscape? ? 'landscape' : 'portrait')}
|
||||
= image_tag organization.avatar.preview.url
|
||||
%figcaption
|
||||
%h5= organization.name
|
||||
%p= location(organization.locations[0])
|
||||
@@ -1,5 +0,0 @@
|
||||
= link_to organization do
|
||||
%h5
|
||||
= organization.name
|
||||
%figure.org-preview.preview-tile{:style => (organization.cover? ? ('background-image: url(' + organization.cover.preview.url + ')') : nil)}
|
||||
= image_tag organization.avatar.preview.url
|
||||
@@ -1,5 +0,0 @@
|
||||
- page_style :form
|
||||
|
||||
= tabs!
|
||||
.row
|
||||
= render 'form'
|
||||
@@ -1,13 +0,0 @@
|
||||
|
||||
- page_style :form
|
||||
|
||||
= tabs!
|
||||
.row
|
||||
= form_for @organization do |f|
|
||||
.columns.medium-4
|
||||
%h2=_'organization.members.help.title', :t
|
||||
%p=_'organization.members.help', :p
|
||||
.columns.medium-8
|
||||
= f.image_field :cover, @organization.cover_url
|
||||
= f.number_field :year_founded
|
||||
= f.actions :save
|
||||
@@ -1,21 +0,0 @@
|
||||
- title _'page.Organizations'
|
||||
- description 'Bike!Bike! list of DIY bicycle collectives, co-ops, coops, community bike projects, advocacy by country, state, provice, and city'
|
||||
- banner_image '/assets/orgs.jpg'
|
||||
- page_style :list
|
||||
- content_for :banner do
|
||||
.row
|
||||
.columns
|
||||
%h1=_'page.Organizations'
|
||||
|
||||
- @organizations.sort_by{|k,v|k}.each do |country,territories|
|
||||
%h2=country
|
||||
- territories.sort_by{|k,v|k.to_s}.each do |territory,cities|
|
||||
- if territory.is_a? String
|
||||
%h3=territory
|
||||
- cities.sort_by{|k,v|k}.each do |city,organizations|
|
||||
%ul.small-block-grid-1.medium-block-grid-2.large-block-grid-3.org-list.preview-list
|
||||
%li.city
|
||||
%figure{:style => "background-image: url('" + static_map(CGI::escape(city+' '+country), 4, 600, 300) + "');"}
|
||||
%h4=city
|
||||
- organizations.each do |organization|
|
||||
%li=render 'preview', :organization => organization
|
||||
@@ -1,15 +0,0 @@
|
||||
|
||||
- page_style :form
|
||||
|
||||
= tabs!
|
||||
.row
|
||||
= form_for @organization do |f|
|
||||
.columns.medium-4
|
||||
%h2=_'organization.members.help.title', :t
|
||||
%p=_'organization.members.help', :p
|
||||
.columns.medium-8
|
||||
.clearfix
|
||||
= f.fields_for :user_organization_relationships, :include_id => true do |u|
|
||||
= u.user_select_field :id, @organization.users[u.index], {:relationship => @organization.user_organization_relationships[u.index].relationship || true}
|
||||
-#attrs: [@organization.user_organization_relationships[u.index]]
|
||||
= f.actions :save
|
||||
@@ -1,5 +0,0 @@
|
||||
-# banner_title 'Register a New Organization'
|
||||
- page_style :form
|
||||
|
||||
.row
|
||||
= render 'form'
|
||||
@@ -1,25 +0,0 @@
|
||||
- territory = Carmen::Country.coded(@organization.locations[0].country).subregions.coded(@organization.locations[0].territory)
|
||||
- location_name = @organization.locations[0].city + (territory ? ' ' + territory.name : '') + ', ' + Carmen::Country.coded(@organization.locations[0].country).name
|
||||
|
||||
- title @organization.name + ' (' + location_name + ')'
|
||||
- description "#{@organization.name} is a bicycle collective, co-op, community bike project, or advocacy group in #{location_name}"
|
||||
- banner_image @organization.cover_url, id: @organization.cover_attribution_id, name: @organization.cover_attribution_name, user_id: @organization.cover_attribution_user_id, src: @organization.cover_attribution_src
|
||||
- page_style 'article'
|
||||
- content_for :banner do
|
||||
.row{:class => (@organization.avatar.is_landscape? ? 'landscape' : 'portrait')}
|
||||
.columns{:class => (@organization.avatar.is_landscape? ? nil : ['medium-6', 'medium-push-6'])}
|
||||
%figure
|
||||
= image_tag(@organization.avatar.url)
|
||||
.columns.info{:class => (@organization.avatar.is_landscape? ? nil : ['medium-6', 'medium-pull-6'])}
|
||||
%h1=@organization.name
|
||||
- territory = Carmen::Country.coded(@organization.locations[0].country).subregions.coded(@organization.locations[0].territory)
|
||||
%h2=location_name
|
||||
|
||||
%p#notice= notice
|
||||
|
||||
= tabs!
|
||||
|
||||
%article.row
|
||||
.columns.large-10
|
||||
%h2=('About '+@organization.name)
|
||||
=p @organization, :info
|
||||
@@ -1,10 +0,0 @@
|
||||
- content_for :banner do
|
||||
- image = image_path('grafitti.jpg')
|
||||
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
|
||||
- if capable_of(:svg)
|
||||
= render 'application/banner_image.svg', {:image => image}
|
||||
%h1=_'page_titles.Translations'
|
||||
|
||||
%h1=_'translate.Translations'
|
||||
%article=render 'translations/list'
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
- content_for :banner do
|
||||
- image = image_path('grafitti.jpg')
|
||||
#header-title.short{style: capable_of(:svg) ? nil : "background-image: url(#{image})"}
|
||||
- if capable_of(:svg)
|
||||
= render 'application/banner_image.svg', {:image => image}
|
||||
%h1=_'page_titles.Translations'
|
||||
|
||||
%article=render 'translations/list'
|
||||
@@ -1,6 +0,0 @@
|
||||
- content_for :banner do
|
||||
#header-title.no-image
|
||||
%h1=_'translate.translation_pages.Locale_Translations', @locale[:name], :vars => {:language => @locale[:name]}
|
||||
.lingua-franca-translations
|
||||
=render 'translations/translation_control'
|
||||
%article=render 'translations/key_wrapper'
|
||||
@@ -1,12 +0,0 @@
|
||||
= form_for @user, :html => (@user && @user.id ? {:multipart => true} : {}) do |f|
|
||||
%div{:class => (@user.id ? 'columns medium-6' : '')}
|
||||
= f.text_field :username
|
||||
= f.email_field :email
|
||||
- if !@user.id
|
||||
= f.password_field :password
|
||||
= f.password_field :password_confirmation
|
||||
= f.actions :register
|
||||
- if @user.id
|
||||
.columns.medium-6
|
||||
= f.image_field :avatar, @user.avatar_url
|
||||
= f.actions :save
|
||||
@@ -1,8 +0,0 @@
|
||||
- banner_title @user.username
|
||||
|
||||
.row
|
||||
= render 'form'
|
||||
|
||||
= link_to 'Show', @user
|
||||
\|
|
||||
= link_to 'Back', users_path
|
||||
@@ -1,22 +0,0 @@
|
||||
- banner_title 'Listing users'
|
||||
|
||||
.row
|
||||
%table
|
||||
%tr
|
||||
%th Email
|
||||
%th Crypted password
|
||||
%th Salt
|
||||
%th
|
||||
%th
|
||||
%th
|
||||
|
||||
- @users.each do |user|
|
||||
%tr
|
||||
%td= user.email
|
||||
%td= user.crypted_password
|
||||
%td= user.salt
|
||||
%td= link_to 'Show', user
|
||||
%td= link_to 'Edit', edit_user_path(user)
|
||||
%td= link_to 'Destroy', user, :method => :delete, :data => { :confirm => 'Are you sure?' }
|
||||
|
||||
= link_to 'New User', new_user_path
|
||||
@@ -1,6 +0,0 @@
|
||||
- banner_title 'Create an Account'
|
||||
|
||||
.row
|
||||
= render 'form'
|
||||
|
||||
= link_to 'Back', users_path
|
||||
@@ -1,14 +0,0 @@
|
||||
- banner_title @user.username
|
||||
|
||||
%p#notice= notice
|
||||
|
||||
.row
|
||||
|
||||
%p
|
||||
%b Email:
|
||||
= @user.email
|
||||
= image_tag(@user.avatar_url(:thumb)) if @user.avatar?
|
||||
|
||||
= link_to 'Edit', edit_user_path(@user)
|
||||
\|
|
||||
= link_to 'Back', users_path
|
||||
Reference in New Issue
Block a user