updates

Boshes · Apr 21, 2017 · 57bb698 · 57bb698
1 parent d8e627a
commit 57bb698
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 12 deletions.
diff --git a/app/static/css/main.css b/app/static/css/main.css
@@ -28,6 +28,11 @@ nav {
     background-repeat: repeat;
 }
 
+.spacing {
+    padding-left: 50px;
+    padding-right: 50px;
+}
+
 @font-face{
     font-family: Ubunutu;
     src: url('../fonts/Ubuntu-L.tff');

diff --git a/app/static/js/newWishController.js b/app/static/js/newWishController.js
@@ -24,7 +24,7 @@ angular.module('WishList').controller('NewWishController',['$scope','$location',
         }
         else{
             $scope.urlfound = true;
-            if ((imagelink.indexOf('www.')>=0) && !(imagelink.indexOf('http://www.')>=0)){
+            if ((imagelink.indexOf('www.')>=0) && !(imagelink.indexOf('http://www.')>=0) && !(imagelink.indexOf('https://www.')>=0)){
                 $scope.imagelink = "http://" + imagelink;
             }
             else if ((imagelink.indexOf('http://www.')>=0)){

diff --git a/app/static/templates/home.html b/app/static/templates/home.html
@@ -1,6 +1,7 @@
 <wishlistheader></wishlistheader>
 <div class="container col-lg-12">
     <h1 class="text-center">Welcome To Your WishList</h1>
+    <hr>
     <ul class="list-inline text-center">
         <li>
             <a href="/#/wishes" style="min-height:100px; min-width:200px; padding-top:40px;" class="btn btn-info btn-lg text-center">View Wishlist</a>

diff --git a/app/static/templates/landing.html b/app/static/templates/landing.html
@@ -2,6 +2,7 @@
     <div class="v-center">
         <h1 class="text-center">Wish List</h1>
         <h3 class="text-center">Created by Justen Morgan</h3>
+        <hr>
         <ul class="list-inline text-center">
             <li>
                 <a href="/#/login" class="btn btn-default btn-lg">Login</a>

diff --git a/app/static/templates/login.html b/app/static/templates/login.html
@@ -1,14 +1,15 @@
 <div class="container v-center" ng-controller="LoginController">
     <h2 class="text-center">Login</h2>
+    <hr>
     <div ng-form="loginForm" ng-class="{'has-error':
     (loginForm.email.$invalid && loginForm.email.$dirty) || 
     (loginForm.password.$invalid && loginForm.password.$dirty)}" class="row text-center">
-      <div class="form-group">
+      <div class="form-group spacing">
         <label>Email Address</label>
         <input type="text" class="form-control" name='email' ng-model="email" placeholder="Enter your email" required>
         </div>
         <uib-alert type="danger" ng-if="loginForm.email.$dirty && loginForm.email.$invalid">Please enter your email</uib-alert>
-      <div class="form-group">
+      <div class="form-group spacing">
         <label>Password</label>
         <input type="password" class="form-control" name="password" ng-model="password" placeholder="Enter your password" required>
       </div>

diff --git a/app/static/templates/newwish.html b/app/static/templates/newwish.html
@@ -1,6 +1,7 @@
 <wishlistheader></wishlistheader>
 <div class="container col-lg-12" ng-controller="NewWishController">
   <h1>New Wish</h1>
+  <hr>
   <div ng-form="wishForm" ng-class="{'has-error':
     (wishForm.url.$invalid && wishForm.url.$dirty) || 
     (wishForm.title.$invalid && wishForm.title.$dirty) ||

diff --git a/app/static/templates/sharewishes.html b/app/static/templates/sharewishes.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
     <h3 class="modal-title">Share Wishlist To Emails</h3>
 </div>
-<hr>
-<div class="modal-body">
+<div class="modal-body spacing">
      <div ng-form="shareForm" ng-class="{'has-error': (shareForm.email.$invalid && shareForm.email.$dirty)}" class="row text-center">
          <div class="form-group">
              <label>Emails to send to (separated by commas)</label>
@@ -20,7 +19,6 @@ <h3 class="modal-title">Share Wishlist To Emails</h3>
     </div>
 </div>
 <br>
-<hr>
 <div class="modal-footer">
     <button class="btn btn-success" type="button" ng-click="confirm()">Send</button>
     <button class="btn btn-danger" type="button" ng-click="cancel()">Cancel</button>

diff --git a/app/static/templates/signup.html b/app/static/templates/signup.html
@@ -1,5 +1,6 @@
 <div class="container v-center" ng-controller="SignUpController">
   <h1 class="text-center">Sign Up</h1>
+  <hr>
   <div ng-form="signUpForm" ng-class="{'has-error':
     (signUpForm.firstname.$invalid && signUpForm.firstname.$dirty) || 
     (signUpForm.lastname.$invalid && signUpForm.lastname.$dirty) ||
@@ -38,7 +39,6 @@ <h1 class="text-center">Sign Up</h1>
     </div>
     <br>
     <div class="col-lg-12 text-center">
-
       <div class="col-lg-6 pull-left">
         <a href="#/" class="btn btn-lg btn-default">Go Back</a>
       </div>

diff --git a/app/static/templates/users.html b/app/static/templates/users.html
@@ -2,9 +2,9 @@
 <div class="container" ng-controller="UsersController">
     <div class="col-lg-12">
     <h1 class="pull-left">All Users</h1>
-    <br>
     </div>
     <div class="col-lg-12">
+        <hr>
         <div class="panel panel-default" ng-repeat="user in users track by $index">
             <div class="panel-heading">
                 <h4>{{user.firstname}} {{user.lastname}}</h4>

diff --git a/app/static/templates/userview.html b/app/static/templates/userview.html
@@ -4,6 +4,7 @@
     <h1 class="pull-left">Your Profile</h1>
     </div>
     <div class="col-lg-12">
+        <hr>
         <div class="col-lg-6">
             <h3>{{user.firstname}} {{user.lastname}}</h3>
             <h4>Username: {{user.username}}</h4>

diff --git a/app/static/templates/viewwishes.html b/app/static/templates/viewwishes.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
     <h3 class="modal-title">{{user}}'s Wishlist</h3>
 </div>
-<hr>
-<div class="modal-body">
+<div class="modal-body spacing">
         <div class="col-lg-12">
         <div class="panel panel-default" ng-repeat="wish in wishes track by $index">
             <div class="panel-heading"></div>
@@ -20,7 +19,6 @@ <h3 class="modal-title">{{user}}'s Wishlist</h3>
     </div>
 </div>
 <br>
-<hr>
 <div class="modal-footer">
     <button class="btn btn-success" type="button" ng-click="ok()">OK</button>
 </div>
diff --git a/app/static/templates/wishes.html b/app/static/templates/wishes.html
@@ -4,6 +4,7 @@ <h1 class="pull-left">All Wishes</h1>
         <span style="margin-right:100px;" class="btn btn-info pull-right" ng-click="shareWishlist()"><i class="fa fa-send">Share Wishlist</i></span>
     <br>
     <div class="col-lg-12">
+        <hr>
         <div class="panel panel-default" ng-repeat="wish in wishes track by $index">
             <div class="panel-heading"></div>
             <div class="panel-body">

diff --git a/app/static/templates/wishgrid.html b/app/static/templates/wishgrid.html
@@ -1,7 +1,6 @@
 <div class="modal-header">
     <h3 class="modal-title">Choose a thumbnail</h3>
 </div>
-<hr>
 <br>
 <div class="modal-body">
     <div class="col-xs-2" ng-repeat="image in imagelist track by $index">