Switched URLs to RI web site

glro · Jan 8, 2010 · 5be93c5 · 5be93c5
1 parent f555be1
commit 5be93c5
Show file tree

Hide file tree

Showing 10 changed files with 627 additions and 15 deletions.
diff --git a/.Makefile.swp b/.Makefile.swp
diff --git a/.ri.widget.js.swp b/.ri.widget.js.swp
diff --git a/Makefile b/Makefile
@@ -11,5 +11,5 @@ merged: ri.widget-min.js ri.query-min.js
 	${JAVA} -jar ${YUICOMPRESSOR} $< -o ${<:.js=-min.js}
 
 clean:
-	rm -f ri.widget-min.js
+	rm -f ri.widget-min.js ri.query-min.js ri.widget-${VERSION}.js
 
diff --git a/Makefile~ b/Makefile~
@@ -0,0 +1,12 @@
+JAVA=java
+YUICOMPRESSOR=/opt/yuicompressor/yuicompressor-2.4.2.jar
+RIQUERY_PATH=../ri.query/ri.query-min.js
+
+ri.widget: ri.widget-min.js
+
+%-min.js: %.js
+	${JAVA} -jar ${YUICOMPRESSOR} $< -o ${<:.js=-min.js}
+
+clean:
+	rm -f ri.widget-min.js
+
diff --git a/debug.html b/debug.html
@@ -7,7 +7,7 @@
                 <img src="ri-banner.jpg" />
             </a>
         </div>
-        <script type="text/javascript" src="../ri.query/ri.query.js"></script>
+        <script type="text/javascript" src="ri.query.js"></script>
         <script type="text/javascript" src="ri.widget.js"></script>
         <script type="text/javascript">
             ri.widget(document.getElementById("ri-widget"));

diff --git a/debug.html~ b/debug.html~
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+    <body>
+        <!-- START: RI Query Widget -->
+        <div id="ri-widget" class="ri-widget" style="width: 300px">
+            <a href="http://ri.ijc.org/">
+                <img src="ri-banner.jpg" />
+            </a>
+        </div>
+        <script type="text/javascript" src="../ri.query/ri.query.js"></script>
+        <script type="text/javascript" src="ri.widget.js"></script>
+        <script type="text/javascript">
+            ri.widget(document.getElementById("ri-widget"));
+        </script>
+        <!-- END: RI Query Widget -->
+    </body>
+</html>
diff --git a/ri.widget.js b/ri.widget.js
@@ -96,7 +96,7 @@ ri.widget = function(container, opts) {
 
 
 // The base URL to use for resources with relative paths
-var baseUrl = ".";
+var baseUrl = "http://ri.ijc.org/widget/";
 
 
 /*
@@ -106,45 +106,45 @@ ri.widget.settings = {
     widgetClass: "ri-widget",
     items: 5,
     stylesheets: [
-        { href: baseUrl + "/style.css" }
+        { href: baseUrl + "style.css" }
     ],
     images: {
         logo: {
-            url: baseUrl + "/ri-logo.png",
+            url: baseUrl + "ri-logo.png",
             w: 107, h: 60,
             alt: "Search the Research Inventory"
         },
         search: {
-            url: baseUrl + "/search.png", 
+            url: baseUrl + "search.png", 
             w: 30, h: 30,
             alt: "Filter projects by keyword",
             trans: true
         },
         lake: {
-            url: baseUrl + "/lakes.png", 
+            url: baseUrl + "lakes.png", 
             w: 49, h: 30,
             alt: "Filter projects by watershed",
             trans: true
         },
         investigator: {
-            url: baseUrl + "/investigator.png", 
+            url: baseUrl + "investigator.png", 
             w: 30, h: 30,
             alt: "Filter projects by investigators",
             trans: true
         },
         wait: {
-            url: baseUrl + "/wait.gif",
+            url: baseUrl + "wait.gif",
             w: 48, h: 48,
             alt: "Loading search results"
         },
         close: {
-            url: baseUrl + "/close.png",
+            url: baseUrl + "close.png",
             w: 30, h: 30,
             alt: "Close search results",
             trans: true
         },
         spacer: {
-            url: baseUrl + "/spacer.gif"
+            url: baseUrl + "spacer.gif"
         }
     }
 };
@@ -372,7 +372,7 @@ ri.widget.ResultBox.prototype = {
                             : (i == projects.length - 1 ? "last" : ""));
                 this.list.appendChild(elem("li", {"class": class_}, [
                     elem("a", {href: p.url, target: "_blank"}, text(p.title)),
-                    elem("p", {"class": "objective"}, text(p.abstract))
+                    elem("p", {"class": "objective"}, text(p["abstract"]))  // Accessing as dict because YUI complains
                 ]));
             }
         }