Fixed application view, a lot of modified files because the repo was …

…locally moved
isfit · Sep 1, 2011 · c94893c · c94893c
1 parent 0144ad8
commit c94893c
Show file tree

Hide file tree

Showing 369 changed files with 50 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.htaccess b/.htaccess
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README b/README
diff --git a/Rakefile b/Rakefile
diff --git a/app/assets/images/0rganisasjonskart_liten.png b/app/assets/images/0rganisasjonskart_liten.png
diff --git a/app/assets/images/Organisasjonskart_liten.jpg b/app/assets/images/Organisasjonskart_liten.jpg
diff --git a/app/assets/images/applyforisfit_before.png b/app/assets/images/applyforisfit_before.png
diff --git a/app/assets/images/applyforisfit_before_dialogue.png b/app/assets/images/applyforisfit_before_dialogue.png
diff --git a/app/assets/images/applyforisfit_en.png b/app/assets/images/applyforisfit_en.png
diff --git a/app/assets/images/applyforisfit_no.png b/app/assets/images/applyforisfit_no.png
diff --git a/app/assets/images/arrows.png b/app/assets/images/arrows.png
diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png
diff --git a/app/assets/images/blivert_eng.png b/app/assets/images/blivert_eng.png
diff --git a/app/assets/images/blivert_tekst.png b/app/assets/images/blivert_tekst.png
diff --git a/app/assets/images/boksbla.png b/app/assets/images/boksbla.png
diff --git a/app/assets/images/boksblabg.png b/app/assets/images/boksblabg.png
diff --git a/app/assets/images/boksgronn.png b/app/assets/images/boksgronn.png
diff --git a/app/assets/images/boksgronnbg.png b/app/assets/images/boksgronnbg.png
diff --git a/app/assets/images/boksoransje.png b/app/assets/images/boksoransje.png
diff --git a/app/assets/images/boksoransjebg.png b/app/assets/images/boksoransjebg.png
diff --git a/app/assets/images/boksrod.png b/app/assets/images/boksrod.png
diff --git a/app/assets/images/boksrodbg.png b/app/assets/images/boksrodbg.png
diff --git a/app/assets/images/boksturkis.png b/app/assets/images/boksturkis.png
diff --git a/app/assets/images/boksturkisbg.png b/app/assets/images/boksturkisbg.png
diff --git a/app/assets/images/bullets.png b/app/assets/images/bullets.png
diff --git a/app/assets/images/chronicle-bottom.png b/app/assets/images/chronicle-bottom.png
diff --git a/app/assets/images/chronicle-middle.png b/app/assets/images/chronicle-middle.png
diff --git a/app/assets/images/chronicle-top.png b/app/assets/images/chronicle-top.png
diff --git a/app/assets/images/chronicle_comment_en.png b/app/assets/images/chronicle_comment_en.png
diff --git a/app/assets/images/chronicle_comment_no.png b/app/assets/images/chronicle_comment_no.png
diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
diff --git a/app/assets/images/footer.png b/app/assets/images/footer.png
diff --git a/app/assets/images/header-01.png b/app/assets/images/header-01.png
diff --git a/app/assets/images/header-02.png b/app/assets/images/header-02.png
diff --git a/app/assets/images/header_en.png b/app/assets/images/header_en.png
diff --git a/app/assets/images/header_layover.png b/app/assets/images/header_layover.png
diff --git a/app/assets/images/header_no.png b/app/assets/images/header_no.png
diff --git a/app/assets/images/headerbg.png b/app/assets/images/headerbg.png
diff --git a/app/assets/images/isfitliten.png b/app/assets/images/isfitliten.png
diff --git a/app/assets/images/isfitlogo.png b/app/assets/images/isfitlogo.png
diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif
diff --git a/app/assets/images/meny.png b/app/assets/images/meny.png
diff --git a/app/assets/images/menyspacer.png b/app/assets/images/menyspacer.png
diff --git a/app/assets/images/omeny.png b/app/assets/images/omeny.png
diff --git a/app/assets/images/pages/koteng.jpg b/app/assets/images/pages/koteng.jpg
diff --git a/app/assets/images/pages/orgmap_no.png b/app/assets/images/pages/orgmap_no.png
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/assets/images/rss.png b/app/assets/images/rss.png
diff --git a/app/assets/images/sjanse.png b/app/assets/images/sjanse.png
diff --git a/app/assets/images/slider.png b/app/assets/images/slider.png
diff --git a/app/assets/images/sok.png b/app/assets/images/sok.png
diff --git a/app/assets/images/submeny.png b/app/assets/images/submeny.png
diff --git a/app/assets/images/test.jpg b/app/assets/images/test.jpg
diff --git a/app/assets/images/turbonegro.jpg b/app/assets/images/turbonegro.jpg
diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png
diff --git a/app/assets/images/x.png b/app/assets/images/x.png
diff --git a/app/assets/javascripts/default.js b/app/assets/javascripts/default.js
diff --git a/app/assets/javascripts/jquery.nivo.slider.js b/app/assets/javascripts/jquery.nivo.slider.js
diff --git a/app/assets/javascripts/new_applicant.js b/app/assets/javascripts/new_applicant.js
diff --git a/vendor/assets/stylesheets/960/960_24_col.css → app/assets/stylesheets/960_24_col.css b/vendor/assets/stylesheets/960/960_24_col.css → app/assets/stylesheets/960_24_col.css
diff --git a/app/assets/stylesheets/calendar.css b/app/assets/stylesheets/calendar.css
diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css
diff --git a/app/assets/stylesheets/forms.css b/app/assets/stylesheets/forms.css
diff --git a/app/assets/stylesheets/nivo-slider.css b/app/assets/stylesheets/nivo-slider.css
diff --git a/vendor/assets/stylesheets/960/areset.css → app/assets/stylesheets/reset.css b/vendor/assets/stylesheets/960/areset.css → app/assets/stylesheets/reset.css
diff --git a/app/assets/stylesheets/style.css b/app/assets/stylesheets/style.css
diff --git a/app/assets/stylesheets/text.css b/app/assets/stylesheets/text.css
diff --git a/app/controllers/._press_accreditations_controller.rb b/app/controllers/._press_accreditations_controller.rb
diff --git a/app/controllers/alumni_reservations_controller.rb b/app/controllers/alumni_reservations_controller.rb
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
diff --git a/app/controllers/cal_controller.rb b/app/controllers/cal_controller.rb
diff --git a/app/controllers/chronicles_controller.rb b/app/controllers/chronicles_controller.rb
diff --git a/app/controllers/dialogue_participants_controller.rb b/app/controllers/dialogue_participants_controller.rb
diff --git a/app/controllers/donations_controller.rb b/app/controllers/donations_controller.rb
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb
diff --git a/app/controllers/isfit_media_links_controller.rb b/app/controllers/isfit_media_links_controller.rb
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
diff --git a/app/controllers/positions_controller.rb b/app/controllers/positions_controller.rb
diff --git a/app/controllers/press_accreditations_controller.rb b/app/controllers/press_accreditations_controller.rb
diff --git a/app/controllers/rss_reader_controller.rb b/app/controllers/rss_reader_controller.rb
diff --git a/app/controllers/sublinks_controller.rb b/app/controllers/sublinks_controller.rb
diff --git a/app/controllers/wop_propositions_controller.rb b/app/controllers/wop_propositions_controller.rb
diff --git a/app/controllers/workshops_controller.rb b/app/controllers/workshops_controller.rb
diff --git a/app/helpers/alumni_reservations_helper.rb b/app/helpers/alumni_reservations_helper.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb
diff --git a/app/helpers/cal_helper.rb b/app/helpers/cal_helper.rb
diff --git a/app/helpers/chronicles_helper.rb b/app/helpers/chronicles_helper.rb
diff --git a/app/helpers/donations_helper.rb b/app/helpers/donations_helper.rb
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
diff --git a/app/helpers/isfit_media_links_helper.rb b/app/helpers/isfit_media_links_helper.rb
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
diff --git a/app/helpers/press_accreditations_helper.rb b/app/helpers/press_accreditations_helper.rb
diff --git a/app/helpers/sublinks_helper.rb b/app/helpers/sublinks_helper.rb
diff --git a/app/helpers/wop_propositions_helper.rb b/app/helpers/wop_propositions_helper.rb
diff --git a/app/models/._postoffice.rb b/app/models/._postoffice.rb
diff --git a/app/models/._press_accreditation.rb b/app/models/._press_accreditation.rb
diff --git a/app/models/alumni_reservation.rb b/app/models/alumni_reservation.rb
diff --git a/app/models/applicant.rb b/app/models/applicant.rb
diff --git a/app/models/article.rb b/app/models/article.rb
diff --git a/app/models/chronicle.rb b/app/models/chronicle.rb
diff --git a/app/models/country.rb b/app/models/country.rb
diff --git a/app/models/data_file.rb b/app/models/data_file.rb
diff --git a/app/models/dialogue_participant.rb b/app/models/dialogue_participant.rb
diff --git a/app/models/event.rb b/app/models/event.rb
diff --git a/app/models/event_date.rb b/app/models/event_date.rb
diff --git a/app/models/event_type.rb b/app/models/event_type.rb
diff --git a/app/models/group.rb b/app/models/group.rb
diff --git a/app/models/host.rb b/app/models/host.rb
diff --git a/app/models/isfit_media_link.rb b/app/models/isfit_media_link.rb
diff --git a/app/models/page.rb b/app/models/page.rb
diff --git a/app/models/participant.rb b/app/models/participant.rb
diff --git a/app/models/photo.rb b/app/models/photo.rb
diff --git a/app/models/picture.rb b/app/models/picture.rb
diff --git a/app/models/position.rb b/app/models/position.rb
diff --git a/app/models/postoffice.rb b/app/models/postoffice.rb
diff --git a/app/models/press_accreditation.rb b/app/models/press_accreditation.rb
diff --git a/app/models/region.rb b/app/models/region.rb
diff --git a/app/models/section.rb b/app/models/section.rb
diff --git a/app/models/slide.rb b/app/models/slide.rb
diff --git a/app/models/spp_article.rb b/app/models/spp_article.rb
diff --git a/app/models/sublink.rb b/app/models/sublink.rb
diff --git a/app/models/tab.rb b/app/models/tab.rb
diff --git a/app/models/wop_proposition.rb b/app/models/wop_proposition.rb
diff --git a/app/models/workshop.rb b/app/models/workshop.rb
diff --git a/app/views/alumni_reservations/create.html.erb b/app/views/alumni_reservations/create.html.erb
diff --git a/app/views/alumni_reservations/index.html.erb b/app/views/alumni_reservations/index.html.erb
diff --git a/app/views/alumni_reservations/new.html.erb b/app/views/alumni_reservations/new.html.erb
diff --git a/app/views/articles/all.html.erb b/app/views/articles/all.html.erb
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
diff --git a/app/views/cal/cal/index.html.erb b/app/views/cal/cal/index.html.erb
diff --git a/app/views/cal/index.html.erb b/app/views/cal/index.html.erb
diff --git a/app/views/chronicles/_chronicle.html.erb b/app/views/chronicles/_chronicle.html.erb
diff --git a/app/views/chronicles/all.html.erb b/app/views/chronicles/all.html.erb
diff --git a/app/views/chronicles/index.html.erb b/app/views/chronicles/index.html.erb
diff --git a/app/views/chronicles/show.html.erb b/app/views/chronicles/show.html.erb
diff --git a/app/views/dialogue_participants/consent_form.erb b/app/views/dialogue_participants/consent_form.erb
diff --git a/app/views/dialogue_participants/faq.erb b/app/views/dialogue_participants/faq.erb
diff --git a/app/views/dialogue_participants/index.erb b/app/views/dialogue_participants/index.erb
diff --git a/app/views/dialogue_participants/login.erb b/app/views/dialogue_participants/login.erb
diff --git a/app/views/dialogue_participants/new.html.erb b/app/views/dialogue_participants/new.html.erb
diff --git a/app/views/dialogue_participants/personal.erb b/app/views/dialogue_participants/personal.erb
diff --git a/app/views/dialogue_participants/question.erb b/app/views/dialogue_participants/question.erb
diff --git a/app/views/dialogue_participants/registered.erb b/app/views/dialogue_participants/registered.erb
diff --git a/app/views/dialogue_participants/visa_form.erb b/app/views/dialogue_participants/visa_form.erb
diff --git a/app/views/donations/donate.html.erb b/app/views/donations/donate.html.erb
diff --git a/app/views/donations/thank_you.html.erb b/app/views/donations/thank_you.html.erb
diff --git a/app/views/events/_calendar.html.erb b/app/views/events/_calendar.html.erb
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
diff --git a/app/views/events/showDate.html.erb b/app/views/events/showDate.html.erb
diff --git a/app/views/hosts/.svn/entries b/app/views/hosts/.svn/entries
diff --git a/app/views/hosts/.svn/text-base/done.erb.svn-base b/app/views/hosts/.svn/text-base/done.erb.svn-base
diff --git a/app/views/hosts/.svn/text-base/index.erb.svn-base b/app/views/hosts/.svn/text-base/index.erb.svn-base
diff --git a/app/views/hosts/done.erb b/app/views/hosts/done.erb
diff --git a/app/views/hosts/index.erb b/app/views/hosts/index.erb
diff --git a/app/views/hosts/new.html.erb b/app/views/hosts/new.html.erb
diff --git a/app/views/isfit_media_links/index.html.erb b/app/views/isfit_media_links/index.html.erb
diff --git a/app/views/isfit_media_links/show.html.erb b/app/views/isfit_media_links/show.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -85,10 +85,34 @@
                    //  });
 </script>-->
   </div><!-- Slutt header -->
