Config update + extras

_config/config.yml

@@ -3,9 +3,8 @@ Name: 'seoextensions'
 ---
 Page:
   extensions:
-    0: 'SeoObjectExtension'
-SeoConfig:
-    Page: true
-    ErrorPage: false
-    RedirectorPage: false
-    VirtualPage: false
+    - 'SeoObjectExtension'
+# Example of how to exclude extra page types from showing the SEO tab:
+# SeoObjectExtension:
+#   excluded_page_types:
+#     - 'SomePage'

code/GoogleSuggestField.php

@@ -3,27 +3,12 @@
  * Field which gets suggestions from google search
  */
 class GoogleSuggestField extends FormField {
-
-	public $google_suggest_results = array();
-
-	public $google_suggest_url = 'http://google.com/complete/search?output=toolbar&q=';
-
-	public static $url_handlers = array(
-		'$Action!/$ID' => '$Action'
-	);
-
-	public static $allowed_actions = array(
-		'gsuggest'
-	);	
 
 	public function Field($properties = array()) {
-
-		$jsBaseURL = Director::absoluteBaseURL();
-
-
+
 		Requirements::customScript(<<<JS
 
-			(function($) {
+ 			(function($) {
 
 				$.entwine('ss', function($){
 
@@ -32,17 +17,27 @@ public function Field($properties = array()) {
 						onmatch : function() {
 
 							$( "#Form_EditForm_{$this->getName()}" ).autocomplete({
-								source: "{$jsBaseURL}admin/pages/edit/EditForm/field/{$this->getName()}/gsuggest/",
-								minLength: 2
+								source: function( request, response ) {
+									$.ajax({
+									  url: "http://suggestqueries.google.com/complete/search",
+									  dataType: "jsonp",
+									  data: {
+										  client: 'firefox',
+									    q: request.term
+									  },
+									  success: function( data ) {
+									    response( data[1] );
+									  }
+									});
+								},
+								minLength: 3
 							});
 
 						},
 					});
 				});
 
 			})(jQuery);
-
-
 JS
 );
 
@@ -51,46 +46,4 @@ public function Field($properties = array()) {
 		return parent::Field($properties);
 
 	}
-
-
-
-	/**
-	 *
-	 * @param SS_HTTPRequest $request
-	 * @return string
-	 */
-	public function gsuggest(SS_HTTPRequest $request) {
-
-		if(!$request->getVar('term')) {
-			return $this->httpError(403, 'No term provided');
-
-		} 		
-
-		$suggest_for = $request->getVar('term');
-
-		$this->get_google_suggest($suggest_for);
-
-	}
-
-	private function get_google_suggest ($suggest_for = '') {
-
-		$url = file_get_contents($this->google_suggest_url . urlencode($suggest_for));
-		$suggestions = Convert::xml2array($url);
-
-		if (!empty($suggestions)) {
-
-			foreach ($suggestions['CompleteSuggestion'] as $suggestion)	{
-				$suggestion_record = array();
-				$suggestion_record['id'] =  $suggestion['suggestion']['@attributes']['data'];
-				$suggestion_record['label'] =  $suggestion['suggestion']['@attributes']['data'];
-				$suggestion_record['value'] = $suggestion['suggestion']['@attributes']['data'];
-
-				$this->google_suggest_results[] = $suggestion_record;
-			}
-		}
-
-		print (Convert::array2json($this->google_suggest_results));
-	}
-
-
 }

code/SeoObjectExtension.php

@@ -6,6 +6,17 @@
  */
 class SeoObjectExtension extends SiteTreeExtension {
 
+	/**
+	 * Specify page types that will not include the SEO tab
+	 *
+	 * @config
+	 * @var array
+	 */
+	private static $excluded_page_types = array(
+		'ErrorPage',
+		'RedirectorPage',
+		'VirtualPage'
+	);
 
 	private static $db = array(
 		'SEOPageSubject' => 'Varchar(256)'
@@ -67,8 +78,8 @@ public function getSEOScoreTips() {
 	 */
 	public function updateCMSFields(FieldList $fields) {
 
-		// use SEO module only on classes which are set up to use it in seo.yml / config.yml
-		if (!Config::inst()->get("SeoConfig", $this->owner->getClassName())) {
+		// exclude SEO tab from some pages
+		if (in_array($this->owner->getClassName(), Config::inst()->get("SeoObjectExtension", "excluded_page_types"))) {
 			return;
 		}
 
@@ -117,7 +128,12 @@ public function updateCMSFields(FieldList $fields) {
 							)
 		);
 		$fields->addFieldsToTab('Root.SEO', array(
-				TextField::create("SEOPageSubject", _t('SEO.SEOPageSubjectTitle', 'Subject of this page (required to view this page SEO score)')),
+				GoogleSuggestField::create("SEOPageSubject", _t('SEO.SEOPageSubjectTitle', 'Subject of this page (required to view this page SEO score)')),
+				LiteralField::create('', '<div class="message notice"><p>' . 
+					_t(
+						'SEO.SEOSaveNotice', 
+						"After making changes save this page to view the updated SEO score"
+					) . '</p></div>'),
 				LiteralField::create('ScoreTitle', '<h4 class="seo_score">' . _t('SEO.SEOScore', 'SEO Score') . '</h4>'),
 				LiteralField::create('Score', $this->getHTMLStars()),
 				LiteralField::create('ScoreClear', '<div class="score_clear"></div>')

javascript/seo.js

@@ -8,10 +8,6 @@
 				onkeyup : function() {
 					set_preview_google_search_result();
 				},
-			});        
-
-			$('.cms-edit-form').entwine({
-
 				onmatch: function() {
 					set_preview_google_search_result();
 				}