jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
Friendika 2011-06-06 14:17:33 -07:00
commit ccf4e3eee5
5 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/settings.php
View file

@ -432,7 +432,7 @@ function settings_content(&$a) {
$selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme'))) $selected = (($f == $_SESSION['theme']) || ($f === $default_theme && (! x($_SESSION,'theme')))
? ' selected="selected" ' : '' ); ? ' selected="selected" ' : '' );
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); $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>';
} }
} }

BIN
view/theme/dispy/icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

11
view/theme/dispy/jot-header.tpl
View file

@ -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() { $('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr; var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() { $('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {

7
view/theme/dispy/jot.tpl
View file

@ -26,8 +26,11 @@
</div> </div>
<div id="profile-upload-wrapper" class="jot-tool" style="display: $visitor;" > <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 id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
</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);" > <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> <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> </div>

8
view/theme/dispy/style.css
View file

@ -815,9 +815,9 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
.pause { background-position: -110px -20px;} .pause { background-position: -110px -20px;}
.play { background-position: -130px -20px;} .play { background-position: -130px -20px;}
.pencil { background-position: -150px -20px;} .pencil { background-position: -150px -20px;}
.small-pencil{ background-position: -170px -20px;} .small-pencil { background-position: -170px -20px;}
.recycle { background-position: -190px -20px;} .recycle { background-position: -190px -20px;}
.remote-link{ background-position: -210px -20px;} .remote-link { background-position: -210px -20px;}
.share { background-position: -230px -20px;} .share { background-position: -230px -20px;}
.tools { background-position: -50px -40px;} .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;} .unlock { background-position: -90px -40px;}
.video { background-position: -110px -40px;} .video { background-position: -110px -40px;}
.youtube { background-position: -130px -40px;} .youtube { background-position: -130px -40px;}
.attach { background-position: -190px -40px;}
.language { background-position: -210px -40px;}
.attachtype { .attachtype {
display: block; width: 20px; height: 23px; display: block; width: 20px; height: 23px;