strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:
This commit is contained in:
Simon L'nu 2012-04-02 16:53:47 -04:00
commit 9cb3fc226a
35 changed files with 378 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/text.php
View file

@ -225,6 +225,9 @@ if(! function_exists('paginate')) {
function paginate(&$a) { function paginate(&$a) {
$o = ''; $o = '';
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string); $stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
$stripped = str_replace('q=','',$stripped); $stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/'); $stripped = trim($stripped,'/');
$pagenum = $a->pager['page']; $pagenum = $a->pager['page'];
@ -725,6 +728,8 @@ function smilies($s, $sample = false) {
'\\o/', '\\o/',
'o.O', 'o.O',
'O.o', 'O.o',
'o_O',
'O_o',
":'(", ":'(",
":-!", ":-!",
":-/", ":-/",
@ -759,6 +764,8 @@ function smilies($s, $sample = false) {
'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />', '<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />', '<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o_O" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />', '<img src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />', '<img src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />', '<img src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',

3
index.php
View file

@ -95,6 +95,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
if(x($_GET,'zrl')) { if(x($_GET,'zrl')) {
$_SESSION['my_url'] = $_GET['zrl']; $_SESSION['my_url'] = $_GET['zrl'];
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
} }
/** /**
@ -243,6 +244,8 @@ if (file_exists($theme_info_file)){
if(! x($a->page,'content')) if(! x($a->page,'content'))
$a->page['content'] = ''; $a->page['content'] = '';
if(! $install)
call_hooks('page_content_top',$a->page['content']);
/** /**
* Call module functions * Call module functions

8
mod/events.php
View file

@ -284,11 +284,11 @@ function events_content(&$a) {
if (x($_GET,'id')){ if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl"); $tpl = get_markup_template("event.tpl");
} else { } else {
if (get_config('experimentals','new_calendar')==1){ // if (get_config('experimentals','new_calendar')==1){
$tpl = get_markup_template("events-js.tpl"); $tpl = get_markup_template("events-js.tpl");
} else { // } else {
$tpl = get_markup_template("events.tpl"); // $tpl = get_markup_template("events.tpl");
} // }
} }
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),

2
view/theme/diabook-aerith/jot.tpl
View file

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" > <div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper"> <div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div> <div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div> </div>
<div id="profile-jot-banner-end"></div> <div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<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" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<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>

4
view/theme/diabook-aerith/profile_vcard.tpl
View file

@ -21,9 +21,9 @@
</div> </div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }} {{ if $location }}

17
view/theme/diabook-aerith/style-network.css
View file

@ -1198,10 +1198,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1256,7 +1260,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: #3465A4;} right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1613,6 +1617,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;

18
view/theme/diabook-aerith/style-profile.css
View file

@ -1193,10 +1193,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1251,7 +1255,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: #3465A4;} right_aside a{color: #3465A4;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1603,6 +1607,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2076,6 +2085,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

6
view/theme/diabook-aerith/style-settings.css
View file

@ -1191,8 +1191,10 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
} }
#id_username { #id_username {

19
view/theme/diabook-aerith/style.css
View file

@ -1,4 +1,4 @@
/opt/lampp/htdocs/friendica/view/theme/diabook/search_item.tpl/** /**
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm> * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
* Additional Changes: Michael Vogel <icarus@dabo.de> * Additional Changes: Michael Vogel <icarus@dabo.de>
**/ **/
@ -1062,6 +1062,7 @@ aside {
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside #page-sidebar{display: none;}
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
@ -1254,10 +1255,14 @@ section {
} }
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1622,6 +1627,11 @@ body .pageheader{
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2096,6 +2106,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

73
view/theme/diabook-aerith/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook-aerith * Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: * Version: (Version: 1.011)
* Author: * Author:
*/ */
@ -164,7 +164,8 @@ function diabook_aerith_community_info(){
$pagelist = array(); $pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid']) intval($a->user['uid'])
); );
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts //js scripts
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class $("a.lightbox").fancybox(); // Select all links with lightbox class
}); });
</script> </script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script> <script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie('close_pages') == '1') if($.cookie("close_pages") == "1")
{ {
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
}; };
if($.cookie('close_helpers') == '1') if($.cookie("close_helpers") == "1")
{ {
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
}; };
if($.cookie('close_services') == '1') if($.cookie("close_services") == "1")
{ {
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
}; };
if($.cookie('close_friends') == '1') if($.cookie("close_friends") == "1")
{ {
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
}; };
if($.cookie('close_postit') == '1') if($.cookie("close_postit") == "1")
{ {
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
}; };
if($.cookie('close_lastusers') == '1') if($.cookie("close_lastusers") == "1")
{ {
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
}; };
if($.cookie('close_lastphotos') == '1') if($.cookie("close_lastphotos") == "1")
{ {
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
}; };
if($.cookie('close_lastlikes') == '1') if($.cookie("close_lastlikes") == "1")
{ {
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
};} };}
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
function close_pages(){ function close_pages(){
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' }); $.cookie("close_pages","1", { expires: 365, path: "/" });
}; };
function close_helpers(){ function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' }); $.cookie("close_helpers","1", { expires: 365, path: "/" });
}; };
function close_services(){ function close_services(){
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' }); $.cookie("close_services","1", { expires: 365, path: "/" });
}; };
function close_friends(){ function close_friends(){
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' }); $.cookie("close_friends","1", { expires: 365, path: "/" });
}; };
function close_postit(){ function close_postit(){
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' }); $.cookie("close_postit","1", { expires: 365, path: "/" });
}; };
function close_lastusers(){ function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' }); $.cookie("close_lastusers","1", { expires: 365, path: "/" });
}; };
function close_lastphotos(){ function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' }); $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
}; };
function close_lastlikes(){ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
function restore_boxes(){ function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie('close_helpers','2', { expires: 365, path: '/' }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie('close_services','2', { expires: 365, path: '/' }); $.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie('close_friends','2', { expires: 365, path: '/' }); $.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie('close_postit','2', { expires: 365, path: '/' }); $.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie('close_lastusers','2', { expires: 365, path: '/' }); $.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert('Right-hand column was restored. Please refresh your browser'); alert("Right-hand column was restored. Please refresh your browser");
}; };
</script>';}
</script>
EOT;

4
view/theme/diabook-aerith/wallwall_item.tpl
View file

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }} {{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook-blue/jot.tpl
View file

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" > <div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper"> <div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div> <div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div> </div>
<div id="profile-jot-banner-end"></div> <div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<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" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<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>

4
view/theme/diabook-blue/profile_vcard.tpl
View file

@ -21,9 +21,9 @@
</div> </div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }} {{ if $location }}

17
view/theme/diabook-blue/style-network.css
View file

@ -1160,10 +1160,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1215,7 +1219,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: #1872A2;} right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1571,6 +1575,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;

18
view/theme/diabook-blue/style-profile.css
View file

@ -1159,10 +1159,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1214,7 +1218,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: #1872A2;} right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1566,6 +1570,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2035,6 +2044,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

6
view/theme/diabook-blue/style-settings.css
View file

@ -1156,8 +1156,10 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
} }
#id_username { #id_username {

17
view/theme/diabook-blue/style.css
View file

@ -1030,6 +1030,7 @@ aside {
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside #page-sidebar{display: none;}
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
@ -1210,10 +1211,14 @@ section {
} }
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1575,6 +1580,11 @@ body .pageheader{
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2044,6 +2054,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

73
view/theme/diabook-blue/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook-blue * Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: * Version: (Version: 1.011)
* Author: * Author:
*/ */
@ -164,7 +164,8 @@ function diabook_blue_community_info(){
$pagelist = array(); $pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid']) intval($a->user['uid'])
); );
@ -316,56 +317,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts //js scripts
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class $("a.lightbox").fancybox(); // Select all links with lightbox class
}); });
</script> </script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script> <script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie('close_pages') == '1') if($.cookie("close_pages") == "1")
{ {
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
}; };
if($.cookie('close_helpers') == '1') if($.cookie("close_helpers") == "1")
{ {
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
}; };
if($.cookie('close_services') == '1') if($.cookie("close_services") == "1")
{ {
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
}; };
if($.cookie('close_friends') == '1') if($.cookie("close_friends") == "1")
{ {
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
}; };
if($.cookie('close_postit') == '1') if($.cookie("close_postit") == "1")
{ {
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
}; };
if($.cookie('close_lastusers') == '1') if($.cookie("close_lastusers") == "1")
{ {
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
}; };
if($.cookie('close_lastphotos') == '1') if($.cookie("close_lastphotos") == "1")
{ {
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
}; };
if($.cookie('close_lastlikes') == '1') if($.cookie("close_lastlikes") == "1")
{ {
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
};} };}
@ -374,57 +377,55 @@ $("right_aside").ready(function(){
function close_pages(){ function close_pages(){
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' }); $.cookie("close_pages","1", { expires: 365, path: "/" });
}; };
function close_helpers(){ function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' }); $.cookie("close_helpers","1", { expires: 365, path: "/" });
}; };
function close_services(){ function close_services(){
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' }); $.cookie("close_services","1", { expires: 365, path: "/" });
}; };
function close_friends(){ function close_friends(){
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' }); $.cookie("close_friends","1", { expires: 365, path: "/" });
}; };
function close_postit(){ function close_postit(){
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' }); $.cookie("close_postit","1", { expires: 365, path: "/" });
}; };
function close_lastusers(){ function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' }); $.cookie("close_lastusers","1", { expires: 365, path: "/" });
}; };
function close_lastphotos(){ function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' }); $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
}; };
function close_lastlikes(){ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
function restore_boxes(){ function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie('close_helpers','2', { expires: 365, path: '/' }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie('close_services','2', { expires: 365, path: '/' }); $.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie('close_friends','2', { expires: 365, path: '/' }); $.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie('close_postit','2', { expires: 365, path: '/' }); $.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie('close_lastusers','2', { expires: 365, path: '/' }); $.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert('Right-hand column was restored. Please refresh your browser'); alert("Right-hand column was restored. Please refresh your browser");
}; };
</script>';}
</script>
EOT;

4
view/theme/diabook-blue/wallwall_item.tpl
View file

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }} {{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook-red/jot.tpl
View file

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" > <div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper"> <div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div> <div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div> </div>
<div id="profile-jot-banner-end"></div> <div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<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" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<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>

4
view/theme/diabook-red/profile_vcard.tpl
View file

@ -21,9 +21,9 @@
</div> </div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }} {{ if $location }}

