pyc-website

commit 91ac57df442f4171bed10053bbf12d328aae7e44
parent fd9f545a40f304531280125bdc9dc603681bdfe6
Author: Jul <jul@9o.is>
Date:   Mon,  2 Jun 2014 20:53:21 -0400

moved the US States selector snippet to seperate class

Diffstat:
M
src/main/scala/inc/pyc/model/field/USStateField.scala
 | 
8
+++++++-
M
src/main/scala/inc/pyc/snippet/AtmSnip.scala
 | 
7
-------
M
src/main/scala/inc/pyc/snippet/UtilSnips.scala
 | 
4
++++
M
src/main/webapp/templates-hidden/parts/apply-atm-form.html
 | 
2
+-
M
src/main/webapp/templates-hidden/parts/notify-atm-form.html
 | 
2
+-

5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/scala/inc/pyc/model/field/USStateField.scala b/src/main/scala/inc/pyc/model/field/USStateField.scala
@@ -4,7 +4,8 @@ package field
 
 import net.liftweb._
 import http._
-import util.Helpers._
+import SHtml._
+import util._, Helpers._
 import record._
 import field._
 import json.JsonAST._
@@ -43,3 +44,8 @@ class USStatesField[OwnerType <: Record[OwnerType]](rec: OwnerType) extends Enum
   }
 }
 
+trait USStatesSelector {
+  def states: CssSel =
+    "@state" #> select(USStates.options, Empty, USStates.stateSelect, "name" -> "state")
+}
+
diff --git a/src/main/scala/inc/pyc/snippet/AtmSnip.scala b/src/main/scala/inc/pyc/snippet/AtmSnip.scala
@@ -18,9 +18,6 @@ import JE.JsVar
 class AtmApplication extends AngularSnippet {
   
   def roundTrips: List[RoundTripInfo] = List("submit" -> submit _)
-        
-  def states: CssSel =
-    "@state" #> select(USStates.options, Empty, USStates.stateSelect, "name" -> "state")
     
   def submit(model: JValue): JValue = {
     val rec = AtmApplication.createRecord
@@ -69,10 +66,6 @@ class FindAtm extends AngularSnippet {
 class NearAtmNotify extends AngularSnippet {
         
   def roundTrips: List[RoundTripInfo] = List("submit" -> submit _)
-  
-  def states: CssSel =
-    "@state" #> select(USStates.options, Empty, USStates.stateSelect, "name" -> "state")
-    
     
   def submit(model: JValue): JValue = {
     val rec = NearAtmNotify.createRecord
diff --git a/src/main/scala/inc/pyc/snippet/UtilSnips.scala b/src/main/scala/inc/pyc/snippet/UtilSnips.scala
@@ -2,6 +2,7 @@ package inc.pyc
 package snippet
 
 import lib._
+import model.field._
 import scala.xml.NodeSeq
 import net.liftweb._
 import common._
@@ -36,3 +37,5 @@ trait AngularImplicits {
     in.headOption.getOrElse(JNull)
   }
 }
+
+object Selector extends USStatesSelector
+\ No newline at end of file
diff --git a/src/main/webapp/templates-hidden/parts/apply-atm-form.html b/src/main/webapp/templates-hidden/parts/apply-atm-form.html
@@ -40,7 +40,7 @@
 					</label>
 				</section>
 				<section class="col col-6" ng-class="{{ stateSuccessError('state') }}">
-					<label data-lift="AtmApplication.states" class="select"> 
+					<label data-lift="Selector.states" class="select"> 
 						<select name="state" ng-model="model.state" required></select> 
 						<i></i>
 						<b class="tooltip tooltip-top-left">The state your business is located.</b>
diff --git a/src/main/webapp/templates-hidden/parts/notify-atm-form.html b/src/main/webapp/templates-hidden/parts/notify-atm-form.html
@@ -44,7 +44,7 @@
 					</label>
 				</section>
 				<section class="col col-6">
-					<label data-lift="NearAtmNotify.states" class="select" ng-class="{{ stateSuccessError('state') }}"> 
+					<label data-lift="Selector.states" class="select" ng-class="{{ stateSuccessError('state') }}"> 
 						<select name="state" ng-model="model.state"></select> 
 						<i></i>
 					</label>