diff --git a/admin/assets/less/flexi_backend.less b/admin/assets/less/flexi_backend.less index bb4871e6945..5c15d2f33d6 100644 --- a/admin/assets/less/flexi_backend.less +++ b/admin/assets/less/flexi_backend.less @@ -1,5 +1,155 @@ +//J4 DEfault vaiables (Can remove) +:root { + --card-bg: rgba(255, 255, 255, 0.7); + --bluegray: #b2bfcd; + --lightbluegray: #f6f9fc; + --toolbar-bg: #fff; + --success-border: var(--success); + --info-border: var(--info); + --warning-border: var(--warning); + --danger-border: var(--danger); + --login-main-bg: #0b1c32; + --border: #cdcdcd; + --white: #fff; + --white-offset: #fefefe; + --focus: #39f; + --focus-shadow: #eaeaea; + --toggle-color: #fff; + --gray-100: #f8f9fa; + --gray-200: #e8e8e8; + --gray-300: #dee2e6; + --gray-400: #cdcdcd; + --gray-500: #adb5bd; + --gray-600: #666e76; + --gray-700: #495057; + --gray-800: #343a40; + --gray-900: #212529; + --primary: #132f53; + --secondary: #495057; + --success: #457d54; + --info: #2a69b8; + --warning: #ffb514; + --danger: #c52827; + --light: #f8f9fa; + --dark: #212529; + --action: #132f53; + --error: #3b0d0c; + --alert-success: #0f2f21; + --primary-rgb: 19, 47, 83; + --secondary-rgb: 73, 80, 87; + --success-rgb: 69, 125, 84; + --info-rgb: 42, 105, 184; + --warning-rgb: 255, 181, 20; + --danger-rgb: 197, 40, 39; + --light-rgb: 248, 249, 250; + --dark-rgb: 33, 37, 41; + --action-rgb: 19, 47, 83; + --error-rgb: 59, 13, 12; + --alert-success-rgb: 15, 47, 33; + --white-rgb: 255, 255, 255; + --black-rgb: 0, 0, 0; + --body-color-rgb: 33, 37, 41; + --body-bg-rgb: 255, 255, 255; + --font-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + --font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + --gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); + --body-font-family: var(--font-sans-serif); + --body-font-size: 1rem; + --body-font-weight: 400; + --body-line-height: 1.5; + --body-color: #212529; + --body-bg: #fff; + --border-width: 1px; + --border-style: solid; + --border-color: #dee2e6; + --border-color-translucent: rgba(0, 0, 0, 0.175); + --border-radius: 0.25rem; + --border-radius-sm: 0.2rem; + --border-radius-lg: 0.3rem; + --border-radius-xl: 0.3rem; + --border-radius-2xl: 0.3rem; + --border-radius-pill: 50rem; + --link-color: var(--template-link-color); + --link-hover-color: var(--template-link-hover-color); + --code-color: #971250; + --highlight-bg: #fff0d0; +} + +/* + BASELINE GRID (doesn't work with chrome mobile 100%) + ======================================================================*/ + .bgrid { + position: relative; + } + + .bgrid::after { + content: ""; + display: block; + position: absolute; + left: 0; + right: 0; + pointer-events: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + top: 0; + height: 100%; + background: linear-gradient(to bottom, rgba(0, 119, 179, 0.2) 1px, transparent 1px); + background-size: 100% calc(var(--body-font-size) * var(--body-line-height)); + } + +//FLEXIContent +:root { + --box-shadow: 0 2px 3px var(--gray-200); + --cubic: cubic-bezier(0.215, 0.61, 0.355, 1); + --dash-color: hsl(var(--hue), 30%, 40%); + --sp-1: 0.75rem; //12px + --sp-2: 1.5rem; //24px calc(var(--body-font-size) * var(--body-line-height) +} + #flexicontent { - margin-bottom: 24px; //*** needed because of Joomla's bottom info bar overlaping the content + margin-bottom: 240px; //*** needed because of Joomla's bottom info bar overlaping the content +} + + +.badge-success { + background: var(--success); +} + +.badge-warning { + background: var(--warning); +} + +.badge-info { + background: var(--info); +} + +.badge-danger { + background: var(--danger); +} + +/* vertical form */ +#flexicontent { + .control-group { + &.fc_vertical { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + + .label-fcinner { + text-align: left; + width: auto; + } + } + } +} + + + + +.accordion-item { + overflow: hidden; } @@ -9,11 +159,13 @@ // *** .fc-layout-params-icon:before { - color: white !important; + color: var(--white); } + .fc-rss-params-icon:before { - color: yellowgreen !important; + color: var(--success); } + /*.fc-display-params-icon:before { color: darkorange !important; }*/ @@ -27,11 +179,13 @@ margin-right: 9px !important; font-size: 16px; } + [class^="fcsb-icon-"]:before, [class*=" fcsb-icon-"]:before { font-family: "IcoMoon"; font-style: normal; } + .disabled[class^="fcsb-icon-"], .disabled[class*=" fcsb-icon-"] { font-weight: normal; @@ -42,77 +196,93 @@ .icon-items:before { content: "\e242"; } + .icon-itemedit:before, .icon-itemadd:before { content: "\2c"; } + /*.fcsb-icon-reviews:before,*/ .icon-reviews:before, icon-reviewadd:before, .icon-reviewedit:before { content: "%"; } + /*.fcsb-icon-types:before,*/ .icon-types:before, icon-typeadd:before, .icon-typeedit:before { content: "\e243"; } + /*.fcsb-icon-fc_categories:before,*/ .icon-fc_categories:before, .icon-fc_categoryadd:before, .icon-fc_categoryedit:before { content: "\2d"; } + /*.fcsb-icon-fields:before,*/ .icon-fields:before, .icon-fieldadd:before, .icon-fieldedit:before { content: "\e230"; } + /*.fcsb-icon-tags:before,*/ .icon-tags:before { content: "\e264"; } + .icon-tagadd:before, .icon-tagedit:before { content: "\e262"; } + /*.fcsb-icon-templates:before,*/ .icon-templates:before { content: "\3c"; } + /*.fcsb-icon-authors:before,*/ .icon-authors:before { content: "\e01f"; } + /*.fcsb-icon-users:before,*/ .icon-authoredit:before, .icon-authoradd:before { content: "\22"; } + /*.fcsb-icon-groups:before,*/ .icon-groups:before, .icon-groupedit:before, .icon-groupadd:before { content: "\e01f"; } + /*.fcsb-icon-filemanager:before,*/ .icon-files:before { content: "\30"; } + .icon-fileedit:before, .icon-fileadd:before { content: "\e239"; } + /*.fcsb-icon-search:before,*/ .icon-searchtext:before { content: "\53"; } + /*.fcsb-icon-stats:before,*/ .icon-stats:before { content: "\75"; } + /*.fcsb-icon-comments:before { content: "\25"; } @@ -125,26 +295,31 @@ icon-typeadd:before, .icon-test:before { content: "l"; - color: #51a351; + color: var(--success); font-weight: bold; } + .icon-savenew:before { content: "\5d"; - color: #51a351; + color: var(--success); } + .icon-32-delete:before, .icon-32-trash:before { content: "\4c"; } + .icon-copy_wvalues:before, .icon-params:before { content: "\e018"; - color: #51a351; + color: var(--success); } + /*.fcsb-icon-archive:before,*/ .icon-32-archive:before { content: "\50"; } + /*.fcsb-icon-wrench:before { content: ":"; }*/ @@ -153,31 +328,39 @@ icon-typeadd:before, }*/ .icon-import:before { content: "\e022"; - color: darkorange; + color: var(--success); } + .icon-32-restore:before { content: "\6c"; } + .icon-translate:before { content: "\25"; } + .icon-32-basicindex:before, .icon-32-advindex:before { content: "S"; } + .icon-32-basicfilter:before, .icon-32-advfilter:before { content: "T"; } + .icon-basicindex:before, .icon-advindex:before, .icon-advindexdirty:before { content: "\e001"; } + .icon-language:before { content: "\35"; } + @media (min-width: 1020px) { + #fctoolbar-copy, #fctoolbar-maintenance-btns-group, #fctoolbar-download, @@ -190,21 +373,24 @@ icon-typeadd:before, #fctoolbar .dropdown-menu, #toolbar .dropdown-menu { - span.icon-lock { - } + span.icon-lock {} + span.icon-upload { - color: darkorange; - } - span.icon-loop { + color: var(--alert-success); } + + span.icon-loop {} + span.icon-download { - color: darkcyan; + color: var(--action); } + span.icon-box-add { - color: darkcyan; + color: var(--action); } + span.icon-upload { - color: darkorange; + color: var(--alert-success); } } @@ -238,25 +424,31 @@ html body#minwidth-body { width: 16px; height: 16px; float: left; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } + .flexicontent .fc_drag_handle { cursor: move; } + .flexicontent .fc_drag_handle_none { background: url(../images/move2_none.png) 0% 0% no-repeat transparent; } + .flexicontent .fc_drag_handle.fc_drag_handle_disabled { background: url(../images/move3.png) 0% 0% no-repeat transparent; cursor: auto; } + .flexicontent .fc_drag_handle.fc_drag_handle_both { background: url(../images/move2.png) 0% 0% no-repeat transparent; } + .flexicontent .fc_drag_handle.fc_drag_handle_uponly { background: url(../images/move2_uponly.png) 0% 0% no-repeat transparent; } + .flexicontent .fc_drag_handle.fc_drag_handle_downonly { background: url(../images/move2_downonly.png) 0% 0% no-repeat transparent; } @@ -268,108 +460,292 @@ html body#minwidth-body { // *** /* dashboard buttons container / dashboard sliders / dashboard credits container */ -div#fc-dash-boardbtns, -div#fc-dash-sliders, -div#fc-dash-credits { - float: left; - clear: both; -} -div#fc-dash-boardbtns { - padding: 0px 0px; - clear: both; - margin-bottom: 12px; -} -div#fc-dash-credits { - margin: 24px 0px 12px 0px; -} +// div#fc-dash-boardbtns, +// div#fc-dash-sliders, +// div#fc-dash-credits { +// float: left; +// clear: both; +// } + +// div#fc-dash-boardbtns { +// padding: 0 0; +// clear: both; +// margin-bottom: var(--sp-1); +// } +// div#fc-dash-credits { +// margin: var(--sp-2) 0 var(--sp-1) 0; +// } div#fc-dash-credits .fc-board-set-inner { text-align: left; } -div#fc-dash-credits #fc-dash-logo { - display: inline-block; - padding: 2px; - float: left; - margin: 4px 16px 16px 0 !important; -} -div#fc-dash-credits #fc-dash-license { - margin: 4px 16px 0 0 !important; - padding: 22px 32px !important; - max-width: inherit; -} -div#fc-dash-credits #fc-dash-devs { - display: inline-flex; -} -div#fc-dash-credits #fc-dash-devs > .fc-mssg-inline { - vertical-align: top; - margin: 0 24px 12px 0 !important; - padding: 0 !important; -} -div#fc-dash-credits #fc-dash-devs .label { - margin: 2px 0; + +// div#fc-dash-credits #fc-dash-logo { +// display: inline-block; +// padding: 2px; +// float: left; +// margin: 4px 16px 16px 0 !important; +// } +// div#fc-dash-credits #fc-dash-license { +// margin: 4px 16px 0 0 !important; +// padding: 22px 32px !important; +// max-width: inherit; +// } +// div#fc-dash-credits #fc-dash-devs { +// display: inline-flex; +// } +// div#fc-dash-credits #fc-dash-devs > .fc-mssg-inline { +// vertical-align: top; +// margin: 0 var(--sp-2) var(--sp-1) 0 !important; +// padding: 0 !important; +// } +// div#fc-dash-credits #fc-dash-devs .label { +// margin: 2px 0; +// } + + + +// div#fc-dash-sliders .panel .title { +// padding: 8px; +// } + + +// Dashboard button SET (a fieldset) + +#flexicontent { + + //OUTER + fieldset.fc-board-set { + border: 0; + margin: 0 var(--sp-2) var(--sp-1) 0; + padding: 0; + } + + // Dashboard button SET title (a fieldset legend) + + .fc-board-header { + display: flex; + padding: 1rem 0 0; + font-weight: 500; + color: var(--template-bg-dark); + } + + + .fc-board-set-inner { + position: relative; + margin: 0; + padding: var(--sp-1) 0 0 0; + border-top: 1px solid var(--border-color); + + display: flex; + flex-wrap: wrap; + gap: var(--sp-1); + } + + + + .fc-board-button { + display: flex; + flex: 0 0 calc(50% - (var(--sp-2)/2)); + + + @media (min-width: 640px) { + flex: 0 0 auto; + width: calc(25% - (var(--sp-2)/2)); + } + + /* Don't need this class in the template */ + .fc-board-button-inner { + width: 100%; + display: flex; + } + + // button + a { + + display: flex; + flex-direction: column; + text-align: center; + width: 100%; + height: 100%; + align-items: center; + + //STYLE + color: var(--dash-color); + background-color: var(--card-bg); + border: 1px solid var(--border-color); + border-radius: calc(var(--border-radius-2xl) * 2); + transition: all .25s ease; + box-shadow: var(--box-shadow); + + .fc-dashboard-icon { + font-size: 2.2rem; + margin: var(--sp-2) var(--sp-1) var(--sp-1); + padding: 0; + width: 2.2rem; + height: 2.2rem; + display: flex; + flex-wrap: wrap; + align-content:flex-start; + justify-content: space-around; + } + + .fc-board-btn-text { + font-weight: 500; + margin: 0 var(--sp-1) var(--sp-2); + + font-size: 95%; + display: flex; + flex-wrap: wrap; + align-content: center; + justify-content: space-around; + height: 100%; + + @media (min-width: 1200px) { + font-size: 100%; + } + + + + &.fcdisabled { + color: var(--btn-disabled-color); + font-style: italic; + } + + } + + + + &:hover { + box-shadow:var(--border-color) 0 0 2px 0, var(--gray-100) 0 6px var(--sp-1) -2px; + opacity: 0.9; + .fc-board-btn-text { + color: var(--link-hover-color); + } + } + } + } + + .fc-board-button_sep { + display: none !important; + } + + //Last row add space + + #fc-dash-boardbtns { + fieldset.fc-board-set:last-of-type { + margin-bottom: var(--sp-2); + + @media (min-width: 1200px) { + margin-bottom: calc(var(--sp-2) * 2); + } + } + } } -div#fc-dash-sliders { - padding: 0px 0px; +#fc-dash-sliders { + padding: 0 0; width: 100%; clear: both; - margin-bottom: 12px; - background: white; -} -div#fc-dash-sliders .panel .title { - padding: 8px; + margin-bottom: var(--sp-1); + background: var(--white); + + .accordion-button { + display: flex; + justify-content: space-between; + align-items: center; + position: relative; + + > .badge { + position: absolute; + right: calc(var(--accordion-btn-padding-x) + 30px); + } + } + + table { + tr { + td, th { + font-size: .8rem; + text-align: right; + } + td { + color: var(--gray-600); + } + th { + color: var(--gray-600); + } + td:first-child, th:first-child { + font-size: 100%; + padding-left: 0; + text-align: left; + color: var(--body-color); + + a { + text-decoration: none; + } + } + + td:last-child, th:last-child { + + padding-right: 0; + } + } + } + } -// Dashboard button SET (a fieldset) +//VERSION CHECKING +#displayfversion { + .col-4 { + color: var(--body-color); + } -#flexicontent fieldset.fc-board-set { - float: left; - width: auto; - margin-left: 10px; - border: 0; - margin: 0 24px 12px 0; - padding: 0; + .col-8 { + color: var(--gray-600); + } + a { + text-decoration: none; + } } -#flexicontent fieldset.fc-board-set div.fc-board-set-inner { - float: left; - clear: both; - position: relative; - top: 0; - margin: 0px; - padding: 12px 0px 0px 0px; - width: auto; - border-top: 1px solid #ccc; + +//PHP Requirements +#fc-dash-sliders-requirements { + .alert { + max-width: 640px; + } } -div#fc-dash-sliders table.table { - width: unset; - margin: 8px 32px; + +//HIDE +#wrapper.open, #wrapper.open.closed { + #fc-dash-sliders { + small { + display: none !important; + } + } } +.fc-board-set-inner {} -// Dashboard button SET title (a fieldset lengend) +// div#fc-dash-sliders table.table { +// width: unset; +// margin: 8px 32px; +// } -#flexicontent .fc-board-header { - float: left; - border-radius: 3px; - font-size: 1rem; - font-weight: bold; - text-decoration: none; - display: inline-block; - width: auto; - line-height: 2em; - margin: 1px 0 0px -1px; - padding: 0px 24px 0 0; -} // Individual titles of dashboard button SETs, currently not added to the code .fc-board-header-content-editing {} + .fc-board-header-type-fields {} + .fc-board-header-content-viewing {} + .fc-board-header-users {} + .fc-board-header-expert {} + .fc-board-header-update-check {} @@ -378,98 +754,136 @@ div#fc-dash-sliders table.table { // *** Dashboard button separator // *** -div#fc-dash-boardbtns .fc-board-button_sep { - margin: 0px 12px 12px 0; - padding: 0px; - font-weight: bold; - width: 0px; - height: 100px; - border-left: 1px dashed #d0d0d0; - display: inline-block; - vertical-align: top; -} +// div#fc-dash-boardbtns .fc-board-button_sep { + + +// margin: 0; +// padding: 0; +// /* font-weight: bold; */ +// width: 0; +// height: 0; +// border-left: 0; +// display: flex; + + +// @media (min-width: 1200px) { +// margin: 0 var(--sp-1) var(--sp-1) 0; +// padding: 0; +// font-weight: bold; +// width: 0; +// height: 100px; +// border-left: 1px dashed var(--border-color); +// display: inline-block; +// vertical-align: top; +// } + +// } + + + // *** // *** Dashboard button // *** -div#fc-dash-boardbtns .fc-board-button { - margin: 0px 12px 12px 0; - padding: 0px; - font-weight: normal; - width: 100px; - height: 100px; - text-align: center; - background-color: #f9f9f9; - border: 1px solid #d0d0d0; - color: #444; - box-shadow: 0 1px 2px rgba(0,0,0,0.25); - transition: all .25s ease; - display: inline-block; - vertical-align: top; - - /* Inner container of dashboard button (of extra styling choices) */ - .fc-board-button-inner { - display: inline-block; - width: 100%; - height: 100%; - padding: 0; - margin: 0; +// div#fc-dash-boardbtns .fc-board-button { +// margin: 0 var(--sp-1) var(--sp-1) 0; +// padding: 0; +// font-weight: normal; +// width: 100px; +// @media screen and (min-width: 740px) { +// width: 118px; +// } +// min-height: 100px; +// text-align: center; +// background-color: var(--card-bg); +// border: 1px solid var(--border-color); +// color: #444; +// box-shadow: var(--box-shadow); +// transition: all .25s ease; +// display: inline-block; +// vertical-align: top; +// border-radius: calc(var(--border-radius-2xl) * 2); +// opacity: 1; +// transition: opacity 0.3s var(--cubic), box-shadow 0.3s var(--cubic); + +// /* Inner container of dashboard button (of extra styling choices) */ +// .fc-board-button-inner { +// display: inline-block; +// width: 100%; +// height: 100%; +// padding: 0; +// margin: 0; + +// .fc-dashboard-icon { +// font-size: 2.2rem; +// margin: 0; +// padding: 0; +// width: 2.2rem; +// height: 2.2rem; +// } +// } + +// // Dashboard button (inner) LINK, (contains the button image and the button text +// a { +// text-decoration: none; +// display: inline-block; +// width: 100%; +// height: 100%; +// padding: 25% 0 0 0; +// margin: 0; +// color: var(--dash-color); +// &:hover { +// .fc-board-btn-text { +// color: var(--link-hover-color); +// } +// } +// } + + +// // TEXT +// .fc-board-btn-text { +// font-weight: 500; +// width: 100%; +// padding: 2px 0%; +// min-height: 48px; +// margin: 0; +// font-size: 0.8rem; +// display: flex; +// flex-wrap: wrap; +// align-content: center; +// justify-content: space-around; + +// &.fcdisabled { +// color: var(--btn-disabled-color); +// font-style: italic; +// } +// } +// &:last-of-type { +// margin-right: 0; +// } + +// &:hover { +// box-shadow:var(--border-color) 0 0 2px 0, var(--gray-100) 0 6px var(--sp-1) -2px; +// opacity: 0.9; +// } +// } - .fc-dashboard-icon { - font-size: 2.2rem; - margin: 0; - padding: 0; - width: 2.2rem; - height: 2.2rem; - } - } - // Dashboard button (inner) LINK, (contains the button image and the button text - a { - text-decoration: none; - display: inline-block; - width: 100%; - height: 100%; - padding: 25% 0 0 0; - margin: 0; - } -} -div#fc-dash-boardbtns .fc-board-button:hover { - background-color: #FffFfF; - box-shadow: 0 0 8px 0 rgba(0,0,0,0.3); - - // Dashboard button (inner) LINK, (contains the button image and the button text - a { - } -} // Dashboard button image and text -div#fc-dash-boardbtns .fc-board-button .fc-board-btn-img { - width: 32px; - margin: 0 auto; - float: none; -} -div#fc-dash-boardbtns .fc-board-button .fc-board-btn-text { - display: inline-block; - width: 100%; - padding: 2px 0%; - margin: 0px 0 0 0; - min-height: 48px; - vertical-align: middle; - font-size: 0.8rem; - line-height: 140%; /* or less will allow 3 lines of text to fit inside the button height */ - text-align: center; -} +// div#fc-dash-boardbtns .fc-board-button .fc-board-btn-img { +// width: 32px; +// margin: 0 auto; +// float: none; +// } + .fc_sidebar_entry.disabled { - color: #aaa; + color: var(--btn-disabled-color); font-style: normal; } -div#fc-dash-boardbtns .fc-board-button .fc-board-btn-text.fcdisabled { - color: gray; - font-style: italic; -} + @@ -482,7 +896,7 @@ div#fc-dash-boardbtns .fc-board-button .fc-board-btn-text.fcdisabled { margin-bottom: 8px; } -.code_box > .btn { +.code_box>.btn { min-width: 300px; text-align: left; } @@ -498,32 +912,34 @@ div#fc-dash-boardbtns .fc-board-button .fc-board-btn-text.fcdisabled { float: none !important; width: 82%; padding: 6px 6% !important; - margin: 1px 6% 0px 1px; + margin: 1px 6% 0 1px; } .fcimport_sampleline { - font-size: 12px; + font-size: var(--sp-1); line-height: 1.6em; display: inline-block; margin-top: 4px; } + .fcimport_missingfile { background: url(../images/warning.png) 0 0 no-repeat; - padding: 2px 0px 2px 20px; - color: red; + padding: 2px 0 2px 20px; + color: var(--danger); } ol.fcimport_field_value_list { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; position: relative; - left: 0px; + left: 0; } + ul.fcimport_field_value_list { - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; position: relative; - left: 0px; + left: 0; } dl.fcimport_field_prop_list.fcimport_field_prop_mainlist dt { @@ -531,51 +947,59 @@ dl.fcimport_field_prop_list.fcimport_field_prop_mainlist dt { width: auto; clear: none; } + dl.fcimport_field_prop_list.fcimport_field_prop_mainlist dd { float: left; margin-right: 48px; } dl.fcimport_field_prop_list { - border: 0px solid; - margin: 0px; - padding: 0px; + border: 0 solid; + margin: 0; + padding: 0; } -dl.fcimport_field_prop_list > dt { + +dl.fcimport_field_prop_list>dt { float: left; clear: left; width: auto; text-align: left; font-weight: bold; - color: green; + color: var(--success); margin-right: 6px; } -dl.fcimport_field_prop_list > dt:after { + +dl.fcimport_field_prop_list>dt:after { content: ":"; } -dl.fcimport_field_prop_list > dd { + +dl.fcimport_field_prop_list>dd { margin: 0; padding: 0; } ol.fcimport_field_value_list { margin-left: 1.5em; - padding-left: 0px; + padding-left: 0; } + ul.fcimport_field_value_list { margin-left: 0em; padding-left: 0.2em; margin-bottom: 0; } + ul.fcimport_field_value_list li { background: url(../images/readon.gif) 0% 50% no-repeat transparent; padding-left: 16px; list-style: none; } + ul.fcimport_field_value_list li:first-child { - border-top: 0px dashed; + border-top: 0 dashed; width: 100%; } + ul.fcimport_field_value_list li { border-top: 1px dashed lightgray; float: left; @@ -601,20 +1025,21 @@ ul.fcimport_field_value_list li { table.postinstall-tbl td .install-task { display: inline-block; - min-height: 24px; + min-height: var(--sp-2); } + table.postinstall-tbl td .fc_button.fc_simple { margin: 0 16px; - padding: 0 24px; + padding: 0 var(--sp-2); } table.postinstall-tbl td .ajax-loader { background: url("../images/ajax-loader.gif") no-repeat scroll center center transparent; width: 16px; - height: 24px; + height: var(--sp-2); display: inline-block; vertical-align: middle; - padding: 0px; + padding: 0; } @@ -625,11 +1050,13 @@ table.postinstall-tbl td .ajax-loader { padding: 1px 0 1px 20px; margin: 5px 15px; } + .copyfailed { background: url(../images/delete.png) 0% 50% no-repeat transparent; padding: 1px 0 1px 20px; margin: 5px 15px; } + .copywarn { background: url(../images/warning.png) 0% 50% no-repeat transparent; padding: 1px 0 1px 20px; @@ -644,16 +1071,17 @@ table.postinstall-tbl td .ajax-loader { padding: 0; margin: 0; width: 20px; - height: 24px; + height: var(--sp-2); display: inline-block; vertical-align: middle; } + .install-notok { background: url(../images/delete.png) 0% 50% no-repeat transparent; padding: 0; margin: 0; width: 20px; - height: 24px; + height: var(--sp-2); display: inline-block; vertical-align: middle; } @@ -666,69 +1094,79 @@ table.postinstall-tbl td .ajax-loader { #import-log { margin: 10px 10px 15px 10px; - font-size: 12px; + font-size: var(--sp-1); line-height: 140%; white-space: normal; } + .alert-modalbox { display: block; - border-color: #D8000C !important; margin: 0 0 15px 0 !important; padding: 8px 10px 8px 36px !important; - border: 1px solid !important; - border-radius: 6px !important; - border-color: #D8000C !important; + border: thin solid !important; + border-radius: var(--border-radius) !important; + border-color: var(--danger-border) !important; - background: #f0f0f0 url(../images/error.png) no-repeat 10px 50%; - color: black !important; + background: var(--body-bg) url(../images/error.png) no-repeat 10px 50%; + color: var(--body-color) !important; } + .alert-modalbox-title { display: block; - margin: 5px 0px; + margin: 5px 0; font-weight: bold; } + .centerimg { display: block; text-align: center; margin-top: 20px; - margin-bottom: 0px; - padding: 0px; + margin-bottom: 0; + padding: 0; height: 30px; } + .spinner { display: block; margin-top: 20px; - margin-bottom: 0px; - padding: 0px; + margin-bottom: 0; + padding: 0; height: 30px; } + .lang-success { - color: green; + color: var(--success); font-weight: bold; } + .lang-fail { - color: red; + color: var(--danger); font-weight: bold; } + #missing { display: none; } + .button-close { text-align: center; - margin: 20px 0px; - padding: 0px; + margin: 20px 0; + padding: 0; } + ul.import-ok, ul.import-failed { list-style: none; margin: 5px 0 10px; padding: 0 0 0 10px; } + ul.import-ok li { background: url(../images/accept.png) 0% 50% no-repeat transparent; padding: 1px 0 1px 20px; } + ul.import-failed li { background: url(../images/delete.png) 0% 50% no-repeat transparent; padding: 1px 0 1px 20px; @@ -746,48 +1184,54 @@ ul.import-failed li { float: none; min-width: 16px; } + img.btn.btn-small.fc-man-icon-s { border-radius: 3px; } + .btn.btn-micro.fc-man-icon-s { border-radius: 3px; padding: 2px; } -.flexicontent .fcmanlist -{ +.flexicontent .fcmanlist { .btn.btn-small img.fc-man-icon-s { float: left; } + .btn.btn-small.fc-preview-btn img.fc-man-icon-s { margin-top: 1px; margin-bottom: -1px; } + .btn.btn-small.fc-edit-layout-btn img.fc-man-icon-s, - .btn.btn-small.fc-rss-list-btn img.fc-man-icon-s { - } + .btn.btn-small.fc-rss-list-btn img.fc-man-icon-s {} - th :not(.btn-group) > [class^="icon-"], - th :not(.btn-group) > [class*="icon-"] { + th :not(.btn-group)>[class^="icon-"], + th :not(.btn-group)>[class*="icon-"] { font-size: 14px; } - .col_template, .col_alias { - } + + .col_template, + .col_alias {} // Some defaults for buttons inside backend lists - :not(.btn-group) > .btn.btn-small { + :not(.btn-group)>.btn.btn-small { padding: 3px 4px 1px 4px !important; font-size: 14px; } - :not(.btn-group) > .btn.btn-micro { + + :not(.btn-group)>.btn.btn-micro { padding: 1px 1px 1px 1px; - font-size: 12px; + font-size: var(--sp-1); } - :not(.btn-group) > .btn.btn-mini { - padding: 1px 1px 0px 2px; + + :not(.btn-group)>.btn.btn-mini { + padding: 1px 1px 0 2px; font-size: 10px; } + .btn.btn-small.fc-assignments-btn { min-width: 50px; box-sizing: border-box; @@ -800,8 +1244,8 @@ body .j-sidebar-container { } body .popover { - max-width: 500px !important; - min-width: 400px !important; + max-width: 500px !important; + min-width: 400px !important; } @@ -809,15 +1253,18 @@ body .popover { body div .fc_assoc_ispublished { background-color: darkgreen; } + body div .fc_assoc_isinprogress { background-color: darkcyan; } + body div .fc_assoc_isunpublished { background-color: #555555; } body div .fc_assoc_isstale { opacity: 0.5; + span { color: white; } @@ -825,6 +1272,7 @@ body div .fc_assoc_isstale { body div .fc_assoc_isuptodate { opacity: 1; + span { color: white; } diff --git a/admin/assets/less/flexi_backend_rtl.less b/admin/assets/less/flexi_backend_rtl.less index 6f2c4b47d57..7d01cef7a89 100644 --- a/admin/assets/less/flexi_backend_rtl.less +++ b/admin/assets/less/flexi_backend_rtl.less @@ -338,7 +338,7 @@ div#fc-dash-sliders .panel .title { margin: 0px; padding: 12px 0px 0px 0px; width: auto; - border-top: 1px solid #ccc; + border-top: 1px solid var(--border-color); } div#fc-dash-sliders table.table { diff --git a/admin/assets/less/flexicontentbackend.less b/admin/assets/less/flexicontentbackend.less index b7c522c5852..c4a396d092a 100644 --- a/admin/assets/less/flexicontentbackend.less +++ b/admin/assets/less/flexicontentbackend.less @@ -1,5 +1,4 @@ @import '../../../../../components/com_flexicontent/assets/css/config.css'; - @import url('../../../../../components/com_flexicontent/assets/less/flexi_form.less'); @import url('../../../../../components/com_flexicontent/assets/less/flexi_containers.less'); @import url('../../../../../components/com_flexicontent/assets/less/flexi_shared.less'); diff --git a/admin/assets/less/j3x.less b/admin/assets/less/j3x.less index 71bf6a5a700..88b533034d0 100644 --- a/admin/assets/less/j3x.less +++ b/admin/assets/less/j3x.less @@ -227,7 +227,7 @@ div.toolbar-box { padding: 2px 2px 2px 5px; } .pane-sliders .content { - box-shadow: 0 0 4px #cccccc; + box-shadow: 0 0 4px var(--border-color); border-radius: 2px; padding: 12px 0px 0px 12px; background: none repeat scroll 0 0 white; @@ -435,7 +435,7 @@ dl.tabs { } dl.tabs dt { background: none repeat scroll 0 0 #E9E9E9; - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); color: #666666; float: left; margin-left: 3px; @@ -453,7 +453,7 @@ dl.tabs dt.open { z-index: 100; } div.current { - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); clear: both; padding: 10px; } diff --git a/admin/assets/less/j3x_rtl.less b/admin/assets/less/j3x_rtl.less index f053593cb21..7dba4ab8da8 100644 --- a/admin/assets/less/j3x_rtl.less +++ b/admin/assets/less/j3x_rtl.less @@ -227,7 +227,7 @@ div.toolbar-box { padding: 2px 2px 2px 5px; } .pane-sliders .content { - box-shadow: 0 0 4px #cccccc; + box-shadow: 0 0 4px var(--border-color); border-radius: 2px; padding: 12px 0px 0px 12px; background: none repeat scroll 0 0 white; @@ -435,7 +435,7 @@ dl.tabs { } dl.tabs dt { background: none repeat scroll 0 0 #E9E9E9; - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); color: #666666; float: right; margin-right: 3px; @@ -453,7 +453,7 @@ dl.tabs dt.open { z-index: 100; } div.current { - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); clear: both; padding: 10px; } diff --git a/admin/assets/less/j4x.less b/admin/assets/less/j4x.less index b7812435d8f..2689ef03272 100644 --- a/admin/assets/less/j4x.less +++ b/admin/assets/less/j4x.less @@ -146,21 +146,21 @@ * Small labels **************/ -.label, -.badge, -.flexicontent label.label { - margin: 0px 2px 2px 4px; - background:var(--template-bg-dark-40); -} -.label.highlight, -.badge.highlight { - color: darkred; -} -.label, -.flexicontent label.label { - padding: 4px; - border-radius: 4px; -} +// .label, +// .badge, +// .flexicontent label.label { +// margin: 0px 2px 2px 4px; +// background:var(--template-bg-dark-40); +// } +// .label.highlight, +// .badge.highlight { +// color: darkred; +// } +// .label, +// .flexicontent label.label { +// padding: 4px; +// border-radius: 4px; +// } /************** * Other layout @@ -234,7 +234,7 @@ div.toolbar-box { padding: 2px 2px 2px 5px; } .pane-sliders .content { - box-shadow: 0 0 4px #cccccc; + box-shadow: 0 0 4px var(--border-color); border-radius: 2px; padding: 12px 0px 0px 12px; background: none repeat scroll 0 0 white; @@ -442,7 +442,7 @@ dl.tabs { } dl.tabs dt { background: none repeat scroll 0 0 #E9E9E9; - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); color: #666666; float: right; margin-right: 3px; @@ -460,7 +460,7 @@ dl.tabs dt.open { z-index: 100; } div.current { - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); clear: both; padding: 10px; } @@ -1044,7 +1044,7 @@ body .ui-widget-header { border: 1px solid #fff !important; background: #fff !important; color: var(--template-bg-dark-50)!important; - border-bottom: 1px solid #ccc!important; + border-bottom: 1px solid var(--border-color) !important; } body .ui-widget-overlay { background: #aaa; @@ -1055,7 +1055,7 @@ body .ui-widget-overlay { } #flexicontent .nav.nav-tabs.nav-stacked li { width: 24%; - border: 1px solid #ccc; + border: 1px solid var(--border-color); margin: 5px; padding: 1.5rem; border-radius: 5px; diff --git a/admin/assets/less/j4x_rtl.less b/admin/assets/less/j4x_rtl.less index 52a44fae29c..6f2ba1ce07a 100644 --- a/admin/assets/less/j4x_rtl.less +++ b/admin/assets/less/j4x_rtl.less @@ -234,7 +234,7 @@ div.toolbar-box { padding: 2px 2px 2px 5px; } .pane-sliders .content { - box-shadow: 0 0 4px #cccccc; + box-shadow: 0 0 4px var(--border-color); border-radius: 2px; padding: 12px 0px 0px 12px; background: none repeat scroll 0 0 white; @@ -442,7 +442,7 @@ dl.tabs { } dl.tabs dt { background: none repeat scroll 0 0 #E9E9E9; - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); color: #666666; float: right; margin-right: 3px; @@ -460,7 +460,7 @@ dl.tabs dt.open { z-index: 100; } div.current { - border: 1px solid #CCCCCC; + border: 1px solid var(--border-color); clear: both; padding: 10px; } @@ -1044,7 +1044,7 @@ body .ui-widget-header { border: 1px solid #fff !important; background: #fff !important; color: var(--template-bg-dark-50)!important; - border-bottom: 1px solid #ccc!important; + border-bottom: 1px solid var(--border-color) !important; } body .ui-widget-overlay { background: #aaa; @@ -1055,7 +1055,7 @@ body .ui-widget-overlay { } #flexicontent .nav.nav-tabs.nav-stacked li { width: 24%; - border: 1px solid #ccc; + border: 1px solid var(--border-color); margin: 5px; padding: 1.5rem; border-radius: 5px; diff --git a/admin/views/flexicontent/tmpl/default.php b/admin/views/flexicontent/tmpl/default.php index 6939d8b3867..289b35c14a5 100644 --- a/admin/views/flexicontent/tmpl/default.php +++ b/admin/views/flexicontent/tmpl/default.php @@ -1,4 +1,5 @@ params->get('dashboard_buttons_hide', array()); $dashboard_buttons_hide = FLEXIUtilities::paramToArray($dashboard_buttons_hide); $sbtns = array_flip($dashboard_buttons_hide); + +$date_format = JText::_('FLEXI_DATE_FORMAT_FLEXI_ITEMS_J16GE'); + $skip_content_fieldset = isset($sbtns['items']) && isset($sbtns['additem']) && isset($sbtns['cats']) && isset($sbtns['addcat']) && isset($sbtns['comments']); $skip_types_fieldset = isset($sbtns['types']) && isset($sbtns['addtype']) && isset($sbtns['fields']) && isset($sbtns['addfield']) && isset($sbtns['tags']) && isset($sbtns['addtag']) && isset($sbtns['files']); $skip_viewing_fieldset = isset($sbtns['templates']) && isset($sbtns['index']) && isset($sbtns['stats']); @@ -48,8 +54,8 @@ if (isset($sbtns['comments'])) $commentsShown = false; else if ( - ($this->params->get('comments')==1 && $this->perms->CanComments) || // Can administer JComments - ($this->params->get('comments')==3 && $user->authorise('core.manage', 'com_komento')) || // Can administer Komento + ($this->params->get('comments') == 1 && $this->perms->CanComments) || // Can administer JComments + ($this->params->get('comments') == 3 && $user->authorise('core.manage', 'com_komento')) || // Can administer Komento (!$this->params->get('comments') && $this->params->get('comments_admin_link')) // Custom comments extension ) $commentsShown = true; else $commentsShown = false; @@ -72,11 +78,8 @@ $skip_sliders = $skip_sliders && $this->dopostinstall && $this->allplgpublish && !$hide_fc_license_credits && !isset($php_lims['warning']); // ensures the PHP version is correct -if (version_compare(PHP_VERSION, FLEXI_PHP_NEEDED, '<')) -{ - echo '
'; - echo JText::sprintf( 'FLEXI_UPGRADE_PHP_VERSION_GE', FLEXI_PHP_NEEDED) . '
'; - echo '
'; +if (version_compare(PHP_VERSION, FLEXI_PHP_NEEDED, '<')) { + $app->enqueueMessage(JText::sprintf('FLEXI_UPGRADE_PHP_VERSION_GE', FLEXI_PHP_NEEDED), 'error'); return false; } @@ -86,709 +89,716 @@
-
-
-sidebar) && FLEXI_J40GE == false) : ?> -
+ + +
- sidebar); ?> + sidebar) && FLEXI_J40GE == false) : ?> -
- -
+
- + sidebar); ?> -
+
- +
+ - params->get('flexi_cat_extension'); +
+ - - if (version_compare(PHP_VERSION, FLEXI_PHP_RECOMMENDED, '<')) - { - $app->enqueueMessage(JText::sprintf( 'PHP version >= %s is recommended', FLEXI_PHP_RECOMMENDED), 'warning'); - } - $_title = "PHP/DB Requirements"; + params->get('flexi_cat_extension'); - // Set a system message with warning of failed PHP limits - $phplimits_printed = $app->getUserStateFromRequest( $option.'.flexicontent.phplimits_printed', 'phplimits_printed', 0, 'int' ); - if ($this->dopostinstall && isset($php_lims['warning']) && $config_saved) - { - $app->setUserState( $option.'.flexicontent.phplimits_printed', $phplimits_printed+1 ); - if ($phplimits_printed < 1) - { - $mssg = 'PHP/DB requirements
'; - foreach($php_lims as $type => $html) { - $mssg .= implode('
', $html); - } - $mssg .= JText::sprintf( - '
(you may have to contact your web hosting company for setting these for you)
+ + if (version_compare(PHP_VERSION, FLEXI_PHP_RECOMMENDED, '<')) { + $app->enqueueMessage(JText::sprintf('PHP version >= %s is recommended', FLEXI_PHP_RECOMMENDED), 'warning'); + } + $_title = "PHP/DB Requirements"; + + // Set a system message with warning of failed PHP limits + $phplimits_printed = $app->getUserStateFromRequest($option . '.flexicontent.phplimits_printed', 'phplimits_printed', 0, 'int'); + if ($this->dopostinstall && isset($php_lims['warning']) && $config_saved) { + $app->setUserState($option . '.flexicontent.phplimits_printed', $phplimits_printed + 1); + if ($phplimits_printed < 1) { + $mssg = '

