bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
Tobias Diekershoff 2011-06-07 20:03:58 +02:00
commit e036434b8a
24 changed files with 426 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

0
view/theme/dispy/experimental Normal file
View file

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

Before After
Before After

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() {
var selstr;
$('#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 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>

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

@ -170,6 +170,20 @@ nav .nav-link {
#notify-update { background-position: -60px 0px; }
#home-update { background-position: -90px 0px; }
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
}
#language-selector {
position: absolute;
top: 0;
left: 16px;
}
/** sysmsg **/
#sysmsg_info{
position:fixed;
@ -776,6 +790,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
border-bottom: 0px;
}*/
.border {
border: 1px solid #babdb6;
-webkit-border-radius: 3px;
@ -800,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;}
@ -810,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;

15
view/theme/duepuntozero/style.css
View file

@ -2223,6 +2223,9 @@ a.mail-list-link {
cursor: pointer;
}
.eventcal {
font-size: 24px;
}
.calendar {
font-family: Courier, monospace;
@ -2298,8 +2301,8 @@ a.mail-list-link {
#language-selector {
position: absolute;
top: 0;
left: 0;
top: 0px;
left: 16px;
}
#group-members {
@ -2403,6 +2406,13 @@ a.mail-list-link {
margin: 5px 0px 0px 0px;
}
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
}
/**
* ICONS
@ -2439,6 +2449,7 @@ a.mail-list-link {
.video { background-position: -48px -32px;}
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
.attachtype {

10
view/theme/loozah/style.css
View file

@ -2319,7 +2319,7 @@ a.mail-list-link {
#language-selector {
position: absolute;
top: 0;
left: 0;
left: 16px;
}
@ -2419,6 +2419,13 @@ a.mail-list-link {
margin: 5px 0px 0px 0px;
}
#lang-select-icon {
cursor: pointer;
position: absolute;
left: 0px;
top: 0px;
}
/**
* ICONS
*/
@ -2454,6 +2461,7 @@ a.mail-list-link {
.video { background-position: -48px -32px;}
.youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; }
.attachtype {
display: block; width: 20px; height: 23px;