Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI

This commit is contained in:
Matan Bar Yosef 2015-06-24 19:11:44 +03:00
commit b19b60b58b

View file

@ -1,75 +1,76 @@
<div layout-padding> <div layout-padding>
<div layout="row"> <div layout="row">
<div flex="20" layout-padding> <div flex="40" layout-padding>
<md-card layout-padding> <md-card layout-padding>
<h2> <h2>
<i class="fa fa-info-circle"></i> Task Info: <i class="fa fa-info-circle"></i> Task Info:
</h2> </h2>
<div layout="column"> <div layout="column">
<div>
<md-input-container>
<label>Title</label>
<input ng-model="task.task.title" required>
</md-input-container>
</div>
<div>
<md-input-container>
<label>Description</label>
<textarea ng-model="task.task.description" required></textarea>
</div>
<div>
<md-switch ng-model="task.isPersonal" aria-label="Switch 1">
This Is: a {{(task.isPersonal) ? "Personal" : "Project"}} Task
</md-switch>
</div>
<div>
Due Date:
<datepicker date-format="d MMMM yyyy" style="width:100%" ng-click="dueTime()">
<input ng-model="task.date" type="text"/>
</datepicker>
</div>
<div layout="row">
<div flex="60"></div>
<div> <div>
<md-button class="md-raised md-primary"><i class="fa fa-paper-plane"></i> Submit</md-button> <md-input-container>
<label>Title</label>
<input ng-model="task.task.title" required>
</md-input-container>
</div>
<div>
<md-input-container>
<label>Description</label>
<textarea ng-model="task.task.description" required></textarea>
</md-input-container>
</div>
<div>
<md-switch ng-model="task.isPersonal" aria-label="Switch 1">
This Is: a {{(task.isPersonal) ? "Personal" : "Project"}} Task
</md-switch>
</div>
<div>
Due Date:
<datepicker date-format="d MMMM yyyy" style="width:100%" ng-click="dueTime()">
<input ng-model="task.date" type="text"/>
</datepicker>
</div>
<div layout="row">
<div flex="60"></div>
<div>
<md-button class="md-raised md-primary"><i class="fa fa-paper-plane"></i> Submit</md-button>
</div>
</div> </div>
</div> </div>
</div> </md-card>
</md-card> <div layout="column">
<div layout="column" layout-padding> <md-card layout-padding>
<md-card layout-padding> <div>
<div> <h2>
<h2> <i class="fa fa-cubes"></i> Add A component:
<i class="fa fa-cubes"></i> Add A component: </h2>
</h2> </div>
</div> <div>
<div> Select Type:
Select Type: <md-select placeholder="Component Type" ng-model="newComp.type">
<md-select placeholder="Component Type" ng-model="newComp.type"> <md-option ng-repeat="component in componentTypes" value="{{component.type}}">{{component.type}}</md-option>
<md-option ng-repeat="component in componentTypes" value="{{component.type}}">{{component.type}}</md-option> </md-select>
</md-select> </div>
</div> <div>
<div> <md-input-container>
<md-input-container> <label>Label</label>
<label>Label</label> <input ng-model="newComp.label" required>
<input ng-model="newComp.label" required> </md-input-container>
</md-input-container> </div>
</div> <div>
<div> <md-switch ng-model="newComp.isMandatory" aria-label="Switch 1">
<md-switch ng-model="newComp.isMandatory" aria-label="Switch 1"> Mandatory?: {{ newComp.isMandatory}}
Mandatory?: {{ newComp.isMandatory}} </md-switch>
</md-switch> </div>
</div> <div layout="row">
<div layout="row"> <div flex="65"></div>
<div flex="65"></div> <md-button class="md-raised" ng-click="addComponent()"><i class="fa fa-plus"></i> Add To Task</md-button>
<md-button class="md-raised" ng-click="addComponent()"><i class="fa fa-plus"></i> Add To Task</md-button> </div>
</div> </md-card>
</md-card> </div>
</div>
</div> </div>
<div flex="80" layout-padding> <div flex="60" layout-padding>
<!-- <md-card style="background-image: url('http://www.stationeryhq.com/content/images/thumbs/0000324_clipboard_500.png')"> <!-- <md-card style="background-image: url('http://www.stationeryhq.com/content/images/thumbs/0000324_clipboard_500.png')">
</md-card> --> </md-card> -->