0.36.1 Eradicated last traces of encore webpack and shrunk signals form

classaxe · Feb 8, 2020 · 6886293 · 6886293
1 parent 3a6f72d
commit 6886293
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 89 deletions.
diff --git a/composer.json b/composer.json
@@ -43,8 +43,7 @@
         "symfony/phpunit-bridge": "^5.0",
         "symfony/profiler-pack": "*",
         "symfony/test-pack": "^1.0",
-        "symfony/web-server-bundle": "^4.2.4",
-        "symfony/webpack-encore-pack": "^1.0.3"
+        "symfony/web-server-bundle": "^4.2.4"
     },
     "config": {
         "preferred-install": {

diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -15,11 +15,5 @@
         "grunt-contrib-watch": "^1.1.0"
     },
     "license": "LGPL",
-    "private": true,
-    "scripts": {
-        "dev-server": "encore dev-server",
-        "dev": "encore dev",
-        "watch": "encore dev --watch",
-        "build": "encore production"
-    }
+    "private": true
 }
diff --git a/public/css/style.css b/public/css/style.css
@@ -1,7 +1,7 @@
 /*!
 * Project:   RXX - NDB Logging Database
 * Homepage:  https://rxx.classaxe.com
-* Date:      2020-02-03
+* Date:      2020-02-08
 * Licence:   LGPL
 * Copyright: 2020 Martin Francis
 */
@@ -984,14 +984,20 @@ button.tiny {
   float: right;
 }
 .signal_list #form_call {
-  width: 50px;
+  width: 60px;
 }
 .signal_list #form_khz_1,
 .signal_list #form_khz_2 {
-  width: 40px;
+  width: 50px;
 }
 .signal_list #form_channels {
-  width: 95px;
+  width: 90px;
+}
+.signal_list #form_gsq {
+  width: 220px;
+}
+.signal_list label[for="form_active"] {
+  padding-left: 1em !important;
 }
 .signal_list #form_active {
   width: 95px;

diff --git a/public/css/style.less b/public/css/style.less
@@ -933,14 +933,20 @@ button.tiny {
         float: right;
     }
     #form_call {
-        width:50px;
+        width:60px;
     }
     #form_khz_1,
     #form_khz_2 {
-        width: 40px;
+        width: 50px;
     }
     #form_channels {
-        width: 95px;
+        width: 90px;
+    }
+    #form_gsq {
+        width: 220px;
+    }
+    label[for="form_active"] {
+        padding-left: 1em !important;
     }
     #form_active {
         width: 95px;

diff --git a/public/css/style.min.css b/public/css/style.min.css
diff --git a/symfony.lock b/symfony.lock
@@ -446,15 +446,6 @@
             "ref": "dae9b39fd6717970be7601101ce5aa960bf53d9a"
         }
     },
-    "symfony/webpack-encore-pack": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "0e8ef1deeaef761e1defbec0be694237660ab13a"
-        }
-    },
     "symfony/yaml": {
         "version": "v4.1.0"
     },

diff --git a/templates/i18n.html.twig b/templates/i18n.html.twig
@@ -605,6 +605,8 @@
     {% trans %}Transmitter{% endtrans %}
     {% trans %}Reported{% endtrans %}
     {% trans %}Not Reported{% endtrans %}
+    {% trans %}Listener Locations{% endtrans %}
+    {% trans %}Listener{% endtrans %}
     {% trans %}Listener Primary QTH{% endtrans %}
     {% trans %}Listener Other QTH{% endtrans %}
 {% endif %}

diff --git a/templates/signals/form.html.twig b/templates/signals/form.html.twig
@@ -25,8 +25,6 @@
                             <label for="form_khz_2" class="sr-only">{% trans %}Freq. 2{% endtrans %}</label>
                             {{ form_widget(form.khz_2) }} <span>kHz</span>
                         </fieldset>
-                    </div>
-                    <div style="display:inline-block; width:auto; float:right">
                         {{ form_label(form.channels) }}
                         {{ form_widget(form.channels) }}
                     </div>
@@ -38,11 +36,15 @@
                     </div>
                     {{ form_row(form.countries) }}
                     {{ form_row(form.region) }}
-                    {{ form_row(form.gsq) }}
-                    {{ form_row(form.active) }}
+                    <div style="display:inline-block; width:auto">
+                        {{ form_label(form.gsq) }}
+                        {{ form_widget(form.gsq) }}
+                        {{ form_label(form.active) }}
+                        {{ form_widget(form.active) }}
+                    </div>
                 </fieldset>
                 <fieldset class="section">
-                    <legend class="line">{% trans %}Loggings{% endtrans %}</legend>
+                    <legend class="line" id="section_loggings">{% trans %}Loggings{% endtrans %}</legend>
                     <div>
                         <div>
                             {{ form_label(form.listener) }}
@@ -67,7 +69,7 @@
                     </div>
                 </fieldset>
                 <fieldset class="section">
-                    <legend class="line">{% trans %}Customise{% endtrans %}</legend>
+                    <legend class="line" id="section_customise">{% trans %}Customise{% endtrans %}</legend>
                     {{ form_row(form.personalise) }}
                     <div style="display:inline-block; clear: none; float:right;">
                         {{ form_label(form.offsets) }}

diff --git a/webpack.config.js b/webpack.config.js