PHP/DB Requirements

'; + foreach ($php_lims as $type => $html) { + $mssg .= implode('
', $html); + } + $mssg .= JText::sprintf( + '


(you may have to contact your web hosting company for setting these for you)
For more information on changing these limitations, please see this article: %s', - 'PHP/DB Requirements' - ); - JFactory::getApplication()->enqueueMessage($mssg, 'warning', ''); - } - } - - if ( isset($php_lims['warning']) ) - $_title .= ' - Warning'; - else if ( isset($php_lims['notice']) ) - $_title .= ' - Notice'; - else - $_title .= ' - OK'; - ?> - -

- dopostinstall) - { - echo '
'; - echo JText::_( 'FLEXI_DO_POSTINSTALL' ); - echo '
'; - } - else if ( !$this->existmenu || !$this->existcat || !$config_saved ) - { - echo '
'; - if ( !$config_saved ) - { - $fc_screen_width = (int) $session->get('fc_screen_width', 0, 'flexicontent'); - $_width = ($fc_screen_width && $fc_screen_width-84 > 940 ) ? ($fc_screen_width-84 > 1400 ? 1400 : $fc_screen_width-84 ) : 940; - $fc_screen_height = (int) $session->get('fc_screen_height', 0, 'flexicontent'); - $_height = ($fc_screen_height && $fc_screen_height-128 > 550 ) ? ($fc_screen_height-128 > 1000 ? 1000 : $fc_screen_height-128 ) : 550; - $conf_link = 'index.php?option=com_config&view=component&component=com_flexicontent&path='; - $conf_link = ''; - - echo JText::sprintf( 'FLEXI_CONFIGURATION_NOT_SAVED', $conf_link.JText::_("FLEXI_CONFIG").'' ) . '
'; - } - else if (!$this->existcat) echo JText::_( 'FLEXI_NO_CATEGORIES_CREATED' ); - else if (!$this->existmenu) echo JText::_( 'FLEXI_NO_MENU_CREATED' ); - echo '
'; - } - ?> - - - dopostinstall && $config_saved) : - ?> - - -
-

- -
getItemAccess()->get('access-create'); - - if ($CanAddAny) - { - $link = 'index.php?option='.$option.'&view=types&tmpl=component&layout=typeslist&action=new'; - FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-apply', JText::_('FLEXI_NEW_ITEM' ), 1, 1, 1200, 0); - } - } - /*if ($this->perms->CanArchives && !isset($sbtns['archives'])) - { - $link = 'index.php?option='.$option.'&view=archive'; - FlexicontentViewFlexicontent::quickiconButton( $link, 'icon-48-archive.png', JText::_( 'FLEXI_ARCHIVE' ) ); - }*/ - if ($this->perms->CanCats) - { - if (!isset($sbtns['cats'])) - { - $link = 'index.php?option='.$option.'&view=categories'; - FlexicontentViewFlexicontent::quickiconButton( $link, '' ,'icon-folder', JText::_( 'FLEXI_CATEGORIES' ) ); - } - if (!isset($sbtns['addcat'])) - { - $canCreateAny = FlexicontentHelperPerm::getPermAny('core.create'); - if ($canCreateAny) - { - $link = 'index.php?option='.$option.'&view=category'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-folder-plus', JText::_( 'FLEXI_NEW_CATEGORY' ) ); + ''; - switch((int) $this->params->get('comments')) - { - case 1: - $link = 'index.php?option=com_jcomments&task=view&fog=com_flexicontent'; - $link_title = JText::_('JComments'); - break; - case 3: - $link = 'index.php?option=com_komento'; - $link_title = JText::_('Komento'); - break; - default: - $link = $this->params->get('comments_admin_link'); - $link_title = JText::_('FLEXI_COMMENTS'); - break; - } - FlexicontentViewFlexicontent::quickiconButton( $link, '', 'icon-comment', $link_title, 1 ); - } - elseif ($this->params->get('comments')==1 && !$this->perms->JComments_Installed) - { - echo ''; - $link = ''; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-comment' , JText::_( 'FLEXI_JCOMMENTS_MISSING' ), 1 ); - } - ?> -
-
- - - - -
-

- -
perms->CanTypes) - { - if (!isset($sbtns['types'])) { - $link = 'index.php?option='.$option.'&view=types'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-briefcase', JText::_( 'FLEXI_TYPES' ) ); - $add_sep = true; - } - if (!isset($sbtns['addtype'])) { - $link = 'index.php?option='.$option.'&view=type'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-file-add', JText::_( 'FLEXI_NEW_TYPE' ) ); - $add_sep = true; - } - } - if ($this->perms->CanFields) - { - if (!isset($sbtns['fields'])) { - $link = 'index.php?option='.$option.'&view=fields'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-signup', JText::_( 'FLEXI_FIELDS' ) ); - $add_sep = true; - } - if (!isset($sbtns['addfield'])) { - $link = 'index.php?option='.$option.'&view=field'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-file-add', JText::_( 'FLEXI_NEW_FIELD' ) ); - $add_sep = true; - } - $addTagsBtns = $this->perms->CanTags && (!isset($sbtns['tags']) || !isset($sbtns['addtag'])); - $addFilesBtns = $this->perms->CanFiles && !isset($sbtns['files']); - if ($add_sep && ($addTagsBtns || $addFilesBtns)) - echo ''; - } - if ($this->perms->CanTags) - { - if (!isset($sbtns['tags'])) { - $link = 'index.php?option='.$option.'&view=tags'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-tags', JText::_( 'FLEXI_TAGS' ) ); - } - if (!isset($sbtns['addtag'])) { - $link = 'index.php?option='.$option.'&view=tag'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-file-add', JText::_( 'FLEXI_NEW_TAG' ) ); - } - } - if ($this->perms->CanFiles && !isset($sbtns['files'])) - { - $link = 'index.php?option='.$option.'&view=filemanager'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-images' , JText::_( 'FLEXI_FILEMANAGER' ) ); - } - ?> -
-
- - - - -
-

- -
perms->CanTemplates && !isset($sbtns['templates'])) - { - $link = 'index.php?option='.$option.'&view=templates'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-eye', JText::_( 'FLEXI_TEMPLATES' ) ); - $add_sep = true; - } - if ($this->perms->CanIndex && !isset($sbtns['index'])) - { - $link = 'index.php?option='.$option.'&view=search'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-search', JText::_( 'FLEXI_SEARCH_INDEXES' ) ); - $add_sep = true; - } - $CanSeeSearchLogs = JFactory::getUser()->authorise('core.manage', 'com_search'); + if (isset($php_lims['warning'])) + $_title .= 'Warning'; + else if (isset($php_lims['notice'])) + $_title .= 'Notice'; + else + $_title .= 'OK'; + ?> - if ($CanSeeSearchLogs) - { - $params = JComponentHelper::getParams('com_search'); - $enable_log_searches = $params->get('enabled'); - if ($enable_log_searches) - { - $link = 'index.php?option=com_search&tmpl=component'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-book', JText::_( 'FLEXI_NAV_SD_SEARCH_LOGS' ), $modal = 1 ); - $add_sep = true; - } - else - { - $link = 'index.php?option=com_config&view=component&component=com_search&path='; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-book', JText::_( 'FLEXI_NAV_SD_SEARCH_LOGS' ), $modal = 1, $close_function = 'function(){window.location.reload(false)}' ); - $add_sep = true; - } - } - - if ($this->perms->CanStats && !isset($sbtns['stats'])) - { - if ($add_sep) - echo ''; - $link = 'index.php?option='.$option.'&view=stats'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-chart', JText::_( 'FLEXI_STATISTICS' ) ); - } - ?> -
-
- +
- -
-

+
+ dopostinstall) { + $app->enqueueMessage(JText::_('FLEXI_DO_POSTINSTALL'), 'warning'); + } else if (!$this->existmenu || !$this->existcat || !$config_saved) { + $message = ""; + + if (!$config_saved) { + $fc_screen_width = (int) $session->get('fc_screen_width', 0, 'flexicontent'); + $_width = ($fc_screen_width && $fc_screen_width - 84 > 940) ? ($fc_screen_width - 84 > 1400 ? 1400 : $fc_screen_width - 84) : 940; + $fc_screen_height = (int) $session->get('fc_screen_height', 0, 'flexicontent'); + $_height = ($fc_screen_height && $fc_screen_height - 128 > 550) ? ($fc_screen_height - 128 > 1000 ? 1000 : $fc_screen_height - 128) : 550; + $conf_link = 'index.php?option=com_config&view=component&component=com_flexicontent&path='; + $conf_link = ''; + $message .= JText::sprintf('FLEXI_CONFIGURATION_NOT_SAVED', $conf_link . JText::_("FLEXI_CONFIG") . '') . '
'; + } + if (!$this->existcat) $message .= JText::_('FLEXI_NO_CATEGORIES_CREATED') . '
'; + if (!$this->existmenu) $message .= JText::_('FLEXI_NO_MENU_CREATED'); + + if (!empty($message)) $app->enqueueMessage($message, 'warning'); + } + + ?> -
perms->CanAuthors) - { - if (!isset($sbtns['users'])) { - $link = 'index.php?option='.$option.'&view=users'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-users', JText::_( 'FLEXI_USERS' ) ); - } - if (!isset($sbtns['adduser'])) { - $link = 'index.php?option='.$option.'&task=users.add'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-file-add', JText::_( 'FLEXI_ADD_USER' ) ); - } - } - if ($this->perms->CanGroups) - { - if (!isset($sbtns['groups'])) { - $link = 'index.php?option='.$option.'&view=groups'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-users', JText::_( 'FLEXI_GROUPS' ) ); - } - if (!isset($sbtns['addgroup'])) { - $link = 'index.php?option='.$option.'&task=groups.add'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-file-add', JText::_( 'FLEXI_ADD_GROUP' ) ); - } - } - ?> -
-
- - - - -
-

