From 9d40e375bfaf9a49ee87d9354aa5072809000911 Mon Sep 17 00:00:00 2001 From: lino Date: Mon, 19 Aug 2024 03:50:32 +0200 Subject: [PATCH] add custom functionality --- assets/squat-radar.css | 144 ++++++++++++++--------------- includes/squat-radar-formatter.php | 10 +- plugin-change-README.txt | 45 +++++++++ squat-radar.php | 3 +- 4 files changed, 126 insertions(+), 76 deletions(-) create mode 100644 plugin-change-README.txt diff --git a/assets/squat-radar.css b/assets/squat-radar.css index bc17894..ff69778 100644 --- a/assets/squat-radar.css +++ b/assets/squat-radar.css @@ -1,72 +1,72 @@ -.squat-radar.radar-event { - margin-bottom: 1em; - padding-bottom: 1em; - border-bottom: 1px solid #ddd; - text-align:left; -} -.squat-radar.radar-event::after { - content: ''; - display: block; - float: none; - clear: both; -} -.squat-radar.rader-event:last-child { - border-bottom: 0; - padding-bottom: 0; - margin-bottom: 0; -} -.squat-radar.radar-event-cancelled { - text-decoration: line-through; -} - -.squat-radar .squat-radar-title { - line-height: 1; - font-size: 1.4em; - margin-bottom: 0.2em; -} - -.squat-radar .squat-radar-datetime { - font-weight: bold; -} - -.squat-radar .squat-radar-datetime.squat-radar-datetime-start::before { - content: ''; - display: block; - float: none; - clear: both; -} - -.squat-radar .squat-radar-event-start-end::after, -.squat-radar .squat-radar-event-start { - content: ''; - display: block; - float: none; - clear: both; -} - -.squat-radar .squat-radar-list li { - display: inline; - list-style: none; -} - -.squat-radar .squat-radar-list li:after { - content: ", "; -} - -.squat-radar .squat-radar-list li:last-child:after { - content: ""; -} - -.squat-radar a.squat-radar-url-more { - padding: .4180469716em 1.11575em; - margin-left: 10px; -/* margin-bottom: 10px;*/ - float: right; -} -.squat-radar a.squat-radar-url-more:hover { - color: white !important; -} - -.squat_radar a.squat-radar-url-more:focus { - outline: 0; -} +.squat-radar.radar-event { + margin-bottom: 1em; + padding-bottom: 1em; + border-bottom: 1px solid #ddd; + text-align:left; +} +.squat-radar.radar-event::after { + content: ''; + display: block; + float: none; + clear: both; +} +.squat-radar.rader-event:last-child { + border-bottom: 0; + padding-bottom: 0; + margin-bottom: 0; +} +.squat-radar.radar-event-cancelled { + text-decoration: line-through; +} + +.squat-radar .squat-radar-title { + line-height: 1; + font-size: 1.4em; + margin-bottom: 0.2em; +} + +.squat-radar .squat-radar-datetime { + font-weight: bold; +} + +.squat-radar .squat-radar-datetime.squat-radar-datetime-start::before { + content: ''; + display: block; + float: none; + clear: both; +} + +.squat-radar .squat-radar-event-start-end::after, +.squat-radar .squat-radar-event-start { + content: ''; + display: block; + float: none; + clear: both; +} + +.squat-radar .squat-radar-list li { + display: inline; + list-style: none; +} + +.squat-radar .squat-radar-list li:after { + content: ", "; +} + +.squat-radar .squat-radar-list li:last-child:after { + content: ""; +} + +.squat-radar a.squat-radar-url-more { + padding: .4180469716em 1.11575em; + margin-left: 10px; +/* margin-bottom: 10px;*/ + float: right; +} +.squat-radar a.squat-radar-url-more:hover { + color: white; +} + +.squat_radar a.squat-radar-url-more:focus { + outline: 0; +} diff --git a/includes/squat-radar-formatter.php b/includes/squat-radar-formatter.php index 8481f49..06288dc 100644 --- a/includes/squat-radar-formatter.php +++ b/includes/squat-radar-formatter.php @@ -209,7 +209,8 @@ class Squat_Radar_Formatter { private static function field_date_format($time, $start_end, $time_only = FALSE) { - $date_format = get_option('squat_radar_date_format', 'j M Y'); + $date_format = get_option('squat_radar_date_format', 'd.m.'); + $year_format = get_option('squat_radar_date_format', 'Y'); $time_format = get_option('squat_radar_time_format', 'H:i'); // Remove offset to stop time being converted to UTC. @@ -220,6 +221,9 @@ class Squat_Radar_Formatter { $output .= ''; $output .= date_i18n($date_format, strtotime($time)); $output .= ' '; + $output .= ''; + $output .= date_i18n($year_format, strtotime($time)); + $output .= ' '; } $output .= ''; $output .= date_i18n($time_format, strtotime($time)); @@ -301,11 +305,11 @@ class Squat_Radar_Formatter { */ static public function field_link_html($value, $original, $field, $context) { if ( ($field[0] == 'title' || $field[0] == 'title_field') && ! empty($context['event']['url'])) { - return '' . sanitize_text_field( $value ) . ''; + return '' . sanitize_text_field( $value ) . ''; } if ($field[0] == 'url' && count($field) == 1) { - return '' . __('more…', 'squat-radar') . ''; + return '' . __('more…', 'squat-radar') . ''; } elseif ($field[0] == 'url') { $title = esc_url($value); diff --git a/plugin-change-README.txt b/plugin-change-README.txt new file mode 100644 index 0000000..81be109 --- /dev/null +++ b/plugin-change-README.txt @@ -0,0 +1,45 @@ +PATH: /wp-content/plugins/squat-radar-calendar-integration/includes/squat-radar-formatter.php + + + +In dem Block der Datumsangabe wurde das Tag/Monat und Jahr separiert. (Und deutsche Zeitangaben) + + private static function field_date_format($time, $start_end, $time_only = FALSE) { + + $date_format = get_option('squat_radar_date_format', 'd.m.'); + $year_format = get_option('squat_radar_date_format', 'Y'); + $time_format = get_option('squat_radar_time_format', 'H:i'); + + // Remove offset to stop time being converted to UTC. + $time = substr($time, 0, -6); + + $output = ''; + if ( ! $time_only ) { + $output .= ''; + $output .= date_i18n($date_format, strtotime($time)); + $output .= ' '; + $output .= ''; + $output .= date_i18n($year_format, strtotime($time)); + $output .= ' '; + } + + +Links werden im anderen Tab geöffnet (target="_blank" hinzufügen) + +static public function field_link_html($value, $original, $field, $context) { + if ( ($field[0] == 'title' || $field[0] == 'title_field') && ! empty($context['event']['url'])) { + return '' . sanitize_text_field( $value ) . ''; + } + + if ($field[0] == 'url' && count($field) == 1) { + return '' . __('more…', 'squat-radar') . ''; + } + + + + +css squat-radar.css +important entfernen +.squat-radar a.squat-radar-url-more:hover { + color: white !important; +} diff --git a/squat-radar.php b/squat-radar.php index 58bda56..a24eb02 100644 --- a/squat-radar.php +++ b/squat-radar.php @@ -8,7 +8,7 @@ * @package Squat_Radar * * @wordpress-plugin - * Plugin Name: Squat Radar calendar integration + * Plugin Name: Squat Radar calendar integration custom * Plugin URI: https://0xacab.org/radar/radar-wp * Description: Provides widget, and shortcode, integration for displaying events from https://radar.squat.net/ agenda. * Version: 2.0.9 @@ -17,6 +17,7 @@ * License URI: http://www.gnu.org/licenses/gpl-2.0.txt * Text Domain: squat-radar * Domain Path: /languages + * Gitea Plugin URI: https://git.systemausfall.org/newyorck/radar-wp-custom */ if ( ! defined( 'ABSPATH' ) ) {