From a513fc88e5e2e7047ba23253804a4cbf1fae7379 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 20 Apr 2017 17:36:55 +0000 Subject: [PATCH] we have new html for the data site --- .../files/html/awstats-index.html | 49 ++ .../files/html/css/awstats-reports.css | 151 +++++++ .../files/html/css/normalize.css | 427 ++++++++++++++++++ .../files/html/main-index.html | 37 ++ .../web-data-analysis/files/html/summary.html | 56 +++ .../web-data-analysis/files/httpd_config.conf | 2 +- roles/web-data-analysis/files/summary.html | 33 -- roles/web-data-analysis/tasks/main.yml | 29 +- 8 files changed, 749 insertions(+), 35 deletions(-) create mode 100644 roles/web-data-analysis/files/html/awstats-index.html create mode 100644 roles/web-data-analysis/files/html/css/awstats-reports.css create mode 100644 roles/web-data-analysis/files/html/css/normalize.css create mode 100644 roles/web-data-analysis/files/html/main-index.html create mode 100644 roles/web-data-analysis/files/html/summary.html delete mode 100644 roles/web-data-analysis/files/summary.html diff --git a/roles/web-data-analysis/files/html/awstats-index.html b/roles/web-data-analysis/files/html/awstats-index.html new file mode 100644 index 0000000000..02612a17c8 --- /dev/null +++ b/roles/web-data-analysis/files/html/awstats-index.html @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + AWStats Reports + + +

Index by Year

+ + + + diff --git a/roles/web-data-analysis/files/html/css/awstats-reports.css b/roles/web-data-analysis/files/html/css/awstats-reports.css new file mode 100644 index 0000000000..6b589e21c5 --- /dev/null +++ b/roles/web-data-analysis/files/html/css/awstats-reports.css @@ -0,0 +1,151 @@ +/* Bring in our fonts */ +@import url(https://fonts.googleapis.com/css?family=Lobster%7CDidact+Gothic%7CInconsolata%7CNoto+Sans%7CNoto+Serif%7CLato); +/* Set up some sane defaults */ +html { + background-color: #EFF; + color: #000; + /* https://css-tricks.com/box-sizing/ */ + box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; +} + +*, *:before, *:after { + box-sizing:inherit; + -webkit-box-sizing: inherit; + -moz-box-sizing: inherit; +} + +body { + padding-top: 1rem; + padding-bottom: 1rem; + padding-right: 1rem; + padding-left: 1rem; + margin: auto; + height: auto; + text-align: left; + font-size: medium; + text-decoration: none; + min-width: 20rem; + letter-spacing: normal; + word-spacing: normal; + line-height: normal; +} + +img { + max-width: 100%; + height: auto; +} + +a { + text-decoration: underline; +} + +a:link { + color: #000; +} + +a:visited { + color: #888; +} + +a:hover { + color: #00F; + font-weight: bolder; +} + +a:active { + color: #F00; +} + +h1, h2, h3, h4, h5, h6 { + display: block; + font-weight: bold; +} + +h1 { + font-size: xx-large; +} + +h2 { + font-size: x-large; +} + +h3 { + font-size: large; +} + +h4{ + font-size: medium; +} + +h5 { + font-size: small; +} + +h6 { + font-size: x-small; +} + +ul.hidden { + list-style-type: none; +} + +ul.disc { + list-style-type: disc; +} +ul.circle { + list-style-type: circle; +} +ul.square { + list-style-type: square; +} + +ol.zero { + list-style-type: decimal-leading-zero; +} + +ol.decimal { + list-style-type: decimal; +} + +ol.upper-roman { + list-style-type: upper-roman; +} + +ol.lower-roman { + list-style-type: lower-roman; +} + +ol.lower-greek { + list-style-type: lower-greek; +} + +ol.upper-alpha { + list-style-type: upper-alpha; +} +ol.lower-alpha { + list-style-type: lower-alpha; +} + +.center { + text-align: center; +} + + +.crate-3col { + position: relative; + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + -webkit-column-width: 10em; + -moz-column-width: 10em; + column-width: 10em; + -webkit-column-gap: 2em; + -moz-column-gap: 2em; + column-gap: 2em; + -webkit-column-rule: 2px solid #ccc; + -moz-column-rule: 2px solid #ccc; + column-rule: 2px solid #ccc; + column-fill: auto; +} diff --git a/roles/web-data-analysis/files/html/css/normalize.css b/roles/web-data-analysis/files/html/css/normalize.css new file mode 100644 index 0000000000..458eea1ea3 --- /dev/null +++ b/roles/web-data-analysis/files/html/css/normalize.css @@ -0,0 +1,427 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/roles/web-data-analysis/files/html/main-index.html b/roles/web-data-analysis/files/html/main-index.html new file mode 100644 index 0000000000..b17d9cc7bd --- /dev/null +++ b/roles/web-data-analysis/files/html/main-index.html @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +

What we have

+ + + diff --git a/roles/web-data-analysis/files/html/summary.html b/roles/web-data-analysis/files/html/summary.html new file mode 100644 index 0000000000..ddd009996d --- /dev/null +++ b/roles/web-data-analysis/files/html/summary.html @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + diff --git a/roles/web-data-analysis/files/httpd_config.conf b/roles/web-data-analysis/files/httpd_config.conf index c57f8e92fe..5b06a941b5 100644 --- a/roles/web-data-analysis/files/httpd_config.conf +++ b/roles/web-data-analysis/files/httpd_config.conf @@ -6,5 +6,5 @@ # This is off because Apache (and thus mod_auth_gssapi) doesn't know this is proxied over TLS GssapiSSLonly Off GssapiLocalName on - Require user smooge kevin puiterwijk mattdm stickster + Require user smooge kevin puiterwijk mattdm pfrields diff --git a/roles/web-data-analysis/files/summary.html b/roles/web-data-analysis/files/summary.html deleted file mode 100644 index f09221603e..0000000000 --- a/roles/web-data-analysis/files/summary.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - Select Fedora Graphs - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index 4a9d5aa6cb..bdebb0f6c0 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -21,6 +21,33 @@ tags: - web-data +- name: copy over website index. + copy: src=html/main-index.html dest=/var/www/html/index.html mode=0644 + tags: + - web-data + +- name: make a css tree + file: path=/var/www/html/css/ state=directory mode=0755 + tags: + - web-data + + +- name: css files + copy: src={{item}} dest=/var/www/html/css/ mode=0644 + with_items: [ html/css/awstats-reports.css, html/css/normalize.css ] + tags: + - web-data + +- name: make an awstats directory + file: path=/var/www/html/awstats-reports/ state=directory mode=0755 + tags: + - web-data + +- name: copy over its index + copy: src=html/awstats-index.html dest=/var/www/html/awstats-reports/index.html mode=0644 + tags: + - web-data + - name: make the web directory exists file: path=/var/www/html/csv-reports/ state=directory mode=0755 tags: @@ -33,7 +60,7 @@ - web-data - name: make the web directory summary. - copy: src=summary.html dest=/var/www/html/csv-reports/images/ mode=0644 + copy: src=html/summary.html dest=/var/www/html/csv-reports/images/ mode=0644 tags: - web-data