-
'Allo, 'Allo!
+'Hello my friends!
angular-dft alwaes a pleasure scaffolding your application.
diff --git a/source/app/states/dima/dima.controller.js b/source/app/states/dima/dima.controller.js
index 8614cb2..dcbf3ed 100644
--- a/source/app/states/dima/dima.controller.js
+++ b/source/app/states/dima/dima.controller.js
@@ -8,6 +8,9 @@ angular
.controller('dimaController', function ( $scope, $log, fromRoot ) {
var vm = $scope.vm = {
+
+ some: "TestTesTest",
+
connections: [
{
rank: 1,
diff --git a/source/app/states/dima/dima.html b/source/app/states/dima/dima.html
index a4b0a30..6351ad5 100644
--- a/source/app/states/dima/dima.html
+++ b/source/app/states/dima/dima.html
@@ -1,7 +1,7 @@
-
-
+
'Привет, 'Привет!
+{{ vm.some }}
angular-dft alwaes a pleasure scaffolding your application.
diff --git a/source/app/states/fedoseev/fedoseev.html b/source/app/states/fedoseev/fedoseev.html
index c62b37f..a5ee1a3 100644
--- a/source/app/states/fedoseev/fedoseev.html
+++ b/source/app/states/fedoseev/fedoseev.html
@@ -1,4 +1,187 @@
-
+Dima
Fedoseev
Nakhaev
+ Pasha
+ Alina
+
+ aleksandrForm
diff --git a/source/app/states/layout.module.js b/source/app/states/layout.module.js
index e693ac5..5c0c288 100644
--- a/source/app/states/layout.module.js
+++ b/source/app/states/layout.module.js
@@ -10,7 +10,10 @@ angular
'layout.home',
'layout.yakov',
'layout.dima',
- 'layout.nakhaev'
+ 'layout.fedoseev',
+ 'layout.nakhaev',
+ 'layout.alina',
+ 'layout.aleksandrForm'
])
.config( function ( $stateProvider ) {
diff --git a/source/app/states/home/home.controller.js b/source/app/states/pasha/pasha.controller.js
similarity index 99%
rename from source/app/states/home/home.controller.js
rename to source/app/states/pasha/pasha.controller.js
index 9b32161..d7a8880 100644
--- a/source/app/states/home/home.controller.js
+++ b/source/app/states/pasha/pasha.controller.js
@@ -3,9 +3,8 @@
angular
- .module('layout.home')
-
- .controller('homeController', function ( $scope, $log, fromRoot ) {
+ .module('layout.pasha')
+ .controller('pashaController', function ( $scope, $log, fromRoot ) {
var vm = $scope.vm = {
connections: [
diff --git a/source/app/states/pasha/pasha.html b/source/app/states/pasha/pasha.html
new file mode 100644
index 0000000..cfd7062
--- /dev/null
+++ b/source/app/states/pasha/pasha.html
@@ -0,0 +1,25 @@
+
+
diff --git a/source/app/states/home/home.module.js b/source/app/states/home/home.module.js
deleted file mode 100644
index 7506b6b..0000000
--- a/source/app/states/home/home.module.js
+++ /dev/null
@@ -1,26 +0,0 @@
-
-'use strict';
-
-angular
-
- .module('layout.home', [
-
- ])
-
- .config( function ( $stateProvider ) {
-
- $stateProvider.state('layout.home', {
- url: '/home',
- templateUrl: 'app/states/home/home.html',
- controller: 'homeController',
- /**
- *
- */
- resolve: {
- // get and prepere user from root
- fromRoot: function ( user ) {
- return {user: user, prepered: true};
- }
- }
- });
- });
diff --git a/source/app/states/layout.controller.js b/source/app/states/layout.controller.js
index 447f7ad..a8b5562 100644
--- a/source/app/states/layout.controller.js
+++ b/source/app/states/layout.controller.js
@@ -14,5 +14,4 @@ angular
toastr.error('Sorry but this state not specified by scaffolding.', state);
}
};
-
});
diff --git a/source/app/states/layout.html b/source/app/states/layout.html
index d76ae4e..9508afa 100644
--- a/source/app/states/layout.html
+++ b/source/app/states/layout.html
@@ -26,6 +26,10 @@
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 21.04.2011
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2012 © Company Name
+WordPress Theme by PandaThemes
+
+
diff --git a/source/app/states/pasha/pasha.module.js b/source/app/states/pasha/pasha.module.js
new file mode 100644
index 0000000..ace8d27
--- /dev/null
+++ b/source/app/states/pasha/pasha.module.js
@@ -0,0 +1,29 @@
+
+'use strict';
+
+angular
+
+ .module('layout.pasha', [
+
+ ])
+
+ .config( function ( $stateProvider ) {
+
+ $stateProvider.state('layout.pasha', {
+ url: '/pasha',
+ templateUrl: 'app/states/pasha/pasha.html',
+ controller: 'pashaController',
+ /**
+ *
+ */
+ resolve: {
+ // resolve is an object, unique for that page dependencies
+ // the names of objects fields can be pulled into controller
+ // usually used to execution of important requests on that page,
+ // without which the page cannot be draw
+ fromRoot: function ( user ) {
+ return {user: user, prepered: true};
+ }
+ }
+ });
+ });
diff --git a/source/assets/images/TimeLine/Latest_1.png b/source/assets/images/TimeLine/Latest_1.png
new file mode 100644
index 0000000..b61163b
Binary files /dev/null and b/source/assets/images/TimeLine/Latest_1.png differ
diff --git a/source/assets/images/TimeLine/Latest_2.png b/source/assets/images/TimeLine/Latest_2.png
new file mode 100644
index 0000000..dfa213d
Binary files /dev/null and b/source/assets/images/TimeLine/Latest_2.png differ
diff --git a/source/assets/images/TimeLine/Latest_3.png b/source/assets/images/TimeLine/Latest_3.png
new file mode 100644
index 0000000..e4515ff
Binary files /dev/null and b/source/assets/images/TimeLine/Latest_3.png differ
diff --git a/source/assets/images/TimeLine/Latest_4.png b/source/assets/images/TimeLine/Latest_4.png
new file mode 100644
index 0000000..1dc2774
Binary files /dev/null and b/source/assets/images/TimeLine/Latest_4.png differ
diff --git a/source/assets/images/TimeLine/Logo.png b/source/assets/images/TimeLine/Logo.png
new file mode 100644
index 0000000..ce7fbc3
Binary files /dev/null and b/source/assets/images/TimeLine/Logo.png differ
diff --git a/source/assets/images/TimeLine/bg.jpg b/source/assets/images/TimeLine/bg.jpg
new file mode 100644
index 0000000..58f1601
Binary files /dev/null and b/source/assets/images/TimeLine/bg.jpg differ
diff --git a/source/assets/images/TimeLine/city_1.jpg b/source/assets/images/TimeLine/city_1.jpg
new file mode 100644
index 0000000..92f9c49
Binary files /dev/null and b/source/assets/images/TimeLine/city_1.jpg differ
diff --git a/source/assets/images/TimeLine/city_2.jpg b/source/assets/images/TimeLine/city_2.jpg
new file mode 100644
index 0000000..021f165
Binary files /dev/null and b/source/assets/images/TimeLine/city_2.jpg differ
diff --git a/source/assets/images/TimeLine/city_3.jpg b/source/assets/images/TimeLine/city_3.jpg
new file mode 100644
index 0000000..c96026e
Binary files /dev/null and b/source/assets/images/TimeLine/city_3.jpg differ
diff --git a/source/assets/images/TimeLine/city_4.jpg b/source/assets/images/TimeLine/city_4.jpg
new file mode 100644
index 0000000..ca980c6
Binary files /dev/null and b/source/assets/images/TimeLine/city_4.jpg differ
diff --git a/source/assets/images/TimeLine/comments.png b/source/assets/images/TimeLine/comments.png
new file mode 100644
index 0000000..2682550
Binary files /dev/null and b/source/assets/images/TimeLine/comments.png differ
diff --git a/source/assets/images/TimeLine/icons.png b/source/assets/images/TimeLine/icons.png
new file mode 100644
index 0000000..4e1a916
Binary files /dev/null and b/source/assets/images/TimeLine/icons.png differ
diff --git a/source/assets/images/TimeLine/like.png b/source/assets/images/TimeLine/like.png
new file mode 100644
index 0000000..702306d
Binary files /dev/null and b/source/assets/images/TimeLine/like.png differ
diff --git a/source/assets/images/TimeLine/purch_btn.jpg b/source/assets/images/TimeLine/purch_btn.jpg
new file mode 100644
index 0000000..d25e305
Binary files /dev/null and b/source/assets/images/TimeLine/purch_btn.jpg differ
diff --git a/source/styles/all.less b/source/styles/all.less
index 5bac055..bd25298 100644
--- a/source/styles/all.less
+++ b/source/styles/all.less
@@ -9,6 +9,10 @@
// common components
// @import 'less/components/some-component-name.less';
+
// unique style sheet for pages
@import 'less/pages/home.less';
@import 'less/pages/yakov.less';
+@import 'less/pages/fedoseev.less';
+@import 'less/pages/dima.less';
+@import 'less/pages/aleksandr.less';
\ No newline at end of file
diff --git a/source/styles/less/pages/aleksandr.less b/source/styles/less/pages/aleksandr.less
new file mode 100644
index 0000000..050f70b
--- /dev/null
+++ b/source/styles/less/pages/aleksandr.less
@@ -0,0 +1,22 @@
+
+#aleksFormFirst {
+ padding: 10px;
+ background-color: lightslategray;
+ border-radius: 10px;
+ max-width: 100%;
+ max-height: 100%;
+}
+
+#aleksFormLast {
+ padding: 10px;
+ margin-top: 30px;
+ background-color: @green;
+ max-width: 100%;
+ max-height: 100%;
+ border-radius: 10px;
+}
+h3 {
+ text-align: center;
+}
+
+
diff --git a/source/styles/less/pages/dima.less b/source/styles/less/pages/dima.less
new file mode 100644
index 0000000..fa3f9bd
--- /dev/null
+++ b/source/styles/less/pages/dima.less
@@ -0,0 +1,6 @@
+#dimaPage {
+ // style only for dimaPage template
+
+ background-color: @orange;
+
+}
diff --git a/source/styles/less/pages/fedoseev.less b/source/styles/less/pages/fedoseev.less
new file mode 100644
index 0000000..eccd418
--- /dev/null
+++ b/source/styles/less/pages/fedoseev.less
@@ -0,0 +1,424 @@
+//@grid-gutter-width: 20px;
+
+
+#fed {
+ .col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9 {
+ padding-right: 10px;
+ padding-left: 10px;
+ }
+ .container {
+ max-width: 940px;
+ padding: 0;
+ }
+
+ font-family: Arial, Helvetica, sans-serif;
+ max-height: 1300px;
+ padding-top: 1px;
+ background: url(../../../assets/images/TimeLine/bg.jpg) center center / cover no-repeat;
+
+ .bodyContainer {
+ max-width: 1140px;
+ margin: 50px auto 0 auto;
+ background: rgba(0,0,0,.3);
+ @media(max-width: 768px) {
+ margin-top: 10px;
+ img {
+ margin-left: 15px;
+ }
+ }
+ }
+
+ header {
+ padding-top: 32px;
+ @media(max-width: 768px) {
+ margin-top: 15px;
+ }
+
+ }
+ .socials {
+ float: right;
+ color: white;
+ font-size: 11px;
+ padding: 18px 0 0 82px;
+ @media(max-width: 800px) {
+ padding: 18px 20px 0 20px;
+ }
+
+ p {
+ display: inline-block;
+ margin-right: 30px;
+ @media(max-width: 740px) {
+ display:block;
+ }
+ }
+
+ }
+ .soc {
+ margin-left: 4px;
+ float: right;
+ overflow: hidden;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ background: url(../../../assets/images/TimeLine/icons.png) ;
+ }
+ a:nth-child(6) {
+ background-position: -20px 0 ;
+ }
+ a:nth-child(5) {
+ background-position: -40px 0 ;
+ }
+ a:nth-child(4) {
+ background-position: -60px 0 ;
+ }
+ a:nth-child(3) {
+ background-position: -80px 0 ;
+ }
+ .navbar {
+ min-height: 42px;
+ margin-top: 35px;
+ margin-bottom: 0;
+ border-radius: 0;
+ background: rgba(0,0,0,.5);
+ @media(max-width: 768px) {
+ margin-top: 15px;
+ }
+ a {
+ color: white;
+ font-size: 16px;
+
+ }
+ a:hover {
+ background: rgba(0,0,0,.3);
+ }
+ a:focus {
+ background: rgba(0,0,0,.7);
+ }
+ }
+ .nav>li>a {
+ padding: 7px 13px 5px 15px;
+ border-left: 1px #363636 solid;
+ }
+ .nav>li>a:last-child {
+ border-right: 1px #363636 solid;
+ }
+ .nav>li {
+ padding-top: 5px;
+ }
+ .dropdown-menu {
+ background: rgba(0,0,0,.7);
+ }
+ .navbar-toggle {
+ background-color: white;//!!
+ }
+ .container-fluid {
+ padding-left: 73px;
+ @media(max-width: 850px) {
+ padding-left: 15px;
+ }
+ }
+ .bl {
+ margin-top: -1px;
+ background: rgba(0,0,0,.3);
+ width: 100%;
+ height: 5px;
+ }
+ .fa-search {
+ color: grey;
+ margin-left: -18px;
+ margin-right: 77px;
+ font-size: 12px;
+ }
+ .search {
+ width: 150px;
+ height: 24px;
+ border-radius: 2px;
+ border: 0;
+ font-size: 11px;
+ padding: 5px;
+ padding-right: 25px;
+ }
+ .datePick {
+ padding-left: 95px;
+ min-height: 60px;
+ background-color: #a44a7d;
+ @media(max-width: 1020px) {
+ padding-left: 15px;
+ }
+ a{
+ text-transform: uppercase;
+ font-size: 11px;
+ display: inline-block;
+ padding: 24px 8px 20px 9px;
+ text-decoration: none;
+ color: rgba(255,255,255,.80);
+
+ }
+ .active>a {
+ background-color: rgba(0,0,0,.1);
+ color:white;
+ }
+ .active {
+ color: white;
+ background-color: rgba(0,0,0,.25);
+ }
+ }
+
+ .year {
+ margin: 0;
+ padding: 0 6px 0 10px;
+
+ font-weight: bold;
+ color: rgba(255,255,255,.80);
+ font-size: 18px;
+ display: inline-block;
+ }
+ .year>div {
+ margin-left: -5px;
+ height: 60px;
+ display: inline-block;
+ }
+ .year>div:first-child {
+ margin-left: 0px;
+ }
+ .year a:hover {
+ background-color: rgba(50,50,50,.30);
+ }
+ .year:hover {
+ color: white;
+ cursor: pointer;
+ }
+
+ .wrapper {
+ background-color: white;
+ padding-top: 47px;
+ @media(max-width: 992px) {
+ padding-top: 15px;
+ }
+
+
+ &>.container:first-child {
+ border-bottom: 1px solid #e5e5e5;
+ padding-bottom: 33px;
+ }
+ }
+ .thumbn {
+ display: block;
+ padding: 4px;
+ margin-bottom: 20px;
+ line-height: 1.42857143;
+ padding: 0;
+ border: 0;
+ p{
+ font-size: 13px;
+ margin-bottom: 15px;
+ }
+ &>p:first-child {
+ color: #b8b8b8;
+ }
+ span {
+ color: black;
+ }
+ .caption p:first-child {
+ margin-top: 10px;
+ min-height: 170px;
+ @media(max-width: 992px) {
+ min-height: 70px;
+ }
+ }
+ .caption {
+ padding-left: 0;
+ }
+ }
+ .thumb-unit {
+ display: inline-block;
+ position: relative;
+ width: 220px;
+ height: 120px;
+ overflow: hidden;
+ }
+
+ .thumb-overlay {
+ position: absolute;
+ top: 100%;
+ right: 0;
+ bottom: null;
+ left: 0;
+ height: 100%;
+ background: rgba(0,0,0,.5);
+ transition: all .25s;
+ h1 {
+ font-size: 14px;
+ color: white;
+ font-weight: bold;
+ margin: 11px 10px 4px 10px;
+ }
+
+ }
+ .thumb-unit:hover .thumb-overlay{
+ top:40%;
+ }
+
+ .thumb-unit {// :nth-child(1)
+ background: url(../../../assets/images/TimeLine/city_1.jpg) center center / cover ;
+ }
+
+ .comments {
+ background: url(../../../assets/images/TimeLine/comments.png) no-repeat;
+ padding-left: 20px;
+ font-size: 11px;
+ font-weight: bold;
+ text-decoration: none;
+ color: black;
+ display: inline-block;
+ height: 25px;
+ }
+ .detailsBtn {
+ font-size: 10px;
+ display: inline-block;
+ padding: 2px 8px;
+ text-decoration: none;
+ width: 48px;
+ height: 21px;
+ border: 1px solid #cccccc;
+ border-radius: 2px;
+ box-shadow: 0 0 4px 4px #eeeeee;
+ color: black;
+ background-image: -webkit-linear-gradient(#fff 0%, #e0e0e0 100%);
+ background-image: -o-linear-gradient(#fff 0%, #e0e0e0 100%);
+ background-image: linear-gradient(#fff 0%, #e0e0e0 100%);
+ background-repeat: repeat-x;
+ margin-right: 10px;
+ margin-left: 5px;
+ }
+ .detailsBtn:hover {
+ background-image: -webkit-linear-gradient(#e0e0e0 0%, #e0e0e0 100%);
+ background-image: -o-linear-gradient(#e0e0e0 0%, #e0e0e0 100%);
+ background-image: linear-gradient(#e0e0e0 0%, #e0e0e0 100%);
+ }
+
+ .purchase {
+ padding: 50px 0 45px 0 ;
+ h2 {
+ font-size: 24px;
+ margin-top: 5px;
+ line-height: 1.2;
+ color: #555555;
+ }
+ a {
+ background: url(../../../assets/images/TimeLine/purch_btn.jpg) -2px ;
+ height: 62px;
+ width: 240px;
+ border-radius: 5px;
+
+ }
+ a:hover {
+ box-shadow: 0 0 4px 4px #eeeeee;
+ }
+ }
+
+ .floatRight {
+ float: right;
+ }
+
+ footer {
+ background-color: rgba(0,0,0,.3);
+ padding-top: 10px;
+ article {
+ padding: 0;
+ }
+ h1 {
+ font-size: 18px;
+ color: white;
+ margin-bottom: 15px;
+ }
+ p {
+ font-size: 13px;
+ color: white;
+ word-spacing: 1.3;
+ }
+
+ .container {
+ border-bottom: 1px solid rgba(255,255,255,.3);
+ padding-bottom: 48px;
+ }
+ .marked {
+ margin-top: 15px;
+ position: relative;
+ padding-left: 40px;
+ span {
+ left: -5px;
+ top: -30px;
+ position: absolute;
+ font-size: 50px;
+ }
+ }
+
+ .recent {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ @media(max-width: 992px) {
+ justify-content: center;
+ }
+ a {
+ margin-bottom: 10px;
+ }
+ h1 {
+ width: 100%;
+ }
+ @media(max-width: 680px) {
+ a:last-child {
+ display: none;
+ }
+ h1 {
+ padding-left: 10px;
+ }
+ }
+ }
+ form {
+ border-radius: 2px;
+ background-color: rgba(0,0,0,.5);
+ padding: 11px 11px 45px 11px;
+ input[type="text"], textarea, input[type="submit"] {
+ font-size: 11px;
+ border-radius: 2px;
+ border: 0;
+ margin-bottom: 7px;
+ color: grey;
+ padding: 5px 8px;
+ }
+ input[type="text"] {
+ width: 166px;
+ }
+ p {
+ display: inline-block;
+ margin-left: 10px;
+ font-size: 11px;
+ color: grey;
+ }
+ textarea {
+ width: 277px;
+ }
+ input[type="submit"] {
+ margin: 2px 7px 5px 0;
+ float: right;
+ text-transform: uppercase;
+ }
+ input[type="submit"]:hover {
+ background-color: #c3c3c3;
+ }
+ }
+ }
+ .copyrights {
+ background-color: rgba(0,0,0,.3);
+ .container {
+ padding-top: 10px;
+ }
+ p {
+ display: inline-block;
+ font-size: 11px;
+ color: #b7b6b5;
+ }
+ }
+}
+
+ 'Allo, 'Allo! Yakov?
+
+
+ angular-dft alwaes a pleasure scaffolding your application.
+
With many thanks to the contributions of Yeoman.
+ +Also with great gratitude to the project connected the following technologies.
+
+
+
+
+
+
+ ![{{ awesomeThing.title }}]()
+
+
+
+ {{ item.name }}
+{{ item.description }}
+