Restyled a lil

5 files changed, 35 insertions, 17 deletions

diff --git a/dash/ads.php b/dash/ads.php
index 97bfa3e..96f05cb 100644
--- a/dash/ads.php
+++ b/dash/ads.php
@@ -6,14 +6,14 @@ $adid = intval($_GET['id']);
 if ($adid < 1) fatal('No ad ID has been provided. You must have reached this page in error.');
 $title = 'Ad / Bulletin';
 require('header.php');
-$result = $db->query('SELECT ads.id, ads.title, ads.pay, ads.time, ads.location, ads.description, users.name, users.email, users.phone, users.picture, users.bio, SUM(ratings.stars) / COUNT(ratings.stars) AS rating FROM ads INNER JOIN users ON users.id = ads.uid LEFT JOIN ratings ON ratings.rated = ads.uid WHERE ads.id = '.$adid.' LIMIT 1') or dash_fatal($db->error);
+$result = $db->query('SELECT ads.id, ads.uid, ads.title, ads.pay, ads.time, ads.location, ads.description, users.name, users.email, users.phone, users.picture, users.bio, SUM(ratings.stars) / COUNT(ratings.stars) AS rating FROM ads INNER JOIN users ON users.id = ads.uid LEFT JOIN ratings ON ratings.rated = ads.uid WHERE ads.id = '.$adid.' LIMIT 1') or dash_fatal($db->error);
 if ($result->num_rows < 1) dash_fatal('No ad with this ID has been found.');
 $row = $result->fetch_assoc();
 $result->free();
 ?>
       <div id="fulljob">
         <div id="fjheader">
-          <h3 id="fjhtitle"><?=htmlentities($row['title']);?></h3>
+          <h3 id="fjhtitle"><a href="ads.php?id=<?=$row['id'];?>"><?=htmlentities($row['title']);?></a></h3>
           <p id="fjhpay">Pays $<?=number_format($row['pay'], 2);?></p>
           <p id="fjhdetails"><?=htmlentities($row['location']);?> at <?=date('g:i a', intval($row['time'])).' on '.date('M j, Y', intval($row['time']));?></p>
         </div>
@@ -28,7 +28,7 @@ if (is_null($row['picture']))
 else
   echo '            <img id="propic" src="uimg/'.intval($row['picture']).'.png" alt="Profile Picture" />'.PHP_EOL;
 ?>
-            <p id="ename"><?=htmlentities($row['name']);?></p>
+            <p id="ename"><a href="profile.php?id=<?=$row['uid'];?>"><?=htmlentities($row['name']);?></a></p>
             <p id="erating"><?=rating_format($row['rating']);?></p>
           </div>
           <div id="fjfright">
diff --git a/dash/css/dash.css b/dash/css/dash.css
index f5df815..4bc22a2 100644
--- a/dash/css/dash.css
+++ b/dash/css/dash.css
@@ -181,6 +181,14 @@ body {
 #fjheader p, #fjheader h3 {
   margin: 0;
 }
+h3 a, h4 a {
+  color: #000000 !important;
+  text-decoration: none;
+}
+h3 a:hover, h4 a:hover {
+  color: #000000 !important;
+  text-decoration: none;
+}
 #fjbody {
   border-top: 1px solid #eeeeee;
   border-bottom: 1px solid #eeeeee;
@@ -197,18 +205,22 @@ body {
 }
 #fjfleft {
   float: left;
-  margin-right: 1em;
+  margin-right: 0.5em;
 }
 #fjfleft img {
-  margin-bottom: 1em;
+  margin-bottom: 0.5em;
   width: 192px;
   height: 192px;
 }
 #fjfleft p {
   margin: 0;
-  font-size: 16pt;
+  font-size: 14pt;
   text-align: center;
 }
+#ename a, #ename a:hover {
+  color: #000000 !important;
+  font-weight: bold;
+}
 #fjfright {
   text-align: center;
 }
diff --git a/dash/css/profile.css b/dash/css/profile.css
index 79a908f..1e55991 100644
--- a/dash/css/profile.css
+++ b/dash/css/profile.css
@@ -18,13 +18,13 @@
 #profile p, #profile h3, #profile h4 {
   margin: 0;
 }
-input[type=text], input[type=password] {
+#profile input[type=text], #profile input[type=password] {
   width: 248px;
   padding: 6px 12px;
   border: 1px solid #dddddd;
   border-radius: 5px;
 }
-input[type=submit], input[type=button], button {
+#profile input[type=submit], #profile input[type=button], #profile button {
   background-color: #fb4d00;
   padding: 5px 10px 3px;
   border-style: none;
@@ -32,10 +32,10 @@ input[type=submit], input[type=button], button {
   color: #ffffff;
   cursor: pointer;
 }
-input[type=submit]:hover, input[type=button]:hover, button:hover {
+#profile input[type=submit]:hover, #profile input[type=button]:hover, #profile button:hover {
   background-color: #fb7700;
 }
-textarea {
+#profile textarea {
   margin: 0.25em auto;
   width: 450px;
   height: 150px;
@@ -58,6 +58,9 @@ textarea {
   margin: 0.5em auto;
   cursor: pointer;
 }
+.public #propic {
+  cursor: default;
+}
 #propic img {
   width: 192px;
   height: 192px;
@@ -83,11 +86,11 @@ textarea {
 .public #probody {
   margin: 1em 0;
 }
-a {
+#profile a {
   text-decoration: none;
   color: #fb4d00;
   cursor: pointer;
 }
-a:hover {
+#profile a:hover {
   color: #fb7700;
 }
diff --git a/dash/header.php b/dash/header.php
index 08a9bfc..47b8aed 100644
--- a/dash/header.php
+++ b/dash/header.php
@@ -9,15 +9,15 @@ $db = new bdb();
     <meta charset="UTF-8" />
     <meta name="description" content="Community, at your fingertips." />
     <link rel="stylesheet" type="text/css" href="css/dash.css" />
-    <link rel="stylesheet" type="text/css" href="../css/chat.css" />
     <script type="text/javascript" src="../js/jquery.min.js"></script>
     <script type="text/javascript" src="../js/jquery-ui.min.js"></script>
     <script type="text/javascript" src="js/dash.js"></script>
-    <script type="text/javascript" src="../js/auth.php"></script>
-    <script type="text/javascript" src="../js/chat.js"></script>
  <?php
 if (!empty($extra_head)) echo $extra_head;
 ?>
+    <link rel="stylesheet" type="text/css" href="../css/chat.css" />
+    <script type="text/javascript" src="../js/auth.php"></script>
+    <script type="text/javascript" src="../js/chat.js"></script>
  </head>
   <body>
     <div id="nav">
diff --git a/dash/profile.php b/dash/profile.php
index 13fc8d7..00764f7 100644
--- a/dash/profile.php
+++ b/dash/profile.php
@@ -16,7 +16,7 @@ if ($public) {
 ?>
       <div id="profile" class="public">
         <div id="proheader">
-          <h3 id="protitle"><?=htmlentities($user['name']);?></h3>
+          <h3 id="protitle"><a href="<?=$_SERVER['REQUEST_URI'];?>"><?=htmlentities($user['name']);?></a></h3>
           <p id="prostars"><?=rating_format($user['rating'], typestr($user['type']));?></p>
         </div>
         <div id="proleft">
@@ -46,6 +46,9 @@ $phonelink = '+'.preg_replace('/[^0-9]/', '', $user['phone']);
             <h4>Address</h4>
             <p><?=(is_null($user['address']) ? '<em>No address specified.</em>' : htmlentities($user['address']));?></p>
             <p>Zipcode: <?=htmlentities($user['zipcode']);?></p>
+            <br />
+            <h4>Chat</h4>
+            <p><a href="#" onclick="bullechat.gui.create('<?=htmlentities($user['email'], ENT_HTML401 | ENT_QUOTES);?>'); return false;">Open a Chat</a></p>
           </div>
         </div>
       </div>
@@ -84,7 +87,7 @@ $phonelink = '+'.preg_replace('/[^0-9]/', '', $user['phone']);
 ?>
       <div id="profile" class="private">
         <div id="proheader">
-          <h3 id="protitle"><?=htmlentities($user['name']);?></h3>
+          <h3 id="protitle"><a href="<?=$_SERVER['REQUEST_URI'];?>"><?=htmlentities($user['name']);?></a></h3>
           <p id="prostars"><?=rating_format($user['rating'], typestr($user['type']));?></p>
         </div>
         <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" enctype="multipart/form-data">