maj.world

commit 65b35317f98adc2c9eff39e4b3d210057e9ba5cc
tree 2075213e6a20b333830e55df9fc6ae396acdf845
parent eef15e03c73b03a171f1ea633573d849eefd09a5
author Engels Antonio <engels@majcms.org> 1294539195 +0800
committer Engels Antonio <engels@majcms.org> 1294539195 +0800

    Holiday release backlog commit

diff --git a/css.php b/css.php
index e00396c..737f1af 100644
--- a/css.php
+++ b/css.php
@@ -57,7 +57,7 @@ body {
        color: #666666;
        background-color: #ffffff;
        text-align: left;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
 
        echo "font-size: $maj_font_Dpx;";
@@ -69,7 +69,7 @@ body {
 
        if (file_exists("data/fonts/body.txt")) {
                $maj_font_body = file_get_contents("data/fonts/body.txt");
-               echo "\n\tfont-family: $maj_font_body,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_body,\"lucida grande\",arial,helvetica,sans-serif;";
        }
       
        if (file_exists("data/colors/bg.txt")) {
@@ -246,7 +246,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        border-color: #dedede;
        border-width: 1px 1px 0px 1px;
        border-style: solid solid none solid;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        font-weight: bold;
        <?php
 
@@ -280,7 +280,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/panel-title.txt")) {
                $maj_font_panel_title = file_get_contents("data/fonts/panel-title.txt");
-               echo "\n\tfont-family: $maj_font_panel_title,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_panel_title,\"lucida grande\",arial,helvetica,sans-serif;";
        }
 
        echo "\n";
@@ -305,7 +305,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        border-color: #dedede;
        border-width: 1px;
        border-style: solid;
-       font-family: arial,helvetica,sans-serif;                               
+       font-family: "lucida grande",arial,helvetica,sans-serif;                               
        <?php
       
        echo "font-size: $maj_font_Mpx;";
@@ -333,7 +333,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/panel-body.txt")) {
                $maj_font_panel_body = file_get_contents("data/fonts/panel-body.txt");
-               echo "\n\tfont-family: $maj_font_panel_body,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_panel_body,\"lucida grande\",arial,helvetica,sans-serif;";
        }
 
        echo "\n";
@@ -350,7 +350,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        border-width: 0px 1px 1px 1px;
        border-style: none solid solid solid;
        text-align: right;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
       
        echo "font-size: $maj_font_Spx;";
@@ -383,7 +383,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/panel-footer.txt")) {
                $maj_font_panel_footer = file_get_contents("data/fonts/panel-footer.txt");
-               echo "\n\tfont-family: $maj_font_panel_footer,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_panel_footer,\"lucida grande\",arial,helvetica,sans-serif;";
        }
 
        echo "\n";
@@ -403,7 +403,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        border-color: #dedede;
        border-width: 1px;
        border-style: solid;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
 
        echo "font-size: $maj_font_Mpx;";
@@ -420,7 +420,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/panel-body.txt")) {
                $maj_font_panel_body = file_get_contents("data/fonts/panel-body.txt");
-               echo "\n\tfont-family: $maj_font_panel_body,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_panel_body,\"lucida grande\",arial,helvetica,sans-serif;";
        }
 
        echo "\n";
@@ -437,7 +437,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        border-width: 0px 1px 1px 1px;
        border-style: none solid solid solid;
        text-align: left;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
 
        echo "font-size: $maj_font_Spx;";
@@ -459,7 +459,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/panel-footer.txt")) {
                $maj_font_panel_category = file_get_contents("data/fonts/panel-footer.txt");
-               echo "\n\tfont-family: $maj_font_panel_category,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_panel_category,\"lucida grande\",arial,helvetica,sans-serif;";
        }
       
        echo "\n";
@@ -473,7 +473,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        color: #666666;
        background: #ffffff;
        border: #999999 solid 1px;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
       
        echo "font-size: $maj_font_Ipx;";
@@ -490,7 +490,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/input.txt")) {
                $maj_font_input = file_get_contents("data/fonts/input.txt");
-               echo "\n\tfont-family: $maj_font_input,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_input,\"lucida grande\",arial,helvetica,sans-serif;";
        }
       
        echo "\n";
