Skip to content

Commit b847783

Browse files
rcoopcscrcoopcsc
authored
fix: visualizzazione date delle fasi
1 parent 442088e commit b847783

File tree

7 files changed

+117
-105
lines changed

7 files changed

+117
-105
lines changed

‎assets/css/overrides.css‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
.footer-link a{text-decoration:none}.footer-link a:hover{text-decoration:underline}#footer-wrapper .footer-link a{text-decoration:underline}#footer-wrapper .footer-list a{text-decoration:underline}#footer-wrapper .footer-link a:hover{text-decoration:none}#footer-wrapper .footer-list a:hover{text-decoration:none}.article-wrapper a{text-decoration:underline}.article-wrapper img{max-width:100%;height:auto}
1+
.footer-link a{text-decoration:none}.footer-link a:hover{text-decoration:underline}#footer-wrapper .footer-link a{text-decoration:underline}#footer-wrapper .footer-list a{text-decoration:underline}#footer-wrapper .footer-link a:hover{text-decoration:none}#footer-wrapper .footer-list a:hover{text-decoration:none}.article-wrapper a{text-decoration:underline}.article-wrapper img{max-width:100%;height:auto}
2+
3+
.calendar-vertical .calendar-date .calendar-date-day span {
4+
font-family: "Roboto Mono",monospace;
5+
font-size: 2.5rem;
6+
line-height: 1;
7+
margin: 0 0 5px 0;
8+
text-align: center;
9+
padding-right: 34px;
10+
display: block;
11+
}
12+
13+
.calendar-vertical .calendar-date .calendar-date-description .calendar-date-description-content:before {
14+
margin:0
15+
}

‎inc/admin/documento.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,13 @@ function dsi_add_documento_metaboxes() {
385385
$timeline_group_id = $cmb_aftercontent->add_field( array(
386386
'id' => $prefix . 'timeline',
387387
'type' => 'group',
388-
'name' => '<h3>Fasi</h3>',
388+
'name' => '<h3>Tempi e scadenze</h3>',
389389
'desc' => __( 'Suddividere i contenuti del documento in fasi e relative date. Es data di apertura della partecipazione a un bando, data di scadenza della possibilità di partecipare al bando' , 'design_scuole_italia' ),
390390
'repeatable' => true,
391391
'options' => array(
392392
'group_title' => __( 'Fase {#}', 'design_scuole_italia' ),
393-
'add_button' => __( 'Aggiungi un elemento', 'design_scuole_italia' ),
394-
'remove_button' => __( 'Rimuovi l\'elemento ', 'design_scuole_italia' ),
393+
'add_button' => __( 'Aggiungi fase', 'design_scuole_italia' ),
394+
'remove_button' => __( 'Rimuovi fase', 'design_scuole_italia' ),
395395
'sortable' => true, // Allow changing the order of repeated groups.
396396
),
397397
) );

‎inc/admin/evento.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ function dsi_add_eventi_metaboxes() {
209209

210210
$group_field_id = $cmb_undercontent->add_field( array(
211211
'id' => $prefix . 'date',
212-
'name' => __('<h1>Date</h1>' , 'design_scuole_italia' ),
212+
'name' => __('<h1>Date e Orari</h1>' , 'design_scuole_italia' ),
213213
'type' => 'group',
214-
'description' => __( 'Se l\'evento si svolge in più giorni o fasi indica qui di seguito i diversi appuntamenti. Es: inizo attività, pausa pranzo, seconda sessione, etc', 'design_scuole_italia' ),
214+
'description' => __( 'Se l\'evento si svolge in più giorni o fasi indica qui di seguito i diversi appuntamenti. Es: inizio attività, pausa pranzo, seconda sessione, etc.', 'design_scuole_italia' ),
215215
'options' => array(
216216
'group_title' => __( 'Fase {#}', 'design_scuole_italia' ), // {#} gets replaced by row number
217-
'add_button' => __( 'Aggiungi una data evento', 'design_scuole_italia' ),
218-
'remove_button' => __( 'Rimuovi', 'design_scuole_italia' ),
217+
'add_button' => __( 'Aggiungi fase', 'design_scuole_italia' ),
218+
'remove_button' => __( 'Rimuovi fase', 'design_scuole_italia' ),
219219
'sortable' => true,
220220
'closed' => false, // true to have the groups closed by default
221221
//'remove_confirm' => esc_html__( 'Are you sure you want to remove?', 'cmb2' ), // Performs confirmation before removing group.

‎inc/admin/servizio.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,13 @@ function dsi_add_servizi_metaboxes() {
349349
/** repeater fasi_scadenze **/
350350
$group_field_id = $cmb_undercontent->add_field( array(
351351
'id' => $prefix . 'fasi_scadenze',
352-
'name' => __('<h1>Fasi e Scadenze</h1>', 'design_scuole_italia' ),
352+
'name' => __('<h1>Tempi e scadenze</h1>', 'design_scuole_italia' ),
353353
'type' => 'group',
354-
'description' => __( 'Prevedere una data di scadenza del Servizio (ad es. "iscrizione asilo nido entro..."). Se il Servizio è diviso in fasi, prevedere un campo per ciascuna fase del Servizio e relativa indicazione dei tempi " - data)', 'design_scuole_italia' ),
354+
'description' => __( 'Prevedere una data di scadenza del Servizio (ad es. "iscrizione asilo nido entro..."). Se il servizio è diviso in fasi, prevedere un campo per ciascuna fase del Servizio e relativa indicazione della data', 'design_scuole_italia' ),
355355
'options' => array(
356356
'group_title' => __( 'Fase {#}', 'design_scuole_italia' ), // {#} gets replaced by row number
357-
'add_button' => __( 'Aggiungi una fase', 'design_scuole_italia' ),
358-
'remove_button' => __( 'Rimuovi la fase', 'design_scuole_italia' ),
357+
'add_button' => __( 'Aggiungi fase', 'design_scuole_italia' ),
358+
'remove_button' => __( 'Rimuovi fase', 'design_scuole_italia' ),
359359
'sortable' => true,
360360
// 'closed' => true, // true to have the groups closed by default
361361
//'remove_confirm' => esc_html__( 'Are you sure you want to remove?', 'cmb2' ), // Performs confirmation before removing group.

‎single-documento.php‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -291,21 +291,39 @@
291291
<div class="col-lg-9">
292292
<div class="calendar-vertical mb-5">
293293
<?php
294+
$old_date = "";
294295
foreach ( $timeline as $item ) {
296+
$readableDate = $item['data_timeline'];
297+
setlocale(LC_TIME, 'it_IT.UTF-8', 'it_IT', 'italian');
298+
$date = DateTime::createFromFormat('d-m-Y', $readableDate);
299+
$day = $date->format('j');
300+
$month = ucfirst(strftime('%B', $date->getTimestamp()));
301+
$current_date = $item["data_timeline"];
295302
?>
296-
<div class="calendar-date">
297-
<div class="calendar-date-description rounded">
298-
<div class="calendar-date-description-content">
299-
<p><?php echo $item["titolo_timeline"] ?></p>
300-
</div><!-- /calendar-date-description-content -->
301-
</div><!-- /calendar-date-description -->
302-
<h4 class="calendar-date-day">
303-
<p><?php echo date_i18n( "d", strtotime( $item["data_timeline"] ) ); ?></p>
304-
<small><b><?php echo date_i18n( "M", strtotime( $item["data_timeline"] ) ); ?></b></small>
305-
</h4><!-- /calendar-date-day -->
306-
</div><!-- /calendar-date -->
307-
<?php } ?>
308-
</div><!-- /calendar-vertical -->
303+
<div class="calendar-date <?php echo ($current_date === $old_date) ? 'same-date' : ''; ?>">
304+
<?php if ($current_date !== $old_date): ?>
305+
<!-- Normal date heading -->
306+
<h3 class="calendar-date-day order-1" aria-label="<?php echo esc_attr("$day $month"); ?>">
307+
<p><?php echo date_i18n( "d", strtotime( $item["data_timeline"] ) ); ?></p>
308+
<small><b><?php echo date_i18n( "M", strtotime( $item["data_timeline"] ) ); ?></b></small>
309+
</h3>
310+
<?php else: ?>
311+
<div class="calendar-date-day order-1">
312+
313+
</div>
314+
<?php endif; ?>
315+
316+
<div class="calendar-date-description rounded">
317+
<div class="calendar-date-description-content order-2">
318+
<p><?php echo esc_html($item["titolo_timeline"]); ?></p>
319+
</div>
320+
</div>
321+
</div>
322+
<?php
323+
$old_date = $current_date; // update previous date
324+
}
325+
?>
326+
</div><!-- /calendar-vertical -->
309327
</div><!-- /col-lg-9 -->
310328
</div><!-- /row -->
311329
<?php

‎single-evento.php‎

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -232,66 +232,32 @@
232232
<h2 class="h4" id="art-par-date"><?php _e("Date e Orari", "design_scuole_italia"); ?></h2>
233233
<div class="calendar-vertical mb-5">
234234
<?php
235-
236235
$old_data = "";
237236
foreach ($date as $data) {
238-
237+
$sr_date = "".date_i18n("d", $data["data"])." ".date_i18n("F", $data["data"])."";
239238
?>
240239
<div class="calendar-date">
240+
<?php if ($old_data != date_i18n("dMY", $data["data"])) { ?>
241+
<h3 class="calendar-date-day order-1" aria-label="<?php echo $sr_date?>">
242+
<span aria-hidden="true"><?php echo date_i18n("d", $data["data"]); ?></span>
243+
<small aria-hidden="true"><b><?php echo date_i18n("M", $data["data"]); ?></b></small>
244+
</h3>
245+
<?php } else { ?>
246+
<div class="calendar-date-day order-1">
247+
<!-- non mostrare la data quando è uguale alla precedente -->
248+
</div><!-- /calendar-date-day -->
249+
<?php } ?>
241250
<div class="calendar-date-description rounded">
242-
<div class="calendar-date-description-content">
243-
<p><?php echo date_i18n("H:i", $data["data"]); ?><?php if (isset($data["descrizione"])) echo " - " . $data["descrizione"]; ?></p>
251+
<div class="calendar-date-description-content order-2">
252+
<p><strong><?php echo date_i18n("H:i", $data["data"]); ?></strong>
253+
<?php if (isset($data["descrizione"])) echo " - " . $data["descrizione"]; ?></p>
244254
</div><!-- /calendar-date-description-content -->
245255
</div><!-- /calendar-date-description -->
246-
<h4 class="calendar-date-day">
247-
<?php if ($old_data != date_i18n("dMY", $data["data"])) { ?>
248-
<p><?php echo date_i18n("d", $data["data"]); ?></p>
249-
<small><b><?php echo date_i18n("M", $data["data"]); ?></b></small>
250-
251-
<?php } ?>
252-
</h4><!-- /calendar-date-day -->
256+
253257
</div><!-- /calendar-date -->
254258
<?php
255259
$old_data = date_i18n("dMY", $data["data"]);
256-
257-
}
258-
/* else {
259-
260-
$timestamp_inizio = dsi_get_meta("timestamp_inizio");
261-
$timestamp_fine = dsi_get_meta("timestamp_fine");
262-
$ora_inizio = date_i18n("H:i", $timestamp_inizio);
263-
$ora_fine = date_i18n("H:i", $timestamp_fine);
264-
265-
?>
266-
<div class="calendar-date">
267-
<div class="calendar-date-day">
268-
<small><?php echo date_i18n("Y", $timestamp_inizio); ?></small>
269-
<p><?php echo date_i18n("d", $timestamp_inizio); ?></p>
270-
<small><b><?php echo date_i18n("M", $timestamp_inizio); ?></b></small>
271-
272-
</div><!-- /calendar-date-day -->
273-
<div class="calendar-date-description rounded">
274-
<div class="calendar-date-description-content">
275-
<p><?php echo $ora_inizio; ?><?php if ($ora_fine != $ora_inizio) echo " - " . $ora_fine; ?></p>
276-
</div><!-- /calendar-date-description-content -->
277-
</div><!-- /calendar-date-description -->
278-
</div><!-- /calendar-date -->
279-
280-
<div class="calendar-date">
281-
<div class="calendar-date-day">
282-
<small><?php echo date_i18n("Y", $timestamp_fine); ?></small>
283-
<p><?php echo date_i18n("d", $timestamp_fine); ?></p>
284-
<small><b><?php echo date_i18n("M", $timestamp_fine); ?></b></small>
285-
286-
</div><!-- /calendar-date-day -->
287-
<div class="calendar-date-description rounded">
288-
<div class="calendar-date-description-content">
289-
<p><?php echo $ora_inizio; ?><?php if ($ora_fine != $ora_inizio) echo " - " . $ora_fine; ?></p>
290-
</div><!-- /calendar-date-description-content -->
291-
</div><!-- /calendar-date-description -->
292-
</div><!-- /calendar-date -->
293-
<?php
294-
} */ ?>
260+
}?>
295261

296262
</div><!-- /calendar-vertical -->
297263
<?php

0 commit comments

Comments
 (0)