Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nicola1971
Nicola1971 committed Nov 13, 2019
2 parents 8b2a3f7 + 4d3d417 commit 82c2af2
Show file tree
Hide file tree
Showing 30 changed files with 8,988 additions and 69 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# EvoFLAT 1.0.4
# EvoFLAT 1.4.10

## Require Evolution CMS => 1.4.4
## Require Evolution CMS => 1.4.10

An advanced, customizable Manager Theme for Evolution cms 1.4 +
An advanced, customizable Manager Theme for Evolution cms 1.4.10
based on MODxFLAT manager theme https://github.com/Nicola1971/MODxFLAT

![flat-dark-side](https://user-images.githubusercontent.com/7342798/33321657-bd4d920e-d446-11e7-9221-6d6bd7ae531c.png)
Expand Down
44 changes: 22 additions & 22 deletions manager/media/style/EvoFLAT/ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
continue;
}

$items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";
$items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . html_escape($row['name'], $modx->config['modx_charset']) . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";
}
}

Expand Down Expand Up @@ -192,7 +192,7 @@
$output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';
}
while ($row = $modx->db->getRow($sql)) {
$items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';
$items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . html_escape($row['name'], $modx->config['modx_charset']) . ' <small>(' . $row['id'] . ')</small></a></li>';
}
}

Expand Down Expand Up @@ -265,7 +265,7 @@
$row = $modx->db->getRow($sql);
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']
'innerHTML' => '<i class="fa fa-code"></i> ' . html_escape($row['name'], $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
Expand All @@ -275,17 +275,17 @@
if (!empty($row['description'])) {
$contextmenu['seperator'] = '';
$contextmenu['description'] = array(
'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
'innerHTML' => '<i class="fa fa-info"></i> ' . html_escape($row['description'], $modx->config['modx_charset'])
);
}
} else {
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-code"></i> ' . $name
'innerHTML' => '<i class="fa fa-code"></i> ' . html_escape($name, $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],
'url' => "index.php?a=23&itemname=" . $name
'url' => "index.php?a=23&itemname=" . html_escape($name, $modx->config['modx_charset'])
)
);
}
Expand All @@ -303,7 +303,7 @@
$row = $modx->db->getRow($sql);
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name']
'innerHTML' => '<i class="fa fa-th-large"></i> ' . html_escape($row['name'], $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
Expand All @@ -313,17 +313,17 @@
if (!empty($row['description'])) {
$contextmenu['seperator'] = '';
$contextmenu['description'] = array(
'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
'innerHTML' => '<i class="fa fa-info"></i> ' . html_escape($row['description'], $modx->config['modx_charset'])
);
}
} else {
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name
'innerHTML' => '<i class="fa fa-th-large"></i> ' . html_escape($name, $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],
'url' => "index.php?a=77&itemname=" . $name
'url' => "index.php?a=77&itemname=" . html_escape($name, $modx->config['modx_charset'])
)
);
}
Expand All @@ -340,7 +340,7 @@
$row = $modx->db->getRow($sql);
$contextmenu = array(
'header' => array(
'innerText' => $row['name']
'innerText' => html_escape($row['name'], $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
Expand All @@ -350,7 +350,7 @@
if (!empty($row['description'])) {
$contextmenu['seperator'] = '';
$contextmenu['description'] = array(
'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
'innerHTML' => '<i class="fa fa-info"></i> ' . html_escape($row['description'], $modx->config['modx_charset'])
);
}
} else {
Expand All @@ -364,7 +364,7 @@
$row = $modx->db->getRow($sql);
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']
'innerHTML' => '<i class="fa fa-code"></i> ' . html_escape($row['name'], $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
Expand All @@ -374,21 +374,21 @@
if (!empty($row['description'])) {
$contextmenu['seperator'] = '';
$contextmenu['description'] = array(
'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
'innerHTML' => '<i class="fa fa-info"></i> ' . html_escape($row['description'], $modx->config['modx_charset'])
);
}
} else {
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-code"></i> ' . $name
'innerHTML' => '<i class="fa fa-code"></i> ' . html_escape($name, $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],
'url' => "index.php?a=77&itemname=" . $name
'url' => "index.php?a=77&itemname=" . html_escape($name, $modx->config['modx_charset'])
),
'item2' => array(
'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],
'url' => "index.php?a=23&itemname=" . $name
'url' => "index.php?a=23&itemname=" . html_escape($name, $modx->config['modx_charset'])
)
);
}
Expand Down Expand Up @@ -452,7 +452,7 @@
$row = $modx->db->getRow($sql);
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name']
'innerHTML' => '<i class="fa fa-list-alt"></i> ' . html_escape($row['name'], $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],
Expand All @@ -462,17 +462,17 @@
if (!empty($row['description'])) {
$contextmenu['seperator'] = '';
$contextmenu['description'] = array(
'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']
'innerHTML' => '<i class="fa fa-info"></i> ' . html_escape($row['description'], $modx->config['modx_charset'])
);
}
} else {
$contextmenu = array(
'header' => array(
'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name
'innerHTML' => '<i class="fa fa-list-alt"></i> ' . html_escape($name, $modx->config['modx_charset'])
),
'item' => array(
'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'],
'url' => "index.php?a=300&itemname=" . $name
'url' => "index.php?a=300&itemname=" . html_escape($name, $modx->config['modx_charset'])
)
);
}
Expand Down Expand Up @@ -616,7 +616,7 @@
$output = !!$row['locked'];
}
}

