team page refactoring: + team-member-profile component, -team-member-profile directive; other

This commit is contained in:
tmshv committed 2016-02-22 00:48:18 +03:00
1 parent 43ab4a66f8
commit 74e6d594c9
9 files changed
+65 -74

No files matched your search

+2 -1
View File
@@ -5,6 +5,7 @@
import Document from './components/Document';
import Award from './components/Award';
import GalleryItem from './components/GalleryItem';
import TeamMemberProfile from './components/TeamMemberProfile';
import api from './api/api';
var deps = [
@@ -84,7 +85,6 @@ app.run(function ($location, $rootScope, $http) {
api,
require("./services/io"),
require("./directives/mainMenu"),
require("./directives/teamMemberProfile"),
require("./directives/backgroundPicture"),
require("./ui/menu"),
require("./ui/breadcrumbs"),
@@ -103,6 +103,7 @@ app.run(function ($location, $rootScope, $http) {
Document,
Award,
GalleryItem,
TeamMemberProfile,
function (app) {
app.controller("SchedulePageController", function ($scope) {
$scope.pageClass = "page-schedule";
@@ -0,0 +1,10 @@
import template from '../../templates/components/team-member-profile.html';
export default function (app) {
app.component('teamMemberProfile', {
bindings: {
member: '='
},
template: template
});
};
@@ -1,13 +0,0 @@
module.exports = function (app) {
app.directive('teamMemberProfile', function (menu) {
return {
restrict: 'E',
templateUrl: '/views/team/profile.html',
scope: {
person: '=profile'
},
link: function(scope, element){
}
}
});
};
@@ -0,0 +1,31 @@
.team-member-profile {
width: 80%;
margin: 0 auto 3em;
display: flex;
justify-content: center;
flex-wrap: wrap;
}
.team-member-profile__picture {
width: 20%;
max-width: 15em;
min-width: 12em;
margin: 0 1em;
img {
width: 100%;
}
}
.team-member-profile__info {
width: 60%;
margin: 0 1em;
h3 {
font-weight: 200;
span {
font-weight: 600;
}
}
}
+2 -1
View File
@@ -1,2 +1,3 @@
@import "./components/gallery-item";
@import "./components/document";
@import "./components/document";
@import "./components/team-member-proifile";
-39
View File
@@ -6,43 +6,4 @@
&.ng-enter {
animation: slideInRight 0.3s both ease-in;
}
}
.team-block {
background-color: white;
width: 100%;
padding-top: 3em;
.team-member {
width: 80%;
margin: 0 auto 3em;
display: flex;
justify-content: center;
flex-wrap: wrap;
}
.team-member__picture {
width: 20%;
max-width: 15em;
min-width: 12em;
margin: 0 1em;
}
.team-member__picture img {
width: 100%;
}
.team-member__info {
width: 60%;
margin: 0 1em;
h3 {
font-weight: 200;
span {
font-weight: 600;
}
}
}
}
@@ -0,0 +1,18 @@
<div class="team-member-profile">
<a name="{{$ctrl.member.anchor}}"></a>
<div class="team-member-profile__picture">
<img ng-src="{{$ctrl.member.picture}}">
</div>
<div class="team-member-profile__info">
<h3>{{$ctrl.member.names[1]}} {{$ctrl.member.names[2]}} <span>{{$ctrl.member.names[3]}}</span></h3>
<p>{{$ctrl.member.position}}</p>
<p>{{$ctrl.member.status}}</p>
<p></p>
<p class="edu">{{$ctrl.member.edu}} </p>
<p class="diploma">Диплом {{$ctrl.member.diploma}}</p>
</div>
</div>
+2 -2
View File
@@ -1,5 +1,5 @@
<!--<background-picture src="'http://static.shlisselburg.org/art/team/team.jpg'"></background-picture>-->
<div class="team-block">
<team-member-profile ng-repeat="person in teamMembers track by $index" profile="person"/>
<div class="content content_wide">
<team-member-profile ng-repeat="person in teamMembers track by $index" member="person"/>
</div>
-18
View File
@@ -1,18 +0,0 @@
<div class="team-member">
<a name="{{person.anchor}}"></a>
<div class="team-member__picture">
<img ng-src="{{person.picture}}">
</div>
<div class="team-member__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>
</div>