-  <div id="meny" class="grid_25"><!-- Start meny -->
+ <div id="meny" class="grid_25"><!-- Start meny -->
     <div id="faner" class="grid_20">
       <!-- Start faner -->
-
+      <%
+        current_tab = Tab.where(:top_bar => 0).order('weight').first
+        Tab.where(:top_bar => 0).order('weight').each do |tab|
+          if tab.name != ""
+            style = ""
+            if tab.tag == params[:tab]
+              current_tab = tab
+              style="selected"
+            else
+              style = ""
+            end
+            link = nil
+            if tab.sublinks.first.page_id == 0 or tab.sublinks.first.page_id == nil
+              if tab.sublinks.first.url != nil
+                arr = tab.sublinks.first.url.partition("#")
+                link =  url_for(:controller=>arr[0], :action=>arr[2], :tab=>tab.tag)
+              end
+            else
+              link = page_path(tab.sublinks.first.page, :tab=>tab.tag)
+            end
+          %>
+          <%= link_to tab.name, link, :class => style%><%=image_tag("menyspacer.png", :class=>"menyspacer")%>
+        <%	end
+        end %>
+
       </div><!-- Slutt faner -->
       <div id="sok" class="grid_4"><!-- Start søk -->
         <!-- <input type="button" value="" class="btn"><input name="search" type="text" value="<%=t('layout.search')%>">-->
