Updated just before migration to Test.

svn path=/; revision=134

diff --git a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
index 5f89aa801e698b7d2adae99c0abec6636a4b0dda..8a59eedd9e8336286147efa5bf7fbeb8692c46d7 100644 (file)
--- a/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
+++ b/preecej/semantic_wiki/LocalSettings/dev.LocalSettings.php
@@ -48,7 +48,7 @@ $wgStylePath        = "$wgScriptPath/skins";
 
 ## The relative URL path to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
-$wgLogo             = "$wgStylePath/common/images/wiki_logo_proto.png";
+$wgLogo             = "$wgStylePath/common/images/wiki_logo_with_text.png";
 
 ## UPO means: this is also a user preference option
 
@@ -117,7 +117,7 @@ $wgSecretKey = "c7f2e0aee38b819689a65337257ed2d6c4eb7157e44563781da69bbfd3e2e45b
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'vector', 'monobook':
-$wgDefaultSkin = 'vector';
+$wgDefaultSkin = 'planteome';
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
@@ -145,6 +145,7 @@ require_once( "$IP/extensions/semantic-bundle/SemanticBundle.php" );
 include("$IP/extensions/SimpleForms/SimpleForms.php");
 
 $sfgAutocompletionURLs['remote_species'] = 'http://palea.cgrb.oregonstate.edu/AnnoWiki/prototyping/remote_autocomplete.php?q=<substr>';
+$sfgAutocompletionURLs['remote_PO_terms'] = 'http://dev.planteome.org/w/prototyping/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=<substr>&format=json&max=20';
 $sfgAutocompleteOnAllChars = false;
 
 # END: Justin Preece - Semantic Bundle (SMW and other extensions)

diff --git a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
index c3c81a1cf4868c6cb6cf903f674871ed6afd6f2f..ed3ece30d3684038c2e22af7c4619a8607760ad1 100644 (file)
--- a/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
+++ b/preecej/semantic_wiki/LocalSettings/proto.LocalSettings.php
@@ -136,9 +136,13 @@ $wgDiff3 = "/usr/bin/diff3";
 $wgHiddenPrefs[] = 'skin';
 $wgUseAjax = true;
 include("$IP/extensions/SimpleForms/SimpleForms.php");
+
 require_once( "$IP/extensions/ParserFunctions/ParserFunctions.php" );
 $wgPFEnableStringFunctions = true;
 
+require_once( "$IP/extensions/Variables/Variables.php" );
+require_once( "$IP/extensions/Loops/Loops.php" );
+
 # END 04/04/11: Justin Preece - Add'l Extensions
 
 # BEGIN 02/22/11: Justin Preece - Semantic Bundle (SMW and other extensions)
@@ -150,6 +154,7 @@ require_once( "$IP/extensions/semantic-bundle/SemanticBundleSettings.php" );
 require_once( "$IP/extensions/semantic-bundle/SemanticBundle.php" );
 
 $sfgAutocompletionURLs['remote_species'] = 'http://palea.cgrb.oregonstate.edu/AnnoWiki/prototyping/remote_autocomplete.php?q=<substr>';
+$sfgAutocompletionURLs['remote_PO_terms'] = 'http://proto.planteome.org/w/prototyping/TermSearch_JSON.php?user=paw&type=autocomplete&field=name&qval=<substr>&format=json&max=20';
 $sfgAutocompleteOnAllChars = false;
 
 # END 02/22/11: Justin Preece - Semantic Bundle (SMW and other extensions)