2.42.0 Removed code to support switching to 'Classic' mode

classaxe · Jul 11, 2022 · 1734bda · 1734bda
1 parent 4562e2b
commit 1734bda
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 110 deletions.
diff --git a/src/Controller/Web/Admin/Help.php b/src/Controller/Web/Admin/Help.php
@@ -31,7 +31,6 @@ public function adminHelpController(
         $this->session->set('route', '');
         $parameters = [
             '_locale' =>    $_locale,
-            'classic' =>    $this->systemRepository->getClassicUrl('admin/help'),
             'mode' =>       'Admin Help',
             'system' =>     $system,
         ];

diff --git a/src/Controller/Web/Admin/Info.php b/src/Controller/Web/Admin/Info.php
@@ -34,7 +34,6 @@ public function controller(
         }
         $parameters = [
             '_locale' =>        $_locale,
-            'classic' =>        $this->systemRepository->getClassicUrl('admin/info'),
             'mode' =>           'System Info',
             'info' =>           $this->systemRepository->getPhpInfo(),
             'mysql_version' =>  $this->systemRepository->getMySQLVersion(),

diff --git a/src/Controller/Web/Admin/Logon.php b/src/Controller/Web/Admin/Logon.php
@@ -96,7 +96,6 @@ public function logonController($_locale, $system, Request $request, LogonForm $
         }
         $parameters = [
             'args' =>       $args,
-            'classic' =>    $this->systemRepository->getClassicUrl('logon'),
             'disableLogon' =>   $disableLogon,
             'form' =>       $form->createView(),
             'form_class' => 'logon',

diff --git a/src/Controller/Web/Admin/Logsessions.php b/src/Controller/Web/Admin/Logsessions.php
@@ -71,7 +71,6 @@ public function logsessions(
         $logSessions = $this->logsessionRepository->getLogsessions($args, $columns);
         $parameters = [
             'args' =>           $args,
-            'classic' =>        $this->systemRepository->getClassicUrl('log_sessions'),
             'columns' =>        $columns,
             'form' =>           $form->createView(),
             '_locale' =>        $_locale,

diff --git a/src/Controller/Web/Admin/Tools.php b/src/Controller/Web/Admin/Tools.php
@@ -89,7 +89,6 @@ public function controller(
 
         $parameters = [
             '_locale' =>        $_locale,
-            'classic' =>        $this->systemRepository->getClassicUrl('admin/tools'),
             'ip' =>             $this->visitor->getIpAddress(),
             'mode' =>           'Administrator Management Tools',
             'system' =>         $system,

diff --git a/src/Controller/Web/Admin/Users.php b/src/Controller/Web/Admin/Users.php
@@ -102,7 +102,6 @@ public function profile(
         $parameters = [
             '_locale' =>            $_locale,
             'id' =>                 $id,
-            'classic' =>            $this->systemRepository->getClassicUrl('profile'),
             'form' =>               $form->createView(),
             'u' =>                  $user,
             'mode' =>               'Your Profile',
@@ -267,7 +266,6 @@ public function users(
         }
         $parameters = [
             'args' =>               $args,
-            'classic' =>            $this->systemRepository->getClassicUrl('users'),
             'columns' =>            $this->userRepository->getColumns(),
             'form' =>               $form->createView(),
             '_locale' =>            $_locale,

diff --git a/src/Controller/Web/Changes/Changes.php b/src/Controller/Web/Changes/Changes.php
@@ -60,7 +60,6 @@ public function controller($_locale, $system)
             '_locale' =>    $_locale,
             'mode' =>       'Change Log',
             'system' =>     $system,
-            'classic' =>    $this->systemRepository->getClassicUrl('changes'),
             'changelog' =>  $changelog,
             'count' =>      count($entries),
             'first' =>      static::FIRST_COMMIT

diff --git a/src/Controller/Web/Cle/Cle.php b/src/Controller/Web/Cle/Cle.php
@@ -131,7 +131,6 @@ public function controller(
             '_locale' =>    $_locale,
             'mode' =>       $i18n->trans('CLE %NUMBER%', [ '%NUMBER%' => $cle->getCle() ]),
             'system' =>     $system,
-            'classic' =>    $this->systemRepository->getClassicUrl('cle'),
             'admin' =>      (int)$this->parameters['access'] & UserEntity::CLE,
             'cle' =>        $cle,
             'form' =>       $form->createView(),

diff --git a/src/Controller/Web/Donate/Donate.php b/src/Controller/Web/Donate/Donate.php
@@ -30,7 +30,6 @@ public function controller($_locale, $system)
             '_locale' =>    $_locale,
             'mode' =>       'Donate',
             'system' =>     $system,
-            'classic' =>    $this->systemRepository->getClassicUrl('donate'),
             'admins' =>     $admins,
             'domain' =>     static::DOMAIN_COST,
             'monthly' =>    static::MONTHLY_COST

diff --git a/src/Controller/Web/Help/Help.php b/src/Controller/Web/Help/Help.php
@@ -27,7 +27,6 @@ class Help extends Base
     public function helpController($_locale, $system) {
         $parameters = [
             '_locale' =>    $_locale,
-            'classic' =>    $this->systemRepository->getClassicUrl('help'),
             'mode' =>       'Help',
             'system' =>     $system,
         ];

diff --git a/src/Controller/Web/Listeners/Collection.php b/src/Controller/Web/Listeners/Collection.php
@@ -132,12 +132,11 @@ public function controller(
             'args' =>               $args,
             'box' =>                $box,
             'center' =>             $center,
-            'classic' =>            $this->systemRepository->getClassicUrl('listeners'),
             'columns' =>            $this->listenerRepository->getColumns('listeners'),
             'form' =>               $form->createView(),
             'listeners' =>          $listeners,
             '_locale' =>            $_locale,
-            'mode' =>               'Listeners and Locations',
+            'mode' =>               'Locations',
             'results' => [
                 'limit' =>              isset($args['limit']) ? $args['limit'] : $this->listenerRepository::defaultLimit,
                 'page' =>               isset($args['page']) ? $args['page'] : $this->listenerRepository::defaultPage,

diff --git a/src/Controller/Web/Maps/Maps.php b/src/Controller/Web/Maps/Maps.php
@@ -31,7 +31,6 @@ public function mapsController($_locale, $system)
 
         $parameters = [
             '_locale' =>    $_locale,
-            'classic' =>    $this->systemRepository->getClassicUrl('maps'),
             'mode' =>       'Maps',
             'system' =>     $system,
             'title' =>      $maps['title'],

diff --git a/src/Controller/Web/Signals/Collection.php b/src/Controller/Web/Signals/Collection.php
@@ -79,7 +79,6 @@ public function signals(
             'args' =>               $this->args,
             'box' =>                $this->mapBox,
             'center' =>             $this->mapCenter,
-            'classic' =>            $this->systemRepository->getClassicUrl('signals', $this->args['show']),
             'columns' =>            $this->signalRepository->getColumns('signals'),
             'expanded' =>           $this->expandedSections,
             'form' =>               $form->createView(),

diff --git a/src/Controller/Web/Tools/Tools.php b/src/Controller/Web/Tools/Tools.php
@@ -36,7 +36,6 @@ public function index($_locale, $system, Request $request)
             'args' =>       $request->query->get('args'),
             'mode' =>       'Tools',
             'system' =>     $system,
-            'classic' =>    $this->systemRepository->getClassicUrl('tools'),
             'widgets' =>    $widgets
         ];
 

diff --git a/src/Controller/Web/Weather/Weather.php b/src/Controller/Web/Weather/Weather.php
@@ -52,7 +52,6 @@ public function controller($_locale, $system, Request $request)
             'mode' =>       'Weather',
             'system' =>     $system,
             'centers' =>    $this->weatherRepository->getCenters(),
-            'classic' =>    $this->systemRepository->getClassicUrl('weather'),
             'widgets' =>    $widgets,
             'zoom' =>       $zoom
         ];

diff --git a/src/Repository/ModeRepository.php b/src/Repository/ModeRepository.php
@@ -20,8 +20,8 @@ class ModeRepository
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'Listeners',
-                'title' =>  'Listeners and Locations',
+                'menu' =>   'Locations',
+                'title' =>  'Listening Posts',
                 'url'=>     false
             ],
             'cle' => [
@@ -64,72 +64,72 @@ class ModeRepository
                 'title' =>  'Changes',
                 'url'=>     false
             ],
-            'help' => [
-                'access' => User::ALL,
-                'admin' =>  true,
-                'guest' =>  true,
-                'menu' =>   'Help',
-                'title' =>  'Help',
-                'url'=>     false
-            ],
-            'donate' => [
-                'access' => User::ALL,
-                'admin' =>  true,
-                'guest' =>  true,
-                'menu' =>   'Donate',
-                'title' =>  'Donate',
-                'url'=>     false
-            ],
         ],
         [
             'ndblistWebsite' => [
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'NDB List Website',
+                'menu' =>   'Ndblist.info',
                 'title' =>  'NDB List Group Information Website',
                 'url'=>     'http://ndblist.info/'
             ],
             'NdbGroup' => [
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'NDB Group',
+                'menu' =>   'NDB Grp',
                 'title' =>  'NDB at Groups.io',
                 'url'=>     'https://groups.io/g/ndblist'
             ],
             'DscGroup' => [
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'DSC Group',
+                'menu' =>   'DSC Grp',
                 'title' =>  'DSC at Groups.io',
                 'url'=>     'https://groups.io/g/dsc-list'
             ],
             'DgpsGroup' => [
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'DGPS Group',
+                'menu' =>   'DGPS Grp',
                 'title' =>  'DGPS at Groups.io',
                 'url'=>     'https://groups.io/g/dgpslist'
             ],
             'NavtexGroup' => [
                 'access' => User::ALL,
                 'admin' =>  true,
                 'guest' =>  true,
-                'menu' =>   'NAVTEX Group',
+                'menu' =>   'NAVTEX Grp',
                 'title' =>  'Navtex at Groups.io',
                 'url'=>     'https://groups.io/g/navtexdx'
             ],
             'logon' => [
                 'access' => User::PUBLIC,
                 'admin' =>  false,
                 'guest' =>  true,
-                'menu' =>   'Log On',
+                'menu' =>   'Logon',
                 'title' =>  'Logon',
                 'url'=>     false
             ],
+            'donate' => [
+                'access' => User::ALL,
+                'admin' =>  true,
+                'guest' =>  true,
+                'menu' =>   'Donate',
+                'title' =>  'Donate',
+                'url'=>     false
+            ],
+            'help' => [
+                'access' => User::ALL,
+                'admin' =>  true,
+                'guest' =>  true,
+                'menu' =>   'Help',
+                'title' =>  'Help',
+                'url'=>     false
+            ],
         ],
         [
             'admin/tools' => [

diff --git a/src/Repository/SystemRepository.php b/src/Repository/SystemRepository.php
@@ -164,49 +164,6 @@ public function getAdmins()
         return $admins;
     }
 
-    public function getClassicUrl($mode='', $submode='')
-    {
-        $response = [ 'type' => 'url', 'value' => '' ];
-        switch ($mode) {
-            case 'admin/help':
-                $response['value'] = 'admin_help';
-                break;
-            case 'admin/info':
-                $response['value'] = 'sys_info';
-                break;
-            case 'admin/tools':
-                $response['value'] = 'admin_manage';
-                break;
-            case 'changes':
-            case 'cle':
-            case 'donate':
-            case 'help':
-            case 'logon':
-            case 'maps':
-            case 'tools':
-            case 'weather':
-                $response['value'] = $mode;
-                break;
-            case 'listeners':
-                $response['value'] = 'listener_list';
-                break;
-            case 'signals':
-                switch ($submode) {
-                    case 'map':
-                        $response['value'] = 'signal_list?show=map';
-                        break;
-                    case 'seeklist':
-                        $response['value'] = 'signal_seeklist';
-                        break;
-                    default:
-                        $response['value'] = 'signal_list';
-                        break;
-                }
-                break;
-        }
-        return $response;
-    }
-
     public function get($code)
     {
         return self::SYSTEMS[$code];

diff --git a/templates/i18n.html.twig b/templates/i18n.html.twig
@@ -17,9 +17,6 @@
 {% endif %}
 {% if 'Version' %}
     {% trans %}Version{% endtrans %}
-    {% trans %}Switch{% endtrans %}
-    {% trans %}Classic{% endtrans %}
-    {% trans %}New{% endtrans %}
 {% endif %}
 {% if 'Menu' %}
     {% trans %}Signals Received in Europe{% endtrans %}

diff --git a/templates/listeners/index.html.twig b/templates/listeners/index.html.twig
@@ -22,7 +22,7 @@
                 </p>
             </div>
         {% endif %}
-        {% set form_title='Customise %s Listeners List' | trans | format(system | upper) %}
+        {% set form_title='Customise %s Locations List' | trans | format(system | upper) %}
         {% set form_class='listener_list' %}
         {% include 'listeners/form.html.twig' %}
     </div>

diff --git a/templates/listeners/list.html.twig b/templates/listeners/list.html.twig
@@ -21,7 +21,7 @@
 }
 </style>
 
-<h2>{{ system|upper }} {% trans %}Listeners and Locations{% endtrans %}</h2>
+<h2>{{ system|upper }} {% trans %}Locations{% endtrans %}</h2>
 {% if listeners|length > 0 %}
 <table id="wide" class="listener results">
     <thead>

diff --git a/templates/listeners/map.html.twig b/templates/listeners/map.html.twig
@@ -31,7 +31,7 @@ $(document).ready( function() {
     <tbody>
     <tr>
         <td width="30%">
-            <h2>{{ system|upper }} {% trans %}Listeners and Locations Map{% endtrans %}</h2>
+            <h2>{{ system|upper }} {% trans %}Locations Map{% endtrans %}</h2>
             <div class="scroll">
                 <div>
                 <table class="results" id="markerlist" style="display:none; margin: 0; max-width: 500px">

diff --git a/templates/menu/menu.html.twig b/templates/menu/menu.html.twig
@@ -3,7 +3,7 @@
     <div class="menu-centered" role="navigation">
         <ul class="menu header">
             <li>
-                <h2>
+                <h2 title="RXX Version {{ gitTag }}">
                     <span class="show-for-medium">{{ systems[system]['title']|trans }}</span>
                     <span class="show-for-small-only">{{ systems[system]['title_s']|trans }}</span>
                 </h2>
@@ -23,7 +23,7 @@
 {% for key, modeRepo in modes[0] %}{% if ((isAdmin and modeRepo.admin) or (not isAdmin and modeRepo.guest))%}
             <li{% if (app.request.get('_route') == key) %} class="is-active"{% endif %}>
                 <a href="{% if modeRepo.url %}{{ modeRepo.url }}{% else %}{{ url(key, { 'system' : system}) }}{% endif %}"{% if modeRepo.url %} rel="external"{% endif %}>
-                    <span>{{ modeRepo['menu']|trans }}</span>
+                    <span>{{ modeRepo['menu']|trans|raw }}</span>
                     {% if modeRepo['menu'] == 'Changes' and gitAge <= gitNew %}<span class="new">&#9673;</span>{% endif %}
                 </a>
             </li>
@@ -33,7 +33,7 @@
             {% for key, modeRepo in modes[1] %}{% if ((isAdmin and modeRepo.admin) or (not isAdmin and modeRepo.guest))%}
                 <li{% if (app.request.get('_route') == key) %} class="is-active"{% endif %}>
                     <a href="{% if modeRepo.url %}{{ modeRepo.url }}{% else %}{{ url(key, { 'system' : system}) }}{% endif %}"{% if modeRepo.url %} rel="external"{% endif %}>
-                        {{ modeRepo['menu']|trans }}
+                        {{ modeRepo['menu']|trans|raw }}
                     </a>
                 </li>
             {% endif %}{% endfor %}
@@ -43,7 +43,7 @@
             {% for key, modeRepo in modes[2] %}
                 {% if (access b-and modeRepo['access'])%}
                     <li{% if (app.request.get('_route') == key) %} class="is-active"{% endif %}>
-                        <a href="{{ url(key, { 'system' : system }) }}">{{ modeRepo['menu']|trans }}</a>
+                        <a href="{{ url(key, { 'system' : system }) }}">{{ modeRepo['menu']|trans|raw }}</a>
                     </li>
                 {% endif %}
             {% endfor %}

diff --git a/templates/topbar.html.twig b/templates/topbar.html.twig
@@ -1,6 +1,5 @@
 <div class="topbar">
     {% include 'user_status.html.twig' %}
-    {% include 'version_switcher.html.twig' %}
 </div>
 <script>
     $(document).ready(function() {

diff --git a/templates/version_switcher.html.twig b/templates/version_switcher.html.twig