17
view/theme/diabook-red/style-network.css
View file

@ -1198,10 +1198,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1253,7 +1257,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: red;} right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1609,6 +1613,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;

18
view/theme/diabook-red/style-profile.css
View file

@ -1176,10 +1176,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1231,7 +1235,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside a{color: red;} right_aside a{color: red;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1583,6 +1587,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2057,6 +2066,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

6
view/theme/diabook-red/style-settings.css
View file

@ -1173,8 +1173,10 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
} }
#id_username { #id_username {

17
view/theme/diabook-red/style.css
View file

@ -1061,6 +1061,7 @@ aside {
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside #page-sidebar{display: none;}
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
@ -1243,10 +1244,14 @@ section {
} }
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1608,6 +1613,11 @@ body .pageheader{
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2081,6 +2091,7 @@ box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px; margin: 2px 5px 2px 5px;
max-height: 85%; max-height: 85%;
max-width: 85%; max-width: 85%;
border-radius: 10px;
} }
.lframe { .lframe {
float: left; float: left;

73
view/theme/diabook-red/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook-red * Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: * Version: (Version: 1.011)
* Author: * Author:
*/ */
@ -164,7 +164,8 @@ function diabook_red_community_info(){
$pagelist = array(); $pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid']) intval($a->user['uid'])
); );
@ -317,56 +318,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts //js scripts
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class $("a.lightbox").fancybox(); // Select all links with lightbox class
}); });
</script> </script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script> <script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie('close_pages') == '1') if($.cookie("close_pages") == "1")
{ {
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
}; };
if($.cookie('close_helpers') == '1') if($.cookie("close_helpers") == "1")
{ {
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
}; };
if($.cookie('close_services') == '1') if($.cookie("close_services") == "1")
{ {
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
}; };
if($.cookie('close_friends') == '1') if($.cookie("close_friends") == "1")
{ {
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
}; };
if($.cookie('close_postit') == '1') if($.cookie("close_postit") == "1")
{ {
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
}; };
if($.cookie('close_lastusers') == '1') if($.cookie("close_lastusers") == "1")
{ {
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
}; };
if($.cookie('close_lastphotos') == '1') if($.cookie("close_lastphotos") == "1")
{ {
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
}; };
if($.cookie('close_lastlikes') == '1') if($.cookie("close_lastlikes") == "1")
{ {
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
};} };}
@ -375,57 +378,55 @@ $("right_aside").ready(function(){
function close_pages(){ function close_pages(){
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' }); $.cookie("close_pages","1", { expires: 365, path: "/" });
}; };
function close_helpers(){ function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' }); $.cookie("close_helpers","1", { expires: 365, path: "/" });
}; };
function close_services(){ function close_services(){
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' }); $.cookie("close_services","1", { expires: 365, path: "/" });
}; };
function close_friends(){ function close_friends(){
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' }); $.cookie("close_friends","1", { expires: 365, path: "/" });
}; };
function close_postit(){ function close_postit(){
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' }); $.cookie("close_postit","1", { expires: 365, path: "/" });
}; };
function close_lastusers(){ function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' }); $.cookie("close_lastusers","1", { expires: 365, path: "/" });
}; };
function close_lastphotos(){ function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' }); $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
}; };
function close_lastlikes(){ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
function restore_boxes(){ function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie('close_helpers','2', { expires: 365, path: '/' }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie('close_services','2', { expires: 365, path: '/' }); $.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie('close_friends','2', { expires: 365, path: '/' }); $.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie('close_postit','2', { expires: 365, path: '/' }); $.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie('close_lastusers','2', { expires: 365, path: '/' }); $.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert('Right-hand column was restored. Please refresh your browser'); alert("Right-hand column was restored. Please refresh your browser");
}; };
</script>';}
</script>
EOT;

4
view/theme/diabook-red/wallwall_item.tpl
View file

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }} {{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}

2
view/theme/diabook/jot.tpl
View file

@ -2,7 +2,6 @@
<div id="profile-jot-wrapper" > <div id="profile-jot-wrapper" >
<div id="profile-jot-banner-wrapper"> <div id="profile-jot-banner-wrapper">
<div id="profile-jot-desc" >&nbsp;</div> <div id="profile-jot-desc" >&nbsp;</div>
<div id="character-counter" class="grey"></div>
</div> </div>
<div id="profile-jot-banner-end"></div> <div id="profile-jot-banner-end"></div>
@ -15,6 +14,7 @@
<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" />
<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
<div id="character-counter" class="grey"></div>
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<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>

4
view/theme/diabook/profile_vcard.tpl
View file

@ -21,9 +21,9 @@
</div> </div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
{{ if $location }} {{ if $location }}

16
view/theme/diabook/style-network.css
View file

@ -1144,8 +1144,13 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
@ -1196,7 +1201,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1544,6 +1549,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;

20
view/theme/diabook/style-profile.css
View file

@ -1138,10 +1138,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1191,7 +1195,7 @@ right_aside {
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px;
margin-top:30px;} margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
right_aside .directory-photo { margin: 0px; } right_aside .directory-photo { margin: 0px; }
@ -1539,6 +1543,11 @@ transition: all 0.2s ease-in-out;
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2003,6 +2012,9 @@ ul.tabs li .active {
float: left; float: left;
} }
/* photo */ /* photo */
.photo {
border-radius: 10px;
}
.lframe { .lframe {
float: left; float: left;
} }

