Permalink
Browse files

BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel ac…

…ross CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs.
  • Loading branch information...
1 parent cbb0259 commit 98399f7779e769e3f06cf25731837db190423aa0 Jeremy Bridson committed Apr 11, 2012
@@ -180,10 +180,10 @@ public function SearchForm() {
$form = new Form($this, "SearchForm",
$context->getSearchFields(),
new FieldList(
- Object::create('ResetFormAction','clearsearch', _t('ModelAdmin.CLEAR_SEARCH','Clear Search'))
- ->setUseButtonTag(true)->addExtraClass('ss-ui-action-minor'),
- Object::create('FormAction', 'search', _t('MemberTableField.SEARCH', 'Search'))
- ->setUseButtonTag(true)
+ Object::create('FormAction', 'search', _t('MemberTableField.APPLY FILTER', 'Apply Filter'))
+ ->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive'),
+ Object::create('ResetFormAction','clearsearch', _t('ModelAdmin.RESET','Reset'))
+ ->setUseButtonTag(true)
),
new RequiredFields()
);
View

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -7,9 +7,6 @@
.cms-search-form {
.resetformaction {
margin-right:0px;
- span {
- padding-left:0px;
- }
}
}
#Form_ImportForm {
View
@@ -602,6 +602,27 @@ body.cms {
padding: $grid-y $grid-x;
overflow: auto;
height:100%;
+ #LastEditedFrom {
+ @include box-shadow(none);
+ input {
+ width:$grid-x * 20;
+ &.hasDatepicker {
+ max-width:$grid-x * 20;
+ }
+ }
+ }
+ #LastEditedTo {
+ @include box-shadow(none);
+ input {
+ width:$grid-x * 20;
+ &.hasDatepicker {
+ max-width:$grid-x * 20;
+ }
+ }
+ }
+ .Actions .ss-ui-action-constructive {
+ margin-right:5px; //accounts for the scrollbar in the filter - keeps the actions on one line instead of wrapping onto two.
+ }
}
.cms-content-header {
@@ -626,6 +647,11 @@ body.cms {
h3 {
font-size: $font-base-size + 1;
}
+
+ h4 {
+ font-size: $font-base-size;
+ margin:5px 0;
+ }
.ui-widget-content {
background: none;
View
@@ -8,17 +8,17 @@ table.details tr { background: #eeeee0; }
p { line-height: 1.5em; margin-top: 0.5em; margin-bottom: 1.0em; }
-h1 { margin: 0px 0px 5px; font: 165% verdana,arial,helvetica; }
+h1 { margin: 0px 0px 5px; font: 165% verdana, arial, helvetica; }
-h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica; }
+h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana, arial, helvetica; }
-h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica; }
+h3 { margin-bottom: 0.5em; font: bold 115% verdana, arial, helvetica; }
-h4 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h4 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
-h5 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h5 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
-h6 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h6 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
.Error { font-weight: bold; color: red; }
View
@@ -597,11 +597,11 @@
);
$lang['en_US']['MemberTableField']['ERRORADDINGUSER'] = 'There was an error adding the user to the group: %s';
$lang['en_US']['MemberTableField']['FILTER'] = 'Filter';
-$lang['en_US']['MemberTableField']['SEARCH'] = 'Search';
+$lang['en_US']['MemberTableField']['APPLY FILTER'] = 'Apply Filter';
$lang['en_US']['ModelAdmin']['ADDBUTTON'] = 'Add';
$lang['en_US']['ModelAdmin']['ADDFORM'] = 'Fill out this form to add a %s to the database.';
$lang['en_US']['ModelAdmin']['CHOOSE_COLUMNS'] = 'Select result columns...';
-$lang['en_US']['ModelAdmin']['CLEAR_SEARCH'] = 'Clear Search';
+$lang['en_US']['ModelAdmin']['RESET'] = 'Reset';
$lang['en_US']['ModelAdmin']['CREATEBUTTON'] = array(
'Create \'%s\'',
PR_MEDIUM,

0 comments on commit 98399f7

Please sign in to comment.