diff options
author | Ananya Sen | 2012-02-10 02:04:42 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-10 02:04:42 -0800 |
commit | cc3d8f5dfa82cf0a3620653af7e974f7417650f9 (patch) | |
tree | 4afe69f30f364f2011d706faced7243fb0eb6256 /js/io/ui/cloudpopup.reel/cloudpopup.html | |
parent | ad0ee69be3512325ede94738f23597086a141a3e (diff) | |
parent | fbe830fabe497d01f4f2eaddb867161a8187c101 (diff) | |
download | ninja-cc3d8f5dfa82cf0a3620653af7e974f7417650f9.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
js/io/document/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/ui/cloudpopup.reel/cloudpopup.html')
-rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index 1ab0892d..8e65a705 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
@@ -46,6 +46,18 @@ | |||
46 | 46 | ||
47 | <button class="btn_ok nj-skinned">Ok</button> | 47 | <button class="btn_ok nj-skinned">Ok</button> |
48 | 48 | ||
49 | <section> | ||
50 | |||
51 | <h4>Install Ninja Cloud App</h4> | ||
52 | |||
53 | <p>Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus.</p> | ||
54 | |||
55 | <div class="cloud_icon"></div> | ||
56 | |||
57 | <button class="btn_download nj-skinned">Download</button> | ||
58 | |||
59 | </section> | ||
60 | |||
49 | </div> | 61 | </div> |
50 | </div> | 62 | </div> |
51 | 63 | ||