Merge branch 'master' into update_bootstrap_for_centos

Dockerfile

@@ -16,6 +16,12 @@ RUN cd /usr/bin && \
     tar -xf dockerize.tar.gz && \
     rm dockerize.tar.gz
 
+# dumb-init for a proper PID 1
+RUN cd /tmp && \
+    wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \
+    dpkg -i dumb-init_1.2.0_amd64.deb && \
+    rm dumb-init_1.2.0_amd64.deb
+
 # explicitly add Gemfile and install dependencies using bundler to make use of
 # Docker's caching
 WORKDIR /osem/
@@ -25,12 +31,13 @@ RUN bundle install --without test development
 
 # add OSEM files and prepare them for use inside a Docker container
 COPY . /osem/
-RUN chown osem.osem /osem/ -R && \
+RUN chown -R osem.root /osem/ && \
+    chmod -R g=u /osem/ && \
     mv /osem/config/database.yml.docker /osem/config/database.yml
 
 # data directory is used to cache the secret key in a file
 ENV DATA_DIR /data
-RUN install -d -m 0700 -o osem $DATA_DIR
+RUN install -d -m 0770 -o osem -g root $DATA_DIR
 VOLUME ["$DATA_DIR"]
 
 USER osem
@@ -42,4 +49,7 @@ COPY docker/init.sh /init.sh
 # from a webserver
 ENV RAILS_SERVE_STATIC_FILES 1
 
+# Runs "/usr/bin/dumb-init -- /my/script --with --args"
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+
 CMD ["bash", "/init.sh"]

app/views/admin/versions/_object_desc_and_link.html.haml

@@ -208,9 +208,7 @@
 - when 'DifficultyLevel'
   difficulty level
   - difficulty_level = current_or_last_object_state(version.item_type, version.item_id)
-  = link_if_alive version, difficulty_level.title,
+  = link_if_alive version, difficulty_level.title,admin_conference_program_difficulty_levels_path(conference_short_title), conference
-          admin_conference_program_difficulty_level_path(conference_short_title, version.item_id),
-          conference
 
 - when 'Splashpage'
   = link_if_alive version, 'splashpage',

app/views/proposals/_tooltip.html.haml

@@ -1,11 +1,12 @@
 - progress_status = event.progress_status
 %ul.list-unstyled
-  %li{'class'=>class_for_todo(progress_status['registered'])}
+  - if can? :create, @conference.registrations.new
-    %span{'class'=>icon_for_todo(progress_status['registered'])}
+    %li{'class'=>class_for_todo(progress_status['registered'])}
-      - if progress_status['registered']
+      %span{'class'=>icon_for_todo(progress_status['registered'])}
-        Speaker(s) registered to the conference
+        - if progress_status['registered']
-      - else
+          Speaker(s) registered to the conference
-        = link_to 'Speaker(s) not registered to the conference', new_conference_conference_registration_path(event.program.conference.short_title)
+        - else
+          = link_to 'Speaker(s) not registered to the conference', new_conference_conference_registration_path(event.program.conference.short_title)
   %li{'class'=>class_for_todo(progress_status['biographies'])}
     %span{'class'=>icon_for_todo(progress_status['biographies'])}
       - if progress_status['biographies']

app/views/proposals/index.html.haml

@@ -48,12 +48,12 @@
             The more information you add to your proposal, the more likely it is that the conference organizers accept your proposal.
             %br
             It will also be more likely that visitors find your proposal interesting enough to attend.
-
+          - if can? :create, @conference.registrations.new
-          %p
+            %p
-            %strong
+              %strong
-              Why do I need to register to the conference?
+                Why do I need to register to the conference?
-          %p
+            %p
-            Knowing the number of visitors for the conference helps the organizers plan better.
+              Knowing the number of visitors for the conference helps the organizers plan better.
 
         %table.table.table-striped#events
           - @events.each do |event|
@@ -67,20 +67,27 @@
                 %small.text-muted
                   = event.event_type.title
                   = "(#{event.event_type.length} min)"
-                  = "in #{event.track.name}" if event.track
+                  = "in #{event.traistck.name}" if event.track
                   - if event.require_registration
                     %br
                     = link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger'
 
               %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
                 = link_to 'Complete your proposal', 'javascript: void(0)', "type"=>"button", "data-trigger"=>"focus", "data-toggle"=>"popover", "title"=>"Your todo list", "data-content"=>"#{render partial: 'tooltip', locals: { event: event} }"
-
+                - if can? :create, @conference.registrations.new
-                - progress_percentage = event.calculate_progress
+                  - progress_percentage = event.calculate_progress
-                .progress
+                  .progress
-                  %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
+                    %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
-                    = event.progress_status.reject{ |_key, value| value || value.nil? }.length
+                      = event.progress_status.reject{ |_key, value| value || value.nil? }.length
-                    left
+                      left
-
+                - else
+                  :ruby
+                    progress_list = event.progress_status
+                    progress_percentage = (100 * progress_list.values.count(true) / (progress_list.values.compact.count-1)).to_s
+                  .progress
+                    %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
+                      = event.progress_status.reject{ |_key, value| value || value.nil? }.length-1
+                      left
               %td.col-md-3{style: "padding:20px 0px 20px 0px;"}
                 .pull-right
                   - if event.transition_possible? :confirm