diff --git a/app/assets/stylesheets/organizations.scss b/app/assets/stylesheets/organizations.scss
index a6cc171..777d845 100644
--- a/app/assets/stylesheets/organizations.scss
+++ b/app/assets/stylesheets/organizations.scss
@@ -126,4 +126,18 @@ div.container {
#twitter-feed {
padding-left: 0;
padding-right: 0;
+
+.organization-logo img {
+ float: left;
+ margin-right: 20px;
+
+}
+
+.organization-logo h1 {
+ position: relative;
+ margin-top: 20px;
+}
+
+.organization-logo {
+ margin-bottom: 30px;
}
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 7514137..08cb6e1 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -21,8 +21,9 @@ class Organization < ActiveRecord::Base
after_validation :geocode
# Company Avatar
- mount_uploader :image, ImageUploader
+ mount_uploader :logo, ImageUploader
# Company Pictures
+ mount_uploader :image, ImageUploader
mount_uploader :image2, ImageUploader
mount_uploader :image3, ImageUploader
mount_uploader :image4, ImageUploader
diff --git a/app/views/organizations/_form.html.erb b/app/views/organizations/_form.html.erb
index 751109c..0e9017f 100644
--- a/app/views/organizations/_form.html.erb
+++ b/app/views/organizations/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for @organization do |f| %>
+<%= simple_form_for @organization, html: { multipart: true } do |f| %>
<%= f.input :name, input_html: {class: "abc"}, label_html: {class: "hey"} %>
<%= f.input :address %>
<%= f.input :overview %>
@@ -11,6 +11,9 @@
<%= f.input :published, as: :boolean, checked_value: true, unchecked_value: false %>
<% end %>
<%= f.association :technologies, input_html: {class: "chosen-select"} %>
+
+ <%= f.file_field :logo %>
+
<%= f.file_field :image %>
<%= f.file_field :image2 %>
<%= f.file_field :image3 %>
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index df967cb..24bf5cc 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,5 +1,13 @@
<%= @organization.address %>
<%= @organization.overview %>
diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000..86895ed Binary files /dev/null and b/dump.rdb differ