WebSVN - www_nix-files - Сравнение путей - /trunk Редакция 55 и /trunk Редакция 56

Не учитывать пробелы Редакция 55 → Редакция 56

 /trunk/servers.php
 ,10 → 8,15
         $srvs =& $db->query("SELECT * FROM members JOIN servers ON servers.member_id=members.id");
         echo "<table>";
         echo "<tr>";
-        echo "<th>Сервер</th><th>Админ</th><th>IP</th>\n";
+        echo "<th>Сервер</th><th>ТТХ</th><th>Админ</th><th>IP</th>\n";
         while ($srvs->fetchInto($info_srvs, DB_FETCHMODE_ASSOC)) {
             echo "<tr>";
             echo "<td><a href='./servers.php?srv=".$info_srvs['id']."'>".$info_srvs['server']."</a></td>\n";
+            echo "<td>";
+            echo "<img src='./img/srv/cpu.png' alt='cpu'>".$info_srvs['cpu']."<br>";
+            echo "<img src='./img/srv/ram.png' alt='ram'>".$info_srvs['ram']."<br>";
+            echo "<img src='./img/srv/hdd.png' alt='hdd'>".$info_srvs['hdd'];
+            echo "</td>\n";
             echo "<td><a href='./members.php?memb=".$info_srvs['member_id']."'>".$info_srvs['nick']."</a></td>\n";
             $ips =& $db->query("SELECT * FROM ips WHERE server_id=".$info_srvs['id']);
             echo "<td>";

 /trunk/db/nix-files.sql
 ,7 → 3,7
 -- http://www.phpmyadmin.net
 --
 -- Хост: localhost
--- Время создания: Окт 23 2009 г., 23:48
+-- Время создания: Окт 24 2009 г., 12:01
 -- Версия сервера: 5.1.37
 -- Версия PHP: 5.2.10-2ubuntu5
 ,6 → 390,9
 CREATE TABLE IF NOT EXISTS `servers` (
   `id` int(5) NOT NULL AUTO_INCREMENT,
   `server` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `cpu` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `ram` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `hdd` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
   `member_id` int(2) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `member_id` (`member_id`)
 ,11 → 402,11
 -- Дамп данных таблицы `servers`
 --
-INSERT INTO `servers` (`id`, `server`, `member_id`) VALUES
-(1, 'diffor', 1),
-(2, 'leon', 2),
-(3, 'Frosia', 3),
-(4, 'fail', 7);
+INSERT INTO `servers` (`id`, `server`, `cpu`, `ram`, `hdd`, `member_id`) VALUES
+(1, 'diffor', 'Intel(R) Celeron(TM) CPU  1200MHz', '512Mb SDRAM', 'RAID1 320Gb ()', 1),
+(2, 'leon', '', '', '', 2),
+(3, 'Frosia', 'Intel(R) Pentium(R) 4 CPU 2.80GHz', '512Mb DDR', '640Gb (WD6401AALS) + 750Gb (WD7501AALS)', 3),
+(4, 'fail', '', '', '', 7);
 -- --------------------------------------------------------

/trunk/img/srv/cpu.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/trunk/img/srv/cpu.png
Новый файл
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/srv/hdd.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/srv/hdd.png
===================================================================
--- img/srv/hdd.png (revision 0)
+++ img/srv/hdd.png (revision 56)

/img/srv/hdd.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/srv/ram.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/srv/ram.png
===================================================================
--- img/srv/ram.png (revision 0)
+++ img/srv/ram.png (revision 56)