mirror of https://github.com/friendica/friendica
Merge pull request #104 from simonlnu/master
push fix for funky menu action. the overflow-x might break again for some people
This commit is contained in:
Simon
commit
58c557b3ad
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@
|
|||
<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>
|
||||
|
|
@ -24,16 +25,13 @@
|
|||
<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>
|
||||
|
||||
<li><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
|
||||
|
||||
<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>
|
||||
</ul>
|
||||
<span id="profile-rotator" class="loading" style="display: none">
|
||||
<img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
|
||||
|
|
|
|||
|
|
@ -584,26 +584,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;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -757,7 +757,7 @@ aside #viewcontacts {
|
|||
margin-top: 10px;
|
||||
}
|
||||
#jot #jot-title {
|
||||
border: 0px;
|
||||
border: 1px solid #aaa;
|
||||
margin: 0 0 5px;
|
||||
height: 20px;
|
||||
width: 90%;
|
||||
|
|
@ -766,11 +766,6 @@ aside #viewcontacts {
|
|||
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;
|
||||
|
|
@ -1013,12 +1008,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 +1154,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;
|
||||
|
|
@ -2581,17 +2576,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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue