From bb9a2f09cd0d53c299e59d49ac20c62e8c6e3670 Mon Sep 17 00:00:00 2001 From: Sergi Date: Mon, 3 Aug 2015 21:52:29 +0200 Subject: [PATCH] =?UTF-8?q?faltaba=20paginador=20en=20offers=20(no=20se=20?= =?UTF-8?q?como=20a=C3=B1adir=20paginador=20en=20los=20resultados=20de=20b?= =?UTF-8?q?=C3=BAsqueda=20solo=20devuelve=2010,=20a=C3=B1ado=20la=20tarea?= =?UTF-8?q?=20en=20redbooth)=20he=20quitado=20campos=20del=20form=20modifi?= =?UTF-8?q?car=20organization=20y=20tambien=20la=20estad=C3=ADstica=20de?= =?UTF-8?q?=20g=C3=A9nero=20ya=20que=20no=20guardamos=20este=20dato?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/offers/index.html.haml | 2 +- app/views/organizations/_form.html.haml | 2 -- .../statistics_demographics.html.haml | 33 ------------------- 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/app/views/offers/index.html.haml b/app/views/offers/index.html.haml index 048e766..1008558 100644 --- a/app/views/offers/index.html.haml +++ b/app/views/offers/index.html.haml @@ -32,4 +32,4 @@ .offers = render partial: "shared/posts", locals: { posts: @offers } -= link_to_next_page @offers, t(".more"), remote: true, params: params += paginate @offers \ No newline at end of file diff --git a/app/views/organizations/_form.html.haml b/app/views/organizations/_form.html.haml index e768490..0bc1f28 100644 --- a/app/views/organizations/_form.html.haml +++ b/app/views/organizations/_form.html.haml @@ -1,6 +1,5 @@ = simple_form_for @organization do |f| = f.input :name - = f.input :theme, collection: Organization::BOOTSWATCH_THEMES = f.input :email = f.input :phone = f.input :web @@ -9,5 +8,4 @@ = f.input :address = f.input :neighborhood = f.input :city - = f.input :domain = f.button :submit diff --git a/app/views/statistics/statistics_demographics.html.haml b/app/views/statistics/statistics_demographics.html.haml index 27f5bbe..ed7c556 100644 --- a/app/views/statistics/statistics_demographics.html.haml +++ b/app/views/statistics/statistics_demographics.html.haml @@ -2,7 +2,6 @@ .panel.panel-default .panel-body #pie - #pie2 :javascript window.onload = function () { @@ -39,37 +38,5 @@ data: ages }] }); - // Por género - var genders = #{ @gender_counts.to_a.to_json }; - $('#pie2').highcharts({ - chart: { - plotBackgroundColor: null, - plotBorderWidth: null, - plotShadow: false - }, - title: { - text: "#{t '.by_gender'}" - }, - tooltip: { - pointFormat: '{series.name}: {point.y}' - }, - plotOptions: { - pie: { - allowPointSelect: true, - cursor: 'pointer', - dataLabels: { - enabled: true, - color: '#000000', - connectorColor: '#000000', - format: '{point.name}: {point.percentage:.1f} %' - } - } - }, - series: [{ - type: 'pie', - name: '#{t '.num_people'}', - data: genders - }] - }); }