7
view/theme/diabook/style-settings.css
View file

@ -1135,8 +1135,11 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; max-width: 575px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
} }
#id_username { #id_username {

20
view/theme/diabook/style.css
View file

@ -1022,7 +1022,7 @@ aside {
float: left; float: left;
/* background: #F1F1F1; */ /* background: #F1F1F1; */
} }
aside #page-sidebar{display: none;}
aside .vcard .fn { aside .vcard .fn {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
@ -1190,10 +1190,14 @@ section {
body .pageheader{ body .pageheader{
text-align: center; text-align: center;
margin-top: 25px; font-size: 20px;
font-size: 0px; margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
}
.qcomment{
max-width: 122px;
} }
#id_username { #id_username {
width: 173px; width: 173px;
} }
@ -1550,6 +1554,11 @@ body .pageheader{
padding: 0.3em; padding: 0.3em;
margin-bottom: 10px; margin-bottom: 10px;
} }
.grey
{
display: inline;
float: right;
}
#jot #jot-tools { #jot #jot-tools {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
@ -2014,6 +2023,9 @@ ul.tabs li .active {
float: left; float: left;
} }
/* photo */ /* photo */
.photo {
border-radius: 10px;
}
.lframe { .lframe {
float: left; float: left;
} }

73
view/theme/diabook/theme.php
View file

@ -3,7 +3,7 @@
/* /*
* Name: Diabook * Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: * Version: (Version: 1.011)
* Author: * Author:
*/ */
@ -169,7 +169,8 @@ function diabook_community_info(){
$pagelist = array(); $pagelist = array();
$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
ORDER BY `name` ASC",
intval($a->user['uid']) intval($a->user['uid'])
); );
@ -264,7 +265,7 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
} }
} }
//tabs at right_aside on settings page //tabs at aside on settings page
if ($a->argv[0] === "settings"){ if ($a->argv[0] === "settings"){
$tabs = array( $tabs = array(
@ -323,55 +324,58 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
//js scripts //js scripts
$a->page['htmlhead'] .= <<< EOT $a->page['htmlhead'] .= '
<script> <script>
$(function() { $(function() {
$('a.lightbox').fancybox(); // Select all links with lightbox class $("a.lightbox").fancybox(); // Select all links with lightbox class
}); });
</script> </script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script> <script>
$("right_aside").ready(function(){ $("right_aside").ready(function(){
if($.cookie('close_pages') == '1') if($.cookie("close_pages") == "1")
{ {
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
}; };
if($.cookie('close_helpers') == '1') if($.cookie("close_helpers") == "1")
{ {
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
}; };
if($.cookie('close_services') == '1') if($.cookie("close_services") == "1")
{ {
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
}; };
if($.cookie('close_friends') == '1') if($.cookie("close_friends") == "1")
{ {
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
}; };
if($.cookie('close_postit') == '1') if($.cookie("close_postit") == "1")
{ {
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
}; };
if($.cookie('close_lastusers') == '1') if($.cookie("close_lastusers") == "1")
{ {
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
}; };
if($.cookie('close_lastphotos') == '1') if($.cookie("close_lastphotos") == "1")
{ {
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
}; };
if($.cookie('close_lastlikes') == '1') if($.cookie("close_lastlikes") == "1")
{ {
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
};} };}
@ -380,60 +384,55 @@ $("right_aside").ready(function(){
function close_pages(){ function close_pages(){
document.getElementById( "close_pages" ).style.display = "none"; document.getElementById( "close_pages" ).style.display = "none";
$.cookie('close_pages','1', { expires: 365, path: '/' }); $.cookie("close_pages","1", { expires: 365, path: "/" });
}; };
function close_helpers(){ function close_helpers(){
document.getElementById( "close_helpers" ).style.display = "none"; document.getElementById( "close_helpers" ).style.display = "none";
$.cookie('close_helpers','1', { expires: 365, path: '/' }); $.cookie("close_helpers","1", { expires: 365, path: "/" });
}; };
function close_services(){ function close_services(){
document.getElementById( "close_services" ).style.display = "none"; document.getElementById( "close_services" ).style.display = "none";
$.cookie('close_services','1', { expires: 365, path: '/' }); $.cookie("close_services","1", { expires: 365, path: "/" });
}; };
function close_friends(){ function close_friends(){
document.getElementById( "close_friends" ).style.display = "none"; document.getElementById( "close_friends" ).style.display = "none";
$.cookie('close_friends','1', { expires: 365, path: '/' }); $.cookie("close_friends","1", { expires: 365, path: "/" });
}; };
function close_postit(){ function close_postit(){
document.getElementById( "close_postit" ).style.display = "none"; document.getElementById( "close_postit" ).style.display = "none";
$.cookie('close_postit','1', { expires: 365, path: '/' }); $.cookie("close_postit","1", { expires: 365, path: "/" });
}; };
function close_lastusers(){ function close_lastusers(){
document.getElementById( "close_lastusers" ).style.display = "none"; document.getElementById( "close_lastusers" ).style.display = "none";
$.cookie('close_lastusers','1', { expires: 365, path: '/' }); $.cookie("close_lastusers","1", { expires: 365, path: "/" });
}; };
function close_lastphotos(){ function close_lastphotos(){
document.getElementById( "close_lastphotos" ).style.display = "none"; document.getElementById( "close_lastphotos" ).style.display = "none";
$.cookie('close_lastphotos','1', { expires: 365, path: '/' }); $.cookie("close_lastphotos","1", { expires: 365, path: "/" });
}; };
function close_lastlikes(){ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none"; document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie('close_lastlikes','1', { expires: 365, path: '/' }); $.cookie("close_lastlikes","1", { expires: 365, path: "/" });
}; };
function restore_boxes(){ function restore_boxes(){
$.cookie('close_pages','2', { expires: 365, path: '/' }); $.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie('close_helpers','2', { expires: 365, path: '/' }); $.cookie("close_helpers","2", { expires: 365, path: "/" });
$.cookie('close_services','2', { expires: 365, path: '/' }); $.cookie("close_services","2", { expires: 365, path: "/" });
$.cookie('close_friends','2', { expires: 365, path: '/' }); $.cookie("close_friends","2", { expires: 365, path: "/" });
$.cookie('close_postit','2', { expires: 365, path: '/' }); $.cookie("close_postit","2", { expires: 365, path: "/" });
$.cookie('close_lastusers','2', { expires: 365, path: '/' }); $.cookie("close_lastusers","2", { expires: 365, path: "/" });
$.cookie('close_lastphotos','2', { expires: 365, path: '/' }); $.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie('close_lastlikes','2', { expires: 365, path: '/' }); $.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert('Right-hand column was restored. Please refresh your browser'); alert("Right-hand column was restored. Please refresh your browser");
}; };
</script>';}
</script>
EOT;

4
view/theme/diabook/wallwall_item.tpl
View file

@ -71,6 +71,10 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a> <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }} {{ endif }}
{{ if $item.filer }}
<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
{{ endif }}
{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}