(chore) Removed prettier from page tamplates. GH-234

Daveiano · Nov 23, 2024 · f557320 · f557320
1 parent acb52ef
commit f557320
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 109 deletions.
diff --git a/changelog.md b/changelog.md
@@ -942,3 +942,4 @@ index 465d4ad..aa8bad6 100644
 - Add Moon phases and planet name translations GH-264
 - Added option to only color the text in the colored temperatur stat tile GH-243
 - Simplified adding of user defined modals GH-255
+- (chore) Remove prettier from *.inc and *html.tmpl files GH-234
diff --git a/skins/weewx-wdc/about.html.tmpl b/skins/weewx-wdc/about.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 
@@ -169,7 +168,6 @@
                   aria-labelledby="tab-code"
                   hidden
                 >
-                  <!--prettier-ignore-->
                   <bx-code-snippet type="multi">&lt;h4 class=&quot;bx--type-productive-heading-03&quot;&gt;<br/>  Heading<br/>&lt;/h4&gt;<br/>&lt;h5 class=&quot;bx--type-productive-heading-02&quot;&gt;<br/>  Subheading<br/>&lt;/h5&gt;<br/>&lt;p class=&quot;bx--type-body-long-02&quot;&gt;<br/>  Paragraph text<br/>&lt;/p&gt;<br/>&lt;p class=&quot;bx--type-helper-text-01&quot;&gt;<br/>  Some helper text<br/>&lt;/p&gt;
                   </bx-code-snippet>
                 </div>
@@ -236,7 +234,6 @@
                 By default, this page is disabled in the skin.conf, simply
                 uncomment if you want to enable it:
               </p>
-              <!--prettier-ignore-->
               <bx-code-snippet type="multi"># Static pages, add as many as you want.
 [[Static]]
     [[[about]]]
@@ -246,7 +243,6 @@
               <p class="bx--type-body-long-02">
                 You can add an unlimited amount of pages:
               </p>
-              <!--prettier-ignore-->
               <bx-code-snippet type="multi"># Static pages, add as many as you want.
 [[Static]]
     [[[about]]]

diff --git a/skins/weewx-wdc/celestial.html.tmpl b/skins/weewx-wdc/celestial.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 #from datetime import datetime
@@ -25,32 +24,27 @@
               <h2>$now</h2>
             </header>
           </div>
-          <!--prettier-ignore-->
           #if $almanac.hasExtras
           <div class="bx--row">
-            <!--prettier-ignore-->
             #attr $labels_almanac = ["Sun", "Moon"]
             #for $label in $labels_almanac
             #set global $label_almanac = $label
             #include "includes/almanac-tile.inc"
             #end for
           </div>
           <div class="bx--row">
-            <!--prettier-ignore-->
             #attr $labels_almanac2 = ["Venus", "Mars", "Jupiter", "Saturn"]
             #for $label in $labels_almanac2
             #set global $label_almanac = $label
             #include "includes/almanac-tile.inc"
             #end for
           </div>
           <div class="bx--row">
-            <!--prettier-ignore-->
             #include "includes/almanac-sun-detail-tile.inc"
             #include "includes/almanac-moon-detail-tile.inc"
           </div>
           #else
           <div class="bx--row">
-            <!--prettier-ignore-->
             #set global $label_almanac = $gettext("Sun")
             #include "includes/almanac-tile-simple.inc"
           </div>

diff --git a/skins/weewx-wdc/computer-monitor.html.tmpl b/skins/weewx-wdc/computer-monitor.html.tmpl
@@ -106,7 +106,6 @@
           #set global $context = 'day'
 
           <div class="bx--row">
-            <!--prettier-ignore-->
             #for $obs in $computer_monitor_stat_tile_observations
               #set $binding = $get_data_binding($obs)
               #set $alltime_tag = $alltime($data_binding=$binding) if $context == 'alltime' else None

diff --git a/skins/weewx-wdc/day-archive/day-%Y-%m-%d.html.tmpl b/skins/weewx-wdc/day-archive/day-%Y-%m-%d.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 #import datetime
@@ -29,9 +28,7 @@
             </header>
           </div>
 
-          <!--prettier-ignore-->
           #if $get_day_archive_enabled()
-          <!--prettier-ignore-->
           <div class="bx--row" style="margin-bottom: 2rem;">
             <div class="bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-6 bx--col-max-6">
               #set $archive_days = $get_archive_days_array($alltime.dateTime.raw, $latest.dateTime.raw, $get_time_format_dict['daily_archive'])
@@ -47,7 +44,6 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get('layout', 'alternative') == 'alternative'
             #include 'includes/body-alternative.inc'
           #else

diff --git a/skins/weewx-wdc/dwd.html.tmpl b/skins/weewx-wdc/dwd.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 #import datetime
@@ -34,13 +33,11 @@
             </header>
           </div>
 
-          <!--prettier-ignore-->
           #if $to_bool($Extras['weewx-DWD']['show_text_forecast'])
           #set $VHDL = $Extras['weewx-DWD']['text_forecast_VHDL']
           #set $dwd_link = $Extras['weewx-DWD']['dwd_link']
           <div class="bx--row" style="margin-bottom: 1.5rem">
             <div class="bx--col">
-              <!--prettier-ignore-->
               <div class="bx--tile">
                 #set $today = datetime.date.today()
                 #set $headings = {54: $pgettext("DWD", "Current Weather Conditions"), 50: $pgettext("DWD", "Today"), 51: $pgettext("DWD", "Tomorrow"), 52: $pgettext("DWD", ($today + datetime.timedelta(days=2)).strftime("%A")), 53: $pgettext("DWD", ($today + datetime.timedelta(days=3)).strftime("%A"))}
@@ -69,7 +66,6 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $to_bool($Extras['weewx-DWD']['show_forecast']) and os.path.exists("dwd/forecast-" + $Extras['weewx-DWD']['mosmix_id'] + ".json")
           <div class="bx--row" style="margin-bottom: 1.5rem">
             <div class="bx--col">
@@ -84,10 +80,8 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get("diagrams", {}).get("combined_observations", {}).get('dwd_meteogram_1', None) is not None
           <div class="bx--row">
-            <!--prettier-ignore-->
             #attr $context = 'custom'
             #set global $context_start_ts = $time.time()
             #set $end_dt = $datetime.date.today() + $datetime.timedelta(days=14)
@@ -101,10 +95,8 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get("diagrams", {}).get("combined_observations", {}).get('dwd_meteogram_2', None) is not None
           <div class="bx--row">
-            <!--prettier-ignore-->
             #attr $context = 'custom'
             #set global $context_start_ts = $time.time()
             #set $end_dt = $datetime.date.today() + $datetime.timedelta(days=14)
@@ -118,10 +110,8 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get("diagrams", {}).get("combined_observations", {}).get('dwd_meteogram_3', None) is not None
           <div class="bx--row">
-            <!--prettier-ignore-->
             #attr $context = 'custom'
             #set global $context_start_ts = $time.time()
             #set $end_dt = $datetime.date.today() + $datetime.timedelta(days=14)
@@ -135,7 +125,6 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $to_bool($Extras['weewx-DWD']['show_pressure_map']) or $to_bool($Extras['weewx-DWD']['show_warning_map'])
           <div class="bx--row" style="margin-bottom: 1.5rem">
             <div
@@ -145,7 +134,6 @@
                 <h2>$gettext("Aktuelle Bodendruck- und Warnkarte")</h2>
               </header>
             </div>
-            <!--prettier-ignore-->
             #if $to_bool($Extras['weewx-DWD']['show_pressure_map'])
             <div
               class="bx--col-sm-4 bx--col-md-8 bx--col-lg-6 bx--col-xlg-6 bx--col-max-6"
@@ -168,7 +156,6 @@
             </div>
             #end if
 
-            <!--prettier-ignore-->
             #if $to_bool($Extras['weewx-DWD']['show_warning_map'])
             <div
               class="bx--col-sm-4 bx--col-md-8 bx--col-lg-6 bx--col-xlg-6 bx--col-max-6"
@@ -193,7 +180,6 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if $to_bool($Extras['weewx-DWD']['show_text_warnings'])
           <div class="bx--row" style="margin-bottom: 1.5rem">
             <div
