From fa7fa4772f638a12980ea144d26d7d5c1be8485b Mon Sep 17 00:00:00 2001
From: Diederik de Groot <dkgroot@talon.nl>
Date: Sat, 7 Nov 2020 15:32:41 +0000
Subject: [PATCH 1/2] Move the disallow box to the top of the form, the order
 is important.

Signed-off-by: Diederik de Groot <dkgroot@talon.nl>
---
 views/server.codec.php | 74 ++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/views/server.codec.php b/views/server.codec.php
index d45583b..b8b8d7d 100644
--- a/views/server.codec.php
+++ b/views/server.codec.php
@@ -38,14 +38,45 @@ if (!empty($_REQUEST['id'])) {
         
 ?>
 
+<!-- TODO: Codec selection has moved to the line level in newer chan-sccp versions and should be moved -->
 <form autocomplete="off" name="frm_codec" id="frm_codec" class="fpbx-submit" action="" method="post">
     <input type="hidden" name="category" value="codecform">
     <input type="hidden" name="Submit" value="Submit">
+
+    <div class="section" data-id="sccp_dcodecs">
+        <!--Codec disallow-->
+        <div class="element-container">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="row">
+                        <div class="form-group">
+                            <div class="col-md-3">
+                                <label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
+                                <i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
+                            </div>
+                            <div class="col-md-9 radioset">
+                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">  
+                                <label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Plz eneter format: alaw,ulaw") ?></span>
+                </div>
+            </div>
+        </div>
+        <!--END Codec disallow-->
+    </div>
     
     <!--SCCP Audio Codecs-->
     <div class="section-title" data-for="sccp_acodecs">
         <h3><i class="fa fa-minus"></i><?php echo _("SCCP Audio Codecs ") ?></h3>
     </div>
+
+
     <div class="section" data-id="sccp_acodecs">
         <!--Codecs-->
         <div class="element-container">
@@ -54,7 +85,7 @@ if (!empty($_REQUEST['id'])) {
                     <div class="row">
                         <div class="form-group">
                             <div class="col-md-3">
-                                <label class="control-label" for="codecw"><?php echo _("Allow (audio)") ?></label>
+                                <label class="control-label" for="codecw"><?php echo _("Allow") ?></label>
                             </div>
                             <div class="col-md-9">
                                 <div>
@@ -90,8 +121,9 @@ if (!empty($_REQUEST['id'])) {
         </div>
         <!--END Codecs-->
 
-        <!--END SCCP Audio Codecs-->
     </div>
+    <!--END SCCP Audio Codecs-->
+
     <!--SCCP Video Codecs-->
     <div class="section-title" data-for="sccp_vcodecs">
         <h3><i class="fa fa-minus"></i><?php echo _("SCCP Video Codecs ") ?></h3>
@@ -104,7 +136,7 @@ if (!empty($_REQUEST['id'])) {
                     <div class="row">
                         <div class="form-group">
                             <div class="col-md-3">
-                                <label class="control-label" for="codecw"><?php echo _("Allow (video)") ?></label>
+                                <label class="control-label" for="codecw"><?php echo _("Allow") ?></label>
                             </div>
                             <div class="col-md-9">
                                 <div>
@@ -137,44 +169,10 @@ if (!empty($_REQUEST['id'])) {
                     </div>
                 </div>
             </div>
+            <!--END Codecs-->
         </div>
-        <!--END Codecs-->
         <!--END SCCP Video Codecs-->
     </div>
-
-    <div class="section-title" data-for="sccp_dcodecs">
-        <h3><i class="fa fa-minus"></i><?php echo _("SCCP Disallow Codecs ") ?></h3>
-    </div>
-    <div class="section" data-id="sccp_dcodecs">
-
-        <!--Codec disallow-->
-        <div class="element-container">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="row">
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
-                                <i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
-                            </div>
-                            <div class="col-md-9 radioset">
-                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">  
-                                <label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Plz eneter format: alaw,ulaw") ?></span>
-                </div>
-            </div>
-        </div>
-        <!--END Codec disallow-->
-    </div>
-
-    
 </form>
 
 

From f8a3c8c81d840d08a0829d12ef98331c6011fc58 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Sun, 30 May 2021 11:34:35 +0200
Subject: [PATCH 2/2] Reapply patch wriiten by DKGroot

Move the disallow box to the top of the codec page
Correct english
---
 views/server.codec.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/views/server.codec.php b/views/server.codec.php
index b8b8d7d..ff543f4 100644
--- a/views/server.codec.php
+++ b/views/server.codec.php
@@ -35,7 +35,7 @@ if (!empty($_REQUEST['id'])) {
 } else {
     $codec_list = $sccp_codec;
 }
-        
+
 ?>
 
 <!-- TODO: Codec selection has moved to the line level in newer chan-sccp versions and should be moved -->
@@ -55,7 +55,7 @@ if (!empty($_REQUEST['id'])) {
                                 <i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
                             </div>
                             <div class="col-md-9 radioset">
-                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">  
+                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">
                                 <label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
                             </div>
                         </div>
@@ -64,13 +64,13 @@ if (!empty($_REQUEST['id'])) {
             </div>
             <div class="row">
                 <div class="col-md-12">
-                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Plz eneter format: alaw,ulaw") ?></span>
+                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Please enter format: alaw,ulaw,...") ?></span>
                 </div>
             </div>
         </div>
         <!--END Codec disallow-->
     </div>
-    
+
     <!--SCCP Audio Codecs-->
     <div class="section-title" data-for="sccp_acodecs">
         <h3><i class="fa fa-minus"></i><?php echo _("SCCP Audio Codecs ") ?></h3>
@@ -174,6 +174,3 @@ if (!empty($_REQUEST['id'])) {
         <!--END SCCP Video Codecs-->
     </div>
 </form>
-
-
-