Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-21 00:15:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/friendica/red into zpull

Browse source
This commit is contained in:
friendica 2013-07-15 18:08:03 -07:00
commit 2cfd9a3fa9
4 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1227,15 +1227,16 @@ footer {
}
#profile-upload-wrapper {
float: left;
margin-left: 30px;
margin-left: 15px;
}
#profile-attach-wrapper {
float: left;
margin-left: 30px;
margin-left: 15px;
}
#profile-rotator {
float: left;
margin-left: 30px;
margin: 8px 0px 0px 20px;
color: #777;
}
#profile-link-wrapper {
float: left;
@ -1263,7 +1264,6 @@ footer {
margin-top: 0px !important;
}
#profile-nolocation-wrapper {
float: left;
margin-left: 15px;

16
view/tpl/jot-header.tpl
View file

@ -123,10 +123,10 @@ function enableOnUser(){
'wall-image-upload',
{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
}
}
);
@ -134,10 +134,10 @@ function enableOnUser(){
'wall-file-upload',
{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
addeditortext(response);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
}
}
);
@ -167,10 +167,10 @@ function enableOnUser(){
reply = prompt("{{$linkurl}}");
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$('#profile-rotator').spin('tiny');
$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
addeditortext(data);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
});
}
}
@ -224,12 +224,12 @@ function enableOnUser(){
event.preventDefault();
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$('#profile-rotator').spin('tiny');
$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val("");
initEditor(function(){
addeditortext(data);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
});
});
}

9
view/tpl/jot.tpl
View file

@ -51,7 +51,10 @@
</div>
<div id="profile-nolocation-wrapper" style="display: none;" >
<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
</div>
</div>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<div id="profile-rotator"></div>
</div>
{{if $showacl}}
<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
@ -69,10 +72,6 @@
{{$jotplugins}}
</div>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
</div>
<div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;">

12
view/tpl/msg-header.tpl
View file

@ -58,10 +58,10 @@ else
'prvmail-upload',
{ action: 'wall_upload/{{$nickname}}',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
onComplete: function(file,response) {
tinyMCE.execCommand('mceInsertRawHTML',false,response);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
}
}
);
@ -71,10 +71,10 @@ else
function jotGetLink() {
reply = prompt("{{$linkurl}}");
if(reply && reply.length) {
$('#profile-rotator').show();
$('#profile-rotator').spin('tiny');
$.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
});
}
}
@ -90,10 +90,10 @@ else
event.target.textContent = reply;
event.preventDefault();
if(reply && reply.length) {
$('#profile-rotator').show();
$('#profile-rotator').spin('tiny');
$.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide();
$('#profile-rotator').spin(false);
});
}
}