diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index e7620d0b..436bd4f9 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -279,7 +279,7 @@ HTML; "

"._t('AssetAdmin.UNUSEDTHUMBNAILSTITLE', 'Unused thumbnails')."

- "._t('AssetAdmin.DELETEUNUSEDTHUMBNAILS', 'Delete unused thumbnails')." + "._t('AssetAdmin.DELETEUNUSEDTHUMBNAILS', 'Delete unused thumbnails')."
" ) ) @@ -705,7 +705,7 @@ JS; foreach($this->getUnusedThumbnailsArray() as $file) { unlink("../assets/" . $file); } - echo "statusMessage('All unused thumbnails has been deleted','good')"; + echo "statusMessage('All unused thumbnails have been deleted','good')"; } /** diff --git a/css/cms_left.css b/css/cms_left.css index 57881529..1b76cd7e 100644 --- a/css/cms_left.css +++ b/css/cms_left.css @@ -23,6 +23,10 @@ width: auto; }*/ +#TreeActions li { + float: left; +} + #TreeActions li button { cursor: pointer; float: left; diff --git a/css/cms_right.css b/css/cms_right.css index 492616a0..737527b1 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -89,14 +89,19 @@ text-align: right; } -.ajaxActions input { +.ajaxActions input, +#MemberFilterButton, +#CommentFilterButton, +.actions input, +#deletemarked input.action, +#UnusedThumbnails a { cursor: pointer; float: left; height: 25px; background-image: url(../images/textures/ToolBar.png); padding-left: 10px; padding-right: 10px; - color: #333333; + color: #333; overflow: visible; width: auto; border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); @@ -105,6 +110,22 @@ font-weight: bold; font-size: 11px; } + #MemberFilterButton, + #CommentFilterButton, + #deletemarked input.action, + .actions input { + float: none; + padding: 0; + } + #UnusedThumbnails { + display: block; + } + #deletemarked { + text-align: right; + } + #deletemarked span { + background: none; + } .ajaxActions input:active { background: #F4F4F4 none repeat scroll 0%; @@ -115,7 +136,8 @@ background: #fff; } -input.delete:hover { +input.delete:hover, +#deletemarked input.delete:hover { background: #ce0000; color: #fff; } @@ -328,9 +350,9 @@ input.loading { } #statusMessage.bad { padding: 2px 20px 2px 40px; - border-color: #c80700; + border-color: #ff8e8e; color: #c80700; - background: #ffe3e2 url(../images/alert-bad.gif) 7px 50% no-repeat; + background: #ffe9e9 url(../images/alert-bad.gif) 7px 50% no-repeat; max-height: 300px; overflow: auto; } @@ -352,20 +374,26 @@ div.MemberListFilter, div.MemberFilter, div.CommentFilter { /*float: right;*/ - width: 40em; + width: 30em; margin: 5px 0; padding: 5px; background-color : #ebeadb; border: 1px solid #aca899; } + div.MemberListFilter span.middleColumn, + div.MemberFilter span.middleColumn, + div.CommentFilter span.middleColumn { + display: inline !important; + } .right form div.MemberListFilter label, .right form div.MemberFilter label, .right form div.CommentFilter label { display: block; - width: 10em; + width: 5em; float: left; margin-left: 0em; + line-height: 2.3; } div.MemberListFilter div.field, diff --git a/images/pagination/record-first-g.png b/images/pagination/record-first-g.png index 7ceeabc7..a3bfef6d 100755 Binary files a/images/pagination/record-first-g.png and b/images/pagination/record-first-g.png differ diff --git a/images/pagination/record-first.png b/images/pagination/record-first.png index 88873dfc..a1a52cc4 100755 Binary files a/images/pagination/record-first.png and b/images/pagination/record-first.png differ diff --git a/images/pagination/record-last-g.png b/images/pagination/record-last-g.png index 8654e336..ede7e36c 100755 Binary files a/images/pagination/record-last-g.png and b/images/pagination/record-last-g.png differ diff --git a/images/pagination/record-last.png b/images/pagination/record-last.png index ba1d68ae..68448e35 100755 Binary files a/images/pagination/record-last.png and b/images/pagination/record-last.png differ diff --git a/images/pagination/record-next-g.png b/images/pagination/record-next-g.png index 74f72943..f4842292 100755 Binary files a/images/pagination/record-next-g.png and b/images/pagination/record-next-g.png differ diff --git a/images/pagination/record-next.png b/images/pagination/record-next.png index e1c5340a..f6c05506 100755 Binary files a/images/pagination/record-next.png and b/images/pagination/record-next.png differ diff --git a/images/pagination/record-prev-g.png b/images/pagination/record-prev-g.png index 7b04f4c1..432558ad 100755 Binary files a/images/pagination/record-prev-g.png and b/images/pagination/record-prev-g.png differ diff --git a/images/pagination/record-prev.png b/images/pagination/record-prev.png index 33330922..951e5229 100755 Binary files a/images/pagination/record-prev.png and b/images/pagination/record-prev.png differ