From f410d9e35091b84c51ea172b63a949ff7736fabe Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 13 Apr 2015 14:09:47 +0200 Subject: [PATCH] propagate crementing --- Foundation.hs | 3 +++ Handler/Common.hs | 2 +- Handler/Restock.hs | 2 +- static/js/crementing.js | 2 +- templates/buy.hamlet | 2 ++ templates/buyCash.hamlet | 2 ++ templates/upstock.hamlet | 4 ++-- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Foundation.hs b/Foundation.hs index a579377..8e396dc 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -115,6 +115,9 @@ instance Yesod App where [ css_bootstrap_css , css_main_css ]) + $(combineScripts 'StaticR + [ js_crementing_js + ]) $(widgetFile "default-layout") withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") diff --git a/Handler/Common.hs b/Handler/Common.hs index 9f67b43..e9cd87f 100644 --- a/Handler/Common.hs +++ b/Handler/Common.hs @@ -65,7 +65,7 @@ amountField = Field Right (a, "") -> Right a _ -> Left $ MsgInvalidInteger s , fieldView = \theId name attr val req -> toWidget [hamlet|$newline never - + |] , fieldEnctype = UrlEncoded } diff --git a/Handler/Restock.hs b/Handler/Restock.hs index df1cb7a..d45c659 100644 --- a/Handler/Restock.hs +++ b/Handler/Restock.hs @@ -46,7 +46,7 @@ postUpstockR bId = do upstockForm :: Form Int upstockForm = renderDivs - $ areq amountField (fieldSettingsLabel MsgAmountAdded) (Just 0) + $ areq amountField (fieldSettingsLabel MsgAmountAdded) (Just 1) getNewArticleR :: Handler Html getNewArticleR = do diff --git a/static/js/crementing.js b/static/js/crementing.js index a80e600..6af33f6 100644 --- a/static/js/crementing.js +++ b/static/js/crementing.js @@ -8,5 +8,5 @@ calling like */ function crmnt( e, i ) { /* read: in-/decrement ( dom-element, signed-integer ) */ var d = parseInt( e.value ) + i; - e.value = ( d < 0 )? 0 : e.value = d; + e.value = ( d < 1 )? 1 : e.value = d; } diff --git a/templates/buy.hamlet b/templates/buy.hamlet index 33a4a1d..ee0a62d 100644 --- a/templates/buy.hamlet +++ b/templates/buy.hamlet @@ -9,3 +9,5 @@ $doctype 5 ^{buyWidget}
+ + diff --git a/templates/buyCash.hamlet b/templates/buyCash.hamlet index 2bbd360..73d7160 100644 --- a/templates/buyCash.hamlet +++ b/templates/buyCash.hamlet @@ -9,3 +9,5 @@ $doctype 5 ^{buyCashWidget}
+ + diff --git a/templates/upstock.hamlet b/templates/upstock.hamlet index af161e9..6a48e7c 100644 --- a/templates/upstock.hamlet +++ b/templates/upstock.hamlet @@ -9,5 +9,5 @@ $doctype 5 ^{upstockWidget}
- - + +