Merge branch 'pull'

This commit is contained in:
friendica 2012-03-07 15:55:20 -08:00
commit 6525507a2f
5 changed files with 112 additions and 97 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

View file

@ -136,11 +136,16 @@
</ul>
</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">
<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>

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

View file

@ -12,46 +12,61 @@
<input type="hidden" name="post_id" value="$post_id" />
<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">
<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
</li>
<div id="jot-tools" class="jothidden" style="display:none">
<div id="profile-jot-submit-wrapper" class="jothidden">
<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
</ul>
<span id="profile-rotator" class="loading" style="display: none">
<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
<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>
</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>
<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 style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
$acl
<hr style="clear:both"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<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-end"></div>
$jotnets
</div>
</div>
</form>
{{ if $content }}<script>initEditor();</script>{{ endif }}

View file

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