浏览代码

cosmetic changes

rajven 3 年之前
父节点
当前提交
b3294e0814
共有 6 个文件被更改,包括 35 次插入42 次删除
  1. 0 1
      .gitignore
  2. 9 7
      html/admin/devices/devvendors.php
  3. 2 2
      html/inc/common.php
  4. 10 18
      html/inc/header.php
  5. 8 13
      html/inc/languages/russian.php
  6. 6 1
      html/white.css

+ 0 - 1
.gitignore

@@ -1,4 +1,3 @@
 /scripts/cfg/config
 /scripts/log/
 /html/cfg/config.php
-/html/js/

+ 9 - 7
html/admin/devices/devvendors.php

@@ -60,13 +60,15 @@ print_device_submenu($page_url);
 
 ?>
 <div id="cont">
+<br>
+
 <form name="def" action="devvendors.php" method="post">
 
 <table class="data">
 <tr>
-<td><b>Список вендоров</b></td>
-<td>Отображать:<?php print_row_at_pages('rows',$displayed); ?></td>
-<td><input type="submit" name="OK" value="Показать"></td>
+<td><b><?php print WEB_list_vendors; ?></b></td>
+<td><?php print WEB_rows_at_page."&nbsp:";print_row_at_pages('rows',$displayed); ?></td>
+<td><input type="submit" name="OK" value="<?php print WEB_btn_show; ?>"></td>
 </tr>
 </table>
 
@@ -85,15 +87,15 @@ print_navigation($page_url,$page,$displayed,$count_records[0],$total);
 <tr align="center">
 <td><input type="checkbox" onClick="checkAll(this.checked);"></td>
 <td><b>Id</b></td>
