Fix list errors and some bad links

diff --git a/css/glma-admin-sass.css b/css/glma-admin-sass.css
index 4bb9092..56196bf 100644 (file)
--- a/css/glma-admin-sass.css
+++ b/css/glma-admin-sass.css
@@ -1,3 +1,3 @@
-.stupid-widget{color:red}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap #glm-admin-content-container{background-color:transparent;border:0;padding:0}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body{padding:10px;position:relative}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .dashboard-widget-buttons{margin:0}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links{padding:8px 12px 4px;margin:0 -12px}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links .quick-link:after{content:' |'}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links .quick-link:last-child:after{content:''}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .list-header{padding:8px 12px 8px;border-top:1px solid #eee;border-bottom:1px solid #eee;margin:0 -10px}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection{margin:0 -10px;border-bottom:1px solid #eee}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item{background-color:#fafafa;line-height:1;padding:5px 15px;float:left;width:100%}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn){color:#0073aa;display:inline-block;overflow:hidden;padding:0 2%}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn).collection-item-left{float:left;text-align:left}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn).collection-item-right{text-align:right;float:right}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget{background-color:white;box-shadow:none;border-color:#e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,0.04)}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget .summary-widget-handle::after{content:"";position:absolute;top:55%;transform:translateY(-50%);right:10px;width:0;height:0;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid black}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget .summary-widget-handle{padding:7px 10px;background-color:white;color:black;border-bottom:1px solid #eee;font-size:15px;font-weight:bold;position:relative}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .glm-summary-widgets-wrapper>h2{font-size:32px}.dashboard-summary-widget .modal-content.datepicker-container .select-dropdown.dropdown-trigger{width:85px}.dashboard-summary-widget .date-search-container{margin-top:20px}.dashboard-summary-widget .date-search-container .date-search-title{padding-left:12px;font-weight:bold}.dashboard-summary-widget .dashboard-widget-buttons{display:inline-block;float:right}.dashboard-summary-widget .dashboard-widget-buttons a[class*="add-"]{background-color:#4CAF50}.dashboard-summary-widget .dashboard-widget-buttons a[class*="export-"]{background-color:#9e9e9e}.dashboard-summary-widget .dashboard-widget-buttons a:hover{color:white}
+.stupid-widget{color:red}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap #glm-admin-content-container{background-color:transparent;border:0;padding:0}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body{padding:10px;position:relative}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .dashboard-widget-buttons{margin:0}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links{padding:8px 12px 4px;margin:0 -12px}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links .quick-link:after{content:' |'}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .quick-links .quick-link:last-child:after{content:''}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .list-header{padding:8px 12px 8px;border-top:1px solid #eee;border-bottom:1px solid #eee;margin:0 -10px}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection{margin:0 -10px;border-bottom:1px solid #eee}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item{background-color:#fafafa;line-height:1;padding:0px 10px;float:left;width:100%}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn){color:#0073aa;display:inline-block;overflow:hidden;padding:7px 2%}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn).collection-item-left{float:left;text-align:left}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .members-summary-widget .summary-widget-body .collection .collection-item a:not(.btn).collection-item-right{text-align:right;float:right}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget{background-color:white;box-shadow:none;border-color:#e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,0.04)}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget .summary-widget-handle::after{content:"";position:absolute;top:55%;transform:translateY(-50%);right:10px;width:0;height:0;border-left:6px solid transparent;border-right:6px solid transparent;border-top:6px solid black}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .dashboard-summary-widget .summary-widget-handle{padding:7px 10px;background-color:white;color:black;border-bottom:1px solid #eee;font-size:15px;font-weight:bold;position:relative}.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap .glm-summary-widgets-wrapper>h2{font-size:32px}.dashboard-summary-widget .modal-content.datepicker-container .select-dropdown.dropdown-trigger{width:85px}.dashboard-summary-widget .date-search-container{margin-top:20px}.dashboard-summary-widget .date-search-container .date-search-title{padding-left:12px;font-weight:bold}.dashboard-summary-widget .dashboard-widget-buttons{display:inline-block;float:right}.dashboard-summary-widget .dashboard-widget-buttons a[class*="add-"]{background-color:#4CAF50}.dashboard-summary-widget .dashboard-widget-buttons a[class*="export-"]{background-color:#9e9e9e}.dashboard-summary-widget .dashboard-widget-buttons a:hover{color:white}
 
 /*# sourceMappingURL=glma-admin-sass.css.map */