- -
perms->CanImport && !isset($sbtns['import'])) - { - $link = 'index.php?option='.$option.'&view=import'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-upload', JText::_( 'FLEXI_IMPORT' ) ); - $add_sep = true; - } - if ($this->perms->CanPlugins) - { - if ($add_sep && (!isset($sbtns['plgfields']) || !isset($sbtns['plgsystem']) || !isset($sbtns['plgflexicontent']))) - echo ''; - - if (!isset($sbtns['plgfields'])) { - $link = 'index.php?option=com_plugins&filter_folder=flexicontent_fields'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-power-cord', JText::_( 'FLEXI_PLUGINS' ). ' - Fields', 1 ); - } - if (!isset($sbtns['plgsystem'])) { - $link = 'index.php?option=com_plugins&filter_folder=system&filter_search=flexi'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-cube', JText::_( 'FLEXI_PLUGINS' ). ' - System', 1 ); - } - if (!isset($sbtns['plgflexicontent'])) { - $link = 'index.php?option=com_plugins&filter_folder=flexicontent'; - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-puzzle', JText::_( 'FLEXI_PLUGINS' ). ' - Flexicontent', 1 ); - } - } - if ( $this->perms->CanEdit ) - { - //$link = 'index.php?option=com_content&view=featured'; - //if (!isset($sbtns['featured'])) FlexicontentViewFlexicontent::quickiconButton( $link, 'icon-48-featured.png', JText::_( 'FLEXI_FEATURED' ), 1 ); - } - ?> -
-
- + dopostinstall && $config_saved) : + ?> - params->get('support_url')): ?> -
-

