Updated toderp

This commit is contained in:
Max Lynch
2013-10-08 18:16:07 -05:00
parent a175b9ce71
commit 7693f64787
4 changed files with 203 additions and 192 deletions

View File

@ -147,12 +147,15 @@
</script>
<script id="settings.html" type="text/ng-template">
<div id="login-view" class="modal slide-in-up" ng-controller="SettingsCtrl">
<div id="settings-view" class="modal slide-in-up" ng-controller="SettingsCtrl">
<header class="bar bar-header bar-secondary">
<h1 class="title">Settings</h1>
<button class="button button-clear button-primary" ng-click="close()">Done</button>
</header>
<main class="content padded has-header">
<list header="GENERAL>
<a class="list-item" href="#" ng-click="logout()">Log out</a>
</list>
</main>
</div>
</script>

View File

@ -188,8 +188,11 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
});
})
.controller('SettingsCtrl', function($scope) {
.controller('SettingsCtrl', function($scope, AuthService) {
$scope.close = function() {
$scope.modal.hide();
}
$scope.logout = function() {
AuthService.logout();
};
})

View File

@ -14,7 +14,6 @@ angular.module('ionic.todo.services', ['ionic.todo', 'firebase'])
});
return {
// Try to log in with the given email and pass
login: function(email, password) {
if(!email || !password) {
@ -28,6 +27,10 @@ angular.module('ionic.todo.services', ['ionic.todo', 'firebase'])
});
},
logout: function() {
angularFireAuth.logout();
},
// Try to sign up with the given email and pass
signup: function(email, password) {
if(!email || !password) {

View File

@ -20,241 +20,243 @@
<h1 class="title">Footer</h1>
</header>
<div class="content has-header has-footer">
<div class="content-wrapper">
<div class="content has-header has-footer">
<h3>Default Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper">
<input type="text" placeholder="First Name">
</label>
<label class="input-wrapper">
<input type="text" placeholder="Last Name">
</label>
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
</div>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper">
<input type="text" placeholder="First Name">
</label>
<label class="input-wrapper">
<input type="text" placeholder="Last Name">
</label>
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
</div>
<div class="padded">
<h3>Default Text Input, Not Inset, With Content Padding</h3>
<h3>Default Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper">
<input type="text" placeholder="Username">
<input type="text" placeholder="First Name">
</label>
<label class="input-wrapper">
<input type="text" placeholder="Last Name">
</label>
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
</div>
<div class="input-group">
<label class="input-wrapper">
<input type="text" placeholder="Filter by name">
</label>
</div>
<h3>Default Text Input, Is Inset, With Content Padding</h3>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper">
<input type="email" placeholder="Email">
<input type="text" placeholder="First Name">
</label>
<label class="input-wrapper">
<input type="text" placeholder="Name">
<input type="text" placeholder="Last Name">
</label>
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
</div>
</div>
<div class="padded">
<h3>Default Text Input, Not Inset, With Content Padding</h3>
<div class="input-group">
<label class="input-wrapper">
<input type="text" placeholder="Username">
</label>
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
</div>
<div class="input-group">
<label class="input-wrapper">
<input type="text" placeholder="Filter by name">
</label>
</div>
<h3>Default Text Input, Is Inset, With Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper">
<input type="email" placeholder="Email">
</label>
<label class="input-wrapper">
<input type="text" placeholder="Name">
</label>
</div>
</div>
<h3>Inline Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Username</span>
<input class="col-xs-8" type="text" placeholder="@drifty">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="your@email.com">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">First Name</span>
<input class="col-xs-8" type="text" placeholder="Sir Derp">
</label>
</div>
<h3>Inline Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<h3>Inline Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<h3>Inline Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper row">
<span class="input-label col-xs-4">First Name</span>
<input class="col-xs-8" type="text" placeholder="John">
<span class="input-label col-xs-4">Username</span>
<input class="col-xs-8" type="text" placeholder="@drifty">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Last Name</span>
<input class="col-xs-8" type="text" placeholder="Suhr">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="email" placeholder="your@email.com">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">First Name</span>
<input class="col-xs-8" type="text" placeholder="Sir Derp">
</label>
</div>
<h3>Inline Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<h3>Inline Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<h3>Inline Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group">
<label class="input-wrapper row">
<span class="input-label col-xs-4">First Name</span>
<input class="col-xs-8" type="text" placeholder="John">
</label>
<label class="input-wrapper row">
<span class="input-label col-xs-4">Last Name</span>
<input class="col-xs-8" type="text" placeholder="Suhr">
</label>
</div>
<h3>Inline Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Email</span>
<input class="col-xs-8" type="text" placeholder="your@email.com">
</label>
</div>
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Filter By Name</span>
<input class="col-xs-8" type="text" placeholder="Enter keywords">
</label>
</div>
</div>
<h3>Stacked Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">First Name</span>
<input type="text" placeholder="Drifty">
</label>
<label class="input-wrapper">
<span class="input-label">Last Name</span>
<input type="text" placeholder="Co">
</label>
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Filter By Name</span>
<input type="text" placeholder="">
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
</div>
<h3>Default Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper">
<div class="icon-search placeholder-icon">
<input type="search" placeholder="Search">
</div>
</label>
</div>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper row">
<span class="input-label col-xs-4">Filter By Name</span>
<input class="col-xs-8" type="text" placeholder="Enter keywords">
</label>
</div>
</div>
<h3>Stacked Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">First Name</span>
<input type="text" placeholder="Drifty">
</label>
<label class="input-wrapper">
<span class="input-label">Last Name</span>
<input type="text" placeholder="Co">
</label>
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Filter By Name</span>
<input type="text" placeholder="">
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<div class="padded">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
</div>
</div>
<h3>Default Text Input, Not Inset, No Content Padding</h3>
<div class="input-group">
<label class="input-wrapper">
<div class="icon-search placeholder-icon">
<input type="search" placeholder="Search">
</div>
</label>
</div>
<h3>Default Text Input, Is Inset, No Content Padding</h3>
<div class="input-group inset">
<label class="input-wrapper">
<div class="icon-star placeholder-icon">
<input type="text" placeholder="Favorites">
</div>
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Email</span>
<div class="icon-envelope placeholder-icon">
<input type="text" placeholder="your@email.com">
</div>
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Send Money</span>
<div class="icon-money placeholder-icon">
<input type="text" placeholder="Dollar Greens">
</div>
</label>
</div>
<div class="padded">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">SaaS</span>
<div class="icon-cloud placeholder-icon">
<input type="text" placeholder="Codiqa">
<div class="icon-star placeholder-icon">
<input type="text" placeholder="Favorites">
</div>
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<h3>Stacked Label On Top Of Text Input, Not Inset, No Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">Favorite Music</span>
<div class="icon-headphones placeholder-icon">
<input type="text" placeholder="Bee Gees">
<span class="input-label">Email</span>
<div class="icon-envelope placeholder-icon">
<input type="text" placeholder="your@email.com">
</div>
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Send Money</span>
<div class="icon-money placeholder-icon">
<input type="text" placeholder="Dollar Greens">
</div>
</label>
</div>
<div class="padded">
<h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
<div class="input-group stacked-label">
<label class="input-wrapper">
<span class="input-label">SaaS</span>
<div class="icon-cloud placeholder-icon">
<input type="text" placeholder="Codiqa">
</div>
</label>
</div>
<h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
<div class="input-group stacked-label inset">
<label class="input-wrapper">
<span class="input-label">Favorite Music</span>
<div class="icon-headphones placeholder-icon">
<input type="text" placeholder="Bee Gees">
</div>
</label>
</div>
</div>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>
<p><a class="button button-secondary" href="index.html">Homepage</a></p>
</div>
</section>