Merge branch 'master' of github.com:kevinmcdonagh/mashbox

Conflicts: code/mashbox1.php
kevinmcdonagh · Sep 5, 2010 · 4f6be74 · 4f6be74
2 parents 9cf3481 + 18009c5
commit 4f6be74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/code/css/mashbox1.css b/code/css/mashbox1.css
@@ -267,7 +267,7 @@ button {
 #add-track #files {
     position:relative;
     z-index:5;
-    padding-bottom:2px;
+    padding-bottom:8px;
 }
 
 #add-track > div {
@@ -313,7 +313,7 @@ button {
     -webkit-box-shadow: rgba(0,0,0,.3) 0 0 3px;
     -moz-box-shadow: rgba(0,0,0,.3) 0 0 3px;
     box-shadow: rgba(0,0,0,.3) 0 0 3px;
-    padding:0 0 0 10px;
+    padding:4px 0 8px 10px;
 }
 
 #add-track > span * {

diff --git a/code/mashbox1.php b/code/mashbox1.php
@@ -78,10 +78,10 @@
                 <tbody>
 					<?php
 						$dbh = new PDO('sqlite:mashbox2.sqlite');
-						foreach($dbh->query('SELECT * FROM tracks') as $row){
+						foreach($dbh->query('SELECT * FROM mashes') as $row){
 							echo ("<tr>\n");
-							echo ("<td><span><strong>" . $row['title'] . "</strong> by " . $row['artist'] . "</span></td>\n");
-							echo ("<td><span>". $row['addedby1'] . "</span> <b>&amp;</b> <span>". $row['addedby2'] . "</span></td>\n");		                        
+							echo ("<td><span><strong>" . $row['name'] . "</strong> by " . $row['artist'] . "</span></td>\n");
+							echo ("<td><span>". $row['original_artist'] . "</span> <b>&amp;</b> <span>". $row['random_mash_artist'] . "</span></td>\n");		                        
 							echo ("<tr>\n");
 					  	}
 						$dbh = null;

diff --git a/code/mashbox2.sqlite b/code/mashbox2.sqlite