MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge https://github.com/friendica/friendica into pull

Browse source
This commit is contained in:
friendica 2012-04-12 16:13:10 -07:00
parent 2b01d2b6e0 e3af552bbf
commit 15e74402d4
61 changed files with 560 additions and 10753 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
view/theme/diabook-aerith/generic_links_widget.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="widget_$title">
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul class="rs_tabs">
{{ for $items as $item }}
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

BIN
view/theme/diabook-aerith/icons/com_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 774 B

BIN
view/theme/diabook-aerith/icons/events.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 723 B

BIN
view/theme/diabook-aerith/icons/home.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 706 B

BIN
view/theme/diabook-aerith/icons/mess_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 637 B

BIN
view/theme/diabook-aerith/icons/notes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 764 B

BIN
view/theme/diabook-aerith/icons/pscontacts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 664 B

BIN
view/theme/diabook-aerith/icons/pubgroups.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 688 B

11
view/theme/diabook-aerith/nets.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

14
view/theme/diabook-aerith/profile_side.tpl
View file

@ -7,13 +7,13 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul> </ul>
</div> </div>

6
view/theme/diabook-aerith/rs_common_tabs.tpl
View file

@ -1,6 +0,0 @@
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
{{ endfor }}
</ul>

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

@ -482,8 +482,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover ,
background: #EEE; #fileas-sidebar .tool:hover {
background: aliceBlue;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -940,44 +941,58 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: aliceBlue;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;

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

File diff suppressed because it is too large Load diff

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

@ -527,8 +527,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: aliceBlue;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -1061,44 +1062,57 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: aliceBlue;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-aerith/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;
@ -2147,6 +2161,41 @@ ul.tabs li .active {
box-shadow: 2px 2px 2px #CFCFCF; box-shadow: 2px 2px 2px #CFCFCF;
margin-left: 5px; margin-left: 5px;
} }
//settings tabs
ul.rs_tabs {
list-style-type: none;
font-size: 11px;
}
ul.rs_tabs li {
float: left;
margin-bottom: 30px;
clear: both;
}
ul.rs_tabs li .selected {
background-color: #3465A4;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 2px 2px 2px #CFCFCF;
font-size: 13px;
}
.rs_tabs {
list-style-type: none;
font-size: 11px;
background-position: 0 -20px;
background-repeat: repeat-x;
height: 27px;
padding: 0;
}
.rs_tab.button {
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
font-weight: bolder;
padding: 3px;
color: #333333;
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */

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

@ -3,13 +3,13 @@
/* /*
* 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: 1.016) * Version: (Version: 1.017)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.016)"; $diabook_version = "Diabook-aerith (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@ -22,7 +22,6 @@ $cssFile = null;
*/ */
function diabook_aerith_community_info(){ function diabook_aerith_community_info(){
$a = get_app(); $a = get_app();
//right_aside at networkpages
// last 12 users // last 12 users
$aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_title'] = t('Last users');
@ -280,55 +279,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
} }
} }
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-settings.css";
}
// custom css // custom css

11
view/theme/diabook-blue/generic_links_widget.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="widget_$title">
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul class="rs_tabs">
{{ for $items as $item }}
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

BIN
view/theme/diabook-blue/icons/com_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 774 B

BIN
view/theme/diabook-blue/icons/events.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 723 B

BIN
view/theme/diabook-blue/icons/home.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 706 B

BIN
view/theme/diabook-blue/icons/mess_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 637 B

BIN
view/theme/diabook-blue/icons/notes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 764 B

BIN
view/theme/diabook-blue/icons/pscontacts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 664 B

BIN
view/theme/diabook-blue/icons/pubgroups.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 688 B

11
view/theme/diabook-blue/nets.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

14
view/theme/diabook-blue/profile_side.tpl
View file

@ -7,13 +7,13 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul> </ul>
</div> </div>

6
view/theme/diabook-blue/rs_common_tabs.tpl
View file

@ -1,6 +0,0 @@
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
{{ endfor }}
</ul>

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

@ -482,8 +482,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #308DBF;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -907,43 +908,57 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #308DBF;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;

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

File diff suppressed because it is too large Load diff

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

