Merge branch 'master' into prod

apps/frontend/modules/common/templates/_menu_content.php

@@ -28,12 +28,6 @@
                            . link_to(ucfirst(__('outings')), '@default_index?module=outings') ?>
                         <ul>
                             <li><?php
-                                echo picto_tag('action_list')
-                                   . link_to(__('cond short'), '@default?module=outings&action=conditions&orderby=date&order=desc') ?></li>
-                            <li<?php if (!$is_connected): ?> class="lilast"<?php endif ?>><?php
-                                echo picto_tag('action_query')
-                                   . link_to(__('Search'), '@filter?module=outings') ?></li>
-                            <li class="lilast"><?php
                                 echo picto_tag('action_create');
                                 if ($is_connected)
                                 {
@@ -49,6 +43,15 @@
                                                    array('width' => 600));
                                 }
                             ?></li>
+                            <li><?php
+                                echo picto_tag('action_query')
+                                   . link_to(__('Search'), '@filter?module=outings') ?></li>
+                            <li><?php
+                                echo picto_tag('action_list')
+                                   . link_to(__('cond short'), '@default?module=outings&action=conditions&orderby=date&order=desc') ?></li>
+                            <li class="lilast"><?php
+                                echo picto_tag('action_list')
+                                   . link_to(__('avalanche_infos_short'), '@default?module=outings&action=conditions&avdate= &date=2W&perso=areas-cult-ifon&orderby=date&order=desc') ?></li>
                         </ul>
                     </li>
                     <li><?php echo picto_tag('picto_routes')

apps/frontend/modules/common/templates/_mobile_menu.php

