friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'pull'

This commit is contained in:
friendica 2012-03-07 15:55:20 -08:00
parent dd3b3c2454 098c98f62a
commit 6525507a2f
5 changed files with 112 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
view/theme/diabook/icons/bug-x.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 B

11
view/theme/diabook/nav.tpl
View File

@ -136,11 +136,16 @@
</ul> </ul>
</nav> </nav>
<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
</ul>
<ul id="nav-notifications-template" style="display:none;" rel="template"> <ul id="nav-notifications-template" style="display:none;" rel="template">
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>

10
view/theme/dispy/jot-header.tpl
View File

@ -1,12 +1,7 @@
<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var editor = false; var editor = false;
var textlen = 0; var textlen = 0;
var plaintext = '$editselect'; var plaintext = '$editselect';
// this is here because of the silly tinymce error. didn't help.
var skin = 'default';
function initEditor(cb) { function initEditor(cb) {
if (editor==false) { if (editor==false) {
@ -119,7 +114,9 @@ function enableOnUser(){
$(this).val(""); $(this).val("");
initEditor(); initEditor();
} }
</script>
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
<script type="text/javascript">
var ispublic = '$ispublic'; var ispublic = '$ispublic';
var addtitle = '$addtitle'; var addtitle = '$addtitle';
@ -127,6 +124,7 @@ function enableOnUser(){
/* enable tinymce on focus and click */ /* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser); $("#profile-jot-text").click(enableOnUser);
/* enable character counter */
$("#profile-jot-text").focus(charCounter); $("#profile-jot-text").focus(charCounter);
$("#profile-jot-text").click(charCounter); $("#profile-jot-text").click(charCounter);

67
view/theme/dispy/jot.tpl
View File

@ -12,46 +12,61 @@
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
</textarea>
<div id="jot-tools" class="jothidden" style="display:none">
<span class="icon border camera"><a href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></span>
<span class="icon border attach"><a href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></span>
<span class="icon border link"><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a></span>
<span class="icon border video"><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo"></a></span>
<span class="icon border audio"><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a></span>
<span class="icon border globe"><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a></span>
<span class="icon border noglobe"><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a></span>
$jotplugins
<ul id="profile-jot-submit-wrapper">
<li>
<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
</li>
<li id="profile-jot-perms" class="profile-jot-perms"> <div id="jot-tools" class="jothidden" style="display:none">
<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a> <div id="profile-jot-submit-wrapper" class="jothidden">
</li>
<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li> <div id="profile-upload-wrapper" style="display: $visitor;">
<div id="wall-image-upload-div"><a class="icon border camera" href="#" onclick="return false;" id="wall-image-upload" title="$upload"></a></div>
</ul>
<span id="profile-rotator" class="loading" style="display: none">
<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
</div> </div>
<div id="profile-attach-wrapper" style="display: $visitor;">
<div id="wall-file-upload-div"><a class="icon border attach" href="#" onclick="return false;" id="wall-file-upload" title="$attach"></a></div>
</div>
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
<a class="icon border link" id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
</div>
<div id="profile-video-wrapper" style="display: $visitor;">
<a class="icon border video" id="profile-video" onclick="jotVideoURL();return false;" title="$video"></a>
</div>
<div id="profile-audio-wrapper" style="display: $visitor;">
<a class="icon border audio" id="profile-audio" onclick="jotAudioURL();return false;" title="$audio"></a>
</div>
<div id="profile-location-wrapper" style="display: $visitor;">
<a class="icon border globe" id="profile-location" onclick="jotGetLocation();return false;" title="$setloc"></a>
</div>
<div id="profile-nolocation-wrapper" style="display: none;">
<a class="icon border noglobe" id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc"></a>
</div>
<div id="profile-jot-plugin-wrapper">
$jotplugins
</div>
<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-jot-perms" class="profile-jot-perms">
<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
</div> </div>
<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
</div>
</div> <!-- /#profile-jot-submit-wrapper -->
</div> <!-- /#jot-tools -->
<div id="jot-preview-content" style="display:none;"></div> <div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;"> <div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl $acl
<hr style="clear:both"/> <hr style="clear:both" />
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> <div id="profile-jot-email-label">$emailcc</div>
<input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div> <div id="profile-jot-email-end"></div>
$jotnets $jotnets
</div> </div>
</div> </div>
</form> </form>
{{ if $content }}<script>initEditor();</script>{{ endif }} {{ if $content }}<script>initEditor();</script>{{ endif }}

121
view/theme/dispy/style.css
View File

@ -143,7 +143,10 @@ a:hover {
} }
.required { .required {
display: inline; display: inline;
color: #ff0000; color: #ff0;
font-size: 16px;
font-weight: bold;
margin: 3px;
} }
.fakelink, .lockview { .fakelink, .lockview {
color: #3465a4; color: #3465a4;
@ -584,26 +587,26 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
border:2px solid #f8911b; border:2px solid #f8911b;
border-bottom:0; border-bottom:0;
padding-bottom: 50px; padding-bottom: 50px;
z-index:1000; z-index: 1000;
} }
#sysmsg { #sysmsg {
position:fixed; position: fixed;
bottom:0; bottom: 0;
-moz-box-shadow:0 0 5px #888; -moz-box-shadow: 0 0 5px #888;
-webkit-box-shadow:0 0 5px #888; -webkit-box-shadow: 0 0 5px #888;
box-shadow:0 0 5px #888; box-shadow: 0 0 5px #888;
padding: 10px; padding: 10px;
background-color:#fcaf3e; background-color: #fcaf3e;
border:2px solid #f8911b; border: 2px solid #f8911b;
border-bottom:0; border-bottom: 0;
padding-bottom: 50px; padding-bottom: 50px;
z-index:1000; z-index: 1000;
} }
#sysmsg_info br, #sysmsg_info br,
#sysmsg br { #sysmsg br {
display:block; display: block;
margin:2px 0px; margin: 2px 0px;
border-top:1px solid #ccccce; border-top: 1px solid #ccccce;
} }
@ -613,7 +616,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
aside { aside {
position: absolute; position: absolute;
right: 15px; right: 15px;
width: 230px; width: 245px;
padding-top: 15px;
font-size: smaller; font-size: smaller;
} }
.vcard .fn { .vcard .fn {
@ -687,7 +691,7 @@ aside #viewcontacts {
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
height: 40px; height: 35px;
overflow: none; overflow: none;
width: 100%; width: 100%;
/*background-color: #0e232e;*/ /*background-color: #0e232e;*/
@ -757,28 +761,21 @@ aside #viewcontacts {
margin-top: 10px; margin-top: 10px;
} }
#jot #jot-title { #jot #jot-title {
border: 0px; border: 1px solid #ccc;
margin: 0 0 5px; margin: 0 0 5px;
height: 20px; height: 20px;
width: 90%; width: 90%;
font-weight: bold; font-weight: bold;
border-radius: 5px; border-radius: 5px;
vertical-align: middle; vertical-align: middle;
padding: 5px 1px;
}
#jot #jot-title:hover,
#jot #jot-title:focus {
border: 1px solid #999;
border-radius: 5px;
} }
#jot #character-counter { #jot #character-counter {
width: 40px; width: 6%;
float: right; float: right;
text-align: right; text-align: right;
height: 20px; height: 15px;
line-height: 20px; line-height: 20px;
padding: 5px; padding: 2px 20px 5px 0;
margin: 0 0 5px;
} }
#profile-jot-text_tbl { #profile-jot-text_tbl {
margin-bottom: 10px; margin-bottom: 10px;
@ -787,15 +784,15 @@ aside #viewcontacts {
width:99.900002% !important; width:99.900002% !important;
} }
#profile-attach-wrapper, #profile-attach-wrapper,
#profile-audio, #profile-audio-wrapper,
#profile-link-wrapper, #profile-link-wrapper,
#profile-location, #profile-location-wrapper,
#profile-nolocation, #profile-nolocation-wrapper,
#profile-title-wrapper, #profile-title-wrapper,
#profile-upload-wrapper, #profile-upload-wrapper,
#profile-video { #profile-video-wrapper {
float: left; float: left;
margin-left: 10px; margin: 0 20px 0 0;
} }
#profile-rotator-wrapper { #profile-rotator-wrapper {
float: right; float: right;
@ -826,9 +823,10 @@ aside #viewcontacts {
padding: 5px; padding: 5px;
} }
#jot-preview-link { #jot-preview-link {
margin: 0 0 0 25px; margin: 0 0 0 10px;
border: 0; border: 0;
text-decoration: none; text-decoration: none;
float: right;
} }
.icon-text-preview { .icon-text-preview {
margin: 0 0 -18px 0; margin: 0 0 -18px 0;
@ -838,9 +836,10 @@ aside #viewcontacts {
background: url(icons.png) no-repeat -128px -40px; background: url(icons.png) no-repeat -128px -40px;
border: 0; border: 0;
text-decoration: none; text-decoration: none;
float: right;
} }
#profile-jot-perms { #profile-jot-perms {
/*float: right;*/ float: right;
background-color: #555753; background-color: #555753;
height: 22px; height: 22px;
width: 20px; width: 20px;
@ -851,17 +850,18 @@ aside #viewcontacts {
border: 0px; border: 0px;
margin: 0 -4px 0 10px; margin: 0 -4px 0 10px;
} }
#profile-jot-plugin-wrapper {
width: 1px;
margin: 10px 0 0 0;
float: right;
}
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
float: right; float: right;
width: 30%; width: 100%;
list-style: none; list-style: none;
margin: 10px 0 0 0; margin: 10px 0 0 0;
padding: 0; padding: 0;
} }
#profile-jot-submit-wrapper li {
display: inline-block;
vertical-align: middle;
}
#profile-jot-submit { #profile-jot-submit {
height: 22px; height: 22px;
background-color: #555753; background-color: #555753;
@ -871,6 +871,7 @@ aside #viewcontacts {
border-radius: 0 5px 5px 0; border-radius: 0 5px 5px 0;
border: 0; border: 0;
margin: 0; margin: 0;
float: right;
} }
#jot-perms-icons { #jot-perms-icons {
background-color: #555753; background-color: #555753;
@ -956,7 +957,7 @@ aside #viewcontacts {
section { section {
margin: 20px 6% 0 4%; margin: 20px 6% 0 4%;
font-size: 0.8em; font-size: 0.8em;
padding-right: 220px; padding-right: 230px;
min-width: 475px; min-width: 475px;
} }
@ -1013,12 +1014,12 @@ section {
.wall-item-content { .wall-item-content {
overflow-x: auto; overflow-x: auto;
} }
/* removing it from here, vs. putting it in .wall-item-content
* might break things for people. we shall see ;) */
[id^="tread-wrapper"], [class^="tread-wrapper"] { [id^="tread-wrapper"], [class^="tread-wrapper"] {
margin: 15px 0 0 0; margin: 15px 0 0 0;
/*border: 1px #aaa solid;*/
/*border-radius: 5px;*/
padding: 0px; padding: 0px;
overflow-x: auto; /*overflow-x: auto;*/
} }
.wall-item-photo-menu { .wall-item-photo-menu {
display: none; display: none;
@ -1159,7 +1160,7 @@ section {
position: absolute; position: absolute;
left: -2px; top: 101px; left: -2px; top: 101px;
display: none; display: none;
z-index: 10000; z-index: 10003;
-webkit-border-radius: 0px 5px 5px 5px; -webkit-border-radius: 0px 5px 5px 5px;
-moz-border-radius: 0px 5px 5px 5px; -moz-border-radius: 0px 5px 5px 5px;
border-radius: 0px 5px 5px 5px; border-radius: 0px 5px 5px 5px;
@ -1731,11 +1732,10 @@ div[id$="wrapper"] br {
margin: 30px 0px; margin: 30px 0px;
} }
.profile-edit-side-div { .profile-edit-side-div {
margin-top: 0px; margin: 5px 2px 0 0;
} }
.profile-edit-side-link { .profile-edit-side-link {
float: right; float: right;
margin: 0px 20px -18px 0;
} }
.profile-listing { .profile-listing {
float: left; float: left;
@ -2124,8 +2124,6 @@ div[id$="wrapper"] br {
} }
.field textarea { .field textarea {
width: 80%; width: 80%;
}
.field textarea {
height: 100px; height: 100px;
} }
.field_help { .field_help {
@ -2157,7 +2155,6 @@ div[id$="wrapper"] br {
.hidden { .hidden {
display:none !important; display:none !important;
} }
.field.radio .field_help { .field.radio .field_help {
margin-left: 0; margin-left: 0;
} }
@ -2285,12 +2282,12 @@ div[id$="wrapper"] br {
.icon.drophide, .icon.delete { .icon.drophide, .icon.delete {
float: left; float: left;
} }
.icon.s22 { /*.icon.s22 {
display: block; display: block;
background: url(icons.png) no-repeat; background: url(icons.png) no-repeat;
width: 22px; width: 22px;
height: 22px; height: 22px;
} }*/
.icon.s22.delete { .icon.s22.delete {
display: block; display: block;
background-position: -110px 0; background-position: -110px 0;
@ -2581,17 +2578,17 @@ footer {
/* autocomplete popup */ /* autocomplete popup */
.acpopup { .acpopup {
max-height:150px; max-height: 150px;
background-color:#555753; background-color: #555753;
color: #FFFFFF; color: #fff;
overflow:auto; overflow: auto;
z-index:100000; z-index: 100000;
border:1px solid #cccccc; border: 1px solid #cccccc;
} }
.acpopupitem { .acpopupitem {
background-color:#555753; background-color: #555753;
padding: 4px; padding: 4px;
clear:left; clear: left;
} }
.acpopupitem img { .acpopupitem img {
float: left; float: left;