Changeset 553 for trunk

Timestamp:

Mar 29, 2009, 4:10:34 PM (16 years ago)

Author:

barny

Message:

Úprava registrací a uptime scriptu

Location:

trunk

Files:

• imgs/logoreg.png (modified) ( previous)
• inc/server.php (modified) (1 diff)
• pages/register.php (modified) (1 diff)
• styles/style.css (modified) (2 diffs)

trunk/inc/server.php

@@ -82 +82 @@
       {
            include("inc/db.php");
-        $this -> db -> select_db($db_realmd);
+        $this -> db -> select_db($db_mangos);
         $row = $this -> db -> query('SELECT `starttime`, `uptime` FROM `uptime` ORDER BY `starttime` DESC LIMIT 1') ->fetch_array();
         $uptime = round($row["uptime"] / 3600);

trunk/pages/register.php

@@ -5 +5 @@
 <table align="center" width="520">
           <tr><th align="center"><img src="./imgs/logoreg.png"</th></tr>
-          <tr><th align="center"><img src="./imgs/textreg.png"</th></tr>
+          
           <tr><td align="center"><br>
          

trunk/styles/style.css

@@ +1 @@
+<<<<<<< .mine
+/* CSS Document */
+body {
+height: 100%;
+background-color: black;
+margin-top: -10px;
+        }
+#page      {
+            width: 982px;
+            min-height:100%;
+            height:auto !important;
+            height:100%;
+            background-image: url(../imgs/web/middle.jpg);
+            position: absolute;
+            top: 0px;
+            right: 50%;
+            margin-right: -491px;
+            margin-bottom: 0px;
+            }
+#top       {
+            top: 174px;
+            height: 90px;
+            background-image: url(../imgs/web/top_menu.jpg);
+            }
+#footer     {
+            position: absolute;
+            top: 100%;
+            width: 982px;
+            height: 100px;
+            margin-top: -100px;
+            background-image: url(../imgs/web/bottom.jpg);
+            z-index: 1;
+            } 
+#copyright    {
+            margin-left: 140px;
+                        font-size:12px;
+            } 
+#menu       {
+            top: 200px;
+            width: 150px;
+            margin-left: 110px;
+            margin-top: -50px;
+            height: auto;
+            text-align: justify;
+            padding-bottom: 100px;
+            z-index: 5;
+            float: left;
+            } 
+#content    {
+            top: 200px;
+            width: 540px;
+            margin-left: 60px;
+            margin-top: -50px;
+            height: auto;
+            text-align: justify;
+            padding-bottom: 100px;
+            z-index: 5;
+            float: left;
+            }  
+#mainmenu a {
+          display: block;
+          width: 150px;
+          height: 33px;
+          line-height: 33px;
+          margin-top: -21px;
+          overflow: hidden;
+          color: white;
+          font-weight: bold;
+          font-family: Verdana;
+          font-size: 12px;
+          background-image: URL('../imgs/web/deselected.jpg');
+          text-decoration: none;
+          text-align: center;
+          margin-bottom: 1px;
+          }
+=======
 body
 {
@@ -90 +166 @@
 }
 
+>>>>>>> .r552
 #mainmenu a:hover 
 {