maj.world

commit d0de1cddc4a2c195b39c7f61d4418e3c425e70ec
tree 1ee1167d0fe21248a6f2749a333360f033d683c7
parent db3c9f6eb6b8c36372187f2c95b43e502be1cfb0
author Engels Antonio <engels@majcms.org> 1280774088 +0800
committer Engels Antonio <engels@majcms.org> 1280774088 +0800

    Change CSS class names to avoid conflicts

diff --git a/css.php b/css.php
index 01fd882..f742137 100644
--- a/css.php
+++ b/css.php
@@ -47,7 +47,7 @@ else {
 <style>
 
 * {
-       font-size: <?php echo $maj_font_Mpx; ?>;
+       font-size: <?php echo $maj_font_Dpx; ?>;
 }
 
 body {
@@ -134,10 +134,6 @@ body {
        ?>
 }
 
-p,td {
-       font-size: <?php echo $maj_font_Mpx; ?>;
-}
-
 a {
        font-weight: bold;
        text-decoration: none;
@@ -212,6 +208,14 @@ a.navlink:link,a.navlink:visited,a.navlink:active,a.navlink:hover {
        text-decoration: none;
 }
 
+a.status:link,a.status:visited,a.status:active,a.status:hover {
+       <?php
+
+       echo "font-size: $maj_font_Spx;\n";
+
+       ?>
+}
+
 .panel_title {
        padding: 5px;
        margin: 0px;
@@ -490,14 +494,6 @@ a.navlink:link,a.navlink:visited,a.navlink:active,a.navlink:hover {
        ?>                                     
 }
 
-.footer {
-       <?php
-
-       echo "font-size: $maj_font_Spx;\n";
-
-       ?>
-}
-
 <?php if (file_exists("data/css.txt")) { readfile("data/css.txt"); } ?>
 
 </style>
diff --git a/index.php b/index.php
index 78517f3..6044381 100644
--- a/index.php
+++ b/index.php
@@ -2586,7 +2586,7 @@ foreach ($maj_disp as $maj_d) {
                        }
 
                        foreach ($maj_entry_categories as $maj_filed_under) {
-                               $maj_category_list = $maj_category_list . " | <a href=\"index.php?category=$maj_filed_under\" class=\"footer\">$maj_filed_under</a>";
+                               $maj_category_list = $maj_category_list . " | <a href=\"index.php?category=$maj_filed_under\" class=\"status\">$maj_filed_under</a>";
                        }
 
                        echo "<div class=\"panel_category\"";
@@ -2643,7 +2643,7 @@ foreach ($maj_disp as $maj_d) {
        if (!file_exists("data/nocomment.txt") or (file_exists("data/memcomment.txt") and isset($_SESSION['logged_in'])) or file_exists("data/items/$maj_d/ucomment.txt")) {
 
                if (!file_exists("data/items/$maj_d/comments/live")) {
-                       echo "<a href=\"index.php?entry=$maj_d&show=comments\" class=\"footer\">add comment</a>";
+                       echo "<a href=\"index.php?entry=$maj_d&show=comments\" class=\"status\">add comment</a>";
                }
                else {
                        if ($maj_dh_comments = opendir("data/items/$maj_d/comments/live")) {
@@ -2659,7 +2659,7 @@ foreach ($maj_disp as $maj_d) {
 
                        $maj_count_live_comments = count($maj_live_comments);
 
-                       echo "<a href=\"index.php?entry=$maj_d&show=comments\" class=\"footer\">";
+                       echo "<a href=\"index.php?entry=$maj_d&show=comments\" class=\"status\">";
 
                        if ($maj_count_live_comments == 1) {
                                echo "$maj_count_live_comments comment";
@@ -2676,7 +2676,7 @@ foreach ($maj_disp as $maj_d) {
                }
        }
        else {
-               echo "<a href=\"index.php?entry=$maj_d\" class=\"footer\">permalink</a>";
+               echo "<a href=\"index.php?entry=$maj_d\" class=\"status\">permalink</a>";
        }
 
        if (file_exists("data/items/$maj_d/views.txt")) {
@@ -2711,7 +2711,7 @@ foreach ($maj_disp as $maj_d) {
 
                $maj_album = count($maj_items_album);
 
-               echo " | <a href=\"index.php?entry=$maj_d&show=album\" class=\"footer\">";
+               echo " | <a href=\"index.php?entry=$maj_d&show=album\" class=\"status\">";
 
                if ($maj_album == 1) {
                        echo "$maj_album image";
@@ -2776,7 +2776,7 @@ foreach ($maj_disp as $maj_d) {
 
                $maj_filedrop = count($maj_items_filedrop);
 
-               echo " | <a href=\"index.php?entry=$maj_d&show=filedrop\" class=\"footer\">";
+               echo " | <a href=\"index.php?entry=$maj_d&show=filedrop\" class=\"status\">";
 
                if ($maj_filedrop == 1) {
                        echo "$maj_filedrop file";
@@ -2826,7 +2826,7 @@ foreach ($maj_disp as $maj_d) {
 
        if (!file_exists("data/nopdf.txt") and file_exists("data/items/$maj_d/pdf/file")) {
 
-               echo "| <a href=\"index.php?entry=$maj_d&show=pdf\" class=\"footer\">pdf</a> ";
+               echo "| <a href=\"index.php?entry=$maj_d&show=pdf\" class=\"status\">pdf</a> ";
 
                if (($maj_req_show == pdf) and (!isset($_SESSION['logged_in']) or ($_SESSION['logged_in'] != $maj_login_username))) {
 
@@ -2853,7 +2853,7 @@ foreach ($maj_disp as $maj_d) {
        }
 
        if (!file_exists("data/nocomment.txt") or (file_exists("data/memcomment.txt") and isset($_SESSION['logged_in'])) or file_exists("data/items/$maj_d/ucomment.txt")) {
-               echo "| <a href=\"index.php?entry=$maj_d\" class=\"footer\">permalink</a>";
+               echo "| <a href=\"index.php?entry=$maj_d\" class=\"status\">permalink</a>";
        }
 
        echo "</div>";
diff --git a/rel.txt b/rel.txt
index e1e5a87..e10f6d0 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201008010354
+201008030220