Skip to content
This repository was archived by the owner on Nov 2, 2019. It is now read-only.

Commit 905e214

Browse files
author
Iris Yuan
committed
bootstrap ui, add presenter.html
1 parent c4c820f commit 905e214

File tree

5 files changed

+147
-30
lines changed

5 files changed

+147
-30
lines changed

‎public/js/app.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
'use strict';
22

33
angular.module('app', [
4+
'ui.bootstrap',
5+
//'ui.router',
46
'app.controllers',
57
'app.filters',
68
'app.services',
79
'app.directives'
8-
]).config(function ($routeProvider, $locationProvider) {
10+
]).config(function ($routeProvider, $locationProvider) {
911
$locationProvider.html5Mode(true);
1012
});
13+

‎public/js/controllers.js

+60-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ angular.module('app.controllers', []).
77

88
$http.get("https://api.tnyu.org/v1.0/teams")
99
.success(function(data){
10-
console.log(data);
11-
$scope.teams = data.teams;
10+
console.log(data);
11+
$scope.teams = data.teams;
1212
})
1313
.error(function(data, status){
14-
console.log(status);
14+
console.log(status);
1515
});
1616

1717
$scope.toggleTeam = function(teamid) {
@@ -22,12 +22,10 @@ angular.module('app.controllers', []).
2222
}
2323

2424
$scope.submit = function() {
25-
2625
// Aggregrate all selected teams into our event to be submitted.
2726
$scope.event.teams = [];
2827
for(var teamid in Object.keys($scope.selectedTeams))
2928
$scope.event.teams.push(teamid);
30-
console.log($scope.event);
3129

3230
$http.post('http://posttestserver.com/post.php', $scope.event)
3331
.success(function(data) {
@@ -37,4 +35,60 @@ angular.module('app.controllers', []).
3735
console.log(status);
3836
});
3937
}
40-
});
38+
}).
39+
40+
41+
controller('DatePickerCtrl', function ($scope) {
42+
$scope.today = function() {
43+
$scope.dt = new Date();
44+
};
45+
$scope.today();
46+
47+
$scope.toggleMin = function() {
48+
$scope.minDate = $scope.minDate ? null : new Date();
49+
};
50+
$scope.toggleMin();
51+
52+
$scope.toggleOpenDatePicker = function($event,datePicker) {
53+
$event.preventDefault();
54+
$event.stopPropagation();
55+
$scope[datePicker] = !$scope[datePicker];
56+
};
57+
58+
$scope.dateOptions = {
59+
formatYear: 'yy',
60+
startingDay: 1
61+
};
62+
$scope.format = 'shortDate';
63+
}).
64+
65+
66+
controller('ModalCtrl', function ($scope, $modal, $log) {
67+
68+
$scope.open = function (size) {
69+
70+
var modalInstance = $modal.open({
71+
templateUrl: 'presenter.html',
72+
controller: 'ModalInstanceCtrl',
73+
size: size,
74+
});
75+
76+
modalInstance.result.then(function (selectedItem) {
77+
$scope.selected = selectedItem;
78+
}, function () {
79+
$log.info('Modal dismissed at: ' + new Date());
80+
});
81+
};
82+
}).
83+
84+
controller('ModalInstanceCtrl', function ($scope, $modalInstance) {
85+
86+
$scope.ok = function () {
87+
$modalInstance.close($scope.selected.item);
88+
};
89+
90+
$scope.cancel = function () {
91+
$modalInstance.dismiss('cancel');
92+
};
93+
});
94+

‎public/js/lib/angular/angular-ui-bootstrap-tpls-0.11.2.min.js

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎views/index.html

+33-23
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
<head>
44
<title>Tech@NYU Intranet</title>
55
<link rel='stylesheet' href='css/app.css'/>
6-
<link rel='stylesheet' href='css/bootstrap.min.css'/>
6+
<link href='http://netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css' rel='stylesheet' />
77

88
<script src="http://cdn.rawgit.com/jpillora/xdomain/0.6.15/dist/0.6/xdomain.min.js" slave="https://api.tnyu.org/v1.0/proxy.html"></script>
99

1010
<script type='text/javascript' src='js/lib/jquery-2.1.1.min.js'></script>
1111
<script type='text/javascript' src='js/lib/bootstrap.min.js'></script>
12-
<script type='text/javascript' src='js/lib/angular/angular.min.js'></script>
12+
<script type='text/javascript' src='http://code.angularjs.org/1.1.5/angular.min.js'></script>
13+
<script type='text/javascript' src='js/lib/angular/angular-ui-bootstrap-tpls-0.11.2.min.js'></script>
1314

1415
<script type='text/javascript' src='js/app.js'></script>
1516
<script type='text/javascript' src='js/controllers.js'></script>
@@ -18,19 +19,14 @@
1819
<script type='text/javascript' src='js/services.js'></script>
1920
</head>
2021
<body ng-app='app'>
21-
<!-- <t-input maxlength="10"></t-input>
22-
<t-input maxlength="5"></t-input>
23-
<t-input maxlength="1"></t-input>
24-
<t-input maxlength="10"></t-input>
25-
<t-input maxlength="10"></t-input> -->
2622

