Skip to content

Commit

Permalink
Breadcrumbs
Browse files Browse the repository at this point in the history
  • Loading branch information
ekubal committed Dec 22, 2015
1 parent ff917e2 commit 9266db3
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/controllers/zut/containers_controller.rb
Expand Up @@ -70,7 +70,7 @@ def index
end
end

send_data @csv, filename: "kontenery-#{Date.current}.csv", type: "text/csv"
send_data @csv.encode('WINDOWS-1250'), filename: "kontenery-#{Date.current}.csv", type: "text/csv"
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/models/wastes/packaging_waste.rb
Expand Up @@ -25,7 +25,7 @@ def set_kind
end

def uploaded_picture=(file)
self.picture = file.read
self.picture = file
end

def packaging_types
Expand Down
5 changes: 4 additions & 1 deletion app/views/zut/containers/edit.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Edycja adresu pojemników
%h3.box-title
= link_to('Pojemniki', zut_containers_path)
»
Edycja adresu pojemników
= render partial: 'form'
5 changes: 3 additions & 2 deletions app/views/zut/containers/index.html.haml
@@ -1,7 +1,8 @@
.box-header.with-border
.row
.col-sm-6
%h3.box-title Pojemniki
%h3.box-title
Pojemniki
.col-sm-6.text-right
= link_to 'Nowy adres kontenerów', new_zut_container_path, class: 'btn btn-primary'

Expand All @@ -13,7 +14,7 @@
= select_tag('district[]', options_from_collection_for_select(@districts, 'id', 'name', params[:district]), multiple: true, size: 8, class: 'form-control')

.col-sm-3
Typ kontenera:
Rodzaj asortymentu:
= select_tag('type[]', options_from_collection_for_select(@container_types, 'first', 'last', params[:type]), multiple: true, size: 8, class: 'form-control')

.col-sm-3
Expand Down
5 changes: 4 additions & 1 deletion app/views/zut/containers/new.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Nowy adres pojemników
%h3.box-title
= link_to('Pojemniki', zut_containers_path)
»
Nowy adres pojemników
= render partial: 'form'
5 changes: 4 additions & 1 deletion app/views/zut/districts/edit.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Edycja dzielnicy
%h3.box-title
= link_to('Dzielnice', zut_districts_path)
»
Edycja dzielnicy
= render partial: 'form'
5 changes: 4 additions & 1 deletion app/views/zut/districts/new.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Nowa dzielnica
%h3.box-title
= link_to('Dzielnice', zut_districts_path)
»
Nowa dzielnica
= render partial: 'form'
5 changes: 4 additions & 1 deletion app/views/zut/districts/new_import_data.html.haml
@@ -1,5 +1,8 @@
.box-header.with-border
%h3.box-title Import słownika
%h3.box-title
= link_to('Dzielnice', zut_districts_path)
»
Import słownika
.box-body
.row
.col-md-12
Expand Down
4 changes: 3 additions & 1 deletion app/views/zut/route_containers/new.html.haml
@@ -1,6 +1,8 @@
.box-header.with-border
%h3.box-title
= @route
= link_to('Trasy', zut_routes_path)
»
= link_to(@route, zut_route_path(@route))
»
Nowy punkt w rejonie

Expand Down
5 changes: 4 additions & 1 deletion app/views/zut/routes/edit.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Edycja rejonu
%h3.box-title
= link_to('Trasy', zut_routes_path)
»
Edycja rejonu
= render partial: 'form'
5 changes: 4 additions & 1 deletion app/views/zut/routes/new.html.haml
@@ -1,3 +1,6 @@
.box-header.with-border
%h3.box-title Nowy rejon
%h3.box-title
= link_to('Trasy', zut_routes_path)
»
Nowy rejon
= render partial: 'form'
2 changes: 1 addition & 1 deletion app/views/zut/routes/show.html.haml
Expand Up @@ -2,7 +2,7 @@
.row
.col-sm-6
%h3.box-title
Trasy
= link_to('Trasy', zut_routes_path)
»
= @route
.col-sm-6.text-right
Expand Down
Binary file modified db/development.sqlite3
Binary file not shown.

0 comments on commit 9266db3

Please sign in to comment.