@ -526,8 +526,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #308DBF;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -1031,43 +1032,57 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #308DBF;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;
@ -2103,6 +2118,41 @@ ul.tabs li .active {
box-shadow: 0 1px 1px #CFCFCF; box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px; margin-left: 5px;
} }
//settings tabs
ul.rs_tabs {
list-style-type: none;
font-size: 11px;
}
ul.rs_tabs li {
float: left;
margin-bottom: 30px;
clear: both;
}
ul.rs_tabs li .selected {
background-color: #055580;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 2px 2px 2px #CFCFCF;
font-size: 13px;
}
.rs_tabs {
list-style-type: none;
font-size: 11px;
background-position: 0 -20px;
background-repeat: repeat-x;
height: 27px;
padding: 0;
}
.rs_tab.button {
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
font-weight: bolder;
padding: 3px;
color: #333333;
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */

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

@ -3,13 +3,13 @@
/* /*
* 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: 1.016) * Version: (Version: 1.017)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-blue (Version: 1.016)"; $diabook_version = "Diabook-blue (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -21,7 +21,6 @@ $cssFile = null;
*/ */
function diabook_blue_community_info(){ function diabook_blue_community_info(){
$a = get_app(); $a = get_app();
//right_aside at networkpages
// last 12 users // last 12 users
$aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_title'] = t('Last users');
@ -279,56 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
} }
} }
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-settings.css";
}
// custom css // custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);

11
view/theme/diabook-red/generic_links_widget.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="widget_$title">
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul class="rs_tabs">
{{ for $items as $item }}
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

BIN
view/theme/diabook-red/icons/com_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 774 B

BIN
view/theme/diabook-red/icons/events.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 723 B

BIN
view/theme/diabook-red/icons/home.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 706 B

BIN
view/theme/diabook-red/icons/mess_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 637 B

BIN
view/theme/diabook-red/icons/notes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 764 B

BIN
view/theme/diabook-red/icons/pscontacts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 664 B

BIN
view/theme/diabook-red/icons/pubgroups.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 688 B

11
view/theme/diabook-red/nets.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

14
view/theme/diabook-red/profile_side.tpl
View file

@ -7,13 +7,13 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul> </ul>
</div> </div>

6
view/theme/diabook-red/rs_common_tabs.tpl
View file

@ -1,6 +0,0 @@
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
{{ endfor }}
</ul>

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

@ -482,8 +482,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #FFE499;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -941,44 +942,57 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #FFE499;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;

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

File diff suppressed because it is too large Load diff

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

@ -526,8 +526,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #FFE499;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -1060,44 +1061,57 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #FFE499;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook-red/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
display: table-cell; display: table-cell;
@ -2132,6 +2146,41 @@ ul.tabs li .active {
box-shadow: 2px 2px 2px #CFCFCF; box-shadow: 2px 2px 2px #CFCFCF;
margin-left: 5px; margin-left: 5px;
} }
//settings tabs
ul.rs_tabs {
list-style-type: none;
font-size: 11px;
}
ul.rs_tabs li {
float: left;
margin-bottom: 30px;
clear: both;
}
ul.rs_tabs li .selected {
background-color: #535353;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 2px 2px 2px #CFCFCF;
font-size: 13px;
}
.rs_tabs {
list-style-type: none;
font-size: 11px;
background-position: 0 -20px;
background-repeat: repeat-x;
height: 27px;
padding: 0;
}
.rs_tab.button {
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
font-weight: bolder;
padding: 3px;
color: #333333;
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */

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

@ -3,13 +3,13 @@
/* /*
* 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: 1.016) * Version: (Version: 1.017)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook-red (Version: 1.016)"; $diabook_version = "Diabook-red (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -21,7 +21,6 @@ $cssFile = null;
*/ */
function diabook_red_community_info(){ function diabook_red_community_info(){
$a = get_app(); $a = get_app();
//right_aside at networkpages
// last 12 users // last 12 users
$aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_title'] = t('Last users');
@ -279,58 +278,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
} }
} }
//tabs at right_aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-settings.css";
}
// custom css // custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);

11
view/theme/diabook/generic_links_widget.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="widget_$title">
{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
{{if $desc}}<div class="desc">$desc</div>{{endif}}
<ul class="rs_tabs">
{{ for $items as $item }}
<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
{{ endfor }}
</ul>
</div>

BIN
view/theme/diabook/icons/com_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 774 B

BIN
view/theme/diabook/icons/events.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 723 B

BIN
view/theme/diabook/icons/home.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 706 B

BIN
view/theme/diabook/icons/mess_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 637 B

BIN
view/theme/diabook/icons/notes.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 764 B

BIN
view/theme/diabook/icons/pscontacts.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 664 B

BIN
view/theme/diabook/icons/pubgroups.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 688 B

11
view/theme/diabook/nets.tpl Normal file
View file

@ -0,0 +1,11 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<ul class="nets-ul">
<li><a style="text-decoration: none;" class="tool" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
{{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

14
view/theme/diabook/profile_side.tpl
View file

@ -7,13 +7,13 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul> </ul>
</div> </div>

6
view/theme/diabook/rs_common_tabs.tpl
View file

@ -1,6 +0,0 @@
<h3 style="border-bottom: 1px solid #D2D2D2;">Settings Menu</h3>
<ul class="rs_tabs">
{{ for $tabs as $tab }}
<li><a href="$tab.url" class="rs_tab button $tab.sel">$tab.label</a></li>
{{ endfor }}
</ul>

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

@ -484,8 +484,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -898,44 +899,57 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #E7F2F7;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook/icons/events.png") no-repeat; background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {

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

@ -483,8 +483,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover{
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -897,8 +898,6 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px; padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
@ -908,28 +907,29 @@ ul.menu-popup .empty {
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} }
.menu-profile-list.events{ .menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
} }
.menu-profile-list.notes{ .menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
} }
.menu-profile-list.foren{ .menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
} }
.menu-profile-list.com_side{ .menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
} }
/* aside */ /* aside */

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

