Merge pull request #210 from tomtom84/master

fixes in diabook-derivates
This commit is contained in:
tomtom84 2012-04-06 04:29:01 -07:00
commit adf3ad5fd6
174 changed files with 135 additions and 54 deletions

12
js/main.js Normal file → Executable file
View File

@ -119,9 +119,7 @@
var home = $(data).find('home').text();
if(home == 0) { home = ''; $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
$('#home-update').html(home);
var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
$('#intro-update').html(intro);
@ -129,6 +127,14 @@
var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
$('#mail-update').html(mail);
var intro = $(data).find('intro').text();
if(intro == 0) { intro = ''; $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
$('#intro-update-li').html(intro);
var mail = $(data).find('mail').text();
if(mail == 0) { mail = ''; $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
$('#mail-update-li').html(mail);
var eNotif = $(data).find('notif')
notif = eNotif.attr('count');

0
view/theme/diabook-aerith/communityhome.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/contact_template.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/directory_item.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/fpostit/fpostit.js Normal file → Executable file
View File

0
view/theme/diabook-aerith/group_side.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/icons/attach.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
view/theme/diabook-aerith/icons/audio.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
view/theme/diabook-aerith/icons/camera.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

0
view/theme/diabook-aerith/icons/close_box.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

0
view/theme/diabook-aerith/icons/drop.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
view/theme/diabook-aerith/icons/file_as.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
view/theme/diabook-aerith/icons/link.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
view/theme/diabook-aerith/icons/lock.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
view/theme/diabook-aerith/icons/lupe.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

0
view/theme/diabook-aerith/icons/messages.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

0
view/theme/diabook-aerith/icons/messages2.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

0
view/theme/diabook-aerith/icons/next.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

0
view/theme/diabook-aerith/icons/notifications.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

0
view/theme/diabook-aerith/icons/notify.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
view/theme/diabook-aerith/icons/notify2.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
view/theme/diabook-aerith/icons/pencil.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

0
view/theme/diabook-aerith/icons/photo-menu.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 459 B

0
view/theme/diabook-aerith/icons/prev.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

0
view/theme/diabook-aerith/icons/recycle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-aerith/icons/remote.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
view/theme/diabook-aerith/icons/scroll_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-aerith/icons/selected.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
view/theme/diabook-aerith/icons/star.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

0
view/theme/diabook-aerith/icons/starred.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

0
view/theme/diabook-aerith/icons/tagged.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

0
view/theme/diabook-aerith/icons/unlock.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

0
view/theme/diabook-aerith/icons/unstarred.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

0
view/theme/diabook-aerith/icons/video.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

0
view/theme/diabook-aerith/icons/weblink.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
view/theme/diabook-aerith/jot.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/mail_conv.tpl Normal file → Executable file
View File

View File

@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>

0
view/theme/diabook-aerith/photo_view.tpl Normal file → Executable file
View File

View File

@ -22,7 +22,7 @@
<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" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}

0
view/theme/diabook-aerith/rs_common_tabs.tpl Normal file → Executable file
View File

0
view/theme/diabook-aerith/search_item.tpl Normal file → Executable file
View File

View File

@ -2093,9 +2093,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View File

@ -2082,10 +2082,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View File

@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
.intro-end {
border-bottom: 1px solid black;
clear: both;
margin-bottom: 25px;
padding-bottom: 25px;
width: 75%;
}
.intro-form-end {
clear: both;
}
.intro-fullname {
padding-bottom: 5px;
padding-top: 5px;
}
.intro-wrapper-end {
clear: both;
padding-bottom: 5px;
}
code {
font-family: Courier, monospace;
white-space: pre;
@ -2111,10 +2129,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

2
view/theme/diabook-aerith/theme.php Normal file → Executable file
View File

@ -3,7 +3,7 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.012)
* Version: (Version: 1.013)
* Author:
*/

0
view/theme/diabook-blue/communityhome.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/contact_template.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/directory_item.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/fpostit/fpostit.js Normal file → Executable file
View File

0
view/theme/diabook-blue/group_side.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/icons/attach.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
view/theme/diabook-blue/icons/audio.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
view/theme/diabook-blue/icons/camera.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

0
view/theme/diabook-blue/icons/close_box.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

0
view/theme/diabook-blue/icons/contacts2.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

0
view/theme/diabook-blue/icons/drop.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
view/theme/diabook-blue/icons/file_as.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 352 B

0
view/theme/diabook-blue/icons/link.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 365 B

0
view/theme/diabook-blue/icons/lock.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

0
view/theme/diabook-blue/icons/lupe.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 697 B

After

Width:  |  Height:  |  Size: 697 B

0
view/theme/diabook-blue/icons/messages.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 490 B

0
view/theme/diabook-blue/icons/next.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

0
view/theme/diabook-blue/icons/notifications.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 727 B

After

Width:  |  Height:  |  Size: 727 B

0
view/theme/diabook-blue/icons/notify.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
view/theme/diabook-blue/icons/pencil.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

0
view/theme/diabook-blue/icons/prev.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 336 B

0
view/theme/diabook-blue/icons/recycle.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-blue/icons/remote.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

0
view/theme/diabook-blue/icons/scroll_top.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

0
view/theme/diabook-blue/icons/selected.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
view/theme/diabook-blue/icons/star.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

0
view/theme/diabook-blue/icons/starred.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

0
view/theme/diabook-blue/icons/tagged.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 353 B

0
view/theme/diabook-blue/icons/unlock.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

0
view/theme/diabook-blue/icons/unstarred.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

0
view/theme/diabook-blue/icons/video.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 472 B

0
view/theme/diabook-blue/icons/weblink.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 505 B

0
view/theme/diabook-blue/jot.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/mail_conv.tpl Normal file → Executable file
View File

View File

@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>

0
view/theme/diabook-blue/photo_view.tpl Normal file → Executable file
View File

View File

@ -22,7 +22,7 @@
<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" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}

0
view/theme/diabook-blue/rs_common_tabs.tpl Normal file → Executable file
View File

0
view/theme/diabook-blue/search_item.tpl Normal file → Executable file
View File

View File

@ -2054,9 +2054,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View File

@ -2049,10 +2049,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

View File

@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
.intro-end {
border-bottom: 1px solid black;
clear: both;
margin-bottom: 25px;
padding-bottom: 25px;
width: 75%;
}
.intro-form-end {
clear: both;
}
.intro-fullname {
padding-bottom: 5px;
padding-top: 5px;
}
.intro-wrapper-end {
clear: both;
padding-bottom: 5px;
}
code {
font-family: Courier, monospace;
white-space: pre;
@ -2067,10 +2085,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
margin: 2px 5px 2px 5px;
max-height: 85%;
max-width: 85%;
margin: 0px;
border-radius: 10px;
height: 145px !important;
width: 145px !important;
}
.lframe {
float: left;

2
view/theme/diabook-blue/theme.php Normal file → Executable file
View File

@ -3,7 +3,7 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.012)
* Version: (Version: 1.013)
* Author:
*/

0
view/theme/diabook-red/communityhome.tpl Normal file → Executable file
View File

0
view/theme/diabook-red/contact_template.tpl Normal file → Executable file
View File

0
view/theme/diabook-red/directory_item.tpl Normal file → Executable file
View File

0
view/theme/diabook-red/fpostit/fpostit.js Normal file → Executable file
View File

0
view/theme/diabook-red/group_side.tpl Normal file → Executable file
View File

0
view/theme/diabook-red/icons/attach.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
view/theme/diabook-red/icons/audio.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

0
view/theme/diabook-red/icons/camera.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 685 B

After

Width:  |  Height:  |  Size: 685 B

0
view/theme/diabook-red/icons/close_box.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

0
view/theme/diabook-red/icons/contacts.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 588 B

0
view/theme/diabook-red/icons/contacts2.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 549 B

Some files were not shown because too many files have changed in this diff Show More