Merge.

slmnhq · Oct 25, 2010 · b036cae · b036cae
2 parents 5409c89 + 3936cbd
commit b036cae
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/README.txt b/README.txt
@@ -192,11 +192,17 @@ Documentation
 
 The home page for the CKAN project is: http://knowledgeforge.net/ckan
 
-This README file is part of the Developer Documentation, viewable at: `http://knowledgeforge.net/ckan/doc/ckan/index.html`_ and stored in the CKAN repo at ckan/doc. 
+This README file is part of the Developer Documentation, viewable at:
+`http://knowledgeforge.net/ckan/doc/ckan/index.html`_ and stored in the CKAN
+repo at ckan/doc. 
 
-The Developer Docs are built using `Sphinx <http://sphinx.pocoo.org/>`_ and uploaded by an admin to KnowledgeForge. To build the developer docs::
+The Developer Docs are built using `Sphinx <http://sphinx.pocoo.org/>`_:
 
       python setup.py build_sphinx
+
+The docs are uploaded to packages.python.org/ckan/ and also (via dav) to
+http://knowledgeforge.net/ckan/doc/ckan/ (http://knowledgeforge.net/ location
+is for backwards compatability).
 
 
 Contributors

diff --git a/ckan/templates/home/stats.html b/ckan/templates/home/stats.html
@@ -7,7 +7,7 @@
 
   <py:def function="optional_head">
     <!--[if IE]><script language="javascript" type="text/javascript" src="/scripts/flot-0.5/excanvas.pack.js"></script><![endif]-->
-    <script type="text/javascript" src="http://m.okfn.org/ext/flot-0.6/jquery.flot.js">//pointless jscript comment</script>
+    <script type="text/javascript" src="http://assets.okfn.org/ext/flot/0.6/jquery.flot.min.js">//pointless jscript comment</script>
   </py:def>
 
   <div py:match="content">

diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -12,7 +12,7 @@
 <head>
   <title>${page_title()} - ${g.site_title}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="shortcut icon" href="http://m.okfn.org/gfx/logo/favicon.ico" type="image/x-icon" />
+  <link rel="shortcut icon" href="http://assets.okfn.org/images/logo/favicon.ico" type="image/x-icon" />
   <py:choose>
   <py:when test="defined('optional_feed')">
     ${optional_feed()}
@@ -23,10 +23,10 @@
   </py:choose>
 
   <style type="text/css"> 
-    @import url(http://m.okfn.org/kforge/css/structure.css);
-    @import url(http://m.okfn.org/kforge/css/display.css);
-    @import url(http://m.okfn.org/kforge/css/navigation.css);
-    @import url(http://m.okfn.org/kforge/css/print.css);
+    @import url(http://assets.okfn.org/kforge/css/structure.css);
+    @import url(http://assets.okfn.org/kforge/css/display.css);
+    @import url(http://assets.okfn.org/kforge/css/navigation.css);
+    @import url(http://assets.okfn.org/kforge/css/print.css);
   </style> 
 
   <link rel="stylesheet" href="/css/ckan.master.css" type="text/css" media="screen, print" />
@@ -36,7 +36,7 @@
   <![endif]-->
 
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-  <script src="http://m.okfn.org/ext/jquery.cookie.min.js"></script>
+  <script src="http://assets.okfn.org/ext/jquery.cookie/jquery.cookie.min.js"></script>
   <script type="text/javascript" src="/scripts/application.js"></script>
 
   <script type="text/javascript">
@@ -138,19 +138,19 @@ <h3 class="hidden">In this section:</h3>
         | <a href="http://www.okfn.org/privacy-policy/">Privacy Policy</a>
       </p>
       <p i18n:msg="">
-        <img style="margin-bottom: -5px;" src="http://m.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" /> CKAN is an <a href="http://www.okfn.org/">Open Knowledge Foundation</a> project
+        <img style="margin-bottom: -5px;" src="http://assets.okfn.org/images/logo/okf_logo_white_and_green_tiny.png" /> CKAN is an <a href="http://www.okfn.org/">Open Knowledge Foundation</a> project
       </p>
       <p i18n:msg="version">
         v${c.__version__}
         | (c) Open Knowledge Foundation
 	| All material available under an <a href="${h.url_for('license')}">open license</a>
         | <a href="http://www.opendefinition.org/1.0/"><img
             style="border: none; margin-bottom: -4px;"
-            src="http://m.okfn.org/images/ok_buttons/ok_90x15_blue.png"
+            src="http://assets.okfn.org/images/ok_buttons/ok_90x15_blue.png"
             alt="This Content and Data is Open" /></a>
         | <a href="http://www.opendefinition.org/1.0/"><img
             style="border: none; margin-bottom: -4px;"
-            src="http://m.okfn.org/images/ok_buttons/od_80x15_blue.png"
+            src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png"
             alt="This Content and Data is Open" /></a>
       </p>
     </div><!-- /footer -->

diff --git a/ckan/templates/package/list.html b/ckan/templates/package/list.html
@@ -25,7 +25,7 @@ <h2>Package listing key</h2>
         <a href="http://www.opendefinition.org/1.0/">Open Knowledge Definition.</a>
       </p>
       <p class="centered">
-        <a href="http://www.opendefinition.org/1.0/"><img src="http://m.okfn.org/images/ok_buttons/ok_90x15_blue.png" alt="" /></a>
+        <a href="http://www.opendefinition.org/1.0/"><img src="http://assets.okfn.org/images/ok_buttons/ok_90x15_blue.png" alt="" /></a>
       </p>
     </div>
   </py:match>

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -73,11 +73,11 @@ <h2>Openness:
           <a
             href="http://www.opendefinition.org/okd/"
             title="This package satisfies the Open Knowledge Definition.">
-            <img src="http://m.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" /></a>
+            <img src="http://assets.okfn.org/images/ok_buttons/od_80x15_blue.png" alt="[Open Data]" /></a>
           <a
             href="http://www.opendefinition.org/okd/"
             title="This package satisfies the Open Knowledge Definition.">
-            <img src="http://m.okfn.org/images/ok_buttons/oc_80x15_blue.png" alt="[Open Content]" /></a>
+            <img src="http://assets.okfn.org/images/ok_buttons/oc_80x15_blue.png" alt="[Open Content]" /></a>
         </p>
       <div py:otherwise="">
       <h5>Help Make This Package Open!</h5>

diff --git a/upload-docs.py b/upload-docs.py