/[smecontribs]/rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager-2.0.4-Yet-more-changes-for-SM2-panels.patch
ViewVC logotype

Diff of /rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager-2.0.4-Yet-more-changes-for-SM2-panels.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.4 by brianr, Sat Jan 20 14:09:56 2024 UTC Revision 1.5 by brianr, Sat Jan 20 17:11:30 2024 UTC
# Line 1  Line 1 
1  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm
2  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm     2023-12-19 09:44:56.678590486 +0000  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm     2023-12-19 09:44:56.678590486 +0000
3  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm 2024-01-20 13:24:00.000000000 +0000  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/lib/SrvMngr/Controller/Dhcpd.pm 2024-01-20 17:01:00.000000000 +0000
4  @@ -137,15 +137,16 @@  @@ -140,12 +140,12 @@
         #  
         # call to show scan results  
         #  
 +       my $y = 1/0;  
5          my $c = shift;          my $c = shift;
6       my $title = $c->l("dhcpd_SCANNING_NETWORK_TITLE");       my $title = $c->l("dhcpd_SCANNING_NETWORK_TITLE");
7       my $modul = '';       my $modul = '';
# Line 22  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 18  diff -urN smeserver-dhcpmanager-2.0.4.ol
18       $c->render( template => 'dhcpd' );       $c->render( template => 'dhcpd' );
19   }   }
20        
21  @@ -332,10 +333,10 @@  @@ -332,10 +332,10 @@
22          my $c = shift;          my $c = shift;
23       my $ret = delete_all_leases($c);       my $ret = delete_all_leases($c);
24          if ($ret == 'ok') {          if ($ret == 'ok') {
# Line 35  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 31  diff -urN smeserver-dhcpmanager-2.0.4.ol
31       return ;       return ;
32   }   }
33    
34  @@ -352,17 +353,17 @@  @@ -352,17 +352,17 @@
35       # else return "ok"       # else return "ok"
36       my $ret = delete_lease($c);       my $ret = delete_lease($c);
37          if ($ret == 'ok') {          if ($ret == 'ok') {
# Line 56  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 52  diff -urN smeserver-dhcpmanager-2.0.4.ol
52   }   }
53                    
54    
55  @@ -374,13 +375,13 @@  @@ -374,13 +374,13 @@
56    
57   sub delete_one_lease {   sub delete_one_lease {
58          my $c = shift;            my $c = shift;  
# Line 72  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 68  diff -urN smeserver-dhcpmanager-2.0.4.ol
68       return "ok";       return "ok";
69   }   }
70    
71  @@ -391,6 +392,118 @@  @@ -391,6 +391,118 @@
72       return @leases;       return @leases;
73   }   }
74    
# Line 191  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 187  diff -urN smeserver-dhcpmanager-2.0.4.ol
187   #=========================================================================   #=========================================================================
188   # Procedure qui charge le dhcpd.conf   # Procedure qui charge le dhcpd.conf
189   # retourne un tableau contenant les informations   # retourne un tableau contenant les informations
190  @@ -536,4 +649,4 @@  @@ -536,4 +648,4 @@
191    
192   1;   1;
193    
# Line 313  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 309  diff -urN smeserver-dhcpmanager-2.0.4.ol
309  +1;  +1;
310  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep
311  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep      2023-12-19 09:44:56.680590493 +0000  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep      2023-12-19 09:44:56.680590493 +0000
312  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep  2024-01-20 13:44:00.000000000 +0000  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/dhcpd.html.ep  2024-01-20 17:01:00.000000000 +0000
313  @@ -49,24 +49,26 @@  @@ -49,24 +49,26 @@
314    
315          % if ($dhcp_data->{trt} eq 'LEASES') {          % if ($dhcp_data->{trt} eq 'LEASES') {
# Line 345  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 341  diff -urN smeserver-dhcpmanager-2.0.4.ol
341  +                                 <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>  +                                 <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
342  +                               </button>  +                               </button>
343  +                       </td><td>        +                       </td><td>      
344  +                               %= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3, onclick=>"showSpinnerNetwork()", id=>"scanNetwork'  +                               %= button_to $c->l('dhcpd_SCAN_YOUR_NETWORK') => '/dhcpd3', onclick=>"showSpinnerNetwork()", id=>"scanNetwork"
345  +                               <button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork" style="display:true">  +                               <button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork" style="display:true">
346  +                                 Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->  +                                 Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->
347  +                                 <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>  +                                 <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
# Line 456  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 452  diff -urN smeserver-dhcpmanager-2.0.4.ol
452  +</div>  +</div>
453  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep  diff -urN smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep
454  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep       1970-01-01 01:00:00.000000000 +0100  --- smeserver-dhcpmanager-2.0.4.old/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep       1970-01-01 01:00:00.000000000 +0100
455  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep   2024-01-20 11:34:00.000000000 +0000  +++ smeserver-dhcpmanager-2.0.4/root/usr/share/smanager/themes/default/templates/partials/_dhcpd_scan.html.ep   2024-01-20 17:08:00.000000000 +0000
456  @@ -0,0 +1,49 @@  @@ -0,0 +1,58 @@
457  +<div id='dhcpd-scan'>  +<div id='dhcpd-scan'>
458  +       <table><tr><td>  +       <table><tr><td>
459  +       %= button_to $c->l('dhcpd_REFRESH') => '/dhcpd3', onclick=>"showSpinnerNetwork()", id=>"scanNetwork"  +       %= button_to $c->l('dhcpd_REFRESH') => '/dhcpd3', onclick=>"showSpinnerNetwork1()", id=>"scanNetwork1"
460  +       <button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork" style="display:true">  +       <button class ="btn btn-primary spinnerButtonOverlay"  type = "submit" id="loadingNetwork1" style="display:true">
461  +         Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->  +         Scanning  <!--%= $c->l('dhcpd_CONNECTED_IP')-->
462  +         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>  +         <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
463  +       </button>  +       </button>
# Line 507  diff -urN smeserver-dhcpmanager-2.0.4.ol Line 503  diff -urN smeserver-dhcpmanager-2.0.4.ol
503  +  +
504  +  +
505  +</div>  +</div>
506    +%= javascript begin
507    +       document.getElementById("loadingNetwork1").style.display="none";
508    +  
509    +       function showSpinnerNetwork1(){
510    +         document.getElementById("scanNetwork1").style.display="none";
511    +         document.getElementById("loadingNetwork1").style.display="inline";
512    +       }
513    +
514    +%end

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed