Merge branch 'staging'

2017-11-16 14:52:16 +01:00
parent 018ddce8cf a4c8b2beba
commit d8106e7b08
40 changed files with 656 additions and 45 deletions
@@ -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)
+          | &nbsp;
+          = 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'
				`@@ -0,0 +1 @@`
				`json.array! @greendays, partial: 'greendays/greenday', as: :greenday`