+ +
+

-
params->get('support_url'); - FlexicontentViewFlexicontent::quickiconButton( $link, '','icon-help', JText::_( 'FLEXI_SUPPORT' ), 1 ); +
getItemAccess()->get('access-create'); + + if ($CanAddAny) { + $link = 'index.php?option=' . $option . '&view=types&tmpl=component&layout=typeslist&action=new'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'fas fa-file-medical', JText::_('FLEXI_NEW_ITEM'), 1, 1, 1200, 0); + } + } + + /*if ($this->perms->CanArchives && !isset($sbtns['archives'])) + { + $link = 'index.php?option='.$option.'&view=archive'; + FlexicontentViewFlexicontent::quickiconButton( $link, 'icon-48-archive.png', JText::_( 'FLEXI_ARCHIVE' ) ); + }*/ + if ($this->perms->CanCats) { + if (!isset($sbtns['cats'])) { + $link = 'index.php?option=' . $option . '&view=categories'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-folder', JText::_('FLEXI_CATEGORIES')); + } + if (!isset($sbtns['addcat'])) { + $canCreateAny = FlexicontentHelperPerm::getPermAny('core.create'); + if ($canCreateAny) { + $link = 'index.php?option=' . $option . '&view=category'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'fas fa-folder-plus', JText::_('FLEXI_NEW_CATEGORY')); + } + } + } + if (isset($sbtns['comments'])) { + // skip + } elseif ( + ($this->params->get('comments') == 1 && $this->perms->CanComments) || // Can administer JComments + ($this->params->get('comments') == 3 && $user->authorise('core.manage', 'com_komento')) || // Can administer Komento + (!$this->params->get('comments') && $this->params->get('comments_admin_link')) // Custom comments extension + ) { + echo ''; + switch ((int) $this->params->get('comments')) { + case 1: + $link = 'index.php?option=com_jcomments&task=view&fog=com_flexicontent'; + $link_title = JText::_('JComments'); + break; + case 3: + $link = 'index.php?option=com_komento'; + $link_title = JText::_('Komento'); + break; + default: + $link = $this->params->get('comments_admin_link'); + $link_title = JText::_('FLEXI_COMMENTS'); + break; + } + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-comment', $link_title, 1); + } elseif ($this->params->get('comments') == 1 && !$this->perms->JComments_Installed) { + echo ''; + $link = ''; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-comment', JText::_('FLEXI_JCOMMENTS_MISSING'), 1); + } + ?> +
+
+ + + + +
+

+ +
perms->CanTypes) { + if (!isset($sbtns['types'])) { + $link = 'index.php?option=' . $option . '&view=types'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-briefcase', JText::_('FLEXI_TYPES')); + $add_sep = true; + } + if (!isset($sbtns['addtype'])) { + $link = 'index.php?option=' . $option . '&view=type'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-file-add', JText::_('FLEXI_NEW_TYPE')); + $add_sep = true; + } + } + if ($this->perms->CanFields) { + if (!isset($sbtns['fields'])) { + $link = 'index.php?option=' . $option . '&view=fields'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-puzzle', JText::_('FLEXI_FIELDS')); + $add_sep = true; + } + if (!isset($sbtns['addfield'])) { + $link = 'index.php?option=' . $option . '&view=field'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-file-add', JText::_('FLEXI_NEW_FIELD')); + $add_sep = true; + } + $addTagsBtns = $this->perms->CanTags && (!isset($sbtns['tags']) || !isset($sbtns['addtag'])); + $addFilesBtns = $this->perms->CanFiles && !isset($sbtns['files']); + if ($add_sep && ($addTagsBtns || $addFilesBtns)) + echo ''; + } + if ($this->perms->CanTags) { + if (!isset($sbtns['tags'])) { + $link = 'index.php?option=' . $option . '&view=tags'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-tags', JText::_('FLEXI_TAGS')); + } + if (!isset($sbtns['addtag'])) { + $link = 'index.php?option=' . $option . '&view=tag'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-file-add', JText::_('FLEXI_NEW_TAG')); + } + } + if ($this->perms->CanFiles && !isset($sbtns['files'])) { + $link = 'index.php?option=' . $option . '&view=filemanager'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-images', JText::_('FLEXI_FILEMANAGER')); + } + ?> +
+
+ + + + +
+

+ +
perms->CanTemplates && !isset($sbtns['templates'])) { + $link = 'index.php?option=' . $option . '&view=templates'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-eye', JText::_('FLEXI_TEMPLATES')); + $add_sep = true; + } + if ($this->perms->CanIndex && !isset($sbtns['index'])) { + $link = 'index.php?option=' . $option . '&view=search'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-search', JText::_('FLEXI_SEARCH_INDEXES')); + $add_sep = true; + } + + $CanSeeSearchLogs = JFactory::getUser()->authorise('core.manage', 'com_search'); + + if ($CanSeeSearchLogs) { + $params = JComponentHelper::getParams('com_search'); + $enable_log_searches = $params->get('enabled'); + if ($enable_log_searches) { + $link = 'index.php?option=com_search&tmpl=component'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-book', JText::_('FLEXI_NAV_SD_SEARCH_LOGS'), $modal = 1); + $add_sep = true; + } else { + $link = 'index.php?option=com_config&view=component&component=com_search&path='; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-book', JText::_('FLEXI_NAV_SD_SEARCH_LOGS'), $modal = 1, $close_function = 'function(){window.location.reload(false)}'); + $add_sep = true; + } + } + + if ($this->perms->CanStats && !isset($sbtns['stats'])) { + if ($add_sep) + echo ''; + + $link = 'index.php?option=' . $option . '&view=stats'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-chart', JText::_('FLEXI_STATISTICS')); + } + ?> +
+
+ + + + +
+

+ +
perms->CanAuthors) { + if (!isset($sbtns['users'])) { + $link = 'index.php?option=' . $option . '&view=users'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-users', JText::_('FLEXI_USERS')); + } + if (!isset($sbtns['adduser'])) { + $link = 'index.php?option=' . $option . '&task=users.add'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-file-add', JText::_('FLEXI_ADD_USER')); + } + } + if ($this->perms->CanGroups) { + if (!isset($sbtns['groups'])) { + $link = 'index.php?option=' . $option . '&view=groups'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-users', JText::_('FLEXI_GROUPS')); + } + if (!isset($sbtns['addgroup'])) { + $link = 'index.php?option=' . $option . '&task=groups.add'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-file-add', JText::_('FLEXI_ADD_GROUP')); + } + } + ?> +
+
+ + + + +
+

