From 597b12e8235a438eaa00a96e2e9e5b7888a71702 Mon Sep 17 00:00:00 2001 From: jbridson Date: Tue, 6 Mar 2012 15:55:26 +1300 Subject: [PATCH] ENHANCEMENT: SSF-53 - Styled the pagination and icons on export to CSV button on User datagrid. --- admin/css/screen.css | 54 +++++++------- admin/images/btn-icon-se62d8b345b.png | Bin 0 -> 15838 bytes admin/images/btn-icon-sfde6065e75.png | Bin 15346 -> 0 bytes admin/images/btn-icon/download-csv.png | Bin 0 -> 683 bytes admin/scss/_style.scss | 21 +++++- css/GridField.css | 19 +++-- images/icons/pagination-arrows.png | Bin 0 -> 358 bytes scss/GridField.scss | 71 ++++++++++++++----- templates/Includes/GridFieldPaginator_Row.ss | 8 ++- 9 files changed, 120 insertions(+), 53 deletions(-) create mode 100644 admin/images/btn-icon-se62d8b345b.png delete mode 100644 admin/images/btn-icon-sfde6065e75.png create mode 100644 admin/images/btn-icon/download-csv.png create mode 100644 images/icons/pagination-arrows.png diff --git a/admin/css/screen.css b/admin/css/screen.css index 842d771f4..4974e2ce9 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -31,7 +31,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, /** ---------------------------------------------------- Double tone borders http://daverupert.com/2011/06/two-tone-borders-with-css3/ ----------------------------------------------------- */ /** ----------------------------- Sprite images ----------------------------- */ /** Helper SCSS file for generating sprites for the interface. */ -.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-sfde6065e75.png') no-repeat; } +.btn-icon-sprite, .ui-state-default .btn-icon-accept, .ui-state-default .btn-icon-accept_disabled, .ui-state-default .btn-icon-add, .ui-state-default .btn-icon-add_disabled, .ui-state-default .btn-icon-addpage, .ui-state-default .btn-icon-addpage_disabled, .ui-state-default .btn-icon-arrow-circle-135-left, .ui-state-default .btn-icon-back, .ui-state-default .btn-icon-back_disabled, .ui-state-default .btn-icon-cross-circle, .ui-state-default .btn-icon-cross-circle_disabled, .ui-state-default .btn-icon-decline, .ui-state-default .btn-icon-decline_disabled, .ui-state-default .btn-icon-download-csv, .ui-state-default .btn-icon-drive-upload, .ui-state-default .btn-icon-drive-upload_disabled, .ui-state-default .btn-icon-magnifier, .ui-state-default .btn-icon-minus-circle, .ui-state-default .btn-icon-minus-circle_disabled, .ui-state-default .btn-icon-navigation, .ui-state-default .btn-icon-navigation_disabled, .ui-state-default .btn-icon-network-cloud, .ui-state-default .btn-icon-network-cloud_disabled, .ui-state-default .btn-icon-pencil, .ui-state-default .btn-icon-pencil_disabled, .ui-state-default .btn-icon-plug-disconnect-prohibition, .ui-state-default .btn-icon-plug-disconnect-prohibition_disabled, .ui-state-default .btn-icon-preview, .ui-state-default .btn-icon-preview_disabled, .ui-state-default .btn-icon-settings, .ui-state-default .btn-icon-settings_disabled, .ui-state-default .btn-icon-unpublish, .ui-state-default .btn-icon-unpublish_disabled { background: url('../images/btn-icon-se62d8b345b.png') no-repeat; } .ui-state-default .btn-icon-accept { background-position: 0 0; } .ui-state-default .btn-icon-accept_disabled { background-position: 0 -17px; } @@ -42,29 +42,30 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, .ui-state-default .btn-icon-arrow-circle-135-left { background-position: 0 -104px; } .ui-state-default .btn-icon-back { background-position: 0 -120px; } .ui-state-default .btn-icon-back_disabled { background-position: 0 -135px; } -.ui-state-default .btn-icon-cross-circle { background-position: 0 -151px; } -.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -167px; } -.ui-state-default .btn-icon-decline { background-position: 0 -183px; } -.ui-state-default .btn-icon-decline_disabled { background-position: 0 -200px; } -.ui-state-default .btn-icon-drive-upload { background-position: 0 -217px; } -.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -233px; } -.ui-state-default .btn-icon-magnifier { background-position: 0 -249px; } -.ui-state-default .btn-icon-minus-circle { background-position: 0 -265px; } -.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -281px; } -.ui-state-default .btn-icon-navigation { background-position: 0 -297px; } -.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -313px; } -.ui-state-default .btn-icon-network-cloud { background-position: 0 -329px; } -.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -345px; } -.ui-state-default .btn-icon-pencil { background-position: 0 -361px; } -.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -377px; } -.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -393px; } -.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -409px; } -.ui-state-default .btn-icon-preview { background-position: 0 -425px; } -.ui-state-default .btn-icon-preview_disabled { background-position: 0 -442px; } -.ui-state-default .btn-icon-settings { background-position: 0 -459px; } -.ui-state-default .btn-icon-settings_disabled { background-position: 0 -475px; } -.ui-state-default .btn-icon-unpublish { background-position: 0 -491px; } -.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -509px; } +.ui-state-default .btn-icon-cross-circle { background-position: 0 -150px; } +.ui-state-default .btn-icon-cross-circle_disabled { background-position: 0 -166px; } +.ui-state-default .btn-icon-decline { background-position: 0 -182px; } +.ui-state-default .btn-icon-decline_disabled { background-position: 0 -199px; } +.ui-state-default .btn-icon-download-csv { background-position: 0 -216px; } +.ui-state-default .btn-icon-drive-upload { background-position: 0 -234px; } +.ui-state-default .btn-icon-drive-upload_disabled { background-position: 0 -250px; } +.ui-state-default .btn-icon-magnifier { background-position: 0 -266px; } +.ui-state-default .btn-icon-minus-circle { background-position: 0 -282px; } +.ui-state-default .btn-icon-minus-circle_disabled { background-position: 0 -298px; } +.ui-state-default .btn-icon-navigation { background-position: 0 -314px; } +.ui-state-default .btn-icon-navigation_disabled { background-position: 0 -330px; } +.ui-state-default .btn-icon-network-cloud { background-position: 0 -346px; } +.ui-state-default .btn-icon-network-cloud_disabled { background-position: 0 -362px; } +.ui-state-default .btn-icon-pencil { background-position: 0 -378px; } +.ui-state-default .btn-icon-pencil_disabled { background-position: 0 -394px; } +.ui-state-default .btn-icon-plug-disconnect-prohibition { background-position: 0 -410px; } +.ui-state-default .btn-icon-plug-disconnect-prohibition_disabled { background-position: 0 -426px; } +.ui-state-default .btn-icon-preview { background-position: 0 -442px; } +.ui-state-default .btn-icon-preview_disabled { background-position: 0 -459px; } +.ui-state-default .btn-icon-settings { background-position: 0 -476px; } +.ui-state-default .btn-icon-settings_disabled { background-position: 0 -492px; } +.ui-state-default .btn-icon-unpublish { background-position: 0 -508px; } +.ui-state-default .btn-icon-unpublish_disabled { background-position: 0 -526px; } .icon { text-indent: -9999px; border: none; outline: none; } .icon.icon-24 { width: 24px; height: 24px; background: url('../images/menu-icons/24x24-s546fcae8fd.png'); } @@ -478,6 +479,11 @@ form.small .cms-file-info-data .field { padding-bottom: 0; } form.small .cms-file-info-data .field label { width: 112px; } form.small .cms-file-info-data .field .middleColumn { margin-left: 120px; } +/** -------------------------------------------- Users Members Admin -------------------------------------------- */ +.members_grid p button#action_export { margin-top: 16px; } +.members_grid p button#action_export span.btn-icon-exportlist { background: url(../images/btn-icon/download-csv.png) no-repeat 0px 0px; height: 20px; } +.members_grid p button#action_export span.ui-button-text { padding-left: 27px; } + /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */ .cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; } .cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } diff --git a/admin/images/btn-icon-se62d8b345b.png b/admin/images/btn-icon-se62d8b345b.png new file mode 100644 index 0000000000000000000000000000000000000000..8cf9be95c8451efa1f80f44a73e94096d90ad470 GIT binary patch literal 15838 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 QmH+?%07*qoM6N<$f*^Dds{jB1 diff --git a/admin/images/btn-icon/download-csv.png b/admin/images/btn-icon/download-csv.png new file mode 100644 index 0000000000000000000000000000000000000000..b0384f4bda0f9d87adcbfe5955973411b88b9381 GIT binary patch literal 683 zcmV;c0#yBpP)ABQ562(>uX7TfF&2$$!Ogg6TwP3La52n~bkotvI2ir_7bXV=qcIpnluBDFrN2@M9c+q; z)FSVP_nfwmwtTJ^A+2KQx@2$x z2}^kk<4RL>*5H$;G;!jt2}!IIH*GG&))|mi(RIDYf%)? zNQC)^WKuX718KV)fE~nD;9H@<{SLU@SjlF&XRoH=TxeT1|C2op^oePx}v7d*0Ub#R7g*8_di5bhM6V?||@D38a;@Kww7pc*ah8 zFi!t;#NoRdi$8sMZha59=ml0@EL4qJa`j+y@h$Dq1kMT!p9J^KnI{7e7Lw8TmPI4w zZH?CR0*^yGE;z0~npN(;`a+|~qXI5km%26`8nq}FU^NcZS zX-V_Avhz-9P)s)GQ5AJv-^Ou#ah^~!4-!1Ckcn)}kZvYn7hg8#p|((`uIui`it_@S zDaxCvk1zwXFf%gS^OV;5It;^;EYfgZ$Yjd0yh!qXEf|Gam>G+W{o%X>#yxa(=WO{0 z<0WdjdSMnN+k?r+t1CJwA>%8E+5J~g?skNDFv8Nt8UO$Q07*qoM6N<$ Eg7dVNFaQ7m literal 0 HcmV?d00001 diff --git a/scss/GridField.scss b/scss/GridField.scss index f3549b6d1..cee947677 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -26,6 +26,7 @@ $gf_color_border_filter_button: #9A9A9A; $gf_color_button: #e6e6e6; $gf_color_button_filter_hover: #338DC1; $gf_color_button_reset_hover: #FF0000; +$color-text-light: white; $gf_grid_y: 12px; $gf_grid_x: 16px; @@ -39,7 +40,7 @@ $gf_grid_x: 16px; .cms { .ss-gridfield { & > div { - margin-bottom: 35px; + margin-bottom: $gf_grid_y*3 - 1; } &[data-selectable] { @@ -86,14 +87,14 @@ $gf_grid_x: 16px; text-indent:-9999em; background: url(../images/icons/decline.png) no-repeat 0 2px; padding:0; - width:20px; - height:20px; + width:$gf_grid_x + 4; + height:$gf_grid_y*2 - 4; } } a.edit-link { display:inline-block; - height:20px; - width:20px; + width:$gf_grid_x + 4; + height:$gf_grid_y*2 - 4; text-indent:-9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } @@ -132,7 +133,6 @@ $gf_grid_x: 16px; } .new{ font-size: $gf_grid_y*1.2; - border-color: $gf_colour_border; float: right; } } @@ -179,7 +179,7 @@ $gf_grid_x: 16px; position:relative; } &.fieldgroup { - min-width: 200px; + min-width: $gf_grid_x*12.5; padding-right:0; } } @@ -212,7 +212,7 @@ $gf_grid_x: 16px; display: inline; position: static; input { - height:28px; + height:$gf_grid_y*2 + 4; } } button.ss-ui-button { @@ -282,14 +282,7 @@ $gf_grid_x: 16px; lighten($gf_color_button, 10%), darken($gf_color_button, 5%) )); - &:hover { - @include background (url(../images/icons/filter-icons.png) no-repeat -16px 6px, - linear-gradient( - lighten($gf_color_button_filter_hover, 5%), - darken($gf_color_button_filter_hover, 5%) - )); - } - &:active { + &.hover-alike:active { @include background (url(../images/icons/filter-icons.png) no-repeat -16px 6px, linear-gradient( lighten($gf_color_button_filter_hover, 5%), @@ -297,6 +290,13 @@ $gf_grid_x: 16px; )); @include box-shadow(inset 0 1px 3px rgb(23, 24, 26), 0 1px 0 rgba(255, 255, 255, .6)); } + &.hover-alike { + @include background (url(../images/icons/filter-icons.png) no-repeat -16px 6px, + linear-gradient( + lighten($gf_color_button_filter_hover, 5%), + darken($gf_color_button_filter_hover, 5%) + )); + } } &.ss-gridfield-button-reset.ss-ui-button{ position:absolute; @@ -318,14 +318,14 @@ $gf_grid_x: 16px; darken($gf_color_button, 5%) )) ); - &:hover { + &.filtered:hover { @include background (url(../images/icons/filter-icons.png) no-repeat 8px -17px, linear-gradient( $gf_color_button_reset_hover, darken($gf_color_button_reset_hover, 10%) )); } - &:active { + &.filtered:active { @include background (url(../images/icons/filter-icons.png) no-repeat 8px -17px, linear-gradient( $gf_color_button_reset_hover, @@ -357,7 +357,40 @@ $gf_grid_x: 16px; color: $gf_colour_font; &.bottom-all { @include border-bottom-radius($gf_border_radius); - @include background-image(linear-gradient($gf_colour_gradient_light, $gf_colour_gradient_dark)); + @include background-image(linear-gradient($gf_colour_gradient_light, $gf_colour_gradient_dark)); + .datagrid-pagination { + position:absolute; + left:50%; + margin-left:-$gf_grid_x*10; + .pagination-page-number { + color:$color-text-light; + } + button.ss-gridfield-previouspage { + @include background (url(../images/icons/pagination-arrows.png) no-repeat -23px 7px); + @include box-shadow-none; + border:none; + width:10px; + margin:0 10px; + span { + text-indent:-9999em; + } + } + button.ss-gridfield-nextpage { + @include background (url(../images/icons/pagination-arrows.png) no-repeat -47px 7px); + @include box-shadow-none; + border:none; + width:10px; + margin:0 10px; + span { + text-indent:-9999em; + } + } + } + .pagination-records-number { + float:right; + padding:($gf_grid_y/2) 0; + color:$color-text-light; + } } } &.last td { diff --git a/templates/Includes/GridFieldPaginator_Row.ss b/templates/Includes/GridFieldPaginator_Row.ss index d8a555c10..5fc35552b 100644 --- a/templates/Includes/GridFieldPaginator_Row.ss +++ b/templates/Includes/GridFieldPaginator_Row.ss @@ -1,7 +1,9 @@ - $Previous10Page $PreviousPage Page $CurrentPageNum of $NumPages $NextPage $Next10Page - - View $FirstShownRecord - $LastShownRecord of $NumRecords +
+ $Previous10Page $PreviousPage Page $CurrentPageNum of $NumPages $NextPage $Next10Page +
+ + View $FirstShownRecord - $LastShownRecord of $NumRecords \ No newline at end of file