Хранилища Subversion ant

Сравнить редакции

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

/trunk/css/ant.css
10,6 → 10,10
font: 12pt/20pt Georgia;
}
 
#ant h2 {
font: 20pt Georgia;
}
 
#ant input {
margin: 0 5px 0 15px;
font: 12pt Georgia;
52,3 → 56,4
img {
border:0;
}
 
/trunk/templates/header.tpl
5,5 → 5,6
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>{$title}</title>
<link rel="stylesheet" type="text/css" href="./css/ant.css">
{$style}
</head>
<body>
/trunk/templates/header.js.tpl
5,6 → 5,7
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>{$title}</title>
<link rel="stylesheet" type="text/css" href="./css/ant.css">
{$style}
<script type="text/javascript" src="./js/jquery.js"></script>
<script type="text/javascript">
{$scripts}
/trunk/process.php
38,9 → 38,9
 
$distlogo = 0;
if ($_FILES["distLOGO"]["type"]!=0) {
$folder = "./img/logo/".stripslashes($distua)."-orig.png";
$folderN = "./img/logo/".stripslashes($distua).".png";
$folderEM = "./img/logo/".stripslashes($distua)."-em.png";
$folder = dirname(__FILE__)."/img/logo/".stripslashes($distua)."-orig.png";
$folderN = dirname(__FILE__)."/img/logo/".stripslashes($distua).".png";
$folderEM = dirname(__FILE__)."/img/logo/".stripslashes($distua)."-em.png";
if (move_uploaded_file($_FILES["distLOGO"]["tmp_name"],$folder)) {
chmod($folder, 0644);
list($width, $height) = GetImageSize($folder);
78,10 → 78,10
$disttype = abs(intval($_POST["distType"]));
$distID = abs(intval($_POST["distID"]));
 
if ($_FILES["distLOGO"]["type"]!=0) {
$folder = "./img/logo/".stripslashes($distua)."-orig.png";
$folderN = "./img/logo/".stripslashes($distua).".png";
$folderEM = "./img/logo/".stripslashes($distua)."-em.png";
if ($_FILES["distLOGO"]["type"]!='') {
$folder = dirname(__FILE__)."/img/logo/".$distua."-orig.png";
$folderN = dirname(__FILE__)."/img/logo/".$distua.".png";
$folderEM = dirname(__FILE__)."/img/logo/".$distua."-em.png";
if (move_uploaded_file($_FILES["distLOGO"]["tmp_name"],$folder)) {
chmod ($folder, 0644);
list($width, $height) = GetImageSize($folder);
90,9 → 90,11
$newheight = $height * $percent;
 
$output = ImageCreateTrueColor($newwidth, $newheight);
$black = ImageColorAllocate($output, 0, 0, 0);
$source = ImageCreateFromPNG($folder);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageColorTransparent($output, $black);
ImagePNG($output, $folderEM);
 
$percent = 15/$height;
100,8 → 102,10
$newheight = $height * $percent;
 
$output = ImageCreateTrueColor($newwidth, $newheight);
$black = ImageColorAllocate($output, 0, 0, 0);
 
ImageCopyResized($output, $source, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
ImageColorTransparent($output, $black);
ImagePNG($output, $folderN);
 
unlink($folder);
/trunk/lib/core.php
91,14 → 91,16
function getCSSList($dblink) {
$req =& $dblink->query("SELECT * FROM distribution");
if ($req->numRows()>0) {
$css = "<style type=\"text/css\">\n";
while ($req->fetchInto($dist, DB_FETCHMODE_ASSOC)) {
if ($dist["distlogo"]) {
$css .= ".".stripslashes($dist["distua"])." { display: inline; padding-left: 15px; background: transparent url(./img/logo/".$dist["distua"].".png) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])."-em { display: inline; padding-left: 32px; background: transparent url(./img/logo/".stripslashes($dist["distua"])."-em.png) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])." { display: inline; padding-left: 15px; background: transparent url(./img/logo/".stripslashes($dist["distua"]).".png) top left no-repeat; }\n";
$css .= ".".stripslashes($dist["distua"])."-em { display: inline; padding-left: 30px; background: transparent url(./img/logo/".stripslashes($dist["distua"])."-em.png) top left no-repeat; }\n";
} else {
$css .= "";
}
}
$css .= "</style>";
} else {
$css = "";
}
/trunk/modern.php
95,7 → 95,7
 
$query =& $db->query("SELECT * FROM distribution");
while ($query->fetchInto($data, DB_FETCHMODE_ASSOC)) {
$linux .= "<option value='".$data["dist_id"]."'>".stripslashes($data["distname"])."</option>\n";
$linux .= "<option value='".$data["dist_id"]."' class='".stripslashes($data["distua"])."'>".stripslashes($data["distname"])."</option>\n";
}
 
$modern .= "<h2>Генератор sources.list</h2>";
114,6 → 114,7
$smarty->assign('scripts',$scripts);
$smarty->assign('antversion',$antversion);
$smarty->assign('interface'," &bull; ".$core->getInterfacesList($_SERVER["REQUEST_URI"],$db));
$smarty->assign('style',$core->getCSSList($db));
 
$smarty->display('modern.tpl');
 
/trunk/img/logo/infralinux-em.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/img/logo/infralinux-em.png
Новый файл
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/logo/infralinux.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/logo/infralinux.png
===================================================================
--- img/logo/infralinux.png (revision 0)
+++ img/logo/infralinux.png (revision 83)
/img/logo/infralinux.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/logo/debian-em.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/logo/debian-em.png
===================================================================
--- img/logo/debian-em.png (revision 0)
+++ img/logo/debian-em.png (revision 83)
/img/logo/debian-em.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/logo/ubuntu-em.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/logo/ubuntu-em.png
===================================================================
--- img/logo/ubuntu-em.png (revision 0)
+++ img/logo/ubuntu-em.png (revision 83)
/img/logo/ubuntu-em.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/logo/debian.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/logo/debian.png
===================================================================
--- img/logo/debian.png (revision 0)
+++ img/logo/debian.png (revision 83)
/img/logo/debian.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: img/logo/ubuntu.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: img/logo/ubuntu.png
===================================================================
--- img/logo/ubuntu.png (revision 0)
+++ img/logo/ubuntu.png (revision 83)
/img/logo/ubuntu.png
Изменения свойств:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: admin.php
===================================================================
--- admin.php (revision 82)
+++ admin.php (revision 83)
@@ -52,7 +52,7 @@
$display .= "Название дистрибутива: <input type='text' name='distName'><br>\n";
$display .= "Представление в строке User-Agent'а: <input type='text' name='distUA'><br>\n";
$display .= "Тип дистрибутива: ".$type."<br>";
- $display .= "Логотип дистрибутива (gif): <input type='file' name='distLOGO'><br>";
+ $display .= "Логотип дистрибутива (Прозрачный PNG): <input type='file' name='distLOGO'><br>";
$display .= "<input type='submit' value='Создать'></form>\n";
break;
case '2':
@@ -76,7 +76,7 @@
$display .= "Название дистрибутива: <input type='text' name='distName' value='".stripslashes($info["distname"])."'><br>\n";
$display .= "Представление в строке User-Agent'a: <input type='text' name='distUA' value='".stripslashes($info["distua"])."'><br>\n";
$display .= "Тип дистрибутива: ".$type."<br>";
- $display .= "Логотип дистрибутива (gif): <input type='file' name='distLOGO'><br>";
+ $display .= "Логотип дистрибутива (Прозрачный PNG): <input type='file' name='distLOGO'><br>";
$display .= "<input type='submit' value='Править'></form>\n";
break;
case '3':