diff --git a/.gitignore b/.gitignore index 35536d4..0b0ba43 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ node_modules # Don't include the .idea folder which is used by the Webstorm IDE .idea/workspace.xml .idea/ +# Don't include the bundle we produce for deployment +avusd_bundle.zip diff --git a/app.js b/app.js index 9311b83..043aee9 100644 --- a/app.js +++ b/app.js @@ -15,6 +15,7 @@ let apos = require('apostrophe')({ 'two-column-widgets': {extend: 'apostrophe-widgets'}, 'two-column-1-2-widgets': {}, 'two-column-2-1-widgets': {}, + 'centered-half-width-column-widgets': {}, 'theme': {}, @@ -66,6 +67,10 @@ let apos = require('apostrophe')({ // Was having some issues with the menus hovering over the text the user was editing. Is less functional but better looking. //'apostrophe-tiptap-rich-text-widgets': {} + + // Adds redirects. + // Can add the `statusCode: 301` for permanent redirects. + 'apostrophe-redirects': { } } }); diff --git a/lib/modules/apostrophe-assets/index.js b/lib/modules/apostrophe-assets/index.js index f0b7391..141dc24 100644 --- a/lib/modules/apostrophe-assets/index.js +++ b/lib/modules/apostrophe-assets/index.js @@ -4,6 +4,7 @@ module.exports = { jQuery: 3, stylesheets: [ + {name: 'common'}, {name: 'pre'}, {name: 'bootstrap'}, {name: 'main'}, diff --git a/lib/modules/apostrophe-assets/public/css/common.css b/lib/modules/apostrophe-assets/public/css/common.css new file mode 100644 index 0000000..7742222 --- /dev/null +++ b/lib/modules/apostrophe-assets/public/css/common.css @@ -0,0 +1,23 @@ +.clearfix { + zoom: 1; +} +.clearfix:before { + content: ""; + display: block; +} +.clearfix:after { + content: ""; + display: table; + clear: both; +} + +.noselect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +/*# sourceMappingURL=common.css.map */ diff --git a/lib/modules/apostrophe-assets/public/css/common.css.map b/lib/modules/apostrophe-assets/public/css/common.css.map new file mode 100644 index 0000000..c71fc91 --- /dev/null +++ b/lib/modules/apostrophe-assets/public/css/common.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["common.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA","file":"common.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/common.sass b/lib/modules/apostrophe-assets/public/css/common.sass new file mode 100644 index 0000000..d5c6ece --- /dev/null +++ b/lib/modules/apostrophe-assets/public/css/common.sass @@ -0,0 +1,17 @@ +.clearfix + zoom: 1 + &:before + content: '' + display: block + + &:after + content: '' + display: table + clear: both +.noselect + -webkit-touch-callout: none /* iOS Safari */ + -webkit-user-select: none /* Safari */ + -khtml-user-select: none /* Konqueror HTML */ + -moz-user-select: none /* Old versions of Firefox */ + -ms-user-select: none /* Internet Explorer/Edge */ + user-select: none /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */ \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/main.css b/lib/modules/apostrophe-assets/public/css/main.css index dee6fd2..c451e9e 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css +++ b/lib/modules/apostrophe-assets/public/css/main.css @@ -1,3 +1,25 @@ +.clearfix { + zoom: 1; +} +.clearfix:before { + content: ""; + display: block; +} +.clearfix:after { + content: ""; + display: table; + clear: both; +} + +.noselect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + @font-face { font-family: "Merriweather"; src: url("/modules/theme/fonts/Merriweather-Regular.ttf") format("truetype"); @@ -23,6 +45,60 @@ p.indent { text-indent: 1rem; } +.apos-rich-text td, .apos-rich-text th { + text-indent: 0; + margin: 0.3rem 0 0.7rem 0; + padding: 0.25rem 0; + font-family: "Merriweather", "serif"; + font-size: 1.1rem; + line-height: 1.4rem; +} +.apos-rich-text td p, .apos-rich-text th p { + margin: 0 !important; + padding: 0 !important; +} +.apos-rich-text td + td, .apos-rich-text th + th { + padding-left: 1rem; +} +.apos-rich-text th { + font-family: "MerriweatherSans", "sans-serif"; + font-weight: 700; +} + +h2.h2, h3.h3, h4.h4 { + font-family: "MerriweatherSans", "sans-serif"; + margin-bottom: 1rem; +} + +h2.h2 + p, h3.h3 + p, h4.h4 + p { + margin-top: 0 !important; +} + +p + h2.h2, p + h3.h3, p + h4.h4, ul + h2.h2, ul + h3.h3, ul + h4.h4, ol + h2.h2, ol + h3.h3, ol + h4.h4, table + h2.h2, table + h3.h3, table + h4.h4 { + margin-top: 1.7rem; +} + +h2.h2 { + font-size: 2.2rem; + line-height: 2.8rem; + font-family: "MerriweatherSans", "sans-serif"; + font-weight: 700; +} + +h3.h3 { + font-size: 1.5rem; + line-height: 2rem; + font-family: "MerriweatherSans", "sans-serif"; + font-weight: 700; +} + +h4.h4 { + font-size: 1.2rem; + line-height: 1.5rem; + font-family: "MerriweatherSans", "sans-serif"; + font-weight: 900; +} + div[data-apos-widget=apostrophe-files] a, .apos-rich-text a { margin: 0.3rem 0 0.7rem 0 !important; font-family: "MerriweatherSans", "sans-serif"; @@ -40,6 +116,17 @@ div[data-apos-widget=apostrophe-files] a:active, .apos-rich-text a:active { color: #7a29ec; } +div[data-apos-widget=apostrophe-files] { + margin: 1rem 0 1.5rem 0.5rem; + padding: 0.5rem 0.5rem 0 0.5rem; + border: 1px solid #5b5b5b; +} +div[data-apos-widget=apostrophe-files] a { + display: block; + padding: 0; + font-size: 1.2rem; +} + .apos-rich-text a { font-size: 1.2rem; line-height: 1.5rem; @@ -52,6 +139,12 @@ h5 { margin-bottom: 0.3rem; } +.navbar sup { + font-weight: 700; + font-size: 0.7rem; + bottom: 0.25rem; +} + .apos-slideshow h4 { display: none; } @@ -88,15 +181,27 @@ h5 { } .highlighted { - background: rgba(170, 122, 82, 0.3); - margin: 1rem 6rem; - padding: 1rem 1rem; - font-size: 1.8rem; + background: rgba(215, 187, 161, 0.3); + margin: 0 0 0 0; + padding: 0.2rem 0 0.2rem 1rem; + font-size: 1.1rem; + font-weight: 700; + color: #006400; +} +.highlighted a { + font-size: 1rem; + line-height: 1.2rem; + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); +} + +.date { + background: black; + color: white; + text-align: right; + padding: 1rem 1.5rem; + margin-bottom: 1rem; + margin-top: 2rem; font-weight: 700; - -webkit-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61); - -moz-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61); - box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61); - color: Green; } .apos-login-logo { diff --git a/lib/modules/apostrophe-assets/public/css/main.css.map b/lib/modules/apostrophe-assets/public/css/main.css.map index 330832f..3fbb3b4 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css.map +++ b/lib/modules/apostrophe-assets/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["main.sass"],"names":[],"mappings":"AAAA;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAQD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["common.sass","main.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACD;EACC;EACA;;;AAEF;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AACF;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAOD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/main.sass b/lib/modules/apostrophe-assets/public/css/main.sass index 8dfe114..f21b7f6 100644 --- a/lib/modules/apostrophe-assets/public/css/main.sass +++ b/lib/modules/apostrophe-assets/public/css/main.sass @@ -1,3 +1,5 @@ +@use './common' + @font-face font-family: 'Merriweather' src: url('/modules/theme/fonts/Merriweather-Regular.ttf') format("truetype") @@ -20,6 +22,48 @@ p p.indent text-indent: 1rem +.apos-rich-text + td, th + text-indent: 0 + margin: 0.3rem 0 0.7rem 0 + padding: 0.25rem 0 + font-family: "Merriweather", "serif" + font-size: 1.1rem + line-height: 1.4rem + p + margin: 0 !important + padding: 0 !important + td + td, th + th // All table data elements following another table data element should have a bit of space between element contents. + padding-left: 1rem + th + font-family: "MerriweatherSans", "sans-serif" + font-weight: 700 + +h2.h2, h3.h3, h4.h4 + font-family: "MerriweatherSans", "sans-serif" + margin-bottom: 1rem +// Remove the margin-top from the paragraphs that follow a heading. Make !important because we have to override the styles set by CKEditor. +h2.h2 + p, h3.h3 + p, h4.h4 + p + margin-top: 0 !important +// Add more margin-top to headings when following content (p, unordered / ordered lists) +p + h2.h2, p + h3.h3, p + h4.h4, ul + h2.h2, ul + h3.h3, ul + h4.h4, ol + h2.h2, ol + h3.h3, ol + h4.h4, table + h2.h2, table + h3.h3, table + h4.h4 + margin-top: 1.7rem +h2.h2 + font-size: 2.2rem + line-height: 2.8rem + font-family: "MerriweatherSans", "sans-serif" + font-weight: 700 +h3.h3 + font-size: 1.5rem + line-height: 2rem + font-family: "MerriweatherSans", "sans-serif" + font-weight: 700 +h4.h4 + font-size: 1.2rem + line-height: 1.5rem + font-family: "MerriweatherSans", "sans-serif" + font-weight: 900 + //Links using Apostrophe Files or Rich Text Widgets div[data-apos-widget='apostrophe-files'], .apos-rich-text a @@ -35,6 +79,14 @@ div[data-apos-widget='apostrophe-files'], .apos-rich-text text-shadow: 0 0 0.6rem rgb(123, 238, 238) a:active color: #7a29ec +div[data-apos-widget='apostrophe-files'] + margin: 1rem 0 1.5rem 0.5rem + padding: 0.5rem 0.5rem 0 0.5rem + border: 1px solid #5b5b5b + a + display: block + padding: 0 + font-size: 1.2rem //Links embedded in a rich text widget. .apos-rich-text a @@ -47,6 +99,11 @@ h5 margin-top: 0.8rem margin-bottom: 0.3rem +.navbar sup + font-weight: 700 + font-size: 0.7rem + bottom: 0.25rem + .apos-slideshow h4 display: none @@ -77,16 +134,25 @@ h5 //.apos-rich-text > div //This was a work around to the rich text widget 'class' property not working in the style. .highlighted - background: rgba(170, 122, 82, 0.3) - margin: 1rem 6rem - padding: 1rem 1rem - font-size: 1.8rem + background: rgba(215, 187, 161, 0.3) + margin: 0 0 0 0 + padding: 0.2rem 0 0.2rem 1rem + font-size: 1.1rem font-weight: 700 - -webkit-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61) - -moz-box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61) - box-shadow: 0 0 20px 10px rgba(255, 255, 255, 0.61) - color: Green + color: #006400 + a + font-size: 1rem + line-height: 1.2rem + text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) +.date + background: black + color: white + text-align: right + padding: 1rem 1.5rem + margin-bottom: 1rem + margin-top: 2rem + font-weight: 700 // // Redefine some of the Apostrophe administrative UI. diff --git a/lib/modules/apostrophe-assets/public/css/menu.css b/lib/modules/apostrophe-assets/public/css/menu.css index 4907a10..05dcfeb 100644 --- a/lib/modules/apostrophe-assets/public/css/menu.css +++ b/lib/modules/apostrophe-assets/public/css/menu.css @@ -1,64 +1,3 @@ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - vertical-align: baseline; -} - -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} - -body { - line-height: 1; -} - -ol, ul { - list-style: none; -} - -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, q:before, q:after { - content: none; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -i { - font-style: italic; -} - -b { - font-weight: bold; -} - -* { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - margin: 0; -} - .clearfix { zoom: 1; } diff --git a/lib/modules/apostrophe-assets/public/css/menu.css.map b/lib/modules/apostrophe-assets/public/css/menu.css.map index b669c5b..7bcf7d7 100644 --- a/lib/modules/apostrophe-assets/public/css/menu.css.map +++ b/lib/modules/apostrophe-assets/public/css/menu.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["pre.sass","menu.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA;;;AAED;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACpED;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;EACA;;AACD;EACC;;AAGD;EACC;EACA;EACA;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;EACA;EACA;EAEA;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;;AAiBH;EACC;IACC;;EAEC;IACC;;EACD;IACC;;EACD;IACC","file":"menu.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["common.sass","menu.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;EACA;;AACD;EACC;;AAGD;EACC;EACA;EACA;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACC;EACA;EACA;EACA;EAEA;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;;AAiBH;EACC;IACC;;EAEC;IACC;;EACD;IACC;;EACD;IACC","file":"menu.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/menu.sass b/lib/modules/apostrophe-assets/public/css/menu.sass index ae5b0c1..980278b 100644 --- a/lib/modules/apostrophe-assets/public/css/menu.sass +++ b/lib/modules/apostrophe-assets/public/css/menu.sass @@ -1,4 +1,4 @@ -@use './pre' +@use './common' .navbar overflow: visible diff --git a/lib/modules/apostrophe-assets/public/css/pre.css b/lib/modules/apostrophe-assets/public/css/pre.css index 894d727..49cd453 100644 --- a/lib/modules/apostrophe-assets/public/css/pre.css +++ b/lib/modules/apostrophe-assets/public/css/pre.css @@ -59,26 +59,4 @@ b { margin: 0; } -.clearfix { - zoom: 1; -} -.clearfix:before { - content: ""; - display: block; -} -.clearfix:after { - content: ""; - display: table; - clear: both; -} - -.noselect { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - /*# sourceMappingURL=pre.css.map */ diff --git a/lib/modules/apostrophe-assets/public/css/pre.css.map b/lib/modules/apostrophe-assets/public/css/pre.css.map index 6809310..1eb30ce 100644 --- a/lib/modules/apostrophe-assets/public/css/pre.css.map +++ b/lib/modules/apostrophe-assets/public/css/pre.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["pre.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA;;;AAED;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA","file":"pre.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["pre.sass"],"names":[],"mappings":"AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAaC;EACA;EACA;EAGA;;;AAED;AACA;AAAA;EAEC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AAED;EACC;EACA;EACA;EACA","file":"pre.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/pre.sass b/lib/modules/apostrophe-assets/public/css/pre.sass index bf7d4a4..c686335 100644 --- a/lib/modules/apostrophe-assets/public/css/pre.sass +++ b/lib/modules/apostrophe-assets/public/css/pre.sass @@ -51,21 +51,3 @@ b -webkit-box-sizing: border-box box-sizing: border-box margin: 0 - -.clearfix - zoom: 1 - &:before - content: '' - display: block - - &:after - content: '' - display: table - clear: both -.noselect - -webkit-touch-callout: none /* iOS Safari */ - -webkit-user-select: none /* Safari */ - -khtml-user-select: none /* Konqueror HTML */ - -moz-user-select: none /* Old versions of Firefox */ - -ms-user-select: none /* Internet Explorer/Edge */ - user-select: none /* Non-prefixed version, currently supported by Chrome, Edge, Opera and Firefox */ diff --git a/lib/modules/apostrophe-pages/views/pages/aves.html b/lib/modules/apostrophe-pages/views/pages/aves.html index 7b969f7..d2218ff 100644 --- a/lib/modules/apostrophe-pages/views/pages/aves.html +++ b/lib/modules/apostrophe-pages/views/pages/aves.html @@ -1,37 +1,4 @@ -{% extends "layout.html" %} - -{# {name: 'Paragraph', element: 'p'},#} -{# {name: 'highlighted', element: 'div', 'class': 'highlighted'},#} -{# {name: 'Heading 2', element: 'h2'},#} -{# {name: 'Heading 3', element: 'h3'},#} -{# {name: 'Heading 4', element: 'h4'},#} -{# {name: 'Heading 5', element: 'h5'}#} - -{% block main %} -
- {{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'original'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, - 'apostrophe-files': {}, - 'two-column': {}, - 'two-column-1-2': {}, - 'two-column-2-1': {} - } - }) }} -
-{% endblock %} +{% extends "basic.html" %} {% block logoImage %} diff --git a/lib/modules/apostrophe-pages/views/pages/avhs.html b/lib/modules/apostrophe-pages/views/pages/avhs.html index aa188b5..94f0430 100644 --- a/lib/modules/apostrophe-pages/views/pages/avhs.html +++ b/lib/modules/apostrophe-pages/views/pages/avhs.html @@ -1,37 +1,4 @@ -{% extends "layout.html" %} - -{# {name: 'Paragraph', element: 'p'},#} -{# {name: 'highlighted', element: 'div', 'class': 'highlighted'},#} -{# {name: 'Heading 2', element: 'h2'},#} -{# {name: 'Heading 3', element: 'h3'},#} -{# {name: 'Heading 4', element: 'h4'},#} -{# {name: 'Heading 5', element: 'h5'}#} - -{% block main %} -
- {{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'original'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, - 'apostrophe-files': {}, - 'two-column': {}, - 'two-column-1-2': {}, - 'two-column-2-1': {} - } - }) }} -
-{% endblock %} +{% extends "basic.html" %} {% block logoImage %} High School Logo ImageAnderson Valley Jr / Sr High School Mascot and Logo diff --git a/lib/modules/apostrophe-pages/views/pages/basic.html b/lib/modules/apostrophe-pages/views/pages/basic.html deleted file mode 100644 index 0e197b9..0000000 --- a/lib/modules/apostrophe-pages/views/pages/basic.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "layout.html" %} - -{% block main %} -
- {{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'original'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'highlighted', element: 'p', attributes: [{'class': 'highlighted'}]}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} - ] - }, - 'apostrophe-files': {}, - 'two-column': {} - } - }) }} -
-{% endblock %} diff --git a/lib/modules/apostrophe-pages/views/pages/district.html b/lib/modules/apostrophe-pages/views/pages/district.html index 3dd290d..219276e 100644 --- a/lib/modules/apostrophe-pages/views/pages/district.html +++ b/lib/modules/apostrophe-pages/views/pages/district.html @@ -1,27 +1,3 @@ -{% extends "layout.html" %} +{% extends "basic.html" %} + -{% block main %} -
- {{ apos.area(data.page, "body", { - widgets: { - 'apostrophe-images': {size: 'original'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Indent', 'Outdent', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, - 'apostrophe-files': {}, - 'two-column': {}, - 'two-column-1-2': {}, - 'two-column-2-1': {} - } - }) }} -
-{% endblock %} diff --git a/lib/modules/apostrophe-pages/views/pages/home.html b/lib/modules/apostrophe-pages/views/pages/home.html index 007a45a..60e97a0 100644 --- a/lib/modules/apostrophe-pages/views/pages/home.html +++ b/lib/modules/apostrophe-pages/views/pages/home.html @@ -23,7 +23,7 @@ widgets: { 'apostrophe-images': {size: 'one-half'}, 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], styles: [ {name: 'Paragraph', element: 'p'}, {name: 'highlighted', element: 'p', attributes: [{'class': 'highlighted'}]}, diff --git a/lib/modules/apostrophe-rich-text-widgets/index.js b/lib/modules/apostrophe-rich-text-widgets/index.js index e7833d9..52ecf47 100644 --- a/lib/modules/apostrophe-rich-text-widgets/index.js +++ b/lib/modules/apostrophe-rich-text-widgets/index.js @@ -1,4 +1,9 @@ module.exports = { + projection: { + title: 1, + _url: 1, + attachment: 1 + }, //sanitizeHtml: { // allowedTags: [], // allowedAttributes: {}, @@ -13,7 +18,7 @@ module.exports = { allowedClasses: { 'p': ['highlighted', 'indent', 'bulletLevel2','apos-indent1', 'apos-indent2'], 'ul': ['bulletLevel2','apos-indent1', 'apos-indent2'], - 'div': ['highlighted', "bulletLevel2",'apos-indent1', 'apos-indent2'], + 'div': ['highlighted', "bulletLevel2",'apos-indent1', 'apos-indent2', 'date'], '*': ['highlighted', 'bulletLevel2', 'test', '*','apos-indent1', 'apos-indent2'] }, allowedAttributes: { diff --git a/lib/modules/centered-half-width-column-widgets/index.js b/lib/modules/centered-half-width-column-widgets/index.js new file mode 100644 index 0000000..85e0b24 --- /dev/null +++ b/lib/modules/centered-half-width-column-widgets/index.js @@ -0,0 +1,11 @@ +module.exports = { + extend: 'apostrophe-widgets', + label: 'Centered 50% Width', + addFields: [ + { + name: "content", + type: "area", + label: "Content Area" + } + ] +}; diff --git a/lib/modules/centered-half-width-column-widgets/views/widget.html b/lib/modules/centered-half-width-column-widgets/views/widget.html new file mode 100644 index 0000000..3c3f04d --- /dev/null +++ b/lib/modules/centered-half-width-column-widgets/views/widget.html @@ -0,0 +1,27 @@ +
+
+
+
+ {{ apos.area(data.widget, "content", { + widgets: { + 'apostrophe-images': {size: 'full'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, + 'apostrophe-files': {} + } + }) }} +
+
+
+
diff --git a/lib/modules/two-column-1-2-widgets/views/widget.html b/lib/modules/two-column-1-2-widgets/views/widget.html index c049b37..e0a5259 100644 --- a/lib/modules/two-column-1-2-widgets/views/widget.html +++ b/lib/modules/two-column-1-2-widgets/views/widget.html @@ -2,41 +2,45 @@
{{ apos.area(data.widget, "areaLeft", { - widgets: { - 'apostrophe-images': {size: 'one-half'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, - 'apostrophe-files': {} - } - }) }} + widgets: { + 'apostrophe-images': {size: 'one-half'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, + 'apostrophe-files': {} + } + }) }}
{{ apos.area(data.widget, "areaRight", { - widgets: { - 'apostrophe-images': {size: 'full'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'} - ] - }, - 'apostrophe-files': {} - } - }) }} + widgets: { + 'apostrophe-images': {size: 'original'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, + 'apostrophe-files': {} + } + }) }}
diff --git a/lib/modules/two-column-2-1-widgets/views/widget.html b/lib/modules/two-column-2-1-widgets/views/widget.html index 0f33398..3dab219 100644 --- a/lib/modules/two-column-2-1-widgets/views/widget.html +++ b/lib/modules/two-column-2-1-widgets/views/widget.html @@ -3,17 +3,18 @@
{{ apos.area(data.widget, "areaLeft", { widgets: { - 'apostrophe-images': {size: 'one-half'}, + 'apostrophe-images': {size: 'original'}, 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], styles: [ - {name: 'Paragraph', element: 'p'}, + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } ] }, 'apostrophe-files': {} @@ -23,17 +24,18 @@
{{ apos.area(data.widget, "areaRight", { widgets: { - 'apostrophe-images': {size: 'full'}, + 'apostrophe-images': {size: 'one-half'}, 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], styles: [ - {name: 'Paragraph', element: 'p'}, + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } ] }, 'apostrophe-files': {} diff --git a/lib/modules/two-column-widgets/views/widget.html b/lib/modules/two-column-widgets/views/widget.html index 985b702..f1057d6 100644 --- a/lib/modules/two-column-widgets/views/widget.html +++ b/lib/modules/two-column-widgets/views/widget.html @@ -3,19 +3,20 @@
{{ apos.area(data.widget, "areaLeft", { widgets: { - 'apostrophe-images': {size: 'one-half'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, + 'apostrophe-images': {size: 'full'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, 'apostrophe-files': {} } }) }} @@ -23,19 +24,20 @@
{{ apos.area(data.widget, "areaRight", { widgets: { - 'apostrophe-images': {size: 'one-half'}, - 'apostrophe-rich-text': { - toolbar: ['Styles', 'Bold', 'Italic', 'Link', 'Unlink', 'Anchor', 'Table', 'BulletedList', 'Blockquote', 'Strike', 'Subscript', 'Superscript', 'Split'], - styles: [ - {name: 'Paragraph', element: 'p'}, - {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, - {name: 'Heading 2', element: 'h2'}, - {name: 'Heading 3', element: 'h3'}, - {name: 'Heading 4', element: 'h4'}, - {name: 'Heading 5', element: 'h5'}, - {name: 'highlighted', element: 'div', attributes: {class: "highlighted"} } - ] - }, + 'apostrophe-images': {size: 'full'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, 'apostrophe-files': {} } }) }} diff --git a/package-lock.json b/package-lock.json index 21d7d9e..f4ddeaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1100,6 +1100,14 @@ "stoppable": "^1.1.0" } }, + "apostrophe-redirects": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/apostrophe-redirects/-/apostrophe-redirects-2.3.0.tgz", + "integrity": "sha512-IQ5Kp8pKapcdLX33Sbv8DPlC4odGDsH2/27/F8kDBgpsi1klpVDvd0vZeJfSrVoV7L1bWVvv2gGfmNsnBmvRkQ==", + "requires": { + "lodash": "^4.17.10" + } + }, "apostrophe-rich-text-permalinks": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/apostrophe-rich-text-permalinks/-/apostrophe-rich-text-permalinks-2.0.5.tgz", diff --git a/package.json b/package.json index 91d8f26..b9b8bee 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "node app.js", "monitor": "monitor", - "build": "bestzip avusd_bundle.zip lib app.js package.json public/images locales views" + "build": "bestzip avusd_bundle.zip lib app.js package.json locales views" }, "repository": { "type": "git", @@ -17,6 +17,7 @@ "dependencies": { "apostrophe": "^2.111.4", "apostrophe-monitor": "^2.1.0", + "apostrophe-redirects": "^2.3.0", "apostrophe-rich-text-permalinks": "^2.0.5", "apostrophe-tiptap-rich-text-widgets": "^0.3.8", "prosemirror-tables": "^0.9.1" diff --git a/views/basic.html b/views/basic.html new file mode 100644 index 0000000..59faee7 --- /dev/null +++ b/views/basic.html @@ -0,0 +1,28 @@ +{% extends "layout.html" %} + +{% block main %} +
+ {{ apos.area(data.page, "body", { + widgets: { + 'apostrophe-images': {size: 'original'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, + 'apostrophe-files': {}, + 'two-column': {}, + 'two-column-1-2': {}, + 'two-column-2-1': {}, + 'centered-half-width-column': {} + } } ) }} +
+{% endblock %} diff --git a/views/layout.html b/views/layout.html index 397d108..0764356 100644 --- a/views/layout.html +++ b/views/layout.html @@ -15,7 +15,7 @@ {% block extraHead %} {# This block outputs its contents in the HTML document's . It is a good place to put extra #} + {# #} {% endblock %} {% block beforeMain %} @@ -51,22 +51,24 @@

District

- About + Welcome + Calendar Staff - Forms Reports Title IX + Open Positions

School Board

- About - Members - Board Policies - Meeting Schedule - Meeting Agendas & Records + General Information + Board Policies + + Board Docs (external)
-

Policies & Committees

+

Administration

+ Contracts, Agreements, and Salary Schedules + Food Service
@@ -82,30 +84,27 @@

School

- Home - About - School Calendar - SARC - Water Report + Welcome + Contact Us + + Reports & Forms +

Staff

+ Support Staff + Teachers + Office Staff

Academics

Academic Schedule - Classes After School Program - Faculty

Extracurricular Activities

FFA Service Learning Team - Student Council +
-

Athletics

- Athletic Calendar

Parents & Students

- Handbook & Policies - Forms - Buses + Reports & Forms Grades Library
@@ -124,45 +123,36 @@

School

- Home + Welcome Contact Information Mission SARC

News & Info

Lice - Safe School Plan Common Core Standards

Kindergarten

- Regulations - Enrollment + Information

Staff

- Support Staff + Teachers Office Staff +

PTAV

+ About +

School Programs

+ School Site Council (SSC) + English Language Arts Curriculum (ELAC) +
+

Family Resources

- Grades - PIP - ASP + Student Grades + Primary Intervention Program (PIP) + After School Program (ASP) Bell Schedules Immunizations Attendance - Menus -
-
-

PTAV

- About - Logo Wear - Meetings -

School Site Council (SSC)

- About - Agenda - Minutes -

English Language Arts Curriculum (ELAC)

- About - Agenda - Minutes +
diff --git a/views/standardArea.html b/views/standardArea.html new file mode 100644 index 0000000..476ae8b --- /dev/null +++ b/views/standardArea.html @@ -0,0 +1,24 @@ +{% macro getStandardArea() %} + {{ apos.area(data.page, "body", { + widgets: { + 'apostrophe-images': {size: 'original'}, + 'apostrophe-rich-text': { + toolbar: ['Styles', 'Bold', 'Italic', 'Strike', 'Subscript', 'Superscript', 'Split', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', '-', 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', '-', 'Link', 'Unlink', 'Anchor', 'Table'], + styles: [ + {name: 'Paragraph', element: 'p', attributes: {class: "p"} }, + {name: 'Topic Paragraph', element: 'p', attributes: {class: "indent"} }, + {name: 'Heading 2', element: 'h2', attributes: {class: "h2"} }, + {name: 'Heading 3', element: 'h3', attributes: {class: "h3"} }, + {name: 'Heading 4', element: 'h4', attributes: {class: "h4"} }, + {name: 'Heading 5', element: 'h5', attributes: {class: "h5"} }, + {name: 'Date', element: 'div', attributes: {class: "date"} }, + {name: 'Highlighted', element: 'div', attributes: {class: "highlighted"} }, + {name: 'Alert', element: 'div', attributes: {class: "alert"} } + ] + }, + 'apostrophe-files': {}, + 'two-column': {}, + 'two-column-1-2': {}, + 'two-column-2-1': {} + } } ) }} +{% endmacro %} \ No newline at end of file