2723
<main class="content container">
2824
<div class="content-header-container row">
2925
<header class="content-header">
3026
<h2>Add New Event</h2>
3127
</header>
3228
</div>
33-
<div class="row" ng-controller="EventAddCtrl">
29+
<div class="row" ng-controller="EventAddCtrl" >
3430
<form id="event-add-form" role="form" ng-submit="submit()" novalidate>
3531
<fieldset id="event-add-basic" class="form-group">
3632
<legend>Basic Information</legend>
@@ -57,21 +53,26 @@ <h2>Add New Event</h2>
5753
</div>
5854
</fieldset>
5955

60-
<!-- We're gonna need some datepicker addon and probably something like moment.js to calc the date differences -->
61-
<fieldset class="form-group">
56+
<!-- Need timepicker -->
57+
<fieldset class="form-group" ng-controller="DatePickerCtrl">
6258
<div class="col-md-3">
6359
<label for="startDateTime">Starts</label>
64-
<input name="startDateTime" class="form-control" type="dateTime" placeholder="yyyy-MM-ddTHH:mm:ss" ng-model="event.startDateTime">
60+
<p class="input-group">
61+
<input type="text" name="startDateTime" class="form-control" datepicker-popup="{{format}}" ng-model="dt.start" is-open="startDate" min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close"/>
62+
<span class="input-group-btn"><button ng-click="toggleOpenDatePicker($event,'startDate')"><i class="glyphicon glyphicon-calendar"></i></button>
63+
</span>
64+
</p>
6565
</div>
6666
<div class="col-md-3">
6767
<label for="endDateTime">Ends</label>
68-
<input name="endDateTime" class="form-control" type="dateTime" placeholder="yyyy-MM-ddTHH:mm:ss" ng-model="event.endDateTime">
69-
</div>
70-
<div class="col-md-2">
71-
<label>Length</label>
72-
<p class="form-control-static">{{ event.endDateTime - event.startDateTime }}h</p>
68+
<p class="input-group">
69+
<input type="text" name="endDateTime" class="form-control" datepicker-popup="{{format}}" ng-model="dt.start" is-open="endDate" min-date="minDate" datepicker-options="dateOptions" ng-required="true" close-text="Close"/>
70+
<span class="input-group-btn"><button ng-click="toggleOpenDatePicker($event,'endDate')"><i class="glyphicon glyphicon-calendar"></i></button>
71+
</span>
72+
</p>
7373
</div>
7474
</fieldset>
75+
7576
<fieldset class="form-group">
7677
<div class="col-md-6">
7778
<label for="description">Description</label>
@@ -96,7 +97,16 @@ <h2>Add New Event</h2>
9697
</div>
9798
</fieldset>
9899
</fieldset>
99-
<fieldset id="event-add-venue" class="form-group">
100+
101+
<fieldset id="event-add-speaker" class="form-group" ng-controller="">
102+
<legend>Speaker</legend>
103+
<div class="col-md-10">
104+
<label for="speaker">Speaker </label>
105+
<input type="url" name="speaker" class="form-control" />
106+
</div>
107+
</fieldset>
108+
109+
<fieldset id="event-add-venue" class="form-group" ng-controller="">
100110
<legend>Venue</legend>
101111

102112
<!-- We're gonna need some kind of typeahead library for this -->
@@ -125,19 +135,19 @@ <h4>Name</h4>
125135
{{event.title}}
126136

127137
<h4>Details</h4>
128-
<pre class="copyable-plaintext">
129-
{{event.description}}
138+
<pre class="copyable-plaintext">
139+
{{event.description}}
130140

131-
{{event.details}}
141+
{{event.details}}
132142

133-
All tech@nyu events are covered by a strict anti-harassment policy: http://techatnyu.org/anti-harassment
134-
</pre>
143+
All tech@nyu events are covered by a strict anti-harassment policy: http://techatnyu.org/anti-harassment
144+
</pre>
135145

136146
<h4>When</h4>
137147
<p>{{event.startDateTime | date: 'MM/dd h:mma' : 'UTC'}} &ndash; {{event.endDateTime | date: 'MM/dd h:mma' : 'UTC'}}</p>
138148
</div>
139149
</div>
140150
</div>
141-
</main>
151+
</main>
142152
</body>
143153
</html>

‎views/presenter.html

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<form id="presenter-form" method="POST" action="" role="form" ng-controller="">
2+
<legend>Presenter</legend>
3+
4+
<fieldset class="form-group">
5+
<div class="col-md-10">
6+
<label for="title">Title</label>
7+
<input name="title" class="form-control" ng-model=""></input>
8+
</div>
9+
10+
<div class="col-md-10">
11+
<label>Name</label>
12+
<input type="text" name="name" class="form-control"></input>
13+
</div>
14+
15+
<div class="col-md-10">
16+
<label>Company</label>
17+
<input type="text" name="currentEmployer" class="form-control"></input>
18+
</div>
19+
20+
<div class="col-md-10">
21+
<label>Twitter ID</label><small><i>Note: this is not the @handle, but their <a href="http://gettwitterid.com/">numeric ID</a></i></small>
22+
<input type="text" name="twitterHandle" class="form-control"></input>
23+
</div>
24+
25+
<div class="col-md-10">
26+
<label>Short Bio</label>
27+
<input type="text" name="shortBio" class="form-control"></input>
28+
</div>
29+
30+
<div class="col-md-10">
31+
<label>Image URL</label>
32+
<input type="text" name="imageURL" class="form-control"></input>
33+
</div>
34+
35+
<!-- how are we submitting? -->
36+
<input type="submit" name="addPresenter" class="form-control"></input>
37+
38+
</fieldset>
39+
</form>

0 commit comments

Comments
 (0)