@@ -205,38 +191,32 @@
             </div>
 
             #set $warning_index = 0
-            <!--prettier-ignore-->
             <div
               class="bx--col-sm-4 bx--col-md-8 bx--col-lg-6 bx--col-xlg-6 bx--col-max-6"
             >
               #for $region, $region_key in $get_dwd_warnings.items()
               #if os.path.exists("dwd/warn-" + $region_key + ".json") and ($warning_index % 2) == 0
 
-                <!--prettier-ignore-->
                 #set global $region = $region
                 #set global $region_key = $region_key
                 #include "includes/dwd-warning.inc"
 
-              <!--prettier-ignore-->
               #end if
               #set $warning_index = $warning_index + 1
               #end for
             </div>
 
             #set $warning_index = 0
-            <!--prettier-ignore-->
             <div
               class="bx--col-sm-4 bx--col-md-8 bx--col-lg-6 bx--col-xlg-6 bx--col-max-6"
             >
               #for $region, $region_key in $get_dwd_warnings.items()
               #if os.path.exists("dwd/warn-" + $region_key + ".json") and ($warning_index % 2) != 0
 
-                <!--prettier-ignore-->
                 #set global $region = $region
                 #set global $region_key = $region_key
                 #include "includes/dwd-warning.inc"
 
-              <!--prettier-ignore-->
               #end if
               #set $warning_index = $warning_index + 1
               #end for

diff --git a/skins/weewx-wdc/externals.html.tmpl b/skins/weewx-wdc/externals.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 
@@ -48,11 +47,8 @@
           </div>
           #end if
 
-          <!--prettier-ignore-->
           #if 'externals' in $Extras
-          <!--prettier-ignore-->
           <div class="bx--row">
-            <!--prettier-ignore-->
             #for $external in $Extras['externals']
             #if $external == 'description'
               #continue
@@ -62,7 +58,6 @@
               class="bx--col-sm-4 bx--col-md-8 bx--col-lg-12 bx--col-xlg-6"
               style="margin-bottom: 1.25rem"
             >
-              <!--prettier-ignore-->
               <div class="bx--tile webcam-tile">
                   <h5 class="bx--type-caption-01" style="margin-bottom: 0">
                     #if 'title_long' in $Extras['externals'][$external]

diff --git a/skins/weewx-wdc/includes/icons/wind-direction.inc b/skins/weewx-wdc/includes/icons/wind-direction.inc
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 

diff --git a/skins/weewx-wdc/month-%Y-%m.html.tmpl b/skins/weewx-wdc/month-%Y-%m.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 #from time import strftime, localtime
@@ -23,7 +22,6 @@
           <div class="bx--row">
             <header class="bx--col page-header">
               <h1>$gettext("Monthly Weather Conditions")</h1>
-              <!-- prettier-ignore -->
               <h2>$month.start - $strftime($get_time_format_dict['month'], $localtime($month.end.raw - 1))</h2>
               <h3>
                 <a
@@ -37,7 +35,6 @@
             </header>
           </div>
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get('layout', 'alternative') == 'alternative'
             #include 'includes/body-alternative.inc'
           #else

diff --git a/skins/weewx-wdc/month.html.tmpl b/skins/weewx-wdc/month.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8
 #from datetime import datetime, timedelta
@@ -24,13 +23,11 @@
             <header class="bx--col page-header">
               <h1>$gettext("Monthly Weather Conditions")</h1>
               <h2>
-                <!--prettier-ignore-->
                 $month.start - $strftime($get_time_format_dict['month'], $localtime($month.end.raw - 1))
               </h2>
             </header>
           </div>
 
-          <!--prettier-ignore-->
           #if $DisplayOptions.get('layout', 'alternative') == 'alternative'
             #include 'includes/body-alternative.inc'
           #else

diff --git a/skins/weewx-wdc/offline.html.tmpl b/skins/weewx-wdc/offline.html.tmpl
@@ -1,4 +1,3 @@
-<!--prettier-ignore-->
 #errorCatcher Echo
 #encoding UTF-8