diff --git a/css/glma-admin-sass.css.map b/css/glma-admin-sass.css.map
index 81704d1..c54480e 100644 (file)
--- a/css/glma-admin-sass.css.map
+++ b/css/glma-admin-sass.css.map
@@ -1 +1 @@
-{"version":3,"file":"glma-admin-sass.css","sources":["app.scss","_test.scss","_dashboard.scss"],"sourcesContent":["@import 'test';\n@import 'dashboard';",".stupid-widget{\n    color: red;\n}","/* New Dashboard Styles */\n.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap {\n    #glm-admin-content-container {\n        background-color: transparent;\n        border: 0;\n        padding: 0;\n    }\n    .members-summary-widget {\n        .summary-widget-body {\n            padding: 10px;\n            position: relative;\n            .dashboard-widget-buttons {\n                margin: 0;\n            }\n            .quick-links {\n                padding: 8px 12px 4px;\n                margin: 0 -12px;\n                .quick-link {\n                    &:after {\n                        content: ' |';\n                    }\n                    &:last-child:after {\n                        content: '';\n                    }\n                }\n            }\n            .list-header {\n                padding: 8px 12px 8px;\n                border-top: 1px solid #eee;\n                border-bottom: 1px solid #eee;\n                margin: 0 -10px;\n            }\n            .collection {\n                margin: 0 -10px;\n                border-bottom: 1px solid #eee;\n                .collection-item {\n                    background-color: #fafafa;\n                    line-height: 1;\n                    padding: 5px 15px;\n                    float: left;\n                    width: 100%;\n                    a:not(.btn) {\n                        color: #0073aa;\n                        display: inline-block;\n                        overflow: hidden;\n                        padding: 0 2%;\n                        &.collection-item-left {\n                            float: left;\n                            text-align: left;\n                        }\n                        &.collection-item-right {\n                            text-align: right;\n                            float: right;\n                        }\n\n                    }\n                }\n            }\n\n        }\n    }\n    .dashboard-summary-widget{\n        background-color: white;\n        box-shadow: none;\n        border-color: #e5e5e5;\n        box-shadow: 0 1px 1px rgba(0,0,0,0.04);\n        // .date-field{\n        //     @media (max-width: 1024px){\n        //         width: 50% !important;\n        //     }\n        // }\n         .summary-widget-handle::after {\n            content: \"\";\n            position: absolute;\n            top: 55%;\n            transform: translateY(-50%);\n            right: 10px;\n            width: 0;\n            height: 0;\n            border-left: 6px solid transparent;\n            border-right: 6px solid transparent;\n            border-top: 6px solid black;\n        }\n        .summary-widget-handle {\n            padding: 7px 10px;\n            background-color: white;\n            color: black;\n            border-bottom: 1px solid #eee;\n            font-size: 15px;\n            font-weight: bold;\n            position: relative;\n        }\n    }\n\n    .glm-summary-widgets-wrapper > h2 {\n        font-size: 32px;\n    }\n}\n.dashboard-summary-widget{\n    .modal-content.datepicker-container{\n        .select-dropdown.dropdown-trigger{\n            width: 85px;\n        }\n    }\n    .date-search-container{\n        margin-top: 20px;\n        .date-search-title{\n            padding-left: 12px;\n            font-weight: bold;\n        }\n    }\n    .dashboard-widget-buttons{\n        display: inline-block;\n        float: right;\n        a[class*=\"add-\"]{\n            background-color: #4CAF50;\n        } \n        a[class*=\"export-\"]{\n            background-color: #9e9e9e;\n        }\n        a:hover{\n            color: white;\n        } \n    }\n    // [type=\"checkbox\"]:not(:checked), [type=\"checkbox\"]:checked{\n    //     position: relative;\n    //     opacity: 1;\n    //     pointer-events: initial;\n    // }\n}"],"mappings":"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","names":[],"sourceRoot":"/source/"}
\ No newline at end of file
+{"version":3,"file":"glma-admin-sass.css","sources":["app.scss","_test.scss","_dashboard.scss"],"sourcesContent":["@import 'test';\n@import 'dashboard';",".stupid-widget{\n    color: red;\n}","/* New Dashboard Styles */\n.glm-associate-admin-wrap.glm-associate-admin-dashboard-wrap {\n    #glm-admin-content-container {\n        background-color: transparent;\n        border: 0;\n        padding: 0;\n    }\n    .members-summary-widget {\n        .summary-widget-body {\n            padding: 10px;\n            position: relative;\n            .dashboard-widget-buttons {\n                margin: 0;\n            }\n            .quick-links {\n                padding: 8px 12px 4px;\n                margin: 0 -12px;\n                .quick-link {\n                    &:after {\n                        content: ' |';\n                    }\n                    &:last-child:after {\n                        content: '';\n                    }\n                }\n            }\n            .list-header {\n                padding: 8px 12px 8px;\n                border-top: 1px solid #eee;\n                border-bottom: 1px solid #eee;\n                margin: 0 -10px;\n            }\n            .collection {\n                margin: 0 -10px;\n                border-bottom: 1px solid #eee;\n                .collection-item {\n                    background-color: #fafafa;\n                    line-height: 1;\n                    padding: 0px 10px;\n                    float: left;\n                    width: 100%;\n                    a:not(.btn) {\n                        color: #0073aa;\n                        display: inline-block;\n                        overflow: hidden;\n                        padding: 7px 2%;\n                        &.collection-item-left {\n                            float: left;\n                            text-align: left;\n                        }\n                        &.collection-item-right {\n                            text-align: right;\n                            float: right;\n                        }\n\n                    }\n                }\n            }\n\n        }\n    }\n    .dashboard-summary-widget{\n        background-color: white;\n        box-shadow: none;\n        border-color: #e5e5e5;\n        box-shadow: 0 1px 1px rgba(0,0,0,0.04);\n        // .date-field{\n        //     @media (max-width: 1024px){\n        //         width: 50% !important;\n        //     }\n        // }\n         .summary-widget-handle::after {\n            content: \"\";\n            position: absolute;\n            top: 55%;\n            transform: translateY(-50%);\n            right: 10px;\n            width: 0;\n            height: 0;\n            border-left: 6px solid transparent;\n            border-right: 6px solid transparent;\n            border-top: 6px solid black;\n        }\n        .summary-widget-handle {\n            padding: 7px 10px;\n            background-color: white;\n            color: black;\n            border-bottom: 1px solid #eee;\n            font-size: 15px;\n            font-weight: bold;\n            position: relative;\n        }\n    }\n\n    .glm-summary-widgets-wrapper > h2 {\n        font-size: 32px;\n    }\n}\n.dashboard-summary-widget{\n    .modal-content.datepicker-container{\n        .select-dropdown.dropdown-trigger{\n            width: 85px;\n        }\n    }\n    .date-search-container{\n        margin-top: 20px;\n        .date-search-title{\n            padding-left: 12px;\n            font-weight: bold;\n        }\n    }\n    .dashboard-widget-buttons{\n        display: inline-block;\n        float: right;\n        a[class*=\"add-\"]{\n            background-color: #4CAF50;\n        } \n        a[class*=\"export-\"]{\n            background-color: #9e9e9e;\n        }\n        a:hover{\n            color: white;\n        } \n    }\n    // [type=\"checkbox\"]:not(:checked), [type=\"checkbox\"]:checked{\n    //     position: relative;\n    //     opacity: 1;\n    //     pointer-events: initial;\n    // }\n}"],"mappings":"ACAA,AAAA,cAAc,AAAA,CACV,KAAK,CAAE,GAAI,CACd,ACDD,AACI,yBADqB,AAAA,mCAAmC,CACxD,4BAA4B,AAAC,CACzB,gBAAgB,CAAE,WAAY,CAC9B,MAAM,CAAE,CAAE,CACV,OAAO,CAAE,CAAE,CACd,AALL,AAOQ,yBAPiB,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,AAAC,CACjB,OAAO,CAAE,IAAK,CACd,QAAQ,CAAE,QAAS,CAiDtB,AA1DT,AAUY,yBAVa,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAGhB,yBAAyB,AAAC,CACtB,MAAM,CAAE,CAAE,CACb,AAZb,AAaY,yBAba,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAMhB,YAAY,AAAC,CACT,OAAO,CAAE,YAAa,CACtB,MAAM,CAAE,OAAQ,CASnB,AAxBb,AAgBgB,yBAhBS,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAMhB,YAAY,CAGR,WAAW,AACN,MAAM,AAAC,CACJ,OAAO,CAAE,IAAK,CACjB,AAnBrB,AAgBgB,yBAhBS,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAMhB,YAAY,CAGR,WAAW,AAIN,WAAW,AAAA,MAAM,AAAC,CACf,OAAO,CAAE,EAAG,CACf,AAtBrB,AAyBY,yBAzBa,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAkBhB,YAAY,AAAC,CACT,OAAO,CAAE,YAAa,CACtB,UAAU,CAAE,cAAe,CAC3B,aAAa,CAAE,cAAe,CAC9B,MAAM,CAAE,OAAQ,CACnB,AA9Bb,AA+BY,yBA/Ba,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAwBhB,WAAW,AAAC,CACR,MAAM,CAAE,OAAQ,CAChB,aAAa,CAAE,cAAe,CAuBjC,AAxDb,AAkCgB,yBAlCS,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAwBhB,WAAW,CAGP,gBAAgB,AAAC,CACb,gBAAgB,CAAE,OAAQ,CAC1B,WAAW,CAAE,CAAE,CACf,OAAO,CAAE,QAAS,CAClB,KAAK,CAAE,IAAK,CACZ,KAAK,CAAE,IAAK,CAgBf,AAvDjB,AAwC8B,yBAxCL,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAwBhB,WAAW,CAGP,gBAAgB,CAMZ,CAAC,AAAA,IAAK,CAAA,AAAA,IAAI,CAAE,CACR,KAAK,CAAE,OAAQ,CACf,OAAO,CAAE,YAAa,CACtB,QAAQ,CAAE,MAAO,CACjB,OAAO,CAAE,MAAO,CAUnB,AAtDrB,AAwC8B,yBAxCL,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAwBhB,WAAW,CAGP,gBAAgB,CAMZ,CAAC,AAAA,IAAK,CAAA,AAAA,IAAI,CAKL,qBAAqB,AAAC,CACnB,KAAK,CAAE,IAAK,CACZ,UAAU,CAAE,IAAK,CACpB,AAhDzB,AAwC8B,yBAxCL,AAAA,mCAAmC,CAMxD,uBAAuB,CACnB,oBAAoB,CAwBhB,WAAW,CAGP,gBAAgB,CAMZ,CAAC,AAAA,IAAK,CAAA,AAAA,IAAI,CASL,sBAAsB,AAAC,CACpB,UAAU,CAAE,KAAM,CAClB,KAAK,CAAE,KAAM,CAChB,AApDzB,AA4DI,yBA5DqB,AAAA,mCAAmC,CA4DxD,yBAAyB,AAAA,CACrB,gBAAgB,CAAE,KAAM,CACxB,UAAU,CAAE,IAAK,CACjB,YAAY,CAAE,OAAQ,CACtB,UAAU,CAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAI,CA2B7B,AA3FL,AAsE+B,yBAtEN,AAAA,mCAAmC,CA4DxD,yBAAyB,CAUpB,sBAAsB,AAAA,OAAO,AAAC,CAC3B,OAAO,CAAE,EAAG,CACZ,QAAQ,CAAE,QAAS,CACnB,GAAG,CAAE,GAAI,CACT,SAAS,CAAE,gBAAU,CACrB,KAAK,CAAE,IAAK,CACZ,KAAK,CAAE,CAAE,CACT,MAAM,CAAE,CAAE,CACV,WAAW,CAAE,qBAAsB,CACnC,YAAY,CAAE,qBAAsB,CACpC,UAAU,CAAE,eAAgB,CAC/B,AAjFT,AAkFQ,yBAlFiB,AAAA,mCAAmC,CA4DxD,yBAAyB,CAsBrB,sBAAsB,AAAC,CACnB,OAAO,CAAE,QAAS,CAClB,gBAAgB,CAAE,KAAM,CACxB,KAAK,CAAE,KAAM,CACb,aAAa,CAAE,cAAe,CAC9B,SAAS,CAAE,IAAK,CAChB,WAAW,CAAE,IAAK,CAClB,QAAQ,CAAE,QAAS,CACtB,AA1FT,AA6FmC,yBA7FV,AAAA,mCAAmC,CA6FxD,4BAA4B,CAAG,EAAE,AAAC,CAC9B,SAAS,CAAE,IAAK,CACnB,AAEL,AAEwB,yBAFC,CACrB,cAAc,AAAA,qBAAqB,CAC/B,gBAAgB,AAAA,iBAAiB,AAAA,CAC7B,KAAK,CAAE,IAAK,CACf,AAJT,AAMI,yBANqB,CAMrB,sBAAsB,AAAA,CAClB,UAAU,CAAE,IAAK,CAKpB,AAZL,AAQQ,yBARiB,CAMrB,sBAAsB,CAElB,kBAAkB,AAAA,CACd,YAAY,CAAE,IAAK,CACnB,WAAW,CAAE,IAAK,CACrB,AAXT,AAaI,yBAbqB,CAarB,yBAAyB,AAAA,CACrB,OAAO,CAAE,YAAa,CACtB,KAAK,CAAE,KAAM,CAUhB,AAzBL,AAgBuB,yBAhBE,CAarB,yBAAyB,CAGrB,CAAC,CAAA,AAAA,KAAC,EAAO,MAAM,AAAb,CAAc,CACZ,gBAAgB,CAAE,OAAQ,CAC7B,AAlBT,AAmB0B,yBAnBD,CAarB,yBAAyB,CAMrB,CAAC,CAAA,AAAA,KAAC,EAAO,SAAS,AAAhB,CAAiB,CACf,gBAAgB,CAAE,OAAQ,CAC7B,AArBT,AAsBS,yBAtBgB,CAarB,yBAAyB,CASrB,CAAC,AAAA,MAAM,AAAA,CACH,KAAK,CAAE,KAAM,CAChB","names":[],"sourceRoot":"/source/"}
\ No newline at end of file