@@ -19,7 +19,7 @@
 $menu_see = array(
     '#' => ' ',
     url_for('@default_index?module=outings&orderby=date&order=desc') => __('outings'),
-    url_for('outings/conditions') =>  __('cond short'),
+    url_for('@default?module=outings&action=conditions&orderby=date&order=desc') =>  __('cond short'),
     url_for('@default_index?module=routes') => __('routes'),
     url_for('@default_index?module=images') => __('images'),
     url_for('@default_index?module=summits') => __('summits'),

apps/frontend/modules/huts/templates/_data.php

@@ -25,20 +25,30 @@
     li(field_data_if_set($document, 'staffed_capacity'));
     li(field_data_if_set($document, 'unstaffed_capacity'));
 
-
+    $unstaffed_capacity = $document->get('unstaffed_capacity');
+    $is_staffed = $document->get('is_staffed');
+    // show unstaff fields if hut is not staffed, or, if staffed, unstaffed_capacity is defined
+    $unstaffed_applies = (!is_null($unstaffed_capacity) && $unstaffed_capacity > 0) || (!is_null($is_staffed) && !$is_staffed);
 
-    // don't show only if not applicable 
-    if ($document->get('has_unstaffed_matress') <> 10 ){ 
-        li(field_data_from_list($document, 'has_unstaffed_matress', 'app_boolean_list'));
-    }
-    if ($document->get('has_unstaffed_blanket') <> 10 ){
-        li(field_data_from_list($document, 'has_unstaffed_blanket', 'app_boolean_list'));
-    }
-    if ($document->get('has_unstaffed_gas') <> 10 ){
-        li(field_data_from_list($document, 'has_unstaffed_gas', 'app_boolean_list'));
-    }
-    if ($document->get('has_unstaffed_wood') <> 10 ){
-        li(field_data_from_list($document, 'has_unstaffed_wood', 'app_boolean_list'));
+    if ($unstaffed_applies)
+    {
+        // don't show only if not applicable 
+        if ($document->get('has_unstaffed_matress') <> 10 )
+        { 
+            li(field_data_from_list($document, 'has_unstaffed_matress', 'app_boolean_list'));
+        }
+        if ($document->get('has_unstaffed_blanket') <> 10 )
+        {
+            li(field_data_from_list($document, 'has_unstaffed_blanket', 'app_boolean_list'));
+        }
+        if ($document->get('has_unstaffed_gas') <> 10 )
+        {
+            li(field_data_from_list($document, 'has_unstaffed_gas', 'app_boolean_list'));
+        }
+        if ($document->get('has_unstaffed_wood') <> 10 )
+        {
+            li(field_data_from_list($document, 'has_unstaffed_wood', 'app_boolean_list'));
+        }
     }
 
     li(field_phone_if_set($document, 'phone', array('microdata' => 'telephone')));

apps/frontend/modules/outings/actions/actions.class.php

@@ -71,7 +71,7 @@ public function executeView()
                 $associated_routes = c2cTools::sortArray($associated_routes, 'duration');
                 foreach ($associated_routes as $route)
                 {
-                    // pour les docs de 2�me niveau, on retient uniquement les itin�raires de 1 ou 2 jours
+                    // pour les docs de 2?me niveau, on retient uniquement les itin?raires de 1 ou 2 jours
                     if (!$route['duration'] instanceof Doctrine_Null)
                     {
                         if ($route['duration'] <= 4)
@@ -88,8 +88,8 @@ public function executeView()
                         $default_ids[] = $route['id'];
                     }
                 }
-                // s'il n'y a pas d'itin�raire de 1 ou 2 jours, on utilise les itin�raires qui ont la plus petite dur�e
-                // s'il n'y en a pas non plus, on utilise les itin�raire dont la dur�e est non renseign�e
+                // s'il n'y a pas d'itin?raire de 1 ou 2 jours, on utilise les itin?raires qui ont la plus petite dur?e
+                // s'il n'y en a pas non plus, on utilise les itin?raire dont la dur?e est non renseign?e
                 if (!count($parent_ids))
                 {
                     if (count($other_routes) > 1)
@@ -574,6 +574,8 @@ protected function filterSearchParameters()
         $this->addCompareParam($out, 'wrat');
         $this->addParam($out, 'glac');
         $this->addDateParam($out, 'date');
+
+        $this->addParam($out, 'avdate');
 
         $this->addParam($out, 'geom');
         $this->addListParam($out, 'ocult');

apps/frontend/modules/outings/config/module.yml

@@ -58,6 +58,22 @@ all:
       3: level_snow_height_total
       4: level_comment
 
+  avalanche_date:
+    list:
+      0:
+      1: no_observation_avalanche
+      2: danger_sign_avalanche
+      3: recent_avalanche
+      4: natural_avalanche
+      5: accidental_avalanche
+    edit_list:
+      0:
+      1: no_observation_avalanche_long
+      2: danger_sign_avalanche_long
+      3: recent_avalanche_long
+      4: natural_avalanche_long
+      5: accidental_avalanche_long
+
   sort:
     criteria:
       'id': ID
@@ -99,8 +115,17 @@ all:
       'alt':  oalt
       'hdif': odif
       'ddif': oddif
+      'usnow': ousnow
+      'dsnow': odsnow
+      'access': oaccess
       'cond': ocond
       'freq': ofreq
+      'park': opark
+      'glac': oglac
+      'track': otrack
+      'hut': ohut
+      'lift': olift
+      'avdate': ''
       'fac': ''
       'time': ''
       'ralt': ''

apps/frontend/modules/outings/templates/_filter_form.php

@@ -24,8 +24,15 @@
 <?php
 echo __('Date') . __('&nbsp;:') . ' ' . date_selector(array('month' => true, 'year' => true, 'day' => true));
 ?>
+<div data-act-filter="1 2 5 7" style="display:none">
+<?php
+echo __('avalanche_infos') . ' ' . select_tag('avdate', options_for_select(array('2-3-4-5' => __('yes'), '1' => __('no'), ' ' => __('filled in'), '-' => __('nonwell informed')),
+                                                                   '', array('include_blank' => true)));
+?>
+</div>
 <br />
-<?php echo __('filter language') . __('&nbsp;:') . ' ' . lang_selector('ocult');
+<?php
+echo __('filter language') . __('&nbsp;:') . ' ' . lang_selector('ocult');
 if ($is_connected)
 {
     echo label_for('myoutings', __('Search in my outings')) . ' ' . checkbox_tag('myoutings', 1, false);

apps/frontend/modules/outings/templates/_form_fields.php

@@ -9,7 +9,8 @@
 
 echo javascript_queue("C2C.confirm_outing_date_message = '" . addslashes(__('Has this outing really been done today?')) . "';
 C2C.confirm_outing_activities_message = '" . addslashes(__('Is really a multi-activity outing?')) . "';
-C2C.alert_outing_paragliding_message = '" . addslashes(__('paragliding can not be selected alone')) . "';");
+C2C.alert_outing_paragliding_message = '" . addslashes(__('paragliding can not be selected alone')) . "';
+C2C.confirm_snow_elevation_message = '" . addslashes(__('Snow elevation is correct?')) . "';");
 
 // Here document = outing
 $link_with = $linked_doc ? $linked_doc->get('id') : 0; 
@@ -120,6 +121,12 @@
 echo form_section_title('Description', 'form_desc', 'preview_desc');
 
 ?>
+<div data-act-filter="1 2 3 6 7 8">
+<?php
+echo object_group_bbcode_tag($document, 'outing_route_desc', null, array('class' => 'smalltext', 'placeholder' => __('outing_route_desc_default')));
+
+?>
+</div>
 <div data-act-filter="1 2 5 7">
 <?php
 // conditions levels fields:
@@ -178,25 +185,56 @@
 });
 ");
 echo end_group_tag();
+// end of conditions levels fields
+
 ?>
 </div>
 <?php
-// end of conditions levels fields
 
 $activities = $document->getRaw('activities');
-$field_title = null;
 if (array_intersect($activities, array(3,4,5)) || (in_array(2, $activities) && !array_intersect($activities, array(1,6,7))))
 {
-    $field_title = 'conditions_and_equipment';
+    $conditions_title = 'conditions_and_equipment';
+    if (array_intersect($activities, array(2,5)))
+    {
+        $conditions_default = 'conditions_ice_default';
+    }
+    else
+    {
+        $conditions_default = 'conditions_rock_default';
+    }
+}
+else if (array_intersect($activities, array(1,7)))
+{
+    $conditions_title = null;
+    $conditions_default = 'conditions_ski_default';
 }
-echo object_group_bbcode_tag($document, 'conditions', $field_title, array('class' => 'medlargetext'), true, $field_title);
+else
+{
+    $conditions_title = null;
+    $conditions_default = 'conditions_hike_default';
+}
+
+echo object_group_bbcode_tag($document, 'conditions', $conditions_title, array('class' => 'mediumtext', 'placeholder' => __($conditions_default)), true, $conditions_title);
+?>
+<div data-act-filter="1 2 5 7">
+<?php
+echo object_group_dropdown_tag($document, 'avalanche_date', 'mod_outings_avalanche_date_edit_list', array('multiple' => true));
+?>
+<div id="avalanche_desc_form">
+<?php
+echo object_group_bbcode_tag($document, 'avalanche_desc', null, array('class' => 'smalltext', 'placeholder' => __('avalanche_desc_tooltip')));
+?>
+</div>
+</div>
+<?php
 echo object_group_bbcode_tag($document, 'weather', null, array('no_img' => true));
 echo object_group_bbcode_tag($document, 'participants', null, array('class' => 'smalltext', 'no_img' => true));
 ?>
 <p class="edit-tips"><?php echo __('link contributors in view page') ?></p>
 <?php
 echo object_group_bbcode_tag($document, 'timing', null, array('class' => 'smalltext', 'no_img' => true));
-echo object_group_bbcode_tag($document, 'description', __('comments'), array('class' => 'mediumtext'));
+echo object_group_bbcode_tag($document, 'description', __('comments'), array('class' => 'mediumtext', 'placeholder' => __('outings_description_default')));
 echo object_group_bbcode_tag($document, 'hut_comments');
 echo object_group_bbcode_tag($document, 'access_comments');
 

apps/frontend/modules/outings/templates/_i18n.php

@@ -1,16 +1,23 @@
 <?php
 use_helper('sfBBCode', 'SmartFormat', 'Field');
 
+$activities = $document->getRaw('activities');
+$outing_route_desc = $document->get('outing_route_desc');
 $conditions = $document->get('conditions');
 $conditions_levels = $document->get('conditions_levels');
+$avalanche_date = $document->getRaw('avalanche_date');
+$avalanche_desc = $document->get('avalanche_desc');
 $weather = $document->get('weather');
 $timing = $document->get('timing');
 $access_comments = $document->get('access_comments');
 $hut_comments = $document->get('hut_comments');
+
+$has_outing_route_desc = !empty($outing_route_desc);
 $has_conditions = !empty($conditions);
 $has_weather_or_timing = (!empty($weather) || !empty($timing));
 $has_access_or_hut = (!empty($access_comments) || !empty($hut_comments));
-$activities = $document->getRaw('activities');
+$has_avalanche_date = !empty($avalanche_date) && count($avalanche_date) && !in_array(0, $avalanche_date);
+$has_avalanche_desc = $has_avalanche_date && !in_array(1, $avalanche_date) && !empty($avalanche_desc);
 
 // hide condition levels if ski, snow, ice_climbing or snowshoeing are not among outing activities
 if (!array_intersect(array(1,2,5,7), $activities))
@@ -53,23 +60,51 @@
     }
 }
 
-if ($has_conditions || $has_conditions_levels)
+if ($has_outing_route_desc || $has_conditions || $has_conditions_levels || $has_avalanche_date)
 {
+    $outing_route_desc_string = field_text_data_if_set($document, 'outing_route_desc', null, array('needs_translation' => $needs_translation, 'images' => $images, 'filter_image_type' => false));
+
     $condition_name = 'conditions';
     if ($has_conditions && (array_intersect($activities, array(3,4,5)) || (in_array(2, $activities) && !array_intersect($activities, array(1,6,7)))))
     {
         $condition_name = 'conditions_and_equipment';
     }
     $lang = $needs_translation ? ' lang="' . $needs_translation . '"' : '';
-    $conditions_title = content_tag('div', __($condition_name), array('class' => 'section_subtitle htext',
-            'id' => '_'.$condition_name, 'data-tooltip' => ''))
-                        . '<div class="field_value"' . $lang . '>';
+    $conditions_title = content_tag('div', __($condition_name), array('class' => 'section_subtitle htext'
+                                                                    , 'id' => '_'.$condition_name
+                                                                    , 'data-tooltip' => ''))
+                      . '<div class="field_value"' . $lang . '>';
 
     if ($has_conditions_levels)
     {
         $conditions_levels_string = conditions_levels_data($conditions_levels);
     }
 
+    $avalanche_string = '';
+    if ($has_avalanche_date)
+    {
+        $avalanche_desc_string = '';
+        if ($has_avalanche_desc)
+        {
+            $avalanche_desc_string .= parse_links(parse_bbcode($avalanche_desc, $images, false));
+        }
+
+        $avalanche_title = content_tag('div', __('avalanche_infos'), array('class' => 'section_subtitle htext'
+                                                                       , 'id' => '_avalanche_infos'
+                                                                       , 'data-tooltip' => ''))
+                          . '<div class="field_value"' . $lang . '>';
+        $avalanche_date_string = field_data_from_list_if_set($document, 'avalanche_date', 'mod_outings_avalanche_date_list', array('multiple' => true, 'raw' => true));
+        $avalanche_date_string = '<p class="avalanche_date">'
+                               . c2cTools::multibyte_ucfirst(trim($avalanche_date_string))
+                               . '.'
+                               . '</p>';
+
+        $avalanche_string = $avalanche_title
+                          . $avalanche_date_string
+                          . $avalanche_desc_string
+                          . '</div>';
+    }
+
     $conditions_string = '';
     if ($has_conditions)
     {
@@ -78,26 +113,32 @@
 
     if ($has_conditions_levels)
     {
-        if (!empty($conditions_string))
+        if ($has_conditions)
         {
-            $conditions_string = '<div class="col_left col_66">'
+            $conditions_string = '<div class="field_value"' . $lang . '>'
                                . $conditions_string
                                . '</div>';
         }
-        $conditions_string = $conditions_title
+        $conditions_string = $outing_route_desc_string
+                           . $conditions_title
                            . $conditions_levels_string
+                           . '</div>'
+                           . '<div class="col_left col_66">'
                            . $conditions_string
+                           . $avalanche_string
                            . '</div>'
                            . $other_conditions;
     }
     else
     {
-        $conditions_string = $conditions_title
-                           . $conditions_string;
         $conditions_string = '<div class="col_left col_66 hfirst">'
+                           . $outing_route_desc_string
+                           . $conditions_title
                            . $conditions_string
+                           . '</div>'
+                           . $avalanche_string
                            . $other_conditions
-                           . '</div></div>';
+                           . '</div>';
     }
 
     echo $conditions_string;