From 48b2ca8d3ea6d6c00398a33b2d3b3609a366b631 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 25 Feb 2016 17:52:23 +0300 Subject: [PATCH] + FooterLinks component; footer links from main -> client config; style update --- src/client/app.js | 6 ++- src/client/components/FooterLinks.js | 11 ++++ src/client/config.js | 54 +++++++++++++++++-- src/client/controllers/AppController.js | 3 ++ src/style/components/footer-links.scss | 21 ++++++++ src/style/{docs.scss => documents.scss} | 0 src/style/footer.scss | 50 ++++++----------- src/style/page.scss | 2 +- src/style/style.scss | 3 +- src/style/variables.scss | 10 +++- src/templates/components/footer-links.html | 7 +++ src/templates/main.html | 28 ++-------- .../views/{docs.html => documents.html} | 0 13 files changed, 126 insertions(+), 69 deletions(-) create mode 100644 src/client/components/FooterLinks.js create mode 100644 src/style/components/footer-links.scss rename src/style/{docs.scss => documents.scss} (100%) create mode 100644 src/templates/components/footer-links.html rename src/templates/views/{docs.html => documents.html} (100%) diff --git a/src/client/app.js b/src/client/app.js index d9807ba9..7ee2ed19 100644 --- a/src/client/app.js +++ b/src/client/app.js @@ -14,6 +14,7 @@ import ScheduleTable from './components/ScheduleTable'; import ScheduleSlider from './components/ScheduleSlider'; import ScheduleSlide from './components/ScheduleSlide'; import ScheduleRecord from './components/ScheduleRecord'; +import FooterLinks from './components/FooterLinks'; import AppController from './controllers/AppController'; import HomeController from './controllers/HomeController'; @@ -102,6 +103,7 @@ app.run(($location, $rootScope, $http) => { ScheduleSlider, ScheduleSlide, ScheduleRecord, + FooterLinks, function (app) { app.controller('HomePageController', ($scope) => { $scope.pageClass = 'page-home'; @@ -119,8 +121,8 @@ app.run(($location, $rootScope, $http) => { $scope.pageClass = 'page-album'; }); - app.controller('DocsPageController', ($scope) => { - $scope.pageClass = 'page-docs'; + app.controller('DocumentsPageController', ($scope) => { + $scope.pageClass = 'page-documents'; }); app.controller('CollectivePageController', ($scope) => { diff --git a/src/client/components/FooterLinks.js b/src/client/components/FooterLinks.js new file mode 100644 index 00000000..a510340a --- /dev/null +++ b/src/client/components/FooterLinks.js @@ -0,0 +1,11 @@ +import template from '../../templates/components/footer-links.html'; + +export default function (app) { + app.component('footerLinks', { + bindings: { + title: '@', + links: '<' + }, + template: template + }); +}; \ No newline at end of file diff --git a/src/client/config.js b/src/client/config.js index 0ed94812..f7857f9a 100644 --- a/src/client/config.js +++ b/src/client/config.js @@ -39,8 +39,56 @@ export let routes = [ }, { name: '/documents', - templateUrl: '/views/docs.html', - controller: 'DocsPageController', + templateUrl: '/views/documents.html', + controller: 'DocumentsPageController', title: 'Документы' } -]; \ No newline at end of file +]; + +export const footer = { + links: { + docs: { + title: 'Документы', + links: [ + {url: '/document/edu-license', link: 'Лицензия на осуществление образовательной деятельности'}, + {url: '/document/gov-certificate', link: 'Свидетельство о государственной регистрации права'}, + {url: '/document/EGRYL1', link: 'Свидетельство о внесении в «ЕГРЮЛ»'}, + {url: '/document/VAT', link: 'ИНН'}, + {url: '/document/statue-2013', link: 'Устав школы'} + ] + }, + sites: { + title: 'Ссылки на образовательные сайты', + links: [ + { + url: 'http://минобрнауки.рф', + link: 'минобрнауки.рф', + description: 'Министерство образования и науки Российской Федерации' + }, + {url: 'http://edu.ru', link: 'edu.ru', description: 'Федеральный сайт «Российское образование»'}, + { + url: 'http://window.edu.ru', + link: 'window.edu.ru', + description: 'Единое окно доступа к образовательным ресурсам' + }, + { + url: 'http://school-collection.edu.ru', + link: 'school-collection.edu.ru', + description: 'Единая коллекция цифровых образовательных ресурсов' + }, + { + url: 'http://fcior.edu.ru', + link: 'fcior.edu.ru', + description: 'Федеральный центр информационных образовательных ресурсов' + }, + {url: 'http://dkhshmga.ru', link: 'dkhshmga.ru', description: 'Художественная школа Мги'}, + { + url: 'http://kirovskdmh.ucoz.ru', + link: 'kirovskdmh.ucoz.ru', + description: 'Музыкальная школа Кировска' + } + ] + } + } +}; + diff --git a/src/client/controllers/AppController.js b/src/client/controllers/AppController.js index ceeb4595..e96d886a 100644 --- a/src/client/controllers/AppController.js +++ b/src/client/controllers/AppController.js @@ -1,5 +1,8 @@ +import {footer} from '../config'; + export default function (app) { app.controller('AppController', ($scope, menu) => { $scope.menuProvider = menu.items; + $scope.footer = footer; }); }; diff --git a/src/style/components/footer-links.scss b/src/style/components/footer-links.scss new file mode 100644 index 00000000..98166f75 --- /dev/null +++ b/src/style/components/footer-links.scss @@ -0,0 +1,21 @@ +@import "../variables"; + +.footer-links { + &__header { + margin-bottom: $single-margin; + font-size: $bigger-font-size; + color: $light-color; + } + + &__link { + margin-bottom: $half-margin; + + a { + border-bottom: 1px solid darken($link-color, 40%); + } + } + + ul { + list-style: none; + } +} diff --git a/src/style/docs.scss b/src/style/documents.scss similarity index 100% rename from src/style/docs.scss rename to src/style/documents.scss diff --git a/src/style/footer.scss b/src/style/footer.scss index 918b88b9..df02ab30 100644 --- a/src/style/footer.scss +++ b/src/style/footer.scss @@ -1,53 +1,33 @@ +@import "variables"; + +$uri: '/graphics/rawline.png'; + footer { - color: #e3e3e3; - background-color: #151515; - font-size: 0.9em; - padding: 0 0.5em 0.5em; + color: $light-color; + padding: 0 $half-margin $half-margin; position: relative; + background-color: $darker-color; &:before { + $s: 3px; + content: ''; position: absolute; - top: -3px; + top: -$s; left: 0; width: 100%; - height: 3px; + height: $s; z-index: 100; - background-image: url('/graphics/rawline.png'); + background-image: url($uri); } - h4{ - font-size: 1.3em; - color: white; - margin: 0.5em 0 0.7em; - } - - ul { - padding: 0 0.5em 0 1em; - list-style: none; - - li { - margin: 0 0 0.5em; - } - } - - a { - padding: 0.15em 0; - line-height: 1.5em; - color: #738cdb; - text-decoration: none; - border-bottom: 1px solid #2c3652; - } - - .info-block { + .footer-info { display: flex; flex-wrap: wrap; justify-content: space-between; - & > div { - box-sizing: border-box; - padding: 0 1em; - } + padding: $double-margin $single-margin 0; + margin-bottom: $double-margin; } .contacts { diff --git a/src/style/page.scss b/src/style/page.scss index 86333e83..fea3d756 100644 --- a/src/style/page.scss +++ b/src/style/page.scss @@ -37,7 +37,7 @@ } } -.page-docs { +.page-documents { &.ng-leave { transform-origin: 50% 50%; animation: rotateOutNewspaper .3s both ease-in; diff --git a/src/style/style.scss b/src/style/style.scss index 6dc07478..4de355d0 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -9,6 +9,7 @@ @import "components/timeline-record-post"; @import "components/timeline-record-instagram"; @import "components/schedule-table"; +@import "components/footer-links"; @import "main"; @import "body-wrapper"; @@ -16,7 +17,7 @@ @import "content"; @import "page-animation"; -@import "docs"; +@import "documents"; @import "document"; @import "album"; @import "schedule-selector"; diff --git a/src/style/variables.scss b/src/style/variables.scss index d2bb1b11..e9c7efdc 100644 --- a/src/style/variables.scss +++ b/src/style/variables.scss @@ -7,8 +7,10 @@ $content-semi-wide: 70%; $content-thin: 60%; //MARGINS -$single-margin: 1.5em; -$double-margin: 3em; +$small-margin: .2em; +$half-margin: .5em; +$single-margin: 1.0em; +$double-margin: 3.0em; //COLOR $dark-color: hsl(0, 0%, 20%); @@ -34,6 +36,10 @@ $white-shadow: 0 .1em 0.3em rgba(0, 0, 0, 0.2); $title-font: "PT Sans", Arial, sans-serif; $text-font: "PT Sans", Arial, sans-serif; +$normal-font-size: 1em; +$bigger-font-size: 1.5em; +$smaller-font-size: .8em; + //MENU $menu-thickness: 2.5em; $menu-colored-mark-thickness: 4px; diff --git a/src/templates/components/footer-links.html b/src/templates/components/footer-links.html new file mode 100644 index 00000000..dee96e12 --- /dev/null +++ b/src/templates/components/footer-links.html @@ -0,0 +1,7 @@ +
+

{{$ctrl.title}}

+ +
\ No newline at end of file diff --git a/src/templates/main.html b/src/templates/main.html index f45088af..f261d65f 100644 --- a/src/templates/main.html +++ b/src/templates/main.html @@ -55,31 +55,9 @@