diff options
| author | Asbjørn Sloth Tønnesen <asbjorn@asbjorn.biz> | 2012-07-10 19:51:16 +0000 |
|---|---|---|
| committer | Asbjørn Sloth Tønnesen <asbjorn@asbjorn.biz> | 2012-07-10 19:51:16 +0000 |
| commit | cf7ed2625456a5e619f68408f8ebfe78f443a672 (patch) | |
| tree | ae6787275ea9b9b8bd29e320c55bb3dbcbb62d30 /web/templates | |
| parent | 5e54ba7aa27b95d1e0568693915e735ab8058ff7 (diff) | |
| download | labitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.tar.gz labitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.tar.xz labitrack-cf7ed2625456a5e619f68408f8ebfe78f443a672.zip | |
upgrade to bootstrap 2
Signed-off-by: Asbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/labitrack.d/alert_newlabel | 4 | ||||
| -rw-r--r-- | web/templates/labitrack.d/labelform | 55 | ||||
| -rw-r--r-- | web/templates/labitrack.d/objecttable | 2 |
3 files changed, 38 insertions, 23 deletions
diff --git a/web/templates/labitrack.d/alert_newlabel b/web/templates/labitrack.d/alert_newlabel new file mode 100644 index 0000000..894183c --- /dev/null +++ b/web/templates/labitrack.d/alert_newlabel @@ -0,0 +1,4 @@ +<div class="alert alert-success"> + <button class="close" data-dismiss="alert">×</button> + <strong>Yay!</strong> You have just created <a href="/view/{{id}}">label #{{id}}<a/>. +</div> diff --git a/web/templates/labitrack.d/labelform b/web/templates/labitrack.d/labelform index b135e9a..ca984d7 100644 --- a/web/templates/labitrack.d/labelform +++ b/web/templates/labitrack.d/labelform @@ -1,34 +1,45 @@ -<form id="labelform"> +<form id="labelform" class="form-horizontal"> <fieldset> - <div class="clearfix"> - <label for="name">Name</label> - <div class="input"> + <div class="control-group"> + <label class="control-label" for="name">Name</label> + <div class="controls"> <input class="xlarge" id="name" name="name" type="text" placeholder="Name" required="required" value="{{data.name}}"/> </div> </div> - <div class="clearfix"> - <label for="desc">Description</label> - <div class="input"> + <div class="control-group"> + <label class="control-label" for="desc">Description</label> + <div class="controls"> <textarea class="xlarge" name="desc" id="desc" rows="3" placeholder="Description" required="required">{{data.desc}}</textarea> </div> </div> - <div class="clearfix"> - <label for="tags">Tags</label> - <div class="input"> - <ul class="inputs-list"> - {{#each tags}} - <li> - <label> - <input type="checkbox" name="tags" value="{{name}}"{{checked_tag ../data.tags}}/> - <span>{{desc}}</span> - </label> - </li> - {{/each}} - </ul> + <div class="control-group"> + <label class="control-label" for="tags">Tags</label> + <div class="controls"> + {{#each tags}} + <label class="checkbox"> + <input type="checkbox" name="tags" value="{{name}}"{{checked_tag ../data.tags}}/> + <span>{{desc}}</span> + </label> + {{/each}} </div> </div> - <div class="actions"> - <input type="submit" class="btn primary save" value="{{save_text}}"> <button type="reset" class="btn">Cancel</button> + <div class="form-actions"> + <div class="btn-toolbar"> + <div class="btn-group"> + <button type="submit" class="hide"/> + <button type="reset" class="hide"/> + <a id="saveandprint" class="btn btn-primary save"><i class="icon-print"/> Save & print</a> + <button type="button" data-toggle="dropdown" class="btn btn-primary dropdown-toggle"><span class="caret"/></button> + <ul class="dropdown-menu"> + <li> + <a id="justsave"><i class="icon-hdd"/> Save</a> + </li> + </ul> + </div> + <div class="btn-group"> + <a id="reset" class="btn">Cancel</a> + </div> + </div> </div> </fieldset> </form> diff --git a/web/templates/labitrack.d/objecttable b/web/templates/labitrack.d/objecttable index 13b6dee..5a9f659 100644 --- a/web/templates/labitrack.d/objecttable +++ b/web/templates/labitrack.d/objecttable @@ -1,5 +1,5 @@ {{pagination}} -<table class="zebra-striped"> +<table class="table table-striped"> <thead> <tr> <th>#</th> |