File diff suppressed because it is too large Load diff

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

@ -529,8 +529,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -1023,43 +1024,56 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #E7F2F7;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; width: 22px;}
} .menu-profile-icon.events{
.menu-profile-list.notes{ background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; float: left;
} height: 22px;
.menu-profile-list.foren{ width: 22px;}
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; .menu-profile-icon.notes{
} background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
.menu-profile-list.com_side{ float: left;
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; height: 22px;
} width: 22px;}
.menu-profile-list.pscontacts{ .menu-profile-icon.foren{
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
float: left;
height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
float: left;
height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {
@ -1287,6 +1301,7 @@ body .pageheader{
padding: 3px; padding: 3px;
color: #333333; color: #333333;
} }
#birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{ #birthday-notice, #event-notice, #birthday-wrapper, #event-wrapper{
margin-bottom: 10px; margin-bottom: 10px;
@ -2072,6 +2087,41 @@ ul.tabs li .active {
box-shadow: 0 1px 1px #CFCFCF; box-shadow: 0 1px 1px #CFCFCF;
margin-left: 5px; margin-left: 5px;
} }
//settings tabs
ul.rs_tabs {
list-style-type: none;
font-size: 11px;
}
ul.rs_tabs li {
float: left;
margin-bottom: 30px;
clear: both;
}
ul.rs_tabs li .selected {
background-color: #333;
border: 1px solid #777777;
color: white;
border-radius: 3px 3px 3px 3px;
box-shadow: 2px 2px 2px #CFCFCF;
font-size: 13px;
}
.rs_tabs {
list-style-type: none;
font-size: 11px;
background-position: 0 -20px;
background-repeat: repeat-x;
height: 27px;
padding: 0;
}
.rs_tab.button {
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
border-radius: 3px 3px 3px 3px;
font-weight: bolder;
padding: 3px;
color: #333333;
text-decoration: none;
}
/** /**
* Form fields * Form fields
*/ */

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

@ -3,13 +3,13 @@
/* /*
* 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: 1.016) * Version: (Version: 1.017)
* Author: * Author:
*/ */
//print diabook-version for debugging //print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.016)"; $diabook_version = "Diabook (Version: 1.017)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version); $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages //change css on network and profilepages
@ -24,7 +24,7 @@ $cssFile = null;
function diabook_community_info(){ function diabook_community_info(){
$a = get_app(); $a = get_app();
//right_aside at networkpages
// last 12 users // last 12 users
$aside['$lastusers_title'] = t('Last users'); $aside['$lastusers_title'] = t('Last users');
@ -288,58 +288,6 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
} }
} }
//tabs at aside on settings page
if ($a->argv[0] === "settings"){
$tabs = array(
array(
'label' => t('Account settings'),
'url' => $a->get_baseurl(true).'/settings',
'sel' => (($a->argc == 1)?'active':''),
),
array(
'label' => t('Display settings'),
'url' => $a->get_baseurl(true).'/settings/display',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
),
array(
'label' => t('Edit/Manage Profiles'),
'url' => $a->get_baseurl(true).'/profiles',
),
array(
'label' => t('Connector settings'),
'url' => $a->get_baseurl(true).'/settings/connectors',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
),
array(
'label' => t('Plugin settings'),
'url' => $a->get_baseurl(true).'/settings/addon',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
),
array(
'label' => t('Connections'),
'url' => $a->get_baseurl(true) . '/settings/oauth',
'sel' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
),
array(
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'sel' => ''
)
);
$tabtpl = file_get_contents(dirname(__file__).'/rs_common_tabs.tpl') ;
$a->page['aside'] = replace_macros($tabtpl, array(
'$tabs' => $tabs,
));
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-settings.css";
}
// custom css // custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);