diff options
Diffstat (limited to 'view/theme/diabook-blue')
-rwxr-xr-x | view/theme/diabook-blue/communityhome.tpl | 25 | ||||
-rw-r--r-- | view/theme/diabook-blue/icons/pscontacts.png | bin | 0 -> 710 bytes | |||
-rw-r--r-- | view/theme/diabook-blue/icons/pubgroups.png | bin | 710 -> 781 bytes | |||
-rw-r--r-- | view/theme/diabook-blue/nav.tpl | 6 | ||||
-rwxr-xr-x | view/theme/diabook-blue/photo_view.tpl | 2 | ||||
-rw-r--r-- | view/theme/diabook-blue/profile_side.tpl | 1 | ||||
-rw-r--r-- | view/theme/diabook-blue/style-network.css | 33 | ||||
-rw-r--r-- | view/theme/diabook-blue/style-profile.css | 4 | ||||
-rw-r--r-- | view/theme/diabook-blue/style.css | 9 | ||||
-rwxr-xr-x | view/theme/diabook-blue/theme.php | 14 | ||||
-rw-r--r-- | view/theme/diabook-blue/wall_item.tpl | 1 | ||||
-rw-r--r-- | view/theme/diabook-blue/wallwall_item.tpl | 1 |
12 files changed, 61 insertions, 35 deletions
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index f1714a436..854684a5f 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -1,3 +1,7 @@ +{{ if $page }} +<div>$page</div> +{{ endif }} + {{ if $lastusers_title }} <h3 style="margin-top:0px;">Help or @NewHere ?</h3> <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> @@ -21,6 +25,19 @@ {{ endif }} {{ if $lastusers_title }} +<h3>Find Friends</h3> +<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> +<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a> +<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a> +{{ endif }} + +{{ if $lastusers_title }} +<h3>PostIt to Friendica</h3> +<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div> +{{ endif }} + +{{ if $lastusers_title }} <h3>$lastusers_title</h3> <div id='lastusers-wrapper' class='items-wrapper'> {{ for $lastusers_items as $i }} @@ -47,14 +64,6 @@ </div> {{ endif }} -{{ if $page }} -<div>$page</div> -{{ endif }} - -{{ if $lastusers_title }} -<h3>PostIt to Friendica</h3> -<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div> -{{ endif }} {{ if $like_title }} <h3>$like_title</h3> diff --git a/view/theme/diabook-blue/icons/pscontacts.png b/view/theme/diabook-blue/icons/pscontacts.png Binary files differnew file mode 100644 index 000000000..acf857f32 --- /dev/null +++ b/view/theme/diabook-blue/icons/pscontacts.png diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png Binary files differindex acf857f32..6d9539610 100644 --- a/view/theme/diabook-blue/icons/pubgroups.png +++ b/view/theme/diabook-blue/icons/pubgroups.png diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl index 289581c36..651b9647d 100644 --- a/view/theme/diabook-blue/nav.tpl +++ b/view/theme/diabook-blue/nav.tpl @@ -85,11 +85,7 @@ </li> - {{ if $nav.directory }} - <li id="nav-directory-link" class="nav-menu $sel.directory"> - <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> - </li> - {{ endif }} + {{ if $nav.apps }} <li id="nav-apps-link" class="nav-menu $sel.apps"> diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl index 902c2a0ed..511fc73ac 100755 --- a/view/theme/diabook-blue/photo_view.tpl +++ b/view/theme/diabook-blue/photo_view.tpl @@ -12,7 +12,7 @@ <div id="photo-photo"> {{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }} - <a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a> + <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a> {{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }} </div> diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl index 0fa8a27fd..94396300f 100644 --- a/view/theme/diabook-blue/profile_side.tpl +++ b/view/theme/diabook-blue/profile_side.tpl @@ -9,6 +9,7 @@ <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-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 pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.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</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-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> diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 85cf23da1..c35320fcf 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -384,11 +384,10 @@ .hide-comments-outer { margin-left: 80px; - margin-bottom: 5px; + margin-bottom: 1px; width: 484px; border-bottom: 1px solid #BDCDD4; - border-top: 1px solid #BDCDD4; - + background-color: #E4EEF7; padding: 8px; } @@ -936,7 +935,9 @@ ul.menu-popup .empty { .menu-profile-list.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; } - +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; + } /* aside */ aside { display: table-cell; @@ -1189,7 +1190,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { @@ -1271,7 +1272,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; @@ -1323,11 +1324,12 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: float: right; } .wall-item-container.comment { - margin-top: 5px; - margin-bottom: 5px; + margin-top: 0px; + margin-bottom: 0px; margin-left: 80px; width: 500px; border-bottom: 1px solid hsl(198, 21%, 79%); + background-color: #E4EEF7; } .wall-item-container.comment .contact-photo { width: 32px; @@ -1343,20 +1345,31 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: .wall-item-container.comment .wall-item-links { padding-left: 12px; } +.wall-item-like { + background-color: #E4EEF7; + + } +.wall-item-dislike{ + background-color: #E4EEF7; + border-bottom: 1px solid #BECED5; + } .wall-item-comment-wrapper { - margin: 1px 5px 1px 80px; + margin: 1px 0px 0px 80px; + background-color: #E4EEF7; + width: 500px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 100%; + width: 93%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; font-size: 14px; + margin-left: 20px; } .wall-item-comment-wrapper .comment-edit-text-full { font-size: 14px; diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index 3671d963e..1296f1647 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; } right_aside .items-wrapper{ overflow: auto; width: 100%; } right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } -#page-sidebar-right_aside{margin-top: 30px;} +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { @@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: } .wall-item-container .wall-item-content img { - max-width: 500px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index a05a49e67..65a019dbf 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -178,8 +178,8 @@ .icon.on { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;} .icon.off { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;} -.prev { background-position: -90px -60px;} -.next { background-position: -110px -60px;} +.icon.prev { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;} +.icon.next { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;} /*.tagged { background-position: -130px -60px;}*/ .attachtype { @@ -387,8 +387,6 @@ margin-bottom: 5px; width: 684px; border-bottom: 1px solid #BDCDD4; - border-top: 1px solid #BDCDD4; - padding: 8px; } @@ -935,6 +933,9 @@ ul.menu-popup .empty { .menu-profile-list.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; + } /* aside */ aside { display: table-cell; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index a5f4490ba..bbda4f103 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -7,9 +7,6 @@ * Author: */ -$a->theme_info = array( - 'extends' => 'diabook', -); //change css on network and profilepages $cssFile = null; @@ -138,6 +135,16 @@ function diabook_blue_community_info(){ else {a_funct()}})()" ; $aside['$fostitJS'] = $fostitJS; + + //nav FIND FRIENDS + + $nv = array(); + $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['match'] = Array('match', t('Similar Interests'), "", ""); + $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); + $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + + $aside['$nv'] = $nv; //Community Page $page = '<div id="page-sidebar-right_aside" class="widget"> @@ -199,6 +206,7 @@ if ($a->argv[0] === "network" && local_user()){ $ps = array('usermenu'=>array()); $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl index 20d24702b..123834064 100644 --- a/view/theme/diabook-blue/wall_item.tpl +++ b/view/theme/diabook-blue/wall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl index e02e5a8be..c5b6b36b5 100644 --- a/view/theme/diabook-blue/wallwall_item.tpl +++ b/view/theme/diabook-blue/wallwall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} |