From fe6ab55b477794a866436b58c063a216ebe799f1 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Wed, 29 Jul 2015 10:45:24 -0700
Subject: [PATCH] added form_fields

---
 .../directives/field.client.directive.js      |  3 ++-
 public/modules/forms/forms.client.module.js   |  2 +-
 .../services/form-fields.client.service.js    | 20 +++++++++++--------
 .../views/directiveViews/field/link.html      |  2 +-
 .../views/directiveViews/field/rating.html    | 12 +++++++++++
 .../views/directiveViews/field/statement.html | 12 ++++++-----
 .../authentication/signin.client.view.html    |  4 ++--
 7 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 public/modules/forms/views/directiveViews/field/rating.html

diff --git a/public/modules/forms/directives/field.client.directive.js b/public/modules/forms/directives/field.client.directive.js
index c94d7947..f6b8bf18 100644
--- a/public/modules/forms/directives/field.client.directive.js
+++ b/public/modules/forms/directives/field.client.directive.js
@@ -25,7 +25,8 @@ angular.module('forms').directive('fieldDirective', function($http, $compile) {
             'hidden',
             'password',
             'radio',
-            'legal'
+            'legal',
+            'statement'
         ];
         if (__indexOf.call(supported_fields, type) >= 0) {
             return templateUrl += type + '.html';
diff --git a/public/modules/forms/forms.client.module.js b/public/modules/forms/forms.client.module.js
index c364bb30..7771d7b8 100644
--- a/public/modules/forms/forms.client.module.js
+++ b/public/modules/forms/forms.client.module.js
@@ -1,4 +1,4 @@
 'use strict';
 
 // Use Application configuration module to register a new module
-ApplicationConfiguration.registerModule('forms', ['ngFileUpload', 'ui.date', 'ui.sortable', 'users']);
\ No newline at end of file
+ApplicationConfiguration.registerModule('forms', ['ngFileUpload', 'ui.date', 'ui.sortable', 'angular-input-stars', 'users']);
\ No newline at end of file
diff --git a/public/modules/forms/services/form-fields.client.service.js b/public/modules/forms/services/form-fields.client.service.js
index 5d8f4793..30d61862 100644
--- a/public/modules/forms/services/form-fields.client.service.js
+++ b/public/modules/forms/services/form-fields.client.service.js
@@ -31,6 +31,10 @@ angular.module('forms').service('FormFields', [
 		        name : 'checkbox',
 		        value : 'Checkbox'
 		    },
+		    {
+		        name : 'yes-no',
+		        value : 'Yes or No'
+		    },
 		    {
 		        name : 'legal',
 		        value : 'Legal'
@@ -39,14 +43,14 @@ angular.module('forms').service('FormFields', [
 		    //     name : 'file',
 		    //     value : 'File Upload'
 		    // },
-		    // {
-		    //     name : 'rating',
-		    //     value : 'Rating'
-		    // },
-		    // {
-		    //     name : 'link',
-		    //     value : 'Link'
-		    // },
+		    {
+		        name : 'rating',
+		        value : 'Rating'
+		    },
+		    {
+		        name : 'link',
+		        value : 'Link'
+		    },
 		    // {
 		    //     name : 'scale',
 		    //     value : 'Opinion Scale'
diff --git a/public/modules/forms/views/directiveViews/field/link.html b/public/modules/forms/views/directiveViews/field/link.html
index 04825cb9..c6c3579b 100644
--- a/public/modules/forms/views/directiveViews/field/link.html
+++ b/public/modules/forms/views/directiveViews/field/link.html
@@ -1,7 +1,7 @@
 <div class="field row">
     <div class="col-xs-5 field-title">{{field.title}} </div>
     <div class="col-xs-7 field-input">
-        <input type="link" placeholder="link" value="{{field.fieldValue}}" ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }"  ng-required="field.required" ng-disabled="field.disabled"/>
+        <input type="url" placeholder="https://example.com/something" value="{{field.fieldValue}}" ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }"  ng-required="field.required" ng-disabled="field.disabled"/>
         <span class="required-error" ng-show="field.required && !field.fieldValue">* required</span>
     </div>
 </div>
diff --git a/public/modules/forms/views/directiveViews/field/rating.html b/public/modules/forms/views/directiveViews/field/rating.html
new file mode 100644
index 00000000..61132d9d
--- /dev/null
+++ b/public/modules/forms/views/directiveViews/field/rating.html
@@ -0,0 +1,12 @@
+<div class="textfield field row">
+    <div class="col-xs-5 field-title">{{field.title}} </div>
+    <div class="col-xs-7 field-input">
+		<input-stars max="5"
+			ng-model="field.fieldValue" ng-model-options="{ debounce: 250 }"  
+			value="field.fieldValue" 
+			ng-required="field.required"
+			ng-disabled="field.disabled">
+		</input-stars>
+        <span class="required-error" ng-show="field.required && !field.fieldValue">* required</span>
+    </div>
+</div>
diff --git a/public/modules/forms/views/directiveViews/field/statement.html b/public/modules/forms/views/directiveViews/field/statement.html
index 8a8d3143..07423261 100644
--- a/public/modules/forms/views/directiveViews/field/statement.html
+++ b/public/modules/forms/views/directiveViews/field/statement.html
@@ -1,10 +1,12 @@
 <div class="statement field row">
-    <div class="col-xs-12 field-title field-title">
-    	<h3>{{field.title}} </h3>
+    <div class="col-xs-12 row field-title field-title">
+    	<i class="fa fa-quote-left fa-3 col-xs-10 col-xs-offset-2"></i>
+    	<h2 class="text-center col-xs-6 col-xs-offset-3">{{field.title}} </h2>
+    	<i class="fa fa-quote-right fa-3 col-xs-offset-10"></i>
     </div>
-    <div class="col-xs-10 col-xs-offset-2 field-title field-input">
-    	<i class="fa fa-quote-left fa-3"></i>
+    <div class="col-xs-8 col-xs-offset-2 field-title field-input">
+    	
     	<p>{{field.description}} </p>
-    	<i class="fa fa-quote-right fa-3"></i>
+    	
     </div>
 </div>
diff --git a/public/modules/users/views/authentication/signin.client.view.html b/public/modules/users/views/authentication/signin.client.view.html
index a4334bd5..8b3b56db 100755
--- a/public/modules/users/views/authentication/signin.client.view.html
+++ b/public/modules/users/views/authentication/signin.client.view.html
@@ -19,7 +19,7 @@
 	</div> -->
 	<!-- <h3 class="col-md-12 text-center">Or with your account</h3> -->
 	<div class="col-xs-offset-2 col-xs-8 col-md-offset-3 col-md-6">
-		<form class="signin form-horizontal" autocomplete="off" action="">
+		<form class="signin form-horizontal" autocomplete="off">
 			<fieldset>
 				<div data-ng-show="error" class="text-center text-danger">
 					Error: <strong data-ng-bind="error"></strong>
@@ -36,7 +36,7 @@
 					<a href="/#!/password/forgot">Forgot your password?</a>
 				</div>
 				<div class="text-center form-group">
-					<button type="submit" class="btn btn-primary" ng-click="signin()">Sign in</button>&nbsp; or&nbsp;
+					<button class="btn btn-primary" ng-click="signin()">Sign in</button>&nbsp; or&nbsp;
 					<a href="/#!/signup">Sign up</a>
 				</div>