aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-28 20:45:39 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-03-28 20:45:39 +0200
commit1a9bbac0bede3daf3bca9260397e1ad2214be1f7 (patch)
treeda3c12cde7a6959491a900b4b810988c98eeb2bd
parente894775a39920edc0e438364c818357ab809bace (diff)
downloadvolse-hubzilla-1a9bbac0bede3daf3bca9260397e1ad2214be1f7.tar.gz
volse-hubzilla-1a9bbac0bede3daf3bca9260397e1ad2214be1f7.tar.bz2
volse-hubzilla-1a9bbac0bede3daf3bca9260397e1ad2214be1f7.zip
bugfix in diabook
-rwxr-xr-xview/theme/diabook-blue/communityhome.tpl14
-rw-r--r--view/theme/diabook-blue/style-network.css14
-rw-r--r--view/theme/diabook-blue/style-profile.css12
-rwxr-xr-xview/theme/diabook-blue/theme.php6
-rwxr-xr-xview/theme/diabook/theme.php5
5 files changed, 38 insertions, 13 deletions
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 1e3da2199..fa8197dd4 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -6,7 +6,7 @@
<div id="close_helpers">
{{ if $lastusers_title }}
-<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box"></a></h3>
+<h3 style="margin-top:0px;">Help or @NewHere ?<a id="close_helpers_icon" onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
@@ -16,7 +16,7 @@
<div id="close_services">
{{ if $lastusers_title }}
-<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box"></a></h3>
+<h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
@@ -32,7 +32,7 @@
<div id="close_friends">
{{ if $nv }}
-<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box"></a></h3>
+<h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></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>
@@ -42,14 +42,14 @@
<div id="close_postit">
{{ if $lastusers_title }}
-<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box"></a></h3>
+<h3>PostIt to Friendica<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></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 }}
</div>
<div id="close_lastusers">
{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box"></a></h3>
+<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
<div id='lastusers-wrapper' class='items-wrapper'>
{{ for $lastusers_items as $i }}
$i
@@ -70,7 +70,7 @@
<div id="close_lastphotos">
{{ if $photos_title }}
-<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box"></a></h3>
+<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()" class="icon close_box" title="close"></a></h3>
<div id='ra-photos-wrapper' class='items-wrapper'>
{{ for $photos_items as $i }}
$i
@@ -81,7 +81,7 @@
<div id="close_lastlikes">
{{ if $like_title }}
-<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box"></a></h3>
+<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
<ul id='likes'>
{{ for $like_items as $i }}
<li id='ra-photos-wrapper'>$i</li>
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index ebf4da695..fc4e4c60c 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1197,6 +1197,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 */
@@ -1279,7 +1291,7 @@ right_aside .icon {width: 10px; height: 10px;}
}
.wall-item-container .wall-item-content img {
- max-width: 400px;
+ 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-profile.css b/view/theme/diabook-blue/style-profile.css
index db172dcda..b3a578680 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1196,6 +1196,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-blue/theme.php b/view/theme/diabook-blue/theme.php
index 3e35144de..de3042dbf 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -150,7 +150,7 @@ function diabook_blue_community_info(){
if(local_user()) {
$page = '<div id="page-sidebar-right_aside" class="widget">
<div class="title tool">
- <h3>'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box"></a></h3></div>
+ <h3>'.t("Community Pages").'<a id="close_pages_icon" onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
<div id="sidebar-page-list"><ul>';
$pagelist = array();
@@ -212,7 +212,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.friendika.com/directory/forum', t('Public Groups'), "", "");
+ $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Community Pages'), "", "");
$tpl = get_markup_template('profile_side.tpl');
@@ -237,7 +237,7 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
-if ($a->argv[0] === "profile"){
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
// COMMUNITY
diabook_blue_community_info();
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index a3f0ca0d4..076223a48 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -243,17 +243,18 @@ if ($a->argv[0] === "network" && local_user()){
//right_aside at profile pages
-if ($a->argv[0] === "profile"){
+if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
if($ccCookie != "8") {
// COMMUNITY
diabook_community_info();
// CUSTOM CSS
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook/style-profile.css";
+
+
}
}
-
// custom css
if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);