From 9445496b94b4ec1277408e793136d4e4a6f915d7 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Fri, 21 Nov 2014 19:09:17 +0300
Subject: [PATCH] team page update

---
 assets/style/main.scss |  8 -------
 assets/style/team.scss | 53 ++++++++++++++++++++++++------------------
 client/pages/team.js   | 45 +----------------------------------
 views/team.html        | 28 +++++++++++-----------
 4 files changed, 46 insertions(+), 88 deletions(-)

diff --git a/assets/style/main.scss b/assets/style/main.scss
index 5b17e060..527e302d 100644
--- a/assets/style/main.scss
+++ b/assets/style/main.scss
@@ -6,12 +6,4 @@ body {
 	font-family: "PT Sans", Arial, sans-serif;
 	margin: 0;
 	padding: 0;
-}
-
-.background-picture{
-  width: 100%;
-  position: fixed;
-  top:0;
-  left: 0;
-  z-index: -999;
 }
\ No newline at end of file
diff --git a/assets/style/team.scss b/assets/style/team.scss
index 9a0b2092..c8262d6f 100644
--- a/assets/style/team.scss
+++ b/assets/style/team.scss
@@ -8,42 +8,49 @@
     }
 }
 
-ul{
-    display: block;   
+.background-picture{
+    width: 100%;
+    position: fixed;
+    top:0;
+    left: 0;
+    z-index: -999;
 }
 
-.team-list{
-    list-style:none; 
+.team-block{
     background-color: white;
     width:100%;
     min-height: 100px;
     padding-top: 100px;
     padding-bottom: 100px;
     margin-top: 63%;
-}
 
-.team-member{
-    margin: 0 auto 50px auto;
-    width: 70%;
-
-    img{
-        width: 40%;
-        max-width: 600px;
-        min-width: 200px;
-        display: inline-block;
+    ul{
+        list-style:none;
     }
 
-    .info{
-        display: inline-block;
-        float: right;
-        width: 55%;
-        line-height: 2em;
+    .team-member{
+        margin: 0 auto 50px auto;
+        width: 70%;
 
-        h3{
-            font-weight: 100;
+        img{
+            width: 40%;
+            max-width: 600px;
+            min-width: 200px;
+            display: inline-block;
+        }
 
-            span{
-                font-weight: 600;   
+        .info{
+            display: inline-block;
+            float: right;
+            width: 55%;
+            line-height: 2em;
+
+            h3{
+                font-weight: 100;
+
+                span{
+                    font-weight: 600;
+                }
             }
         }
     }
diff --git a/client/pages/team.js b/client/pages/team.js
index caca44ac..a9548de0 100644
--- a/client/pages/team.js
+++ b/client/pages/team.js
@@ -8,47 +8,4 @@ module.exports = function (app) {
             return person;
         });
     });
-};
-
-/**
- * Generates list of numbers
- * @param  {Number} start starting value
- * @param  {Number} num   amount of numbers in list
- * @param  {Number} step  difference value
- * @return {Array}        list of numbers
- */
-function range(start, num, step) {
-    var list = [];
-    var val = start;
-    for (var i = 0; i < num; i++) {
-        list.push(val);
-        val += step;
-    }
-    return list;
-}
-
-///**
-// * Monday date of current week
-// * @param  {[type]} d [description]
-// * @return {[type]}   [description]
-// */
-//function getMonday(d) {
-//    d = new Date(d);
-//    var day = d.getDay();
-//    var diff = d.getDate() - day + (day == 0 ? -6 : 1); // adjust when day is sunday
-//    return new Date(d.setDate(diff));
-//}
-
-function getDates(day) {
-    var dates = [];
-    var prev = day == 0 ? 0 : day - 1;
-    var next = 6 - prev;
-    var dayMask = range(-1, prev, -1).concat([0]).concat(range(1, next, 1));
-
-    dayMask.forEach(function (m) {
-        var time = Date.now() + (1000 * 60 * 60 * 24) * m;
-        var date = new Date(time);
-        dates.push(date.getDate());
-    });
-    return dates;
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/views/team.html b/views/team.html
index a536f04b..1a4ec918 100644
--- a/views/team.html
+++ b/views/team.html
@@ -1,15 +1,17 @@
 <img class="background-picture" src="http://static.shlisselburg.org/art/team/team.jpg">
 
-<ul class="team-list" ng-controller="TeamController">
-    <li class="team-member" ng-repeat="person in team">
-        <img ng-src="{{person.picture}}">
-        <div class="info">
-            <h3>{{person.names[1]}} {{person.names[2]}} <span>{{person.names[3]}}</span></h3>
-            <p>{{person.position}}</p>
-            <p>{{person.status}}</p>
-            <p></p>
-            <p class="edu">{{person.edu}} </p>
-            <p class="diploma">Диплом {{person.diploma}}</p>
-        </div>
-    </li>
-</ul>
+<div class="team-block">
+    <ul ng-controller="TeamController">
+        <li class="team-member" ng-repeat="person in team">
+            <img ng-src="{{person.picture}}">
+            <div class="info">
+                <h3>{{person.names[1]}} {{person.names[2]}} <span>{{person.names[3]}}</span></h3>
+                <p>{{person.position}}</p>
+                <p>{{person.status}}</p>
+                <p></p>
+                <p class="edu">{{person.edu}} </p>
+                <p class="diploma">Диплом {{person.diploma}}</p>
+            </div>
+        </li>
+    </ul>
+</div>
\ No newline at end of file