Merge branch 'staging'
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
# Place all the behaviors and hooks related to the matching controller here.
|
||||
# All this logic will automatically be available in application.js.
|
||||
# You can use CoffeeScript in this file: http://coffeescript.org/
|
||||
@@ -20,6 +20,17 @@
|
||||
@import "footnotes"
|
||||
@import "statements"
|
||||
@import "donations"
|
||||
@import "nav"
|
||||
|
||||
*:focus
|
||||
outline: 0
|
||||
-webkit-box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.075), 0 0 8px red
|
||||
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.075), 0 0 8px red
|
||||
|
||||
.form-control:focus, input:focus
|
||||
outline: 0
|
||||
-webkit-box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.075), 0 0 8px $brand-success
|
||||
box-shadow: inset 0 2px 2px rgba(0, 0, 0, 0.075), 0 0 8px $brand-success
|
||||
|
||||
.alert-alert
|
||||
@extend .alert-danger
|
||||
@@ -58,6 +69,12 @@ body
|
||||
.container
|
||||
padding-left: 0px
|
||||
|
||||
header > .row
|
||||
margin-bottom: 12px
|
||||
|
||||
main > h1
|
||||
margin-top: 0px
|
||||
|
||||
ul#topnav
|
||||
font-size: 1.2em
|
||||
|
||||
@@ -135,4 +152,7 @@ body
|
||||
a
|
||||
color: #FFF
|
||||
|
||||
|
||||
.row.fix
|
||||
display: flex
|
||||
flex-wrap: wrap
|
||||
width: 100%
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
// Place all the styles related to the Greendays controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
|
||||
.well > h2
|
||||
margin-top: 0px
|
||||
|
||||
#map
|
||||
width: 100%
|
||||
height: 300px
|
||||
margin-bottom: 12px
|
||||
|
||||
.col-lg-4
|
||||
width: 32% !important
|
||||
@@ -0,0 +1,34 @@
|
||||
@import "variables"
|
||||
|
||||
nav#mainnav
|
||||
marign-top: 12px
|
||||
font-size: 16pt
|
||||
|
||||
a
|
||||
color: $brand-success
|
||||
|
||||
a.selected
|
||||
font-weight: bold
|
||||
|
||||
|
||||
ul
|
||||
list-style: none
|
||||
padding: 0px
|
||||
|
||||
li
|
||||
padding: 5px 5px 5px 10px
|
||||
|
||||
ul
|
||||
padding-left: 20px
|
||||
|
||||
li
|
||||
font-size: 12pt
|
||||
|
||||
li.selected
|
||||
background-color: $brand-success
|
||||
a
|
||||
color: white
|
||||
|
||||
#greendays
|
||||
margin-bottom: 12px
|
||||
border: 1px solid $brand-success
|
||||
@@ -0,0 +1,30 @@
|
||||
.field_with_errors {
|
||||
padding: 2px;
|
||||
background-color: red;
|
||||
display: table;
|
||||
}
|
||||
|
||||
#error_explanation {
|
||||
width: 450px;
|
||||
border: 2px solid red;
|
||||
padding: 7px;
|
||||
padding-bottom: 0;
|
||||
margin-bottom: 20px;
|
||||
background-color: #f0f0f0;
|
||||
|
||||
h2 {
|
||||
text-align: left;
|
||||
font-weight: bold;
|
||||
padding: 5px 5px 5px 15px;
|
||||
font-size: 12px;
|
||||
margin: -7px;
|
||||
margin-bottom: 0px;
|
||||
background-color: #c00;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
ul li {
|
||||
font-size: 12px;
|
||||
list-style: square;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
$brand-success: #66903F
|
||||
$brand-success: #4b7d1c
|
||||
$navbar-default-bg: #FFF
|
||||
$navbar-default-border: none
|
||||
$font-size-base: 14px
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
class GreendaysController < ApplicationController
|
||||
before_action :only_admin, except: [:index, :show]
|
||||
before_action :set_greenday, only: [:show, :edit, :update, :destroy]
|
||||
|
||||
def index
|
||||
@greendays = Greenday.all.sort(title: 1)
|
||||
end
|
||||
|
||||
def new
|
||||
@greenday = Greenday.new
|
||||
end
|
||||
|
||||
def edit; end
|
||||
|
||||
def create
|
||||
@greenday = Greenday.new(greenday_params)
|
||||
|
||||
respond_to do |format|
|
||||
if @greenday.save
|
||||
format.html { redirect_to greendays_path, success: 'Greenday was successfully created.' }
|
||||
format.json { render :show, status: :created, location: @greenday }
|
||||
else
|
||||
format.html { render :new }
|
||||
format.json { render json: @greenday.errors, status: :unprocessable_entity }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
respond_to do |format|
|
||||
if @greenday.update(greenday_params)
|
||||
format.html { redirect_to greendays_path, notice: 'Greenday was successfully updated.' }
|
||||
format.json { render :show, status: :ok, location: @greenday }
|
||||
else
|
||||
format.html { render :edit }
|
||||
format.json { render json: @greenday.errors, status: :unprocessable_entity }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@greenday.destroy
|
||||
respond_to do |format|
|
||||
format.html { redirect_to greendays_path, notice: 'Greenday was successfully destroyed.' }
|
||||
format.json { head :no_content }
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Use callbacks to share common setup or constraints between actions.
|
||||
def set_greenday
|
||||
@greenday = Greenday.find(params[:id])
|
||||
end
|
||||
|
||||
# Never trust parameters from the scary internet, only allow the white list through.
|
||||
def greenday_params
|
||||
params.require(:greenday).permit(:title, :address, :homepage, :description, :logo, :delete_logo)
|
||||
end
|
||||
|
||||
def only_admin
|
||||
return true if current_supporter && current_supporter.admin?
|
||||
raise ActionController::RoutingError, 'Not Found'
|
||||
end
|
||||
end
|
||||
@@ -21,7 +21,7 @@ class SupportersController < ApplicationController
|
||||
private
|
||||
|
||||
def supporter_form_params
|
||||
params.require(:supporter).permit(:first_name, :last_name, :street, :zip, :email, :support, :li_membership, :age_category, :city, :comments)
|
||||
params.require(:supporter).permit(:first_name, :last_name, :street, :zip, :email, :support, :li_membership, :age_category, :city, :comments, :tel)
|
||||
end
|
||||
|
||||
# We use sendy for newsletters atm
|
||||
|
||||
@@ -3,4 +3,13 @@ module ApplicationHelper
|
||||
content_for :title, strip_tags(page_title.to_s)
|
||||
page_title
|
||||
end
|
||||
|
||||
def markdown(content)
|
||||
@markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, space_after_headers: true)
|
||||
@markdown.render(content)
|
||||
end
|
||||
|
||||
def admin?
|
||||
current_supporter && current_supporter.admin?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
class Greenday
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
include Geocoder::Model::Mongoid
|
||||
include Mongoid::Paperclip
|
||||
|
||||
before_save :delete_logo?
|
||||
|
||||
has_mongoid_attached_file :logo,
|
||||
path: ':attachment/:id/:style.:extension',
|
||||
styles: {
|
||||
original: ['1920x1680>', :jpg],
|
||||
small: ['100x100#', :jpg],
|
||||
medium: ['250x250', :jpg],
|
||||
large: ['500x500>', :jpg]
|
||||
},
|
||||
convert_options: { all: '-background white -flatten +matte' }
|
||||
|
||||
field :title, type: String
|
||||
field :address, type: String
|
||||
field :homepage, type: String
|
||||
field :description, type: String
|
||||
field :coordinates, type: Array
|
||||
|
||||
geocoded_by :address
|
||||
after_validation :geocode # auto-fetch coordinates
|
||||
|
||||
validates :title, presence: true
|
||||
validates :address, presence: true
|
||||
validates_attachment_content_type :logo, content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif']
|
||||
|
||||
def delete_logo
|
||||
@delete_logo ||= '0'
|
||||
end
|
||||
|
||||
attr_writer :delete_logo
|
||||
|
||||
private
|
||||
|
||||
def delete_logo?
|
||||
logo.clear if @delete_logo == '1'
|
||||
end
|
||||
end
|
||||
@@ -45,6 +45,7 @@ class Supporter
|
||||
field :comments, type: String
|
||||
field :language, type: String
|
||||
field :duplicate, type: Boolean, default: false
|
||||
field :tel, type: String
|
||||
|
||||
validates :first_name, presence: true
|
||||
validates :last_name, presence: true
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
b Am 23. November ist Nationaler CBD-Tag!
|
||||
p Um die #{link_to 'Finanzierung der Sammlung und Beglaubigung', donation_path} der eidgenössischen #{link_to 'Volksinitiative zur Cannabislegalisierung', initiative_text_path} in der Schweiz voranzutreiben, lanciert der Verein Legalize it! in Zusammenarbeit mit dem #{link_to 'Branchenverband IG Hanf', 'https://www.ighanf.ch/D_about.html', target: '_blank'} am 23. November 2017 den ersten nationalen CBD-Tag.
|
||||
p An diesem Tag gibt es in zahlreichen CBD-Läden 10 Prozent Rabatt auf ausgewählte CBD-Produkte. In jedem Laden steht eine Spendenbox, welche für Spenden für die Initiative benutzt werden kann und die dem Verein Legalize it! zugute kommt.
|
||||
p Welche Läden mitmachen, seht ihr auf der Karte:
|
||||
@@ -0,0 +1,14 @@
|
||||
= simple_form_for(@greenday) do |f|
|
||||
= f.error_notification
|
||||
|
||||
.form-inputs
|
||||
= f.input :title
|
||||
= f.input :address, as: :text
|
||||
= f.input :homepage
|
||||
= f.input :description, as: :text
|
||||
= f.input :logo, as: :file, required: false
|
||||
= image_tag f.object.logo.url(:original), alt: '', class: 'img-responsive'
|
||||
= f.input :delete_logo, as: :boolean
|
||||
|
||||
.form-actions
|
||||
= f.button :submit, 'Shop speichern'
|
||||
@@ -0,0 +1,2 @@
|
||||
json.extract! greenday, :id, :title, :address, :coordinates, :homepage, :logo, :description, :created_at, :updated_at
|
||||
json.url greenday_url(greenday, format: :json)
|
||||
@@ -0,0 +1,8 @@
|
||||
h1 Editing greenday
|
||||
|
||||
== render 'form'
|
||||
|
||||
= link_to 'Show', @greenday
|
||||
' |
|
||||
= link_to 'Back', greendays_path
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
|
||||
h1.sr-only = title 'Gründonnerstag'
|
||||
= render 'description'
|
||||
#map
|
||||
= link_to 'Neuen Shop erfassen', new_greenday_path if admin?
|
||||
|
||||
.row.fix
|
||||
- @greendays.each do |greenday|
|
||||
.col-xs-12.col-sm-6.col-lg-4
|
||||
.well
|
||||
h2 = greenday.title
|
||||
- if greenday.logo.url(:original) != '/logos/original/missing.png'
|
||||
= image_tag greenday.logo.url(:original), alt: '', class: 'img-responsive'
|
||||
address = simple_format(greenday.address)
|
||||
- if greenday.homepage
|
||||
= link_to(greenday.homepage, greenday.homepage, target: "_blank")
|
||||
p = markdown(greenday.description).html_safe
|
||||
|
||||
- if admin?
|
||||
= link_to 'Bearbeiten', edit_greenday_path(greenday)
|
||||
|
|
||||
= link_to 'Löschen', greenday, data: { confirm: 'Are you sure?' }, method: :delete
|
||||
|
||||
javascript:
|
||||
function initMap() {
|
||||
|
||||
var map = new google.maps.Map(document.getElementById('map'), {
|
||||
zoom: 8, center: {lat: 47.242, lng: 8.133},
|
||||
});
|
||||
|
||||
var greendays_url = "#{greendays_url(format: :json)}"
|
||||
|
||||
var infowindow = new google.maps.InfoWindow({
|
||||
content: '',
|
||||
maxWidth: 200
|
||||
});
|
||||
|
||||
|
||||
$.getJSON(greendays_url, function(json) {
|
||||
$.each(json, function(key, data) {
|
||||
var marker = new google.maps.Marker({
|
||||
position: {lat: data.coordinates[1], lng: data.coordinates[0] },
|
||||
map: map,
|
||||
title: data.title
|
||||
});
|
||||
|
||||
marker.addListener('click', function() {
|
||||
infowindow.open(map, marker);
|
||||
|
||||
var content = '<b>' + data.title + '</b>'
|
||||
if(data.logo) {
|
||||
content += '<img src="' + data.logo + ' alt="" width="100%"/>'
|
||||
}
|
||||
content += '<address>' + data.address.replace(/\n/g,"<br>")
|
||||
if(data.homepage) {
|
||||
content += '<br/><a href="' + data.homepage + '" target="_blank">' +data.homepage + '</a>'
|
||||
}
|
||||
content += '</address>'
|
||||
|
||||
if(data.description) {
|
||||
content += '<p>' + data.description + '</p>'
|
||||
}
|
||||
infowindow.setContent(content);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
script async="" defer="" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBbwMtGKDqf4i8x9-OVP1-H_QVAKp92h2M&callback=initMap&libraries=visualization"
|
||||
@@ -0,0 +1 @@
|
||||
json.array! @greendays, partial: 'greendays/greenday', as: :greenday
|
||||
@@ -0,0 +1,5 @@
|
||||
h1 New greenday
|
||||
|
||||
== render 'form'
|
||||
|
||||
= link_to 'Back', greendays_path
|
||||
@@ -65,8 +65,11 @@ html lang="#{I18n.locale}"
|
||||
.container.content
|
||||
= render 'shared/flashes'
|
||||
= render 'shared/header'
|
||||
= render 'shared/topnavigation'
|
||||
= yield
|
||||
.row
|
||||
.col-xs-12.col-sm-3
|
||||
nav#mainnav = render_navigation
|
||||
.col-xs-12.col-sm-9
|
||||
main= yield
|
||||
hr
|
||||
footer.row
|
||||
.col-xs-12.col-sm-6
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
= navbar do
|
||||
= navbar_header
|
||||
= navbar_collapse do
|
||||
= navbar_group id: 'topnav' do
|
||||
= navbar_item "Home", "/#{I18n.locale}"
|
||||
= navbar_dropdown t('.initiative') do
|
||||
= navbar_item t('.initiative_text'), initiative_text_path
|
||||
= navbar_item t('.arguments'), arguments_path
|
||||
= navbar_item t('.faq'), faq_path
|
||||
= navbar_item t('.numbers'), numbers_path
|
||||
= navbar_item t('.collection_concept'), collection_concept_path
|
||||
= navbar_item t('.statements'), statements_path
|
||||
= navbar_item t('donation'), donation_path
|
||||
= navbar_item 'Blog', 'http://blog.cannabis-initiative.ch'
|
||||
= navbar_item t('.sign_in'), new_supporter_session_path unless supporter_signed_in?
|
||||
= navbar_item t('.sign_out'), destroy_supporter_session_path, nil, 'data-method' => :delete if supporter_signed_in?
|
||||
- if supporter_signed_in? && current_supporter.admin?
|
||||
= navbar_dropdown t('admin.title') do
|
||||
= navbar_item t('admin.publicities.index.title'), admin_publicities_path
|
||||
@@ -9,6 +9,7 @@
|
||||
= f.input :city, placeholder: t('.placeholders.city')
|
||||
= f.input :zip, placeholder: t('.placeholders.zip')
|
||||
= f.input :email, placeholder: t('.placeholders.email')
|
||||
= f.input :tel, placeholder: '+41 (0) xxxx'
|
||||
= f.input :support, as: :radio_buttons, collection: t('support_type').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
|
||||
= f.input :li_membership, as: :boolean
|
||||
= f.input :age_category, as: :radio_buttons, collection: t('age_category'), label_method: :last, value_method: :first
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
dd == t("age_category.#{current_supporter.age_category}")
|
||||
dt = Supporter.human_attribute_name(:language)
|
||||
dd = t("languages.#{current_supporter.language}")
|
||||
dt = Supporter.human_attribute_name(:tel)
|
||||
dd = current_supporter.tel
|
||||
|
||||
p
|
||||
= link_to t('.edit'), edit_supporter_registration_path(), class: 'pull-right'
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
= f.input :language, as: :radio_buttons, collection: t('languages').map{ |x| [x.first, raw(x.last)]}, label_method: :last, value_method: :first
|
||||
.form-actions
|
||||
= f.button :submit, t("devise.registrations.edit.update"), class: 'btn btn-primary'
|
||||
p = link_to t("devise.shared.links.back"), :back
|
||||
hr
|
||||
p = link_to t("devise.registrations.edit.cancel_my_account"), registration_path(resource_name), data: { confirm: t("devise.registrations.edit.are_you_sure") }, method: :delete, class: 'btn btn-danger btn-sm pull-right'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user