maj.world

commit eef15e03c73b03a171f1ea633573d849eefd09a5
tree eac86d52511ec9c975f51058af6f1d93eb195074
parent d926b0d472214d6ca552ebde2a82b4d434ad48c2
author Engels Antonio <engels@majcms.org> 1294539194 +0800
committer Engels Antonio <engels@majcms.org> 1294539194 +0800

    Holiday release backlog commit

diff --git a/css.php b/css.php
index 2ee1028..e00396c 100644
--- a/css.php
+++ b/css.php
@@ -569,6 +569,59 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        ?>                                     
 }
 
+.mbadge {
+       width: 80px;
+       padding: 1px;
+       margin: 0px 0px 3px 0px;
+       color: #ccc;
+       background-color: #fff;
+       border: 1px solid #dedede;
+       font-family: arial,helvetica,sans-serif;
+       font-size: 9px;
+
+       //-webkit-border-radius: 2px;
+       //-khtml-border-radius: 2px;
+       //-moz-border-radius: 2px;
+       //border-radius: 2px;
+
+       -webkit-box-shadow: 0 0 2px #ddd;
+       -khtml-box-shadow: 0 0 2px #ddd;
+       -moz-box-shadow: 0 0 2px #ddd;
+       box-shadow: 0 0 2px #ddd;
+
+       margin-left: auto;
+       margin-right: auto;
+}
+
+a.mblink:link,a.mblink:visited,a.mblink:active,a.mblink:hover {
+       text-decoration: none;
+       color: #ccc;
+       font-size: 9px;
+}
+
+.mbox1, .mbox2 {
+       font-weight: bold;
+       text-align: center;
+       float: left;
+       border: 1px solid #dedede;
+       font-size: 9px;
+}
+
+.mbox1 {
+       width: 25px;
+       margin: 0px 1px 0px 0px;
+}
+
+.mbox2 {
+       width: 50px;
+       margin: 0px;
+       border-color: #dedede;
+}
+
+.mclear {
+       clear: left;
+}
+
 <?php if (file_exists("data/css.txt")) { readfile("data/css.txt"); } ?>
 
 </style>
diff --git a/index.php b/index.php
index ad13d94..c70d528 100644
--- a/index.php
+++ b/index.php
@@ -5202,14 +5202,24 @@ if ($maj_count_right_panels > 0) {
 }
 
 if ($maj_count_latest > 0) {
-       echo '<table border="0" cellspacing="2" cellpadding="0" width="100%">';
-       echo '<tr><td align="center"><a target="_button" href="http://maj.sourceforge.net/"><img src="images/button.maj.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '<tr><td align="center"><a target="_button" href="http://php.net/"><img src="images/button.php.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '<tr><td align="center"><a target="_button" href="rss.php?ver=0.91"><img src="images/button.rss-0.91.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '<tr><td align="center"><a target="_button" href="rss.php?ver=1.0"><img src="images/button.rss-1.0.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '<tr><td align="center"><a target="_button" href="rss.php?ver=2.0"><img src="images/button.rss-2.0.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '<tr><td align="center"><a target="_button" href="sitemap.php"><img src="images/button.sitemap.png" border="0" width="80" height="15"></a></td></tr>';
-       echo '</table>';
+//     echo '<table border="0" cellspacing="2" cellpadding="0" width="100%">';
+//     echo '<tr><td align="center"><a target="_button" href="http://maj.sourceforge.net/"><img src="images/button.maj.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '<tr><td align="center"><a target="_button" href="http://php.net/"><img src="images/button.php.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '<tr><td align="center"><a target="_button" href="rss.php?ver=0.91"><img src="images/button.rss-0.91.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '<tr><td align="center"><a target="_button" href="rss.php?ver=1.0"><img src="images/button.rss-1.0.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '<tr><td align="center"><a target="_button" href="rss.php?ver=2.0"><img src="images/button.rss-2.0.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '<tr><td align="center"><a target="_button" href="sitemap.php"><img src="images/button.sitemap.png" border="0" width="80" height="15"></a></td></tr>';
+//     echo '</table>';
+
+$mphp_version = phpversion();
+
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://majcms.org/\"><div class=\"mbox1\">MAJ</div><div class=\"mbox2\">2.0</div></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://php.net/\"><div class=\"mbox1\">PHP</div><div class=\"mbox2\">$mphp_version</div></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=0.91\"><div class=\"mbox1\">RSS</div><div class=\"mbox2\">0.91</div></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=1.0\"><div class=\"mbox1\">RSS</div><div class=\"mbox2\">1.0</div></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=2.0\"><div class=\"mbox1\">RSS</div><div class=\"mbox2\">2.0</div></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"sitemap.php\"><div class=\"mbox1\">XML</div><div class=\"mbox2\">SITEMAP</div></a><div class=\"mclear\"></div></div>";
+
 }
 
 echo "</td></tr>";
diff --git a/rel.txt b/rel.txt
index 689cb5f..c2336ab 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012200322
+201012231728
diff --git a/url.txt b/url.txt
index df92025..3ab108b 100644
--- a/url.txt
+++ b/url.txt
@@ -1 +1 @@
-http://maj.sourceforge.net/
+http://majcms.org/
\ No newline at end of file