diff options
| author | Friendika <info@friendika.com> | 2011-06-06 14:17:33 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-06-06 14:17:33 -0700 |
| commit | ccf4e3eee5f01caad487cc42607c6cde710c4f5d (patch) | |
| tree | 44732a2c92c480814773dc86cd81cbce0ef86485 | |
| parent | c003eda17710f6818a47dbaca4e95a755fc8de39 (diff) | |
| parent | a37a952f5b382f1d65575278ca6c43632ef7cfc3 (diff) | |
| download | volse-hubzilla-ccf4e3eee5f01caad487cc42607c6cde710c4f5d.tar.gz volse-hubzilla-ccf4e3eee5f01caad487cc42607c6cde710c4f5d.tar.bz2 volse-hubzilla-ccf4e3eee5f01caad487cc42607c6cde710c4f5d.zip | |
Merge branch 'pull'
| -rw-r--r-- | mod/settings.php | 2 | ||||
| -rw-r--r-- | view/theme/dispy/icons.png | bin | 16306 -> 17101 bytes | |||
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 11 | ||||
| -rw-r--r-- | view/theme/dispy/jot.tpl | 7 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 8 |
5 files changed, 22 insertions, 6 deletions
diff --git a/mod/settings.php b/mod/settings.php index f976bdf8f..916e04270 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -432,7 +432,7 @@ function settings_content(&$a) { $selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme'))) ? ' selected="selected" ' : '' ); $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - $theme_selector .= '<option val="' . $f . '"' . $selected . '>' . $theme_name . '</option>'; + $theme_selector .= '<option value="' . $f . '"' . $selected . '>' . $theme_name . '</option>'; } } diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png Binary files differindex 43228bb9d..b016fe33b 100644 --- a/view/theme/dispy/icons.png +++ b/view/theme/dispy/icons.png diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 245957808..eab3af700 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -81,6 +81,17 @@ tinyMCE.init({ } } ); + var file_uploader = new window.AjaxUpload( + 'wall-file-upload', + { action: 'wall_attach/$nickname', + name: 'userfile', + onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + onComplete: function(file,response) { + tinyMCE.execCommand('mceInsertRawHTML',false,response); + $('#profile-rotator').hide(); + } + } + ); $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() { var selstr; $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index ab121db31..f87b6fbb3 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -26,8 +26,11 @@ </div> <div id="profile-upload-wrapper" class="jot-tool" style="display: $visitor;" > - <div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div> - </div> + <div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div> + </div> + <div id="profile-attach-wrapper" class="jot-tool" style="display: $visitor;" > + <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div> + </div> <div id="profile-link-wrapper" class="jot-tool" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > <a id="profile-link" class="icon border link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a> </div> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 5cedf4118..36702b3e8 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -815,9 +815,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} .pause { background-position: -110px -20px;} .play { background-position: -130px -20px;} .pencil { background-position: -150px -20px;} -.small-pencil{ background-position: -170px -20px;} +.small-pencil { background-position: -170px -20px;} .recycle { background-position: -190px -20px;} -.remote-link{ background-position: -210px -20px;} +.remote-link { background-position: -210px -20px;} .share { background-position: -230px -20px;} .tools { background-position: -50px -40px;} @@ -825,7 +825,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} .unlock { background-position: -90px -40px;} .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} - + +.attach { background-position: -190px -40px;} +.language { background-position: -210px -40px;} .attachtype { display: block; width: 20px; height: 23px; |
