diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 3748ec0e..0cdafe8c 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -279,7 +279,7 @@ HTML;
"
"._t('AssetAdmin.UNUSEDTHUMBNAILSTITLE', 'Unused thumbnails')."
-
+
"
)
)
diff --git a/code/CommentTableField.php b/code/CommentTableField.php
index a87325b4..b51b93f8 100644
--- a/code/CommentTableField.php
+++ b/code/CommentTableField.php
@@ -138,7 +138,7 @@ class CommentTableField extends ComplexTableField {
new HiddenField('CommentFieldName','',$this->name)
);
- $actionFields = new LiteralField('CommentFilterButton','');
+ $actionFields = new LiteralField('CommentFilterButton','');
$fieldContainer = new FieldGroup(
$searchFields,
diff --git a/code/MemberTableField.php b/code/MemberTableField.php
index 854ebaba..27007b8b 100755
--- a/code/MemberTableField.php
+++ b/code/MemberTableField.php
@@ -216,7 +216,7 @@ class MemberTableField extends ComplexTableField {
}
$groupFields = new DropdownField('MemberGroup','Filter by group',$groupArray );
- $actionFields = new LiteralField('MemberFilterButton','');
+ $actionFields = new LiteralField('MemberFilterButton','');
$fieldContainer = new FieldGroup(
$searchFields,
diff --git a/css/cms_left.css b/css/cms_left.css
index c219ce58..4c28dc1a 100644
--- a/css/cms_left.css
+++ b/css/cms_left.css
@@ -1,37 +1,3 @@
-#TreeActions {
- background: #eee;
- border-bottom: 1px solid #ccc;
- float: left;
- width: 100%;
-}
- #TreeActions li {
- float: left;
- }
- #TreeActions li button {
- cursor: pointer;
- float: left;
- background-image: url(../images/textures/ToolBar.png);
- color: #333;
- overflow: visible;
- width: auto;
- margin: 1px;
- border-color: #ccc rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
- border-style: double;
- font-weight: bold;
- font-size: 11px;
- }
- #TreeActions li button:active {
- background: #F4F4F4 none repeat scroll 0%;
- border-color: #999 rgb(204, 204, 204) rgb(204, 204, 204) rgb(153, 153, 153);
- }
- #TreeActions li button:hover {
- background: #fff;
- }
- #TreeActions li.selected,
- #TreeActions li.action:hover {
- background: #ccc;
- }
-
#left form.actionparams {
background: #ccc;
border-bottom: 1px solid #eee;
diff --git a/css/cms_right.css b/css/cms_right.css
index 5853edef..27e41fdd 100644
--- a/css/cms_right.css
+++ b/css/cms_right.css
@@ -129,83 +129,6 @@
width: auto;
}
-
-/**
- * Actions/Buttons
- */
-.ajaxActions {
- position: absolute;
- bottom: 5px;
- right: 15px;
- text-align: right;
-}
-
-.ajaxActions input,
-#MemberFilterButton,
-#CommentFilterButton,
-.actions input,
-#deletemarked input.action,
-#UnusedThumbnails button,
-div.Actions input,
-.actionparams input.action {
- cursor: pointer;
- float: left;
- height: 25px;
- background-image: url(../images/textures/ToolBar.png);
- padding-left: 10px;
- padding-right: 10px;
- color: #333;
- overflow: visible;
- width: auto;
- border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
- border-style: double;
- margin: 1px;
- font-weight: bold;
- font-size: 11px;
-}
- #MemberFilterButton,
- #CommentFilterButton,
- #deletemarked input.action,
- .actions input,
- .actionparams input.action {
- float: none;
- }
- .actionparams input.action {
- padding: 0;
- height: auto;
- }
-
- #deletemarked {
- text-align: right;
- }
- #deletemarked span {
- background: none;
- }
-
-.ajaxActions input:active {
- background: #F4F4F4 none repeat scroll 0%;
- border-color: #999999 rgb(204, 204, 204) rgb(204, 204, 204) rgb(153, 153, 153);
-}
-
-.ajaxActions input:hover,
-div.Actions input:hover,
-.actionparams input[type="submit"]:hover {
- background: #fff;
-}
-
-input.delete:hover,
-#deletemarked input.delete:hover,
-#UnusedThumbnails button:hover,
-.actionparams input.delete:hover {
- background: #ce0000;
- color: #fff;
-}
-
-input.loading {
- padding-left: 16px;
- background: #fff url(../images/network-save.gif) no-repeat center left;
-}
-
/**
* Tabs
*/
diff --git a/css/layout.css b/css/layout.css
index f276a857..77af9846 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -14,6 +14,79 @@ body {
height: 100%;
background: #ccdef3;
}
+/**
+ * Actions/Buttons
+ */
+.ajaxActions {
+ position: absolute;
+ bottom: 5px;
+ right: 15px;
+ text-align: right;
+}
+
+#TreeActions {
+ background: #eee;
+ border-bottom: 1px solid #ccc;
+ float: left;
+ width: 100%;
+}
+ #TreeActions li {
+ float: left;
+ }
+
+.ajaxActions input,
+.actions input,
+button.action,
+div.Actions input,
+input.action,
+li.action input,
+li.action button {
+ cursor: pointer;
+ background-image: url(../images/textures/ToolBar.png);
+ color: #333;
+ overflow: visible;
+ width: auto;
+ border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204);
+ border-style: double;
+ margin: 1px;
+ padding: 2px;
+ font-size: 11px;
+}
+ .ajaxActions input,
+ #TreeActions li.action input {
+ float: left;
+ height: 25px;
+ padding: 0 10px;
+ font-weight: bold;
+ }
+ #TreeActions li.action input {
+ font-weight: normal;
+ }
+ .ajaxActions input:active {
+ background: #F4F4F4 none repeat scroll 0%;
+ border-color: #999999 rgb(204, 204, 204) rgb(204, 204, 204) rgb(153, 153, 153);
+ }
+
+ .ajaxActions input:hover,
+ div.Actions input:hover,
+ input.action:hover,
+ button.action:hover,
+ li.action input:hover,
+ li.action button:hover {
+ background: #fff;
+ }
+
+input.delete:hover,
+button.delete:hover,
+.actionparams input.delete:hover {
+ background: #ce0000;
+ color: #fff;
+}
+
+input.loading {
+ padding-left: 16px;
+ background: #fff url(../images/network-save.gif) no-repeat center left;
+}
/* Overrides - TODO Find a better place to put them */
form#Form_EditForm fieldset {