+ +
perms->CanImport && !isset($sbtns['import'])) { + $link = 'index.php?option=' . $option . '&view=import'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-upload', JText::_('FLEXI_IMPORT')); + $add_sep = true; + } + if ($this->perms->CanPlugins) { + if ($add_sep && (!isset($sbtns['plgfields']) || !isset($sbtns['plgsystem']) || !isset($sbtns['plgflexicontent']))) + echo ''; + + if (!isset($sbtns['plgfields'])) { + $link = 'index.php?option=com_plugins&filter_folder=flexicontent_fields'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-power-cord', JText::_('FLEXI_PLUGINS') . ' - Fields', 1); + } + if (!isset($sbtns['plgsystem'])) { + $link = 'index.php?option=com_plugins&filter_folder=system&filter_search=flexi'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-cube', JText::_('FLEXI_PLUGINS') . ' - System', 1); + } + if (!isset($sbtns['plgflexicontent'])) { + $link = 'index.php?option=com_plugins&filter_folder=flexicontent'; + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-puzzle', JText::_('FLEXI_PLUGINS') . ' - Flexicontent', 1); + } + } + if ($this->perms->CanEdit) { + //$link = 'index.php?option=com_content&view=featured'; + //if (!isset($sbtns['featured'])) FlexicontentViewFlexicontent::quickiconButton( $link, 'icon-48-featured.png', JText::_( 'FLEXI_FEATURED' ), 1 ); + } + ?> +
+
+ + + + params->get('support_url')) : ?> +
+

