mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

move out to template

Browse source
This commit is contained in:
Joey Hess 2012-07-31 18:33:19 -04:00
commit c950e8fba0
3 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Assistant/WebApp/Configurators.hs
View file

@ -48,24 +48,10 @@ addRepositoryForm :: Form RepositoryPath
addRepositoryForm msg = do addRepositoryForm msg = do
cwd <- liftIO $ getCurrentDirectory cwd <- liftIO $ getCurrentDirectory
(pathRes, pathView) <- mreq textField "" (Just $ pack cwd) (pathRes, pathView) <- mreq textField "" (Just $ pack cwd)
let widget = do let form = do
webAppFormAuthToken webAppFormAuthToken
toWidget [julius| $(widgetFile "configurators/addrepository/form")
$(function() { return (RepositoryPath <$> pathRes, form)
$('##{fvId pathView}').focus();
})
|]
[whamlet|
#{msg}
<p>
<div .input-prepend .input-append>
<span .add-on>
<i .icon-folder-open></i>
^{fvInput pathView}
<button type=submit .btn>
Make Repository
|]
return (RepositoryPath <$> pathRes, widget)
addRepository :: Bool -> Widget addRepository :: Bool -> Widget
addRepository firstrun = do addRepository firstrun = do

4
Makefile
View file

@ -6,7 +6,7 @@ FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP
bins=git-annex bins=git-annex
mans=git-annex.1 git-annex-shell.1 mans=git-annex.1 git-annex-shell.1
sources=Build/SysConfig.hs Utility/Touch.hs Utility/Mounts.hs sources=Build/SysConfig.hs Utility/Touch.hs Utility/Mounts.hs
thfiles=Assistant/Threads/WebApp.hs thfiles=Assistant/Threads/WebApp.hs $(shell find Assistant/WebApp*)
all=$(bins) $(mans) docs all=$(bins) $(mans) docs
OS:=$(shell uname | sed 's/[-_].*//') OS:=$(shell uname | sed 's/[-_].*//')
@ -58,7 +58,7 @@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
# Force GHC to rebuild template haskell files whenever includes # Force GHC to rebuild template haskell files whenever includes
# change # change
$(thfiles): $(shell echo templates/* static/*) $(thfiles): $(shell find templates static)
$(thfiles): $(thfiles):
touch $(thfiles) touch $(thfiles)

8
templates/configurators/addrepository/form.hamlet Normal file
View file

@ -0,0 +1,8 @@
#{msg}
<p>
<div .input-prepend .input-append>
<span .add-on>
<i .icon-folder-open></i>
^{fvInput pathView}
<button type=submit .btn>
Make Repository