From 9a6483b024618e9d898d4eb107dce75fa410726f Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 11 Aug 2008 02:25:44 +0000
Subject: [PATCH] (merged from branches/roa. use "svn log -c <changeset> -g
 <module-svn-path>" for detailed commit message)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetAdmin.php                   | 5 +++--
 javascript/ModelAdmin.js              | 2 +-
 templates/Includes/AssetTableField.ss | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 3cc10925..fffd9636 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -40,8 +40,9 @@ class AssetAdmin extends LeftAndMain {
 	);
 
 	public function Link($action = null) {
-		if(!$action) $action = "index";
-		return "admin/assets/$action/" . $this->currentPageID();
+		//if(!$action) $action = "index";
+		//return "admin/assets/$action/" . $this->currentPageID();
+		return "admin/assets/$action/";
 	}
 	
 	/**
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index a9933509..789be733 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -111,7 +111,7 @@ jQuery(document).ready(function() {
 		return false;
 	});
 	
-	jQuery('#right #ModelAdminPanel tbody td a').livequery('click', function(){
+	jQuery('#right #Form_ResultsForm tbody td a').livequery('click', function(){
 		var el = jQuery(this);
 		showRecord(el.attr('href'));
 		//el.parent().parent().find('td').removeClass('active');
diff --git a/templates/Includes/AssetTableField.ss b/templates/Includes/AssetTableField.ss
index 87cb95af..e9e2c4e8 100755
--- a/templates/Includes/AssetTableField.ss
+++ b/templates/Includes/AssetTableField.ss
@@ -1,4 +1,4 @@
-<div id="$id" class="$Classes field">
+<div id="$id" class="$CSSClasses field">
 	<% include TableListField_PageControls %>
 	<table class="data">
 		<thead>