added non modular and colorized

This commit is contained in:
Andy Miller
2015-09-09 21:38:28 -06:00
parent 20509e0011
commit b722c2295c
5 changed files with 36 additions and 4 deletions

View File

@@ -419,12 +419,15 @@ class AdminController
if (count($flags)) {
// Filter by state
$pageStates = array('modular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished');
$pageStates = array('modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished');
if (count(array_intersect($pageStates, $flags)) > 0) {
if (in_array('modular', $flags))
$collection = $collection->modular();
if (in_array('nonmodular', $flags))
$collection = $collection->nonModular();
if (in_array('visible', $flags))
$collection = $collection->visible();

View File

@@ -1626,12 +1626,23 @@ tr {
#page-filtering .selectize-control.multi .selectize-input > div[data-value='Routable'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='Routable'] {
background: #CE431D;
color: #fff; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='NonRoutable'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='NonRoutable'] {
color: #CE431D; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='Visible'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='Visible'] {
background: #71B15E;
color: #fff; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='NonVisible'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='NonVisible'] {
color: #71B15E; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='Modular'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='Modular'] {
background: #9055AF;
color: #fff; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='NonModular'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='NonModular'] {
color: #9055AF; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='Published'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='Published'] {
background: #0093B8;
color: #fff; }
#page-filtering .selectize-control.multi .selectize-input > div[data-value='NonPublished'], #page-filtering .selectize-control.multi .selectize-input > div.active[data-value='NonPublished'] {
color: #0093B8; }
.admin-form-wrapper {
position: relative; }

File diff suppressed because one or more lines are too long

View File

@@ -12,10 +12,11 @@ $(function(){
options = [
{flag: 'Modular', key: 'Modular', cat: 'mode'},
{flag: 'Visible', key: 'Visible', cat: 'mode'},
{flag: 'Non-Visible', key: 'NonVisible', cat: 'mode'},
{flag: 'Routable', key: 'Routable', cat: 'mode'},
{flag: 'Non-Routable', key: 'NonRoutable', cat: 'mode'},
{flag: 'Published', key: 'Published', cat: 'mode'},
{flag: 'Non-Modular', key: 'NonModular', cat: 'mode'},
{flag: 'Non-Visible', key: 'NonVisible', cat: 'mode'},
{flag: 'Non-Routable', key: 'NonRoutable', cat: 'mode'},
{flag: 'Non-Published', key: 'NonPublished', cat: 'mode'},
];

View File

@@ -184,15 +184,32 @@
background: #CE431D;
color: $white;
}
&[data-value='NonRoutable'] {
color: #CE431D;
}
&[data-value='Visible'] {
background: #71B15E;
color: $white;
}
&[data-value='NonVisible'] {
color: #71B15E;
}
&[data-value='Modular'] {
background: #9055AF;
color: $white;
}
&[data-value='NonModular'] {
color: #9055AF;
}
&[data-value='Published'] {
background: #0093B8;
color: $white;
}
&[data-value='NonPublished'] {
color: #0093B8;
}
}
}
}