+ +
params->get('support_url'); + FlexicontentViewFlexicontent::quickiconButton($link, '', 'icon-help', JText::_('FLEXI_SUPPORT'), 1); + + // Read installation file + /*$manifest_path = JPATH_ADMINISTRATOR .DS. 'components' .DS. 'com_flexicontent' .DS. 'flexicontent.xml'; $com_xml = JInstaller::parseXMLInstallFile( $manifest_path ); if (!empty($com_xml['authorUrl'])) { FlexicontentViewFlexicontent::quickiconButton( $com_xml['authorUrl'], 'icon-48-dashboard.png', JText::_( 'FLEXI_ABOUT' ), 1 ); }*/ - ?> -
-
- - - - - - params->get('show_updatecheck', 1) && $this->perms->CanConfig ) - { - $this->document->addScriptDeclaration(" - jQuery(document).ready(function () { - if(jQuery.trim(jQuery('#displayfversion').html())=='') { - jQuery('#displayfversion').html('

<\/p>'); - jQuery.ajax({ - url: 'index.php?option=com_flexicontent&task=flexicontent.fcversioncompare&format=raw&". JSession::getFormToken() ."=1', - success: function(str) { - jQuery('#displayfversion').html(str); - jQuery('#displayfversion').parent().css('height', 'auto'); - } - }); - } - }); - "); - echo ' -

-

'.JText::_( 'FLEXI_UPDATE_CHECK' ).'

-
-
-
-
- '; - } - ?> + ?> +
+ + -
+ - dopostinstall || !$this->allplgpublish) : - // Make sure POST-INSTALLATION Task slider is open - echo JHtml::_('bootstrap.startAccordion', 'fc-dash-sliders', array('active' => 'fc-dash-sliders-postinstall')); +
- $title = JText::_( 'FLEXI_POST_INSTALL' ); - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-postinstall' ); - echo $this->loadTemplate('postinstall'); - echo JHtml::_('bootstrap.endSlide'); - echo JHtml::_('bootstrap.endAccordion'); +
+ dopostinstall || !$this->allplgpublish) : + // Make sure POST-INSTALLATION Task slider is open + echo JHtml::_('bootstrap.startAccordion', 'fc-dash-sliders', array('active' => 'fc-dash-sliders-postinstall')); - elseif (!$skip_sliders && $config_saved) : + $title = JText::_('FLEXI_POST_INSTALL'); + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-postinstall'); + echo $this->loadTemplate('postinstall'); + echo JHtml::_('bootstrap.endSlide'); - echo JHtml::_('bootstrap.startAccordion', 'fc-dash-sliders', array()); + echo JHtml::_('bootstrap.endAccordion'); - ob_start(); ?> - '; - echo 'PHP/DB requirements
'; - foreach($php_lims as $type => $html) { - echo implode('
', $html); - } - echo JText::sprintf( - '
(you may have to contact your web hosting company for setting these for you)
- For more information on changing these limitations, please see this article: %s', - 'PHP/DB Requirements' - ); - echo '
'; - echo JHtml::_('bootstrap.endSlide'); - ?> - - - - - '.$this->totalrows['pending'].''; - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-pending' ); - $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=PE'; - ?> - - - - - - - - - - - - pending); - - for ($i = 0, $n; $i < $n; $i++) - { - $row = $this->pending[$i]; - $assetName = 'com_content.article.' . $row->id; - $isAuthor = $row->created_by && $row->created_by == $user->id; - $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); - ?> - - - - - - - - - - - -
- canEdit, $config = array( - 'ctrl' => 'items', - 'view' => 'item', - 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', - )); - ?> - created); ?>creator; ?>
- ...   - ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> -
- - - - '.$this->totalrows['revised'].''; - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-revised' ); - $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=RV'; - ?> - - - - - - - - - - - - revised); - - for ($i = 0, $n; $i < $n; $i++) - { - $row = $this->revised[$i]; - $assetName = 'com_content.article.' . $row->id; - $isAuthor = $row->created_by && $row->created_by == $user->id; - $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); - ?> - - - - - - - - - - - -
- canEdit, $config = array( - 'ctrl' => 'items', - 'view' => 'item', - 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', - )); - ?> - modified); ?>modifier; ?>
- ...   - ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> -
- - - - - '.$this->totalrows['inprogress'].''; - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-inprogress' ); - $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=IP'; - ?> - - - - - - - - - - - - inprogress); - - for ($i = 0, $n; $i < $n; $i++) - { - $row = $this->inprogress[$i]; - $assetName = 'com_content.article.' . $row->id; - $isAuthor = $row->created_by && $row->created_by == $user->id; - $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); - ?> - - - - - - - - - - - - -
- canEdit, $config = array( - 'ctrl' => 'items', - 'view' => 'item', - 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', - )); - ?> - created); ?>creator; ?>
- ...   - ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> -
- - - - - '.$this->totalrows['draft'].''; - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-draft' ); - $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=OQ'; - ?> - - - - - - - - - - - - draft); - - for ($i = 0, $n; $i < $n; $i++) - { - $row = $this->draft[$i]; - $assetName = 'com_content.article.' . $row->id; - $isAuthor = $row->created_by && $row->created_by == $user->id; - $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); - ?> - - - - - - - -
- canEdit, $config = array( - 'ctrl' => 'items', - 'view' => 'item', - 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', - )); - ?> - created); ?>creator; ?>
- ...   - + elseif (!$skip_sliders && $config_saved) : + + echo JHtml::_('bootstrap.startAccordion', 'fc-dash-sliders', array()); + + ob_start(); ?> + + PHP/DB Requirements'; + foreach ($php_lims as $type => $html) { + $message .= implode('
', $html); + } + $message .= JText::sprintf( + '


(you may have to contact your web hosting company for setting these for you)
+ For more information on changing these limitations, please see this article.' + ); + + + echo '

'; + + echo JHtml::_('bootstrap.endSlide'); + ?> + + + + + totalrows['pending'] == 0) { + $badge_class = " disabled"; + } + $title = JText::_('FLEXI_PENDING_SLIDER2') . '' . $this->totalrows['pending'] . ''; + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-pending'); + $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=PE'; + ?> + + + + + + + + + + + + pending); + + for ($i = 0, $n; $i < $n; $i++) { + $row = $this->pending[$i]; + $assetName = 'com_content.article.' . $row->id; + $isAuthor = $row->created_by && $row->created_by == $user->id; + $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); + ?> + + + + + + + + + + + +
+ canEdit, $config = array( + 'ctrl' => 'items', + 'view' => 'item', + 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', + )); + ?> + created, $date_format); ?>creator; ?>
+ + ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> +
+ + + + totalrows['revised'] == 0) { + $badge_class = " disabled"; + } + $title = JText::_('FLEXI_REVISED_VER_SLIDER2') . '' . $this->totalrows['revised'] . ''; + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-revised'); + $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=RV'; + ?> + + + + + + + + + + + + revised); + + for ($i = 0, $n; $i < $n; $i++) { + $row = $this->revised[$i]; + $assetName = 'com_content.article.' . $row->id; + $isAuthor = $row->created_by && $row->created_by == $user->id; + $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); + ?> + + + + + + + + + + + +
+ canEdit, $config = array( + 'ctrl' => 'items', + 'view' => 'item', + 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', + )); + ?> + modified, $date_format); ?>modifier; ?>
+ ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> +
+ + + + + totalrows['inprogress'] == 0) { + $badge_class = " disabled"; + } + $title = JText::_('FLEXI_IN_PROGRESS_SLIDER2') . '' . $this->totalrows['inprogress'] . ''; + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-inprogress'); + $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=IP'; + ?> + + + + + + + + + + + + inprogress); + + for ($i = 0, $n; $i < $n; $i++) { + $row = $this->inprogress[$i]; + $assetName = 'com_content.article.' . $row->id; + $isAuthor = $row->created_by && $row->created_by == $user->id; + $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); + ?> + + + + + + + + + + + + +
+ canEdit, $config = array( + 'ctrl' => 'items', + 'view' => 'item', + 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', + )); + ?> + created, $date_format); ?>creator; ?>
+ ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' )
'; ?> +
+ + + + + totalrows['draft'] == 0) { + $badge_class = " disabled"; + } + $title = JText::_('FLEXI_DRAFT_SLIDER2') . '' . $this->totalrows['draft'] . ''; + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', $title, 'fc-dash-sliders-draft'); + $show_all_link = 'index.php?option=com_flexicontent&view=items&filter_state=OQ'; + ?> + + + + + + + + + + + + draft); + + for ($i = 0, $n; $i < $n; $i++) { + $row = $this->draft[$i]; + $assetName = 'com_content.article.' . $row->id; + $isAuthor = $row->created_by && $row->created_by == $user->id; + $row->canEdit = $user->authorise('core.edit', $assetName) || ($isAuthor && $user->authorise('core.edit.own', $assetName)); + ?> + + + + + + + + - - +
'; + ?> + + + -
+ canEdit, $config = array( + 'ctrl' => 'items', + 'view' => 'item', + 'onclick' => 'var url = jQuery(this).attr(\'data-href\'); var the_dialog = fc_showDialog(url, \'fc_modal_popup_container\', 0, 0, 0, fc_edit_fcitem_modal_close, {title:\'' . JText::_('FLEXI_EDIT', true) . '\', loadFunc: fc_edit_fcitem_modal_load}); return false;" ', + )); + ?> + created, $date_format); ?>creator; ?>
+ ' . JText::_('FLEXI_SHOW_ALL') . ' ( ' . JText::_('FLEXI_ITEMS_MANAGER') . ' ) -
'; - ?> -
- +
+ - - params->get('show_updatecheck', 1) || !$this->perms->CanConfig ) - { - $this->document->addScriptDeclaration(" + +
+
+ + + + + + + params->get('show_updatecheck', 1) && $this->perms->CanConfig) { + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', JText::_('FLEXI_VERSION_CHECKING'), 'fc-dash-sliders-updatecomponent'); + $this->document->addScriptDeclaration(" +jQuery(document).ready(function () { +if(jQuery.trim(jQuery('#displayfversion').html())=='') { +jQuery('#displayfversion').html('

<\/p>'); +jQuery.ajax({ + url: 'index.php?option=com_flexicontent&task=flexicontent.fcversioncompare&format=raw&" . JSession::getFormToken() . "=1', + success: function(str) { + jQuery('#displayfversion').html(str); + jQuery('#displayfversion').parent().css('height', 'auto'); + } +}); +} +}); +"); + echo ' +

+

' . JText::_('FLEXI_UPDATE_CHECK') . '

+
+
+'; + + echo JHtml::_('bootstrap.endSlide'); + } + + + if (!isset($ssliders['version'])) : ?> + params->get('show_updatecheck', 1) || !$this->perms->CanConfig) { + $this->document->addScriptDeclaration(" jQuery(document).ready(function () { jQuery('#updatecomponent').click(function(e){ if(jQuery.trim(jQuery('#displayfversion').html())=='') { jQuery('#displayfversion').html('

<\/p>'); jQuery.ajax({ - url: 'index.php?option=com_flexicontent&task=flexicontent.fcversioncompare&format=raw&". JSession::getFormToken() ."=1', + url: 'index.php?option=com_flexicontent&task=flexicontent.fcversioncompare&format=raw&" . JSession::getFormToken() . "=1', success: function(str) { jQuery('#displayfversion').html(str); jQuery('#displayfversion').parent().css('height', 'auto'); @@ -798,102 +808,121 @@ }); }); "); - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', JText::_( 'FLEXI_VERSION_CHECKING' ), 'fc-dash-sliders-updatecomponent' ); - echo "

"; - echo JHtml::_('bootstrap.endSlide'); - } - endif; /* !isset($ssliders['version']) */ ?> - - - -
-

'.JText::_( 'About FLEXIcontent' ).'

' : ''; ?> -
- - - FLEXIcontent
GNU/GPL licence, Copyright © 2009-2022 -

- - - Georgios Papadakis

- FLEXIcontent.org - - - - Emmanuel Danan

- agerix.fr - - - - Marvelic Engine

- "> - marvelic.co.th - - - - - Suriya Kaewmungmuang - - - - Yannick Berges

- "> - com3elles.com - - - - - Ruben Reyes

- "> - lyquix.com - - - - -
- ' : ''; ?> - -
- - - perms->CanConfig ) : - echo $fc_requirements; - endif; - - if ($hide_fc_license_credits) : - echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', "About FLEXIcontent", 'fc-dash-sliders-aboutflexi' ); - echo $fc_logo_license; - echo JHtml::_('bootstrap.endSlide'); - endif; - - echo JHtml::_('bootstrap.endAccordion'); - - endif; /* !$skip_sliders */ ?> + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', JText::_('FLEXI_VERSION_CHECKING'), 'fc-dash-sliders-updatecomponent'); + echo "
"; + echo JHtml::_('bootstrap.endSlide'); + } + endif; /* !isset($ssliders['version']) */ ?> + + + +
+

