diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-02-24 08:11:03 -0500 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-02-24 08:11:03 -0500 |
| commit | 7b9c7f610974c56f13e05387c1f5ff9d7ca16ad0 (patch) | |
| tree | 4086d35a5a4fa49808ec3a9f5fb8b0d9109ac93c /template/profile.st | |
| parent | 0f8f1b234276514560e6df3bb6f6bac56fa9807d (diff) | |
| parent | 49ef1a688025d9183452fe5f1dccf7802d64dc62 (diff) | |
resolved merge
Diffstat (limited to 'template/profile.st')
| -rwxr-xr-x | template/profile.st | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/template/profile.st b/template/profile.st index 04a28fb..b5d3f38 100755 --- a/template/profile.st +++ b/template/profile.st @@ -5,8 +5,8 @@ <link rel="stylesheet" type="text/css" media="screen" href="/static/profile.css"> <script src="/static/jquery.editinplace.1.0.1.packed.js" - type="text/javascript" > - </script> + type="text/javascript"></script> + <script src="/static/js/ajaxupload.js"></script> <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script> <link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" /> @@ -15,7 +15,7 @@ <script> jQuery(document).ready(function(){ initProfile(); - }); + }); </script> </head> @@ -46,6 +46,8 @@ $if(is_home)$ <div id="avatar" class="editable">$avatar$</div> + <input id="upload" value="Upload" type="submit"> + <img id="spinner" src="/static/spinner.gif" style="display: none" /> $endif$ |