@@ -97,7 +121,31 @@
 
     </div><!-- Slutt meny -->
     <div id="submeny" class="grid_25"><!-- Start submeny -->
+      <%
+        current_tab.sublinks.each do |sub|
+          active = false
+          link = nil
+
+          if sub.page_id == 0 or sub.page_id == nil
+            if sub.url != nil
+              arr = sub.url.partition("#")
+              link =  url_for(:controller=>arr[0], :action=>arr[2], :tab=>current_tab.tag)
+            elsif sub.external_url != nil
+              link = sub.external_url
+            end
+          else
+            link = page_path(sub.page, :tab=>current_tab.tag)
+          end
 
+          #if fullpath == link
+          #  active = true
+          #end
+
+          if link != nil %>
+            <%=link_to(sub.title, link, :class=> active ? "a_sublink" : "ina_sublink")%><%
+          end
+        end %>
+
       </div><!-- Slutt submeny -->
       <div id="ramme" class="grid_25"><!-- Start ramme -->
         <div id="venstreramme" class="grid_5"><!-- Start venstreramme -->

diff --git a/app/views/layouts/application_no_boxes.html.erb b/app/views/layouts/application_no_boxes.html.erb
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
diff --git a/app/views/pages/show.html.erb b/app/views/pages/show.html.erb
diff --git a/app/views/partials/_error.html.erb b/app/views/partials/_error.html.erb
diff --git a/app/views/participants/new.html.erb b/app/views/participants/new.html.erb
diff --git a/app/views/photos/create.html.erb b/app/views/photos/create.html.erb
diff --git a/app/views/photos/create.js.erb b/app/views/photos/create.js.erb
diff --git a/app/views/photos/crop.html.erb b/app/views/photos/crop.html.erb
diff --git a/app/views/photos/crop_create.html.erb b/app/views/photos/crop_create.html.erb
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb
diff --git a/app/views/photos/index.js.erb b/app/views/photos/index.js.erb
diff --git a/app/views/photos/new.html.erb b/app/views/photos/new.html.erb
diff --git a/app/views/photos/show.html.erb b/app/views/photos/show.html.erb
diff --git a/app/views/positions/apply.html.erb b/app/views/positions/apply.html.erb
diff --git a/app/views/positions/index.html.erb b/app/views/positions/index.html.erb
diff --git a/app/views/positions/sections.html.erb b/app/views/positions/sections.html.erb
diff --git a/app/views/positions/show.html.erb b/app/views/positions/show.html.erb
diff --git a/app/views/postoffice/._press_acc.html.erb b/app/views/postoffice/._press_acc.html.erb
diff --git a/app/views/postoffice/._registered.html.erb b/app/views/postoffice/._registered.html.erb
diff --git a/app/views/postoffice/fund.rhtml b/app/views/postoffice/fund.rhtml
diff --git a/app/views/postoffice/press_acc.html.erb b/app/views/postoffice/press_acc.html.erb
diff --git a/app/views/postoffice/registered.html.erb b/app/views/postoffice/registered.html.erb
diff --git a/app/views/postoffice/registered.rhtml b/app/views/postoffice/registered.rhtml
diff --git a/app/views/press_accreditations/.__form.html.erb b/app/views/press_accreditations/.__form.html.erb
diff --git a/app/views/press_accreditations/._index.html.erb b/app/views/press_accreditations/._index.html.erb
diff --git a/app/views/press_accreditations/._new.html.erb b/app/views/press_accreditations/._new.html.erb
diff --git a/app/views/press_accreditations/._show.html.erb b/app/views/press_accreditations/._show.html.erb
diff --git a/app/views/press_accreditations/_form.html.erb b/app/views/press_accreditations/_form.html.erb
diff --git a/app/views/press_accreditations/edit.html.erb b/app/views/press_accreditations/edit.html.erb
diff --git a/app/views/press_accreditations/index.html.erb b/app/views/press_accreditations/index.html.erb
diff --git a/app/views/press_accreditations/new.html.erb b/app/views/press_accreditations/new.html.erb
diff --git a/app/views/press_accreditations/show.html.erb b/app/views/press_accreditations/show.html.erb
diff --git a/app/views/rss_reader/index.html.erb b/app/views/rss_reader/index.html.erb
diff --git a/app/views/sublinks/._index.html.erb b/app/views/sublinks/._index.html.erb
diff --git a/app/views/sublinks/._new.html.erb b/app/views/sublinks/._new.html.erb
diff --git a/app/views/sublinks/._show.html.erb b/app/views/sublinks/._show.html.erb
diff --git a/app/views/sublinks/_form.html.erb b/app/views/sublinks/_form.html.erb
diff --git a/app/views/sublinks/edit.html.erb b/app/views/sublinks/edit.html.erb
diff --git a/app/views/sublinks/index.html.erb b/app/views/sublinks/index.html.erb
diff --git a/app/views/sublinks/new.html.erb b/app/views/sublinks/new.html.erb
diff --git a/app/views/sublinks/show.html.erb b/app/views/sublinks/show.html.erb
diff --git a/app/views/wop_propositions/new.html.erb b/app/views/wop_propositions/new.html.erb
diff --git a/app/views/workshops/all.html.erb b/app/views/workshops/all.html.erb
diff --git a/app/views/workshops/index.html.erb b/app/views/workshops/index.html.erb
diff --git a/app/views/workshops/show.html.erb b/app/views/workshops/show.html.erb
diff --git a/config.ru b/config.ru
diff --git a/config/._routes.rb b/config/._routes.rb
diff --git a/config/application.rb_old b/config/application.rb_old
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
diff --git a/config/initializers/setup_mail.rb b/config/initializers/setup_mail.rb
diff --git a/config/locales/._en.yml b/config/locales/._en.yml
diff --git a/config/locales/._no.yml b/config/locales/._no.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/config/locales/no.yml b/config/locales/no.yml
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/db/migrate/20100728174121_create_groups.rb b/db/migrate/20100728174121_create_groups.rb
diff --git a/db/migrate/20100805122627_create_articles.rb b/db/migrate/20100805122627_create_articles.rb
diff --git a/db/migrate/20100806113753_add_main_article_to_article.rb b/db/migrate/20100806113753_add_main_article_to_article.rb
diff --git a/db/migrate/20100806150134_create_tabs.rb b/db/migrate/20100806150134_create_tabs.rb
diff --git a/db/migrate/20100806150403_create_pages.rb b/db/migrate/20100806150403_create_pages.rb
diff --git a/db/migrate/20100806150727_create_sublinks.rb b/db/migrate/20100806150727_create_sublinks.rb
diff --git a/db/migrate/20100807223903_create_events.rb b/db/migrate/20100807223903_create_events.rb
diff --git a/db/migrate/20100808001714_create_participants.rb b/db/migrate/20100808001714_create_participants.rb
diff --git a/db/migrate/20100808002548_create_countries.rb b/db/migrate/20100808002548_create_countries.rb
diff --git a/db/migrate/20100808002603_create_regions.rb b/db/migrate/20100808002603_create_regions.rb
diff --git a/db/migrate/20100808003033_create_workshops.rb b/db/migrate/20100808003033_create_workshops.rb
diff --git a/db/migrate/20100809205345_create_photos.rb b/db/migrate/20100809205345_create_photos.rb
diff --git a/db/migrate/20100810001343_add_attachment_original_picture_to_photo.rb b/db/migrate/20100810001343_add_attachment_original_picture_to_photo.rb
diff --git a/db/migrate/20100810230852_create_sections.rb b/db/migrate/20100810230852_create_sections.rb
diff --git a/db/migrate/20100810231335_create_applicants.rb b/db/migrate/20100810231335_create_applicants.rb
diff --git a/db/migrate/20100810231810_create_positions.rb b/db/migrate/20100810231810_create_positions.rb
diff --git a/db/migrate/20100811205735_add_attachment_half_article_picture_to_photo.rb b/db/migrate/20100811205735_add_attachment_half_article_picture_to_photo.rb
diff --git a/db/migrate/20100811205743_add_attachment_full_article_picture_to_photo.rb b/db/migrate/20100811205743_add_attachment_full_article_picture_to_photo.rb
diff --git a/db/migrate/20100812101311_create_chronicles.rb b/db/migrate/20100812101311_create_chronicles.rb
diff --git a/db/migrate/20100813213932_add_published_to_article.rb b/db/migrate/20100813213932_add_published_to_article.rb
diff --git a/db/migrate/20100814115842_add_weight_to_chronicle.rb b/db/migrate/20100814115842_add_weight_to_chronicle.rb
diff --git a/db/migrate/20100814195017_add_byline_to_article.rb b/db/migrate/20100814195017_add_byline_to_article.rb
diff --git a/db/migrate/20100816154137_create_isfit_media_links.rb b/db/migrate/20100816154137_create_isfit_media_links.rb
diff --git a/db/migrate/20100902141857_create_wop_propositions.rb b/db/migrate/20100902141857_create_wop_propositions.rb
diff --git a/db/migrate/20100902144801_add_attachment_attachment_to_wop_proposition.rb b/db/migrate/20100902144801_add_attachment_attachment_to_wop_proposition.rb
diff --git a/db/migrate/20101025211852_create_hosts.rb b/db/migrate/20101025211852_create_hosts.rb
diff --git a/db/migrate/20101026193309_add_preferences_to_host.rb b/db/migrate/20101026193309_add_preferences_to_host.rb
diff --git a/db/migrate/20101116212043_create_press_accreditations.rb b/db/migrate/20101116212043_create_press_accreditations.rb
diff --git a/db/migrate/20110103200248_create_alumni_reservations.rb b/db/migrate/20110103200248_create_alumni_reservations.rb
diff --git a/db/migrate/20110104103617_add_mail_to_alumni_reservation.rb b/db/migrate/20110104103617_add_mail_to_alumni_reservation.rb
diff --git a/db/migrate/20110106123726_create_slides.rb b/db/migrate/20110106123726_create_slides.rb
diff --git a/db/migrate/20110106123757_add_attachment_image_to_slide.rb b/db/migrate/20110106123757_add_attachment_image_to_slide.rb
diff --git a/db/migrate/20110107135655_create_event_types.rb b/db/migrate/20110107135655_create_event_types.rb
diff --git a/db/migrate/20110107135824_create_event_dates.rb b/db/migrate/20110107135824_create_event_dates.rb
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
diff --git a/lib/tasks/.gitkeep b/lib/tasks/.gitkeep
diff --git a/public/.htaccess b/public/.htaccess
diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html
diff --git a/public/audio/p2.mp3 b/public/audio/p2.mp3
diff --git a/public/border-anim-h.gif b/public/border-anim-h.gif
diff --git a/public/border-anim-v.gif b/public/border-anim-v.gif
diff --git a/public/border-h.gif b/public/border-h.gif
diff --git a/public/border-v.gif b/public/border-v.gif
diff --git a/public/default.css~ b/public/default.css~
diff --git a/public/dispatch.fcgi b/public/dispatch.fcgi
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/public/system/images/1/original/turbonegro.jpg b/public/system/images/1/original/turbonegro.jpg
diff --git a/public/system/images/2/original/header_en.png b/public/system/images/2/original/header_en.png
diff --git a/public/system/main_pictures/1/original/geek3.jpg b/public/system/main_pictures/1/original/geek3.jpg
diff --git a/script/rails b/script/rails
diff --git a/test/fixtures/alumni_reservations.yml b/test/fixtures/alumni_reservations.yml
diff --git a/test/fixtures/applicants.yml b/test/fixtures/applicants.yml
diff --git a/test/fixtures/articles.yml b/test/fixtures/articles.yml
diff --git a/test/fixtures/chronicles.yml b/test/fixtures/chronicles.yml
diff --git a/test/fixtures/countries.yml b/test/fixtures/countries.yml
diff --git a/test/fixtures/event_dates.yml b/test/fixtures/event_dates.yml
diff --git a/test/fixtures/event_types.yml b/test/fixtures/event_types.yml
diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml
diff --git a/test/fixtures/hosts.yml b/test/fixtures/hosts.yml
diff --git a/test/fixtures/isfit_media_links.yml b/test/fixtures/isfit_media_links.yml
diff --git a/test/fixtures/pages.yml b/test/fixtures/pages.yml
diff --git a/test/fixtures/participants.yml b/test/fixtures/participants.yml
diff --git a/test/fixtures/photos.yml b/test/fixtures/photos.yml