diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/io/ui/cloudpopup.reel/cloudpopup.html | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index 2c1c169a..e58041ec 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> | 37 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> |
| 38 | 38 | ||
| 39 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" /> | 39 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" /> |
| 40 | 40 | ||
| 41 | <button class="btn_test nj-skinned">Test</button> | 41 | <button class="btn_test nj-skinned">Test</button> |
| 42 | 42 | ||