Move display_error_block() to footer.html

This commit is contained in:
Flat 2016-07-02 20:19:26 +09:00
commit d1b1f97ff4
55 changed files with 78 additions and 224 deletions

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -438,4 +436,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -81,4 +79,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -100,4 +98,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -32,7 +30,7 @@
<div class="vst-text step-top helper-container">
<div id="tabs" class="cron-helper-tabs">
<ul>
<ul>
<li><a href="#tabs-1"><?=__('Minutes')?></a></li>
<li><a href="#tabs-2"><?=__('Hourly')?></a></li>
<li><a href="#tabs-3"><?=__('Daily')?></a></li>
@ -232,7 +230,7 @@
</form>
</div>
<div id="tabs-5">
<form>
<input type="hidden" name="h_wday" value="*" />

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -84,7 +82,7 @@
}
echo ">".htmlentities($value)."</option>\n";
}
?>
?>
</select>
</td>
</tr>
@ -133,4 +131,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -125,4 +123,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -97,4 +95,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -125,4 +123,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -32,11 +32,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -30,11 +30,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -397,4 +393,4 @@
</div>
</div>
</div>
</div>
</div>

View file

@ -29,11 +29,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -51,11 +51,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
@ -79,8 +75,8 @@
}
?>
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['CRON'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="cron"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>"
sort-star="<? if($_SESSION['favourites']['CRON'][$key] == 1) echo '1'; else echo '0'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -72,11 +72,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
@ -109,8 +105,8 @@
?>
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['DB'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="db"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>" sort-star="<? if($_SESSION['favourites']['DB'][$key] == 1) echo '1'; else echo '0'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -42,11 +42,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -69,8 +65,8 @@
}
?>
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>"
v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['DNS'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>"
v_section="dns" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
sort-expire="<?=strtotime($data[$key]['EXP'])?>" sort-records="<?=(int)$data[$key]['RECORDS']?>" sort-star="<?if($_SESSION['favourites']['DNS'][$key] == 1) echo '1'; else echo '0';?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -32,11 +32,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -45,11 +45,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -72,8 +68,8 @@
}
?>
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="firewall"
sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>"
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended'; if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="firewall"
sort-action="<?=$data[$key]['ACTION']?>" sort-protocol="<?=$data[$key]['PROTOCOL']?>" sort-port="<?=$data[$key]['PORT']?>"
sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>" sort-comment="<?=$data[$key]['COMMENT']?>" sort-star="<? if($_SESSION['favourites']['FIREWALL'][$key] == 1) echo '1'; else echo '2'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -30,11 +30,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -47,7 +43,7 @@
foreach ($data as $key => $value) {
++$i;
list($ip,$chain) = explode(":",$key);
?>
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--suspended';?>">

View file

@ -42,11 +42,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -14,9 +14,6 @@
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -50,11 +50,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
@ -86,8 +82,8 @@
?>
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL'][$key] == 1) echo ' l-unit--starred'; ?>" v_unit_id="<?=$key?>" v_section="mail"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>"
sort-accounts="<?=$data[$key]['ACCOUNTS']?>" sort-star="<? if($_SESSION['favourites']['MAIL'][$key] == 1) echo "1"; else echo "0"; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -49,11 +49,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
@ -83,7 +79,7 @@
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo ' l-unit--starred'; ?>"
v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>"
v_unit_id="<?=$key."@".$_GET['domain']?>" v_section="mail_acc" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?$data[$key]['U_DISK']?>"
sort-star="<? if($_SESSION['favourites']['MAIL_ACC'][$key."@".$_GET['domain']] == 1) echo '1'; else echo '0'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -37,11 +37,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -56,8 +52,8 @@
?>
<div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo ' l-unit--starred'; ?>"
v_unit_id="<?=$key?>" v_section="package" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
<div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo ' l-unit--starred'; ?>"
v_unit_id="<?=$key?>" v_section="package" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
sort-star="<?if($_SESSION['favourites']['PACKAGE'][$key] == 1) echo '1'; else echo '0'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -41,11 +41,7 @@
</tr>
</table>
</div -->
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -115,4 +111,4 @@
<div class="l-separator"></div>
<div class="l-center">
</div>
</div>
</div>

View file

@ -23,9 +23,6 @@
</table>
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

View file

@ -36,9 +36,6 @@
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>
@ -84,4 +82,4 @@
</tr>
</table>
</form>
</div>
</div>

View file

@ -37,11 +37,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -265,4 +261,4 @@
</div>
</div>
</div>
</div>
</div>

View file

@ -35,11 +35,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

View file

@ -54,11 +54,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>
@ -81,8 +77,8 @@
}
?>
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_SESSION['favourites']['USER'][$key] == 1) echo ' l-unit--starred';?>" v_section="user"
v_unit_id="<?=$key?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>"
sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['favourites']['USER'][$key] == 1) echo '1'; else echo '0'; ?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">

View file

@ -38,16 +38,13 @@
</select>
</div>
<input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
</div>
</td>
</tr>
</table>
<!-- -->
</div>
<!-- /.l-sort -->
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
<div class="l-separator"></div>
@ -120,9 +117,9 @@
}
?>
<div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_section="web" v_unit_id="<?=$key?>"
id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
<div class="l-unit <? if($data[$key]['SUSPENDED'] == 'yes') echo 'l-unit--suspended'; if($_SESSION['favourites']['WEB'][$key] == 1) echo ' l-unit--starred'; ?>" v_section="web" v_unit_id="<?=$key?>"
id="web-unit-<?=$i?>" sort-ip="<?=str_replace('.', '', $data[$key]['IP'])?>"
sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>"
sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-star="<? if($_SESSION['WEB'][$key] == 1) echo '1'; else echo '0';?>">
<div class="l-unit-toolbar clearfix">
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
@ -210,7 +207,7 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
</div>
</td>
<td>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<? if($proxy_support == 'no'){ ?>
<div class="l-unit__stat-cols clearfix disabled last"><?=__('Proxy Support')?></div>
<? } else {?>
@ -222,7 +219,7 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
</div>
<? } ?>
<? } ?>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<? if($backend_support == 'no'){ ?>
<div class="l-unit__stat-cols clearfix disabled last"><?=__('Backend Support')?></div>
<? } else {?>
@ -251,7 +248,7 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
<? } ?>
</td>
<td>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Proxy Template')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
@ -259,7 +256,7 @@ sort-name="<?=$key?>" sort-bandwidth="<?=$data[$key]['U_BANDWIDTH']?>" sort-dis
</div>
</div>
<? } ?>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backend Template')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">