clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into contacts

This commit is contained in:
Friendika 2011-11-09 18:29:30 -08:00
parent a2018e2d14 2b1e011851
commit e35f3f1ada
7 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDIKA_PLATFORM', 'Friendica'); define ( 'FRIENDIKA_PLATFORM', 'Friendica');
define ( 'FRIENDIKA_VERSION', '2.3.1159' ); define ( 'FRIENDIKA_VERSION', '2.3.1160' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1103 ); define ( 'DB_UPDATE_VERSION', 1103 );
@ -823,6 +823,14 @@ function profile_load(&$a, $nickname, $profile = 0) {
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
$_SESSION['theme'] = $a->profile['theme']; $_SESSION['theme'] = $a->profile['theme'];
/**
* load/reload current theme info
*/
$theme_info_file = "view/theme/".current_theme()."/theme.php";
if (file_exists($theme_info_file)){
require_once($theme_info_file);
}
if(! (x($a->page,'aside'))) if(! (x($a->page,'aside')))
$a->page['aside'] = ''; $a->page['aside'] = '';

3
view/jot-header.tpl
View File

@ -222,8 +222,9 @@ function initEditor(cb){
event.target.textContent = reply; event.target.textContent = reply;
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);

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

@ -229,8 +229,9 @@ function initEditor(cb) {
event.target.textContent = reply; event.target.textContent = reply;
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);

54
view/theme/testbubble/jot-header.tpl
View File

@ -32,16 +32,37 @@ function initEditor(cb) {
content_css: "$baseurl/view/custom_tinymce.css", content_css: "$baseurl/view/custom_tinymce.css",
theme_advanced_path : false, theme_advanced_path : false,
setup : function(ed) { setup : function(ed) {
//Character count cPopup = null;
ed.onKeyUp.add(function(ed, e) { ed.onKeyDown.add(function(ed,e) {
var txt = tinyMCE.activeEditor.getContent(); if(cPopup !== null)
textlen = txt.length; cPopup.onkey(e);
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) { });
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html(' '); ed.onKeyUp.add(function(ed, e) {
} var txt = tinyMCE.activeEditor.getContent();
match = txt.match(/@([^ \n]+)$/);
if(match!==null) {
if(cPopup === null) {
cPopup = new ACPopup(this,baseurl+"/acl");
}
if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
if(! cPopup.ready) cPopup = null;
}
else {
if(cPopup !== null) { cPopup.close(); cPopup = null; }
}
textlen = txt.length;
if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
$('#profile-jot-desc').html(ispublic);
}
else {
$('#profile-jot-desc').html(' ');
}
//Character count
if(textlen <= 140) { if(textlen <= 140) {
$('#character-counter').removeClass('red'); $('#character-counter').removeClass('red');
@ -67,7 +88,6 @@ function initEditor(cb) {
$("#profile-upload-wrapper").show(); $("#profile-upload-wrapper").show();
$("#profile-attach-wrapper").show(); $("#profile-attach-wrapper").show();
$("#profile-link-wrapper").show(); $("#profile-link-wrapper").show();
$("#profile-youtube-wrapper").show();
$("#profile-video-wrapper").show(); $("#profile-video-wrapper").show();
$("#profile-audio-wrapper").show(); $("#profile-audio-wrapper").show();
$("#profile-location-wrapper").show(); $("#profile-location-wrapper").show();
@ -163,20 +183,13 @@ function initEditor(cb) {
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply); reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);
$('#profile-rotator').hide(); $('#profile-rotator').hide();
}); });
} }
} }
function jotGetVideo() {
reply = prompt("$utubeurl");
if(reply && reply.length) {
tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
}
}
function jotVideoURL() { function jotVideoURL() {
reply = prompt("$vidurl"); reply = prompt("$vidurl");
if(reply && reply.length) { if(reply && reply.length) {
@ -229,8 +242,9 @@ function initEditor(cb) {
event.target.textContent = reply; event.target.textContent = reply;
event.preventDefault(); event.preventDefault();
if(reply && reply.length) { if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show(); $('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) { $.get('parse_url?binurl=' + reply, function(data) {
if (!editor) $("#profile-jot-text").val(""); if (!editor) $("#profile-jot-text").val("");
initEditor(function(){ initEditor(function(){
tinyMCE.execCommand('mceInsertRawHTML',false,data); tinyMCE.execCommand('mceInsertRawHTML',false,data);

3
view/theme/testbubble/jot.tpl
View File

@ -30,9 +30,6 @@
<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > <div id="profile-link-wrapper" class="jot-tool" style="display: none;" 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> <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> </div>
<div id="profile-youtube-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-youtube" class="icon border youtube" title="$youtube" onclick="jotGetVideo(); return false;"></a>
</div>
<div id="profile-video-wrapper" class="jot-tool" style="display: none;" > <div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
<a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a> <a id="profile-video" class="icon border video" title="$video" onclick="jotVideoURL(); return false;"></a>
</div> </div>

6
view/theme/testbubble/mail_head.tpl
View File

@ -1,7 +1,3 @@
<h3>$messages</h3> <h3>$messages</h3>
<ul class="tabs-wrapper"> $tab_content
<li><a href="message" class="tabs button {{if $activetab==inbox}}active{{endif}}">$inbox</a></li>
<li><a href="message/sent" class="tabs button {{if $activetab==sent}}active{{endif}}">$outbox</a></li>
<li><a href="message/new" class="tabs button {{if $activetab==new}}active{{endif}}">$new</a></li>
</ul>

7
view/theme/testbubble/style.css
View File

@ -823,10 +823,9 @@ profile-jot-banner-wrapper {
/* ======== */ /* ======== */
.tabs { .tabs {
min-width: 500px; min-width: 400px;
list-style: none; list-style: none;
padding: 10px; padding: 10px;
margin: 0px 0px 10px 0px;
border-bottom: 1px solid #efefef; border-bottom: 1px solid #efefef;
font-size: 0.9em; font-size: 0.9em;
} }
@ -834,6 +833,8 @@ profile-jot-banner-wrapper {
.tab { .tab {
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px;
display: inline-block;
margin-bottom: 5px;
margin-right: 5px; margin-right: 5px;
font-style: bold; font-style: bold;
} }
@ -848,7 +849,7 @@ profile-jot-banner-wrapper {
.wall-item-outside-wrapper { .wall-item-outside-wrapper {
max-width: 93%; max-width: 93%;
border-bottom: 1px solid #dedede; border-bottom: 1px solid #dedede;
margin-top: 20px; margin-top: 20px;
padding-right: 10px; padding-right: 10px;
padding-left: 12px; padding-left: 12px;