diff --git a/scss/admin/_dashboard.scss b/scss/admin/_dashboard.scss
index ff0ca31..1c9597c 100644 (file)
--- a/scss/admin/_dashboard.scss
+++ b/scss/admin/_dashboard.scss
@@ -36,14 +36,14 @@
                 .collection-item {
                     background-color: #fafafa;
                     line-height: 1;
-                    padding: 5px 15px;
+                    padding: 0px 10px;
                     float: left;
                     width: 100%;
                     a:not(.btn) {
                         color: #0073aa;
                         display: inline-block;
                         overflow: hidden;
-                        padding: 0 2%;
+                        padding: 7px 2%;
                         &.collection-item-left {
                             float: left;
                             text-align: left;

diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index d6bb311..199cc47 100644 (file)
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -509,7 +509,7 @@ add_filter(
                     'id'        => 'membersExportModal',
                     'template'  => 'modal',
                     'order'     => 99,
-                    'form'      => $this->controller('export', 'index', false, true)
+                    'form'      => ''//$this->controller('export', 'index', false, true)
                 ],
                 [
                     'id'        => 'textSearch',
@@ -532,13 +532,13 @@ add_filter(
                     'refLink'       => $membersRefLink,
                     'url'           => $membersEditPage,
                     'result'        => $MemberInfo->getList('status='.$MemberInfo->config['status_numb']['Pending'], $order, $fieldVals, $idField, $start, $limit),
-                    'count'         => $MemberInfo->getStats('status='.$MemberInfo->config['status_numb']['Pending'], $order, $fieldVals, $idField, $start, $limit),
+                    'count'         => $MemberInfo->getStats('status='.$MemberInfo->config['status_numb']['Pending']),
                     'fieldMap'      => [
-                        'id'            => 'id',
+                        'ID'            => 'id',
                         'name'          => 'reference_name',
                         'status'        => 'status',
-                        'ref_dest_id'   => 'member_pointer',
-                        'ref_dest_name' => 'member',
+                        'refDestID'     => 'member_pointer',
+                        'refDestName'   => 'member',
                         //'ref_type'      => 'ref_type', // membersInfo has no ref_type field yet
                     ],
                 ],
@@ -553,13 +553,13 @@ add_filter(
                     'refLink'       => $membersRefLink,
                     'url'           => $membersEditPage,
                     'result'        => $MemberInfo->getList("has_no_map_data='1'", $order, $fieldVals, $idField, $start, $limit),
-                    'count'         => $MemberInfo->getStats("has_no_map_data='1'", $order, $fieldVals, $idField, $start, $limit),
+                    'count'         => $MemberInfo->getStats("has_no_map_data='1'"),
                     'fieldMap'      => [
-                        'id'            => 'id',
+                        'ID'            => 'id',
                         'name'          => 'reference_name',
                         'status'        => 'status',
-                        'ref_dest_id'   => 'member_pointer',
-                        'ref_dest_name' => 'member',
+                        'refDestID'     => 'member_pointer',
+                        'refDestName'   => 'member',
                         //'ref_type'      => 'ref_type', // membersInfo has no ref_type field yet
                     ],
                 ],

diff --git a/views/admin/newDashboard/components/list.html b/views/admin/newDashboard/components/list.html
index 684f630..f1e8551 100644 (file)
--- a/views/admin/newDashboard/components/list.html
+++ b/views/admin/newDashboard/components/list.html
@@ -1,55 +1,44 @@
 <div class="{$component.title}-list list-header"> {$component.title}: <a href="{$component.url}">{$component.count}</a> </div>
 <ul class="collection">
-
 {foreach $component['result'] as $listItem}
     {if isset($listItem)}
 
-        {$itemID = false}
-        {$itemName = false}
-        {$itemRefType = false}
-        {$itemRefDestID = false}
-        {$itemRefDestName = false}
-        {$itemExpireDate = false}
-
-        {* Convert mapped values to more easily usable variables *}
-        {if isset($listItem[$component['fieldMap']['id']]) && isset($listItem[$component['fieldMap']['id']])}
-            {$itemID = $listItem[$component['fieldMap']['id']]}
-        {/if}
-        {if isset($listItem[$component['fieldMap']['name']]) && isset($listItem[$component['fieldMap']['name']])}
-            {$itemName = $listItem[$component['fieldMap']['name']]}
-        {/if}
-        {if isset($listItem[$component['fieldMap']['ref_type']]) && isset($listItem[$component['fieldMap']['ref_type']]) }
-            {$itemRefType = $listItem[$component['fieldMap']['ref_type']]['name']|strtolower}
-        {else}
-            {$itemRefType = $component['defaultRefType']}
-        {/if}
-        {if isset($listItem[$component['fieldMap']['ref_dest_id']]) && isset($listItem[$component['fieldMap']['ref_dest_id']])}
-            {$itemRefDestID = $listItem[$component['fieldMap']['ref_dest_id']]}
-        {/if}
-        {if isset($listItem[$component['fieldMap']['ref_dest_name']]) && isset($listItem[$component['fieldMap']['ref_dest_name']])}
-            {$itemRefDestName = $listItem[$component['fieldMap']['ref_dest_name']]}
-        {/if}
-        {if isset($listItem[$component['fieldMap']['expire_date']]) && isset($listItem[$component['fieldMap']['expire_date']])}
-            {$itemExpireDate = $listItem[$component['fieldMap']['expire_date']]}
-        {/if}
+        {* This loop converts mapped values to more easily usable variables *}
+        {* These will be stored in $item.{fieldname} where fieldname equals the one set in the map in the filter *}
+        {foreach $component['fieldMap'] as $fieldMapItemKey => $fieldMapItemValue}
+            {if isset( $listItem[$component['fieldMap'][{$fieldMapItemKey}]] )}
+                {$item.{$fieldMapItemKey} = $listItem[$component['fieldMap'][$fieldMapItemKey]]}
+            {else}
+                {$item.{$fieldMapItemKey} = false}
+            {/if}
+        {/foreach}
+        
+        {* Not all tables have a refType but all links require it, so make sure it is set *}
+        {if !$item.refType}{$item.refType = $component['defaultRefType']}{/if}
 
-        <li class="collection-item" style="line-height: 1;padding : 5px 15px;">
+        <li class="collection-item">
             {if isset($component.url)}
-                <a href='{$component.url}{if $itemRefDestID}&{$itemRefType}={$itemRefDestID}{/if}&{$component.entityID}={$itemID}'
-                    class='collection-item-left{if $itemExpireDate} tooltipped{/if}'
-                    {if $itemExpireDate} data-position="top" data-tooltip="expired: {date( 'm/d/Y', strtotime($itemExpireDate))}"{/if}>
+                <a href='{$component.url}{if $item.refDestID}&{$item.refType}={$item.refDestID}{/if}&{$component.entityID}={$item.ID}'
+                    class='collection-item-left{if $item.expireDate} tooltipped{/if}'
+                    {if $item.expireDate} data-position="top" data-tooltip="expired: {$item.expireDate['date']}"{/if}>
             {/if}
-                    <span>{$itemName}</span>
+                    <span>{$item.name}</span>
             {if isset($component.url)}
                 </a>
             {/if}
-            {if $itemRefType && $itemRefDestID && $itemRefDestName}
-                <a class="collection-item-right" href='{$component.refLink}&{$itemRefType}={$itemRefDestID}'>
-                    <span>{$itemRefDestName}</span>
+            {if $item.refType && $item.refDestID && $item.refDestName}
+                <a class="collection-item-right" href='{$component.refLink}&{$item.refType}={$item.refDestID}'>
+                    <span>{$item.refDestName}</span>
                 </a>
             {/if}
         </li>
-        <br>
     {/if}
 {/foreach}
-</ul>
\ No newline at end of file
+</ul>
+<script>
+    jQuery(function($){
+        listComponent({
+            // activates tooltips
+        })
+    })
+</script>
\ No newline at end of file

diff --git a/views/admin/newDashboard/index.html b/views/admin/newDashboard/index.html
index 79cb62a..265386d 100644 (file)
--- a/views/admin/newDashboard/index.html
+++ b/views/admin/newDashboard/index.html
@@ -120,6 +120,16 @@
 
         });
     }
+
+    /*
+     *  List component tooltips
+     */
+    function listComponent(listComponentData) {
+        jQuery(function($){
+            $('.tooltipped').tooltip();
+        });
+    }
+            
 </script>
 
 {include file='admin/footer.html'}
\ No newline at end of file

diff --git a/views/admin/newDashboard/summaryWidget.html b/views/admin/newDashboard/summaryWidget.html
index e25ecfa..fd786fa 100644 (file)
--- a/views/admin/newDashboard/summaryWidget.html
+++ b/views/admin/newDashboard/summaryWidget.html
@@ -1,5 +1,6 @@
 <div class="glm-summary-widget col s12 m6 l6 xl4">
     <ul id="{$addon.slug}-summary-widget" class="summary members-summary-widget dashboard-summary-widget collapsible">
+        <!--  something like if getOption("dashboard-expanded-{ $addon-for-$currentuser") ==> class="active" -->
         <li class="active">
             <div class="summary-widget-handle collapsible-header"><pre> {$addon.widgetData.title}</pre></div>
             <div class="summary-widget-body collapsible-body">