Merge pull request #186 from creativecommons/openverse-org

Author: TimidRobot

index.php

@@ -28,7 +28,7 @@
 	switch ( $engine ) {
 
 		case "openverse":
-			$url = 'https://wordpress.org/openverse/search/?q=' . $query . '&license_type='. $rights;
+			$url = 'https://openverse.org/search/?q=' . $query . '&license_type='. $rights;
 			break;
 
 		case "openclipart":
@@ -74,7 +74,7 @@
 		case "thingiverse":
 			// Defer to OpenVerse (with search refined only to Thingiverse items) until Thingiverse licence search filter issue is fixed
 			// TODO Use Thingiverse search filters when issue is fixed and
-			$url = 'https://wordpress.org/openverse/search/image?q=' . $query . '&source=thingiverse' . $rights;
+			$url = 'https://openverse.org/search/image?q=' . $query . '&source=thingiverse' . $rights;
 			// $url = 'https://www.thingiverse.com/search?q=' . $query . $rights;
 			break;
 
@@ -432,7 +432,7 @@ function get_http_security () {
                         </div>
                         <div class="row">
 						<div class="four columns alpha">
-						<div class="engine">
+						<div id="openverse" class="engine">
 							<div class="engineButton">
 								<button onclick="setEngine(this)" name="engine" value="openverse" id="openverse" aria-label="Openverse" type="button"></button>
 							</div>

search.js

@@ -42,14 +42,15 @@ $(function () {
 var engines = ["google", "googleimg", "flickr", "jamendo", "openclipart", "wikimediacommons", "fotopedia", "europeana", "youtube", "ccmixter", "soundcloud", "thingiverse", "openverse", "sketchfab", "nappy", "vimeo"];
 
 //defaults:
-var engine = "";
+var default_query = "flowers";
+var default_engine = "openverse";
+
+var engine = default_engine;
 var comm = 1;
 var deriv = 1;
 var rights = "";
 var url = "";
 
-var default_query = "flowers";
-var default_engine = "_random";
 
 // mmm, cookies...
 function setCookie(name, value, expires, path, domain, secure) {
@@ -484,7 +485,7 @@ function doSearch() {
 		// NOTE: if you make changes here, you should make a similar change in search.php
 		switch (engine) {
 			case "openverse":
-				url = 'https://wordpress.org/openverse/search/?q=' + query.val() + "&license_type=" + rights;
+				url = 'https://openverse.org/search/?q=' + query.val() + "&license_type=" + rights;
 				break;
 
 			case "openclipart":
@@ -542,7 +543,7 @@ function doSearch() {
 			case "thingiverse":
 				// Defer to OpenVerse (with search refined only to Thingiverse items) until Thingiverse licence search filter issue is fixed
 				// TODO Use Thingiverse search filters when issue is fixed and
-				url = 'https://wordpress.org/openverse/search/image?q=' + query.val() + '&source=thingiverse' + rights;
+				url = 'https://openverse.org/search/image?q=' + query.val() + '&source=thingiverse' + rights;
 				// url = 'https://www.thingiverse.com/search?q=' + query.val() + rights;
 				break;
 

style.css

@@ -207,6 +207,10 @@ fieldset {
   width: 100%;
 }
 
+#engines #openverse.engine {
+  border-width: 3px;
+}
+
 #engines .engine {
   text-align: left;
 }
@@ -327,4 +331,4 @@ fieldset {
 }
 .bucket small{
   font-size: 14px;
-}
+}