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

Merge branch 'master' into assistant

Browse source
This commit is contained in:
Joey Hess 2012-07-27 04:50:35 -04:00
commit 4b8feea853
8 changed files with 95 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/design/assistant/webapp.mdwn
View file

@ -27,16 +27,15 @@ The webapp is a web server that displays a shiny interface.
* there could be a UI to export a file, which would make it be served up
over http by the web app
* Display any relevant warning messages. One is the `inotify max_user_watches`
exceeded message.
exceeded message. Need to lift such messages into DaemonStatus
so the WebApp can include them in its rendering of DaemonStatus.
## implementation
* use `addStaticContent` to make /favicon.ico work. Return `Right (route, query)`
and I think the route can be `favicon_ico`.
* perhaps define a custom `errorHandler`, which could avoid the potential
of leaking auth tokens on error pages
of leaking auth tokens on error pages. Or make the test suite test for
leakage.
* possibly lose the ugly auth= token past the first page,
and use a client-side session. It could be encrypted using the token
as the `encryptKey`. Note: Would need to set the session duration
to infinite (how?)
* look up "server-sent events" sent using `sendWaiResponse`

10
doc/design/assistant/webapp/comment_4_f4068a7abbb77ba6a3297cbcf1e503e9._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.2.189"
subject="comment 4"
date="2012-07-26T17:45:28Z"
content="""
So, Yesod's scaffolded site actually does use bootstrap, but I didn't use the scaffolded site so don't have it. I am not quite to the point of doing any theming of the webapp, but I do have this nice example of how to put in bootstrap right here..
By the way, if anyone would like to play with the html templates for the webapp, the main html template is `templates/default-layout.hamlet`. Uses a slightly weird template markup, but plain html will also work. And there's also the `static/` directory; every file in there will be compiled directly into the git-annex binary, and is available at `http://localhost:port/static/$file` in the webapp. See the favicon link in `default-layout.hamlet` of how to construct a type-safe link to a static file: `href=@{StaticR favicon_ico}`. That's all you really need to theme the webapp, without doing any real programming!
"""]]