Просмотр исходного кода

Fix missing selection checkboxes on Backup/Restore page

Robert Zollner 6 лет назад
Родитель
Сommit
89fb007b56
2 измененных файлов с 177 добавлено и 161 удалено
  1. 2 2
      web/js/events.js
  2. 175 159
      web/templates/admin/list_backup_detail.html

+ 2 - 2
web/js/events.js

@@ -325,7 +325,7 @@ VE.navigation.move_focus_down = function(){
 
         $('html, body').animate({
             scrollTop: $('.units .l-unit.focus').offset().top - 200
-        }, 80);
+        }, 200);
     }
 }
 
@@ -348,7 +348,7 @@ VE.navigation.move_focus_up = function(){
 
         $('html, body').animate({
             scrollTop: $('.units .l-unit.focus').offset().top - 200
-        }, 80);
+        }, 200);
     }
 }
 

+ 175 - 159
web/templates/admin/list_backup_detail.html

@@ -39,7 +39,7 @@
     <div class="l-separator"></div>
 
     <div class="l-center units animated fadeIn">
-    <div class="l-unit header">
+    <div class="header">
       <div class="subtitle"><?=__('Listing')?>  <?=htmlentities($_GET['backup'])?></div>
     </div>
 
@@ -52,30 +52,32 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
-            <label for="check<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
         <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='WEB ' . __('domain')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+            <div class="clearfix l-unit__stat-col--left super-compact">
+              <input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
+              <label for="check<?=$i++?>" class="check-label"></label>
+            </div>
+
+            <div class="clearfix l-unit__stat-col--left">
+                <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='WEB ' . __('domain')?></div>
+            </div>
+            <div class="clearfix l-unit__stat-col--left wide-3">
+                <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
+            </div>
+
+            <!-- START QUICK ACTION TOOLBAR AREA -->
+            <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+              <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                <div class="actions-panel clearfix">
+                  <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                    <a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
+                      <i class="fas fa-undo status-icon green status-icon dim"></i>
+                    </a>
                   </div>
-                </td>
-              </tr>
-            </table>
-          </div>
+                </div>
+              </div>
+            </div>
+            <!-- END QUICK ACTION TOOLBAR AREA -->
         </div>
       </div>
 
@@ -88,32 +90,34 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check2<?=$i?>" type="checkbox" name="mail[]" value="<?=$key?>">
-            <label for="check2<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='MAIL ' . __('domain')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                  <input id="check2<?=$i?>" class="ch-toggle" type="checkbox" name="mail[]" value="<?=$key?>">
+                  <label for="check2<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='MAIL ' . __('domain')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
         </div>
-      </div>
 
       <? }} ?>
 
@@ -124,31 +128,33 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check3<?=$i?>" type="checkbox" name="dns[]" value="<?=$key?>">
-            <label for="check3<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='DNS ' . __('domain')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check3<?=$i?>" class="ch-toggle" type="checkbox" name="dns[]" value="<?=$key?>">
+                <label for="check3<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='DNS ' . __('domain')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
-        </div>
       </div>
 
       <? }} ?>
@@ -160,30 +166,33 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check4<?=$i?>" type="checkbox" name="db[]" value="<?=$key?>">
-            <label for="check4<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('database')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check4<?=$i?>" class="ch-toggle" type="checkbox" name="db[]" value="<?=$key?>">
+                <label for="check4<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('database')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
-        </div>
       </div>
 
       <? }} ?>
@@ -195,31 +204,33 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check5<?=$i?>" type="checkbox" name="check" value="<?=$key?>">
-            <label for="check5<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron&object=records"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?='cron '.__('records')?></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check5<?=$i?>" class="ch-toggle" type="checkbox" name="check" value="<?=$key?>">
+                <label for="check5<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?='cron '.__('records')?></b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=cron&object=records&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
-        </div>
       </div>
       <? }} ?>
 
@@ -230,60 +241,65 @@
       ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check6<?=$i?>" type="checkbox" name="udir[]" value="<?=$key?>">
-            <label for="check6<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
-
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('user dir')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b><?=$key?></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check6<?=$i?>" class="ch-toggle" type="checkbox" name="udir[]" value="<?=$key?>">
+                <label for="check6<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('user dir')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
-        </div>
       </div>
       <? }} ?>
 
       <div class="l-unit">
-        <div class="l-unit-toolbar clearfix">
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--left">
-            <input id="check7<?=$i?>" type="checkbox" name="cron" value="<?=$i?>">
-            <label for="check7<?=$i++?>" class="check-label"></label>
-          </div>
-          <div class="l-unit-toolbar__col l-unit-toolbar__col--right">
-            <div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
-          </div>
-        </div>
 
-        <div class="l-unit__col l-unit__col--left clearfix"></div>
-        <div class="l-unit__col l-unit__col--right">
-          <div>
-            <table>
-               <tr>
-                <td>
-                  <div class="l-unit__stat-cols clearfix">
-                    <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
-                    <div class="l-unit__stat-col l-unit__stat-col--left wide-3"><b></b></div>
+          <div class="l-unit__col l-unit__col--right">
+              <div class="clearfix l-unit__stat-col--left super-compact">
+                <input id="check7<?=$i?>" class="ch-toggle" type="checkbox" name="cron" value="<?=$i?>">
+                <label for="check7<?=$i++?>" class="check-label"></label>
+              </div>
+  
+              <div class="clearfix l-unit__stat-col--left">
+                  <div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
+              </div>
+              <div class="clearfix l-unit__stat-col--left wide-3">
+                  <div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b>&nbsp;</b></div>
+              </div>
+  
+              <!-- START QUICK ACTION TOOLBAR AREA -->
+              <div class="clearfix l-unit__stat-col--left compact-4 text-right">
+                <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
+                  <div class="actions-panel clearfix">
+                    <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
+                      <a href="/schedule/restore/?backup=<?=$backup?>&type=cron&token=<?=$_SESSION['token']?>" title="Restore">
+                        <i class="fas fa-undo status-icon green status-icon dim"></i>
+                      </a>
+                    </div>
                   </div>
-                </td>
-              </tr>
-            </table>
+                </div>
+              </div>
+              <!-- END QUICK ACTION TOOLBAR AREA -->
           </div>
-        </div>
       </div>
     </div>