4 files changed, 22 insertions, 106 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 6bc85674..f06b0af7 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -138,37 +138,6 @@ header {
   list-style: none;
 }
 
-.dropdown {
-  display: inline-block;
-  color: #c3c3c3;
-  background-color: #424242;
-  border: 1px solid;
-  border-color: #464646 #2B2B2B #252525;
-  border-radius: 4px;
-  padding: 3px 8px;
-  font-size: 16px;
-  text-decoration: none;
-  font-style: normal;
-  font-weight: bold;
-  cursor: pointer;
-  position: relative;
-}
-
-.dropdown_items {
-  position: absolute;
-  right: 0px;
-  top: 25px;
-  background-color: #424242;
-  padding: 10px;
-  width: 160px;
-  border-radius: 5px 0 5px 5px;
-  box-shadow: 0 2px 1px black;
-}
-
-.dropdown_items a {
-  display: block;
-}
-
 a.logo {
   color: #fff;
   font-weight: bold;
@@ -250,17 +219,6 @@ footer {
   font-family: 'Lato', sans-serif;
 }
 
-.button_collect {
-    background-image: url("../images/icon_collect.png"); 
-    background-repeat: no-repeat;
-    background-position:top center;
-    height: 30px;
-    width: 30px;
-    margin: 0px;
-    padding: 3px 3px 2px 3px;
-    position: relative;
-}
-
 .pagination {
 text-align: center;
 }
@@ -290,6 +248,10 @@ text-align: center;
   height: 0;
 }
 
+.hidden {
+  display: none;
+}
+
 .media_sidebar h3 {
 	font-size: 1em;
 	margin: 0 0 5px;
@@ -409,9 +371,8 @@ textarea#comment_content {
   float: left;
   padding: 0px;
   width: 180px;
-  height: 156px;
   overflow: hidden;
-  margin: 0px 4px 10px;
+  margin: 0px 3px 10px;
   text-align: center;
   font-size: 0.875em;
   background-color: #222;
@@ -420,43 +381,32 @@ textarea#comment_content {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
+  border-color: #0D0D0D;
+  border-style: solid;
+  border-width: 1px 1px 2px;
 }
 
 .media_thumbnail a {
   color: #eee;
   text-decoration: none;
+  display: block;
 }
 
-.media_thumbnail img {
-  max-height: 135px;
-}
-
-/* collection media */
-
-.collection_thumbnail {
-  float: left;
-  padding: 0px;
-  width: 180px;
-  margin: 0px 4px 10px;
-  text-align: left;
-  font-size: 0.875em;
-  background-color: #222;
-  border-radius: 0 0 5px 5px;
-  padding: 0 0 6px;
-  text-overflow: ellipsis;
+.media_thumbnail a.remove {
+  color: #86D4B1;
+  text-decoration: underline;
 }
 
-.collection_thumbnail a {
-  color: #eee;
-  text-decoration: none;
+a.thumb_entry_title {
+  padding: 8px;
 }
 
-.collection_thumbnail a.remove {
-  color: #86D4B1;
+.media_thumbnail img {
+  max-height: 135px;
 }
 
-.collection_thumbnail img {
-  max-height: 135px;
+.thumb_entry_last {
+  margin-right: 0px;
 }
 
 /* media detail */
@@ -486,7 +436,7 @@ p.media_specs {
   padding: 130px 10px 20px 10px;
 }
 
-img.media_image {
+a img.media_image {
   cursor: -webkit-zoom-in;
   cursor: -moz-zoom-in;
   cursor: zoom-in;
diff --git a/mediagoblin/static/images/media_thumbs/image.png b/mediagoblin/static/images/media_thumbs/image.png
new file mode 100644
index 00000000..8437a298
--- /dev/null
+++ b/mediagoblin/static/images/media_thumbs/image.png
diff --git a/mediagoblin/static/js/geolocation-map.js b/mediagoblin/static/js/geolocation-map.js
index de49a37d..26d94c5d 100644
--- a/mediagoblin/static/js/geolocation-map.js
+++ b/mediagoblin/static/js/geolocation-map.js
@@ -31,19 +31,15 @@ $(document).ready(function () {
     var map = new L.Map('tile-map');
 
     var mqtileUrl = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg';
-    var mqtileAttrib = 'Map data © '
-	+ String(new Date().getFullYear())
-	+ ' OpenStreetMap contributors, CC-BY-SA.'
-	+ ' Imaging © '
-	+ String(new Date().getFullYear())
-	+ ' <a target="_blank" href="http://mapquest.com">MapQuest</a>.';
+    var mqtileAttrib = '<a id="osm_license_link">see map license</a>';
     var mqtile = new L.TileLayer(
 	mqtileUrl,
 	{maxZoom: 18,
 	 attribution: mqtileAttrib,
 	 subdomains: '1234'});
 
-    var location = new L.LatLng(latitude, longitude); 
+    map.attributionControl.setPrefix('');
+    var location = new L.LatLng(latitude, longitude);
     map.setView(location, 13).addLayer(mqtile);
 
     var marker = new L.Marker(location);
diff --git a/mediagoblin/static/js/header_dropdown.js b/mediagoblin/static/js/header_dropdown.js
deleted file mode 100644
index 643bafa4..00000000
--- a/mediagoblin/static/js/header_dropdown.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * GNU MediaGoblin -- federated, autonomous media hosting
- * Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-$(document).ready(function() {
-  $(".dropdown_items").hide();
-  $(document).mouseup(function(e) {
-    if($(e.target).is(".dropdown")) {
-      $(".dropdown_items").toggle();
-    } else if($(e.target).is(".dropdown_items")) {
-      return;
-    } else {
-      $(".dropdown_items").hide();
-    }
-  });
-});