aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-27 23:27:43 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-03-27 23:27:43 +0200
commit211d00a1f550094931e737b062d7f70797bde652 (patch)
treedbc1e415847eb2da467df83c0f716f4e8cafa068 /view
parent0bf22d64f66dc425dc340bb2dc54b6c01ef7fb85 (diff)
downloadvolse-hubzilla-211d00a1f550094931e737b062d7f70797bde652.tar.gz
volse-hubzilla-211d00a1f550094931e737b062d7f70797bde652.tar.bz2
volse-hubzilla-211d00a1f550094931e737b062d7f70797bde652.zip
fixes in diabook
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook/communityhome.tpl14
-rwxr-xr-xview/theme/diabook/icons/expand.pngbin0 -> 263 bytes
-rw-r--r--view/theme/diabook/nav.tpl6
-rw-r--r--view/theme/diabook/style-network.css11
-rw-r--r--view/theme/diabook/style-profile.css12
-rwxr-xr-xview/theme/diabook/theme.php19
6 files changed, 49 insertions, 13 deletions
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 @@
<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/icons/facebook.png" title="Facebook"></a>
<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/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 this 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
@@ -69,7 +69,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
@@ -80,7 +80,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/icons/expand.png b/view/theme/diabook/icons/expand.png
new file mode 100755
index 000000000..a46e88ea5
--- /dev/null
+++ b/view/theme/diabook/icons/expand.png
Binary files differ
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 }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-
- <li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
-
-
<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+
+ <li><a class="$nav.search.2" onClick="restore_boxes()" title="restore third column" style="cursor: pointer;">restore third column</a></li>
{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ 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
@@ -1176,7 +1176,18 @@ 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 = '<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();
@@ -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');
+ };
+
+
</script>