Skip to content

Views fixes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edsfocci wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Views fixes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29afb6b
Minor views corrections
edsfocci May 15, 2015
b69ebfa
Fix not well-formed HTML
edsfocci May 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions views/homepage.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
</div>
<button type="submit" class="btn btn-success">
<span ng-show="!loginForm.loading">Sign in</span>
<span ng-show="loginForm.loading" class="fa fa-spinner"></span>
<span ng-show="loginForm.loading" class="overlord-loading-spinner fa fa-spinner"></span>
<span ng-show="loginForm.loading">Signing in...</span>
</button>
<input type="hidden" name="_csrf" value="<%= _csrf %>" />
</form>
</nav>
</div>
</div>
</nav>
</div>

<div class=" col-md-8 col-md-offset-2">
Expand All @@ -69,7 +69,7 @@
<footer class="footer pull-right">
<div>
<a href="http://sailsjs.com/">sailsjs.org</a>
<div>tutorial by irl nathan, with a bunch of help from cody, gabe, heather, mike, racheal, scott and zoli</div>
<div>tutorial by irl nathan, with a bunch of help from cody, gabe, heather, mike, rachael, scott and zoli</div>
</div>
</footer>
</div>
Expand Down
12 changes: 6 additions & 6 deletions views/signup.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
<!-- S U B M I T -->
<button type="submit" class="btn btn-success">
<span ng-show="!loginForm.loading">Sign in</span>
<span ng-show="loginForm.loading" class="fa fa-spinner"></span>
<span ng-show="loginForm.loading">Signing up...</span>
<span ng-show="loginForm.loading" class="overlord-loading-spinner fa fa-spinner"></span>
<span ng-show="loginForm.loading">Signing in...</span>
</button>
<input type="hidden" name="_csrf" value="<%= _csrf %>" />
</form>
</nav>
</div>
</div>
</nav>
</div>

<!-- SIGNUP FORM -->
Expand Down Expand Up @@ -122,7 +122,7 @@
ng-class="{'has-error':signup.password.$invalid &&
signup.password.$dirty}">
<label>Choose a password</label>
<!-- Added the compareTo directive that compares the passowrds -->
<!-- Added the compareTo directive that compares the passwords -->
<input type="password" class="form-control" placeholder="at least 6 characters" name="password" ng-model="signupForm.password" id="password" required ng-minlength="6" compare-to="signupForm.confirmPassword" >
<span class="help-block has-error" ng-if="signup.password.$dirty">
<span ng-show="signup.password.$error.required">Password is required.</span>
Expand Down Expand Up @@ -161,7 +161,7 @@
<footer class="footer pull-right">
<div>
<a href="http://sailsjs.com/">sailsjs.org</a>
<div>tutorial by irl nathan, with a bunch of help from cody, gabe, heather, mike, racheal, scott and zoli</div>
<div>tutorial by irl nathan, with a bunch of help from cody, gabe, heather, mike, rachael, scott and zoli</div>
</div>
</footer>
</div>
Expand Down