@@ -509,7 +509,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        background: #ffffff;
        border: #999999 solid 1px;
        font-weight: bold;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
       
        echo "font-size: $maj_font_Mpx;";
@@ -526,7 +526,7 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 
        if (file_exists("data/fonts/input.txt")) {
                $maj_font_input = file_get_contents("data/fonts/input.txt");
-               echo "\n\tfont-family: $maj_font_input,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_input,\"lucida grande\",arial,helvetica,sans-serif;";
        }
       
        echo "\n";
@@ -551,14 +551,14 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        color: #666666;
        background: #ffffff;
        border: #dedede solid 1px;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        <?php
       
        echo "font-size: $maj_font_Ipx;";
       
        if (file_exists("data/fonts/input.txt")) {
                $maj_font_input = file_get_contents("data/fonts/input.txt");
-               echo "\n\tfont-family: $maj_font_input,arial,helvetica,sans-serif;";
+               echo "\n\tfont-family: $maj_font_input,\"lucida grande\",arial,helvetica,sans-serif;";
        }
       
        if (file_exists("data/colors/border.txt")) {
@@ -572,11 +572,12 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
 .mbadge {
        width: 80px;
        padding: 1px;
-       margin: 0px 0px 3px 0px;
+       //margin: 0px 0px 3px 0px;
+       margin: 0px 0px 2px 0px;
        color: #ccc;
        background-color: #fff;
        border: 1px solid #dedede;
-       font-family: arial,helvetica,sans-serif;
+       font-family: "lucida grande",arial,helvetica,sans-serif;
        font-size: 9px;
 
        //-webkit-border-radius: 2px;
@@ -584,10 +585,10 @@ a.status:link,a.status:visited,a.status:active,a.status:hover {
        //-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;
+       //-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;
@@ -597,6 +598,7 @@ a.mblink:link,a.mblink:visited,a.mblink:active,a.mblink:hover {
        text-decoration: none;
        color: #ccc;
        font-size: 9px;
+       font-weight: bold;
 }
 
 .mbox1, .mbox2 {
@@ -610,6 +612,14 @@ a.mblink:link,a.mblink:visited,a.mblink:active,a.mblink:hover {
 .mbox1 {
        width: 25px;
        margin: 0px 1px 0px 0px;
+       color: #fff;
+       background-color: #ffa443;
+       border-color:#FC9 #888 #777 #F96;
+
+       -moz-box-shadow: inset 0px 2px 2px #f60, inset 0px 4px 4px #ff7400, inset 0px 6px 6px #ffaa33;
+       -webkit-box-shadow: inset 0px 2px 2px #f60, inset 0px 4px 4px #ff7400, inset 0px 6px 6px #ffaa33;
+       -khtml-box-shadow: inset 0px 2px 2px #f60, inset 0px 4px 4px #ff7400, inset 0px 6px 6px #ffaa33;
+       box-shadow: inset 0px 2px 2px #f60, inset 0px 4px 4px #ff7400, inset 0px 6px 6px #ffaa33;
 }
 
 .mbox2 {
diff --git a/index.php b/index.php
index c70d528..fe01d82 100644
--- a/index.php
+++ b/index.php
@@ -5213,12 +5213,12 @@ if ($maj_count_latest > 0) {
 
 $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 "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://majcms.org/\"><span class=\"mbox1\">MAJ</span><span class=\"mbox2\">2.0</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"http://php.net/\"><span class=\"mbox1\">PHP</span><span class=\"mbox2\">$mphp_version</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=0.91\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">0.91</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=1.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">1.0</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"rss.php?ver=2.0\"><span class=\"mbox1\">RSS</span><span class=\"mbox2\">2.0</span></a><div class=\"mclear\"></div></div>";
+echo "<div class=\"mbadge\"><a class=\"mblink\" target=\"_maj\" href=\"sitemap.php\"><span class=\"mbox1\">XML</span><span class=\"mbox2\">SITEMAP</span></a><div class=\"mclear\"></div></div>";
 
 }
 
diff --git a/rel.txt b/rel.txt
index c2336ab..eed0db1 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012231728
+201012240427