This page looks a little (YIKES!) busy but, this 
 is the way I see it while I'm playing - the complete set 
 of notes for the current key, with the C.A.G.E.D links 
 as you travel up and down the neck. 
Starting with the DIMINISHED  SCALES  ( 8  NOTES )
with some ISOLATED LINEAR PATTERNS
followed by the "BIG FOUR" DIATONIC SCALES  ( 7 NOTES )
and, last (and possibly least?), the WHOLE-TONE SCALE  ( 6 NOTES )
with some ISOLATED LINEAR PATTERNS.
 NOTE: The SQUARES represent the  TONIC  or "DO"