echo $output;

break;
Expand Down
22 changes: 16 additions & 6 deletions manager/media/style/EvoFLAT/css/custom.css
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
/* [ COLS ] */
.row { margin-left: -1.25rem; margin-right: -1.25rem }
.container { padding-left: 1.25rem; padding-right: 1.25rem; width: 100% }
.container { padding-left: 1.25rem; padding-right: 1.25rem; width: 100%; min-width:100% }
/* :TODO .container-body need remove and replace .tab-content */
/*Collapce old*/
.collapse { display: none}
.collapse.in {display: block}
tr.collapse.in {display: table-row}
tbody.collapse.in { display: table-row-group}
.container-body { padding: 1.25rem }
/*fix for bootstrap 4*/
.pull-right { float: right; }
.pull-left { float: left; }
/* [ FORMS ] */
.form-row { margin-bottom: 0.25rem; }
.form-row.row { margin-left: 0; margin-right: -1rem }
Expand All @@ -14,7 +22,7 @@
.form-control-name { position: relative; }
.form-control-name .form-control { padding-right: 2em }
.form-control-name .custom-control { display: block; overflow: hidden; position: absolute; z-index: 3; top: 0; right: 0; width: 2em; height: 100%; margin: 0; padding: 0; cursor: pointer }
.form-control-name .custom-control input { position: absolute; left: -100% }
.form-control-name .custom-control input { position: absolute; left: -100%; opacity: 0;}
.form-control-name .custom-control .fa-lock { margin-top: 0.6em; font-size: 1.5em }
.form-control-name .custom-control .fa-lock::before { content: "\f09c"; color: #ddd }
.form-control-name .custom-control input:checked ~ .fa-lock::before { content: "\f023"; color: #d9534f }
Expand Down Expand Up @@ -42,6 +50,7 @@ select[name=docgroup] + input[type=submit] { float: none; margin: 0; }
#actions .btn-group .btn-success { box-shadow: inset 0 -2px 0 rgba(0, 0, 0, .07); }
#actions .btn-group .btn-success:hover { box-shadow: none }
#actions .btn-group .plus { z-index: 2; float: right; margin: -2.4em 0 0 0; width: 2rem; padding-left: 0; padding-right: 0; text-align: center }
/*#actions .btn-group .plus::before { content: "\f107"; font-weight: 900; font-family: 'Font Awesome 5 Free' }*/
#actions .btn-group select#stay { display: block; position: relative; z-index: -1; clear: both; width: auto; height: 0; margin: -100% 0 -2rem 0; font-size: 0.675rem; opacity: 0; visibility: hidden; }
#actions .btn-group .dropdown-menu { display: none; position: absolute; z-index: -1; left: auto; right: 0; top: 100%; width: 100%; min-width: 2rem; margin: 0; padding: 0; text-align: left; font-size: .6772rem; border-top: none; border-radius: 0 0 0.1em 0.1em; overflow: hidden; }
#actions .btn-group .show > .dropdown-menu { display: block}
Expand Down Expand Up @@ -72,9 +81,10 @@ select[name=docgroup] + input[type=submit] { float: none; margin: 0; }
#actions .actionButtons li a, #actions .actionButtons .plus { float: left; padding: 0 10px !important; height: 32px; line-height: 30px; -webkit-user-select: none; user-select: none; }
#actions .actionButtons li:last-child { margin: 0 }
#actions .actionButtons #Button1 a { width: 100%; text-align: left; }
#actions .actionButtons .plus { overflow: hidden; float: right; margin: -32px 0 0 0; width: 35px; border-radius: 0 3px 3px 0 !important; text-align: center; cursor: default; font: normal normal normal 0/30px FontAwesome }
#actions .actionButtons .plus { overflow: hidden; float: right; margin: -32px 0 0 0; width: 35px; border-radius: 0 3px 3px 0 !important; text-align: center; cursor: default; font: normal normal normal 0/30px Font Awesome 5 Free }
#actions .actionButtons .plus::before { content: "\f107"; font-size: 14px }
#actions .actionButtons .show .plus::before { content: "\f106"; }
#actions .actionButtons .plus::before { display:none; }
#actions .actionButtons .dropdown-menu { display: none; position: absolute; z-index: -1; left: auto; right: 0; top: 100%; width: 100%; min-width: 35px; margin: -2px 0 0; padding: 2px 0 0; text-align: left; font-size: 1em; background-color: #fff; border: 1px solid #32ab9a; border-top: none; border-radius: 0 0 3px 3px; overflow: hidden; }
#actions .actionButtons .show > .dropdown-menu { display: block }
#actions .actionButtons .dropdown-menu > span { display: block; padding: 0 10px; height: 32px; line-height: 30px; border: none; border-top: 1px solid #f2f2f2; cursor: pointer; }
Expand Down Expand Up @@ -161,7 +171,7 @@ table.actionButtons .searchtext { padding: 5px; height: 24px; width: 150px; }
/* table-data-sortable */
.table.data thead .sortable a, .table.data thead .sortable-text a { color: #777; text-decoration: none !important; }
.table.data thead .sortable a:hover, .table.data thead .sortable-text a:hover { color: #222 }
.table.data thead .sortable a::after, .table.data thead .sortable-text a::after { content: "\f107"; font-family: FontAwesome; opacity: .3; margin-left: .5em; }
.table.data thead .sortable a::after, .table.data thead .sortable-text a::after { content: "\f107"; font-family: Font Awesome 5 Free; opacity: .3; margin-left: .5em; }
.table.data thead .sortable.forwardSort a::after, .table.data thead .sortable-text.forwardSort a::after { opacity: 1; content: "\f106"; color: #d9534f }
.table.data thead .sortable.reverseSort a::after, .table.data thead .sortable-text.reverseSort a::after { opacity: 1; content: "\f107"; color: #d9534f }
.table.data thead .sortable:hover a::after, .table.data thead .sortable-text:hover a::after, .table.data thead .sortable-numeric:hover a::after, .table.data thead .sortable-date:hover a::after { opacity: 1 }
Expand Down Expand Up @@ -223,7 +233,7 @@ ul.breadcrumbs {margin-left: 1.5rem;}
/* [ SEARCHBAR ] */
.searchbar input[type=text] { max-width: 10rem }
/* [ WIDGETS ] */
.widgets .card { margin-bottom: .75rem; border: 1px solid #dfdfdf; border-radius: 0.15rem; background-color: #fff; box-shadow: none;}
.widgets .card { margin-bottom: 1rem; margin-right: 0.6rem; border-width: 0; border-radius: 0; background-color: #fff; -webkit-transition: box-shadow .35s; transition: box-shadow .35s; box-shadow: 0 0.1rem 0.3rem 0 rgba(0, 0, 0, 0.075); }
.widgets .card-header { padding: .75rem 1rem; font-size: .675rem; color: #616a73; text-transform: uppercase; font-weight: 900; border: none; background-color: #fff; }
.darkness .widgets .card-header { color: #fafafa; background-color: var(--darkness-grey);}
.darkness .widgets .card { background-color: var(--darkness-grey); border-color:var(--darkness-grey) }
Expand All @@ -245,7 +255,7 @@ ul.breadcrumbs {margin-left: 1.5rem;}
text-decoration: none; color: #646b7b; box-shadow: none; transition-duration: .5s }
.widgets #welcome .wm_button a:hover { color: #373b46; background-color: rgba(93, 109, 202, 0.16) }
.widgets #welcome .wm_button a .fa { display: inline-block; }
.widgets #welcome .wm_button a .fa + span { display: block; padding: .5em 0; line-height: 1em; font-size: .7rem; }
.widgets #welcome .wm_button a .fa + span { display: block; padding: .5em 0; line-height: 1em; font-size: .7rem; word-wrap:normal; }
.widgets #modxrecent_widget .table.data tbody tr:not(:hover) { background-color: #fff }
.widgets #modxrecent_widget .table.data tbody tr:nth-child(4n+1):not(:hover) { background-color: #f6f8f8 }
.widgets #modxrecent_widget .table.data tbody tr:nth-child(2n) { background-color: #fff }
Expand Down
Loading

0 comments on commit 82c2af2

Please sign in to comment.