' . JText::_('About FLEXIcontent') . '

' : ''; ?> +
+ + +
+ '; + echo JHtml::image('administrator/components/com_flexicontent/assets/images/logo.png', 'FLEXIcontent', array('id' => 'fc-dash-logo')); + echo '
'; + } + + ?> + +
+
+ FLEXIcontent
GNU/GPL licence, Copyright © 2009- +
+
+
+ + + + + +
+
+

Georgios Papadakis
+ FLEXIcontent.org +

+
+
+

Emmanuel Danan
+ agerix.fr +

+
+
+

Marvelic Engine
+ "> + marvelic.co.th + +

+
+
+

Suriya Kaewmungmuang

+
+
+

Yannick Berges
+ "> + com3elles.com + +

+
+ +
+ + +

Ruben Reyes
+ "> + lyquix.com + +

+ +
+
+ +
+ ' : ''; ?> + +
+ + perms->CanConfig) : + echo $fc_requirements; + endif; + + if ($hide_fc_license_credits) : + echo JHtml::_('bootstrap.addSlide', 'fc-dash-sliders', "About FLEXIcontent", 'fc-dash-sliders-aboutflexi', false); + echo $fc_logo_license; + echo JHtml::_('bootstrap.endSlide'); + endif; + + echo JHtml::_('bootstrap.endAccordion'); + endif; + ?> + - + - - - - - - - + + + + + + + - + -
-
+
+ - - + + \ No newline at end of file diff --git a/admin/views/flexicontent/tmpl/fversion.php b/admin/views/flexicontent/tmpl/fversion.php index ae4993242b7..5925725aa5e 100644 --- a/admin/views/flexicontent/tmpl/fversion.php +++ b/admin/views/flexicontent/tmpl/fversion.php @@ -1,117 +1,62 @@ getTemplate(); -if($this->check['connect'] == 0) { +$template = $app->getTemplate(); + +if ( $this->check[ 'connect' ] == 0 ) { ?> - - - - - - - - - - - -
- -
- '.JText::_( 'FLEXI_CONNECTION_FAILED' ).''; - ?> -
+
+

+
+ +
+
check['enabled'] == 1) { +} elseif ( $this->check[ 'enabled' ] == 1 ) { ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
- check['current'] == 0 ) { - echo JHtml::image( 'components/com_flexicontent/assets/images/'.'accept.png', JText::_('FLEXI_LATEST_VERSION_INSTALLED'), ''); - } elseif( $this->check['current'] == -1 ) { - echo JHtml::image( 'components/com_flexicontent/assets/images/'.'note.gif', JText::_('FLEXI_OLD_VERSION_INSTALLED'), ''); - } else { - echo JHtml::image( 'components/com_flexicontent/assets/images/'.'note.gif', JText::_('You have installed a newer version than the latest officially stable version'), ''); - } - ?>   - check['current'] == 0) { - echo ''.JText::_( 'FLEXI_LATEST_VERSION_INSTALLED' ).''; - } elseif( $this->check['current'] == -1 ) { - echo ' - '.JText::_( 'FLEXI_NEWS_VERSION_COMPONENT' ).' - '.JText::_( 'FLEXI_DOWNLOAD' ) .' - '; - } else { - echo ''.JText::_( 'FLEXI_NEWER_THAN_OFFICIAL_INSTALLED' ).''; - } - ?> -
- - - check['version']; ?> -   : - check['released']; ?> -
- - - check['current_version']; ?> -   : - - check['current_creationDate'], $dateformat, $timezone ); - } catch ( Exception $e ) { - $date = $this->check['current_creationDate']; - } - echo $date; - ?> -
+
+
+
+ check[ 'current' ] == 0 ) { + echo '
' . JText::_( 'FLEXI_LATEST_VERSION_INSTALLED' ) . '
'; + } elseif ( $this->check[ 'current' ] == -1 ) { + echo '
' . JText::_( 'FLEXI_OLD_VERSION_INSTALLED' ) . '
'; + } else { + echo '
' . JText::_( 'You have installed a newer version than the latest officially stable version' ) . '
'; + } + ?> +
+
+
+
+ +
+
+ check['version']; ?> + : check['released']; ?> +
+
+
+
+ +
+
+ check['current_version']; ?> + : check['current_creationDate']; ?> +
+
+
+?> \ No newline at end of file