-<td><b>Производитель</b></td>
-<td><input type="submit" name='save' value="Сохранить"></td>
+<td><b><?php echo WEB_model_vendor; ?></b></td>
+<td><input type="submit" name='save' value="<?php echo WEB_btn_save; ?>"></td>
 </tr>
 <?php
 $t_ou = get_records_sql($db_link,"SELECT * FROM vendors ORDER BY name LIMIT $start,$displayed");
 foreach ($t_ou as $row) {
     print "<tr align=center>\n";
     print "<td class=\"data\" style='padding:0'><input type=checkbox name=f_id[] value='{$row['id']}'></td>\n";
-    print "<td class=\"data\"><input type=\"hidden\" name='id[]' value='{$row['id']}'>{$row['id']}</td>\n";
+    print "<td class=\"data\">{$row['id']}</td>\n";
     print "<td class=\"data\"><input type=\"text\" name='f_name[]' value='{$row['name']}'></td>\n";
     print "<td class=\"data\"></td>\n";
     print "</tr>\n";
@@ -103,7 +105,7 @@ foreach ($t_ou as $row) {
 <table>
 <tr>
 <td><input type=text name=new_vendor value="Unknown"></td>
-<td><input type="submit" name="create" value="Добавить"></td>
+<td><input type="submit" name="create" value="<?php echo WEB_btn_add; ?>"></td>
 <td align="right"></td>
 </tr>
 </table>

+ 2 - 2
html/inc/common.php

@@ -3132,7 +3132,7 @@ print "</select>\n";
 function print_navigation($url,$page,$displayed,$count_records,$total) {
 if ($total<=1) { return; }
 #две назад
-    print "<br><div align=left>";
+    print "<div align=left class=records >";
     if(($page-2)>0):
       $pagetwoleft="<a class='first_page_link' href=".$url."?page=".($page-2).">".($page-2)."</a>  ";
     else:
@@ -3178,7 +3178,7 @@ if ($total<=1) { return; }
       $nextp=null;
     endif;
 
-print "<br>".$pagerevp.$pagetwoleft.$pageoneleft.'<span class="num_page_not_link"><b>'.$page.'</b></span>'.$pageoneright.$pagetworight.$nextp;
+print $pagerevp.$pagetwoleft.$pageoneleft.'<span class="num_page_not_link"><b>'.$page.'</b></span>'.$pageoneright.$pagetworight.$nextp;
 print " | Total records: $count_records";
 print "</div>";
 }

+ 10 - 18
html/inc/header.php

@@ -36,22 +36,14 @@ $('.js-select-single').select2();
 
 <div id="title"><?php print get_const('org_name')?></div>
 <div id="navi">
-<a href="/admin/reports/index-full.php">
-<?php print $title_reports?>
-</a> | <a href="/admin/groups/">
-<?php print $title_groups?>
-</a> | <a href="/admin/users/">
-<?php print $title_users?>
-</a> | <a href="/admin/iplist/">
-<?php print $title_users_ips?>
-</a> | <a href="/admin/filters/">
-<?php print $title_filters?>
-</a> | <a href="/admin/queues/">
-<?php print $title_shapers?>
-</a> | <a href="/admin/devices/">
-<?php print $title_devices?>
-</a> |
-<a href="/admin/customers/control.php"> Managment </a> |
-<a href="/admin/logs/"> Logs </a> |
-<a href="/logout.php">Exit</a>
+<a href="/admin/reports/index-full.php"><?php print WEB_title_reports; ?></a> | 
+<a href="/admin/groups/"><?php print WEB_title_groups; ?></a> | 
+<a href="/admin/users/"><?php print WEB_title_users; ?></a> | 
+<a href="/admin/iplist/"><?php print WEB_title_users_ips; ?></a> | 
+<a href="/admin/filters/"><?php print WEB_title_filters; ?></a> | 
+<a href="/admin/queues/"><?php print WEB_title_shapers; ?></a> | 
+<a href="/admin/devices/"><?php print WEB_title_devices; ?></a> |
+<a href="/admin/customers/control.php"><?php print WEB_title_control; ?></a> |
+<a href="/admin/logs/"><?php print WEB_title_logs; ?></a> |
+<a href="/logout.php"><?php print WEB_title_exit; ?></a>
 </div>

+ 8 - 13
html/inc/languages/russian.php

@@ -15,15 +15,6 @@ $m = array(
     12 => "Декабрь"
 );
 
-/* header title */
-$title_reports = "Отчёт";
-$title_groups = "Группы";
-$title_users = "Пользователи";
-$title_users_ips = "Все IP";
-$title_filters = "Фильтры";
-$title_shapers = "Шейперы";
-$title_devices = "Инфраструктура";
-
 /* traffic headers */
 $title_ip = "Адрес";
 $title_date = "Дата";
@@ -110,6 +101,8 @@ define("WEB_MONTHS", array(
 /* common variables */
 define("WEB_days","дней");
 define("WEB_sec","секунд");
+define("WEB_page_speed","Страница сгенерирована за ");
+define("WEB_rows_at_page","Записей на страницу");
 
 /* error messages */
 define("WEB_auth_unknown","IP-адрес клиента не установлен");
@@ -166,8 +159,8 @@ define("WEB_submenu_traffic_ip_report","Отчёт по трафику (ip)");
 define("WEB_submenu_traffic_login_report","Отчёт по трафику (login)");
 define("WEB_submenu_traffic_top10","TOP 10 по трафику");
 define("WEB_submenu_detail_log","Подробный лог");
-define("WEB_submenu_net_devices","Активное сетевое оборудование");
-define("WEB_submenu_passive_net_devices","Пассивное оборудование");
+define("WEB_submenu_net_devices","Сетевые устройства");
+define("WEB_submenu_passive_net_devices","Пассивные устройства");
 define("WEB_submenu_buildings","Расположение");
 define("WEB_submenu_hierarchy","Структура");
 define("WEB_submenu_device_models","Модели устройств");
@@ -191,8 +184,9 @@ define("WEB_title_users_ips","Все адреса");
 define("WEB_title_filters","Фильтры");
 define("WEB_title_shapers","Шейперы");
 define("WEB_title_devices","Инфраструктура");
-define("WEB_page_speed","Страница сгенерирована за ");
-define("WEB_rows_at_page","Записей на страницу");
+define("WEB_title_logs","Логи");
+define("WEB_title_control","Настройки");
+define("WEB_title_exit","Выход");
 
 /* traffic headers */
 define("WEB_title_ip","Адрес");
@@ -249,6 +243,7 @@ define("WEB_list_customers","Список администраторов");
 define("WEB_list_filters","Список фильтров");
 define("WEB_list_users","Список полльзователей");
 define("WEB_list_models","Список моделей устройств");
+define("WEB_list_vendors","Список вендоров");
 
 /* button names */
 define("WEB_btn_remove","Удалить");

+ 6 - 1
html/white.css

@@ -29,8 +29,13 @@ select                          { font-family: tahoma; }
 form                            { margin: 0; margin-top: 5px; }
 .cont                           { font-family: tahoma; }
 
+span.num_page_not_link          { border: 1px solid; font-color: black; padding: 3px; margin-bottom: 1em;}
+
+div.records                     { font-color: black; margin-bottom: 1em; margin-top: 1em; }
+div.simple                      { margin-bottom: 1em; margin-top: 1em; }
+
 a                               { font-family: tahoma; color: #000000; text-decoration: underline; }
-a.first_page_link               { border: 1px solid green; font-color: black; background-color: #A5FF33; padding: 3px; }
+a.first_page_link               { border: 1px solid green; font-color: black; background-color: #A5FF33; padding: 3px; margin-bottom: 1em;}
 a:visited                       { color: #000000; text-decoration: underline; }
 a:link                          { color: #000000; text-decoration: underline; }
 a:active                        { color: #ed8b0d; text-decoration: none; }