From 211d00a1f550094931e737b062d7f70797bde652 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 27 Mar 2012 23:27:43 +0200 Subject: [PATCH] fixes in diabook --- view/theme/diabook/communityhome.tpl | 14 +++++++------- view/theme/diabook/icons/expand.png | Bin 0 -> 263 bytes view/theme/diabook/nav.tpl | 6 ++---- view/theme/diabook/style-network.css | 11 +++++++++++ view/theme/diabook/style-profile.css | 12 ++++++++++++ view/theme/diabook/theme.php | 19 +++++++++++++++++-- 6 files changed, 49 insertions(+), 13 deletions(-) create mode 100755 view/theme/diabook/icons/expand.png diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 3e6441692..c43cf861f 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -6,7 +6,7 @@
{{ if $lastusers_title }} -

Help or @NewHere ?

+

Help or @NewHere ?

Friendica Support
Let's talk
Local Friendica @@ -16,7 +16,7 @@
{{ if $lastusers_title }} -

Connectable Services

+

Connectable Services

Facebook StatusNet @@ -32,7 +32,7 @@
{{ if $nv }} -

Find Friends

+

Find Friends

$nv.directory.1
$nv.match.1
$nv.suggest.1 @@ -42,14 +42,14 @@
{{ if $lastusers_title }} -

PostIt to Friendica

+

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this Link.
{{ endif }}
{{ if $lastusers_title }} -

$lastusers_title

+

$lastusers_title

{{ for $lastusers_items as $i }} $i @@ -69,7 +69,7 @@
{{ if $photos_title }} -

$photos_title

+

$photos_title

{{ for $photos_items as $i }} $i @@ -80,7 +80,7 @@
{{ if $like_title }} -

$like_title

+

$like_title

    {{ for $like_items as $i }}
  • $i
    • diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png new file mode 100755 index 0000000000000000000000000000000000000000..a46e88ea5a1bb8de9fa1f3947ef095c0b04b93fa GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfo} z8*&|T5NUbnKilMGP=(2PfsZUrQCq=X1h>S!LmmBhI(`IfzeCS=! zk7zODZ#f$e{d285PtMtH literal 0 HcmV?d00001 diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 5776b6cf7..e1b50c4d2 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -68,13 +68,11 @@ {{ if $nav.help }}
  • $nav.help.1
    • {{ endif }} - -
  • $nav.community.1
    • - -
  • $nav.search.1
  • Info/Impressum
    • + +
  • restore third column
    • {{ if $nav.settings }}
  • $nav.settings.1
    • {{ endif }} {{ if $nav.admin }}
  • $nav.admin.1
    • {{ endif }} diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index f322aac8f..3882e37bd 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -1174,9 +1174,20 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: #page-sidebar-right_aside ul {margin-top: 0px;} right_aside .icon {width: 10px; height: 10px;} .close_box { + background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + float: right; + opacity: 0.1; + } +.close_box:hover { background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); float: right; cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; } /* wall item */ diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index 7020ee4a0..249596f9f 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -1173,6 +1173,18 @@ right_aside .icon {width: 10px; height: 10px;} background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); float: right; cursor: pointer; + opacity: 0.1; + } +.close_box:hover { + background-image: url("../../../view/theme/diabook-blue/icons/close_box.png"); + float: right; + cursor: pointer; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; } /* wall item */ .tread-wrapper { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5a447cc9b..53424a084 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -154,7 +154,7 @@ function diabook_community_info(){ if(local_user()) { $page = '
    -

    '.t("Community Pages").'

    +

    '.t("Community Pages").'

      '; $pagelist = array(); @@ -218,7 +218,7 @@ if ($a->argv[0] === "network" && local_user()){ $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Public Groups'), "", ""); + $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Community Pages'), "", ""); $tpl = get_markup_template('profile_side.tpl'); @@ -358,6 +358,21 @@ function close_lastlikes(){ $.cookie('close_lastlikes','1', { expires: 365, path: '/' }); }; + + +function restore_boxes(){ + $.cookie('close_pages','2', { expires: 365, path: '/' }); + $.cookie('close_helpers','2', { expires: 365, path: '/' }); + $.cookie('close_services','2', { expires: 365, path: '/' }); + $.cookie('close_friends','2', { expires: 365, path: '/' }); + $.cookie('close_postit','2', { expires: 365, path: '/' }); + $.cookie('close_lastusers','2', { expires: 365, path: '/' }); + $.cookie('close_lastphotos','2', { expires: 365, path: '/' }); + $.cookie('close_lastlikes','2', { expires: 365, path: '/' }); + alert('right column was restored'); + }; + +