Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rrrene/freight-exchange
base: cd187cac69
...
head fork: rrrene/freight-exchange
compare: 8c22575be5
  • 2 commits
  • 8 files changed
  • 0 commit comments
  • 1 contributor
View
6 app/views/freights/_form.html.erb
@@ -15,8 +15,6 @@
<% end %>
<%= f.inputs :transport_timeframe do %>
- <%= render :partial => "postings/frequency_form", :locals => {:f => f} %>
-
<%= f.input :transport_weight, :as => :string %>
<%#= localized_info_fields f, :goods_text %>
@@ -38,10 +36,10 @@
<%#= f.input :wagons_provided_by, :collection => collection_choices(Freight, :wagons_provided_by), :as => :radio %>
<%#= f.input :paying_freight, :collection => collection_choices(Freight, :paying_freight), :as => :select, :include_blank => false %>
- <%= f.input :desired_proposal_type, :collection => collection_choices(Freight, :desired_proposal_type), :as => :radio %>
<% end %>
- <%= f.inputs :misc_text do %>
+ <%= f.inputs :misc_text, :class => "inputs misc_info" do %>
+ <%= f.input :desired_proposal_type, :collection => collection_choices(Freight, :desired_proposal_type), :as => :radio %>
<%#= localized_info_fields f, :misc_text %>
<%= f.input :contact_person, :collection => current_company.people %>
<% end %>
View
4 app/views/loading_spaces/_form.html.erb
@@ -2,8 +2,6 @@
<%= render :partial => "postings/shared_form", :locals => {:f => f} %>
<%= f.inputs :transport_timeframe do %>
- <%= render :partial => "postings/frequency_form", :locals => {:f => f} %>
-
<%= f.input :free_capacities, :collection => collection_choices(resource.class, :free_capacities), :as => :select %>
<%#= localized_info_field f, :transport_text %>
@@ -16,7 +14,7 @@
<% end %>
- <%= f.inputs :posting_contact do %>
+ <%= f.inputs :misc_text, :class => "inputs misc_info" do %>
<%= f.input :contact_person, :collection => current_company.people %>
<% end %>
View
11 app/views/postings/_frequency_form.html.erb
@@ -1,5 +1,6 @@
-
-<%= f.input :frequency, :collection => collection_choices(resource_class, :frequency), :as => :select %>
-<%= f.input :first_transport_at, :as => :string, :input_html => { :value => resource.first_transport_at ? I18n.l(resource.first_transport_at.to_date) : nil } %>
-<%= f.input :last_transport_at, :as => :string, :input_html => { :value => resource.last_transport_at ? I18n.l(resource.last_transport_at.to_date) : nil } %>
-<%= f.input :transport_count, :as => :string %>
+<%= f.inputs :timeframe do %>
+ <%= f.input :frequency, :collection => collection_choices(resource_class, :frequency), :as => :select %>
+ <%= f.input :first_transport_at, :as => :string, :input_html => { :value => resource.first_transport_at ? I18n.l(resource.first_transport_at.to_date) : nil } %>
+ <%= f.input :last_transport_at, :as => :string, :input_html => { :value => resource.last_transport_at ? I18n.l(resource.last_transport_at.to_date) : nil } %>
+ <%= f.input :transport_count, :as => :string %>
+<% end %>
View
3  app/views/postings/_shared_form.html.erb
@@ -14,4 +14,7 @@
<% end %>
<% end %>
+<%= render :partial => "postings/frequency_form", :locals => {:f => f} %>
+
+
<%= render :partial => "postings/form_origin_and_destination", :locals => {:f => f} %>
View
3  config/locales/de.yml
@@ -660,7 +660,8 @@ de:
person_name: "Persönliche Angaben"
contractor_info: "Basisdaten:"
timeframe: "Transportzeitraum:"
- transport_timeframe: "Zeitraum und Transporte"
+ transport_timeframe: "Transportdaten"
+ timeframe: "Zeitraum"
freight_classification: "Klassifikation"
transport_type: "Frachtbeschreibung:"
freights:
View
3  config/locales/en.yml
@@ -610,7 +610,8 @@ en:
origin_site_info: "Loading site:"
person_name: "Personal information"
timeframe: "Time frame:"
- transport_timeframe: "Timeframe and Transports"
+ transport_timeframe: "Transports"
+ frequency: "Timeframe"
transport_type: "Transport description:"
freights:
common:
View
4 public/stylesheets/formtastic_changes.css
@@ -13,6 +13,10 @@ form.formtastic fieldset ol li fieldset legend { margin-left: -6px;}
--------------------------------------------------------------------------------------------------*/
+form.formtastic fieldset.misc_info {
+ border-bottom: none!important;
+}
+
#user_session_submit,
form.formtastic fieldset.buttons ol li.commit input {
padding: 4px;
View
34 readme.md
@@ -1,25 +1,39 @@
-CODE24 Prototype for an Online Rail Transport Spot Exchange
-==========================================================
+# CODE24 Prototype for an Online Rail Transport Spot Exchange
This is the source code for an european online rail transport spot exchange. It is a regular Rails Web Application and a first prototype, developed by René Föhring during his research at the University of Duisburg-Essen. The prototype was originally developed as part of the CODE24 project.
-Setup
------
+## Setup
-To set up this prototype, a basic knowledge and understanding of web development and rails applications is required. The Ruby on Rails framework and many helpful links can be found under http://rubyonrails.org
+### Rails
-NOTE: The prototype has only been tested with ruby-1.8.7, therefore use of rvm is heavily recommended (.rvmrc file is present).
+To set up this prototype, a basic knowledge and understanding of web development and rails applications is required.
-After checking out the app, database.yml needs to be created and configured (sample files for both sqlite and mysql are present in the config/ folder).
+The Ruby on Rails framework and many helpful links can be found under http://rubyonrails.org
-Afterwards:
+### Ruby
+
+As a Rails 3.0 app, the prototype naturally requires RubyGems and Bundler to be installed.
+
+Please note: The use of rvm is heavily recommended (.rvmrc file is present). The app has only been tested with ruby-1.8.7 (patch levels 299 and 357 to be precise).
+
+### Database
+
+The prototype works properly with SQLite as well as MySQL.
+
+After checking out the app, database.yml needs to be created and configured (sample files for both sqlite and mysql configurations are present in the config/ folder).
+
+### Installation
+
+After database.yml was created, simply run:
$ bundle
$ rake db:create:all
$ rake db:setup
-The db:setup task might take a while since the db will be seeded with several thousands railway stations from across europe.
+Please note: The db:setup task might take a while since the db will be seeded with several thousands of european railway stations.
+
+### Finishing up
After the seeding is finished, the prototype can be started like any other Rails 3.0 app and a setup assistant will be shown to create an administrator account for the online spot exchange etc.
-NOTE: The client has been originally developed using WEBrick as webserver, but thin or unicorn are recommended for performance reasons.
+Please note: The client has been originally developed using WEBrick as webserver, but servers like thin or unicorn are recommended for performance reasons.

No commit comments for this range

Something went wrong with that request. Please try again.