From 8a71191d6d45f74e200bb6e279916375c2416b05 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Tue, 3 Apr 2012 20:59:00 +0200 Subject: make right_aside translatable and provide german translation... and some css-fixes --- view/theme/diabook/communityhome.tpl | 14 ++++++------- view/theme/diabook/photo-menu.jpg | Bin 459 -> 0 bytes view/theme/diabook/style-network.css | 24 +++++++++++++++------- view/theme/diabook/style-profile.css | 25 +++++++++++++++-------- view/theme/diabook/style-settings.css | 21 ++++++++++++------- view/theme/diabook/style.css | 37 ++++++++++++++++++++++++++-------- view/theme/diabook/theme.php | 36 ++++++++++++++++++++++++++++----- 7 files changed, 115 insertions(+), 42 deletions(-) delete mode 100755 view/theme/diabook/photo-menu.jpg (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index d344cad31..5c2164b50 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -6,7 +6,7 @@
{{ if $lastusers_title }} -

Help or @NewHere ?

+

$helpers.title.1

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

Connectable Services

-
+

$con_services.title.1

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

Find Friends

+

$nv.title.1

$nv.directory.1
-$nv.global_directory.1
+$nv.global_directory.1
$nv.match.1
$nv.suggest.1
$nv.invite.1 @@ -44,8 +44,8 @@ $nv.search
{{ if $lastusers_title }} -

PostIt to Friendica

-
Post to Friendica from anywhere by bookmarking this Link.
+

$postit.title.1

+
$postit.title.2$postit.text.1
{{ endif }}
diff --git a/view/theme/diabook/photo-menu.jpg b/view/theme/diabook/photo-menu.jpg deleted file mode 100755 index fde5eb535..000000000 Binary files a/view/theme/diabook/photo-menu.jpg and /dev/null differ diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index d226c70fd..c4f0b54b1 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -545,15 +545,17 @@ header #banner a:hover { text-decoration: none; outline: none; vertical-align: middle; + font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; - margin-top: 5px; + margin-top: 3px; } header #banner #logo-text { - font-size: 22px; + font-size: 20px; position: absolute; - top: 15%; + top: 10%; } /* nav */ nav { @@ -632,7 +634,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -1001,6 +1003,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1201,7 +1205,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1694,6 +1698,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; + font-size: 14px; } #profile-upload-wrapper { @@ -1746,7 +1751,9 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; } #profile-jot-perms{ float: right; @@ -1757,9 +1764,10 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; } .button.creation2 { background-color: #33ACFF; @@ -1769,6 +1777,8 @@ transition: all 0.2s ease-in-out; border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; + cursor: pointer; + font-weight: bolder; } /*input[type="submit"] { background-color: #33ACFF; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index f1672f4b4..5ac152252 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -543,15 +543,17 @@ header #banner a:hover { text-decoration: none; outline: none; vertical-align: middle; + font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; - margin-top: 5px; + margin-top: 3px; } header #banner #logo-text { - font-size: 22px; + font-size: 20px; position: absolute; - top: 15%; + top: 10%; } /* nav */ nav { @@ -630,7 +632,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -995,6 +997,8 @@ aside #profiles-menu { } aside #search-text { width: 150px; + height: 17px; + padding-left: 10px; border-top-left-radius: 15px; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1195,7 +1199,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 3px; margin-bottom: 0px; +right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } right_aside .directory-photo { margin: 0px; } @@ -1688,7 +1692,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1740,7 +1744,9 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; } #profile-jot-perms{ float: right; @@ -1751,9 +1757,10 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; } .button.creation2 { background-color: #33ACFF; @@ -1763,6 +1770,8 @@ transition: all 0.2s ease-in-out; border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; + cursor: pointer; + font-weight: bolder; } /*input[type="submit"] { border: 0px; diff --git a/view/theme/diabook/style-settings.css b/view/theme/diabook/style-settings.css index b23c2bb1b..fdb4f24c7 100644 --- a/view/theme/diabook/style-settings.css +++ b/view/theme/diabook/style-settings.css @@ -543,15 +543,17 @@ header #banner a:hover { text-decoration: none; outline: none; vertical-align: middle; + font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; - margin-top: 5px; + margin-top: 3px; } header #banner #logo-text { - font-size: 22px; + font-size: 20px; position: absolute; - top: 15%; + top: 10%; } /* nav */ nav { @@ -630,7 +632,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -1680,7 +1682,7 @@ transition: all 0.2s ease-in-out; #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1732,7 +1734,9 @@ transition: all 0.2s ease-in-out; float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; } #profile-jot-perms{ float: right; @@ -1743,9 +1747,10 @@ transition: all 0.2s ease-in-out; .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; } .button.creation2 { background-color: #33ACFF; @@ -1755,6 +1760,8 @@ transition: all 0.2s ease-in-out; border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; + cursor: pointer; + font-weight: bolder; } /*input[type="submit"] { border: 0px; diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c8efeab33..5f60c0bff 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -542,15 +542,17 @@ header #banner a:hover { text-decoration: none; outline: none; vertical-align: middle; + font-weight: bolder; + margin-left: 3px; } header #banner #logo-img { height: 25px; - margin-top: 5px; + margin-top: 3px; } header #banner #logo-text { - font-size: 22px; + font-size: 20px; position: absolute; - top: 15%; + top: 10%; } /* messages */ #message-new { @@ -709,7 +711,7 @@ nav #logo-text { nav .nav-menu-search { position: relative; - margin: 3px 17px; + margin: 4px 17px; margin-right: 0px; height: 17px; width: 180px; @@ -1076,7 +1078,13 @@ aside #profiles-menu { width: 20em; } aside #search-text { - width: 173px; + width: 150px; + height: 17px; + padding-left: 10px; + border-top-left-radius: 15px; +border-top-right-radius: 15px; +border-bottom-right-radius: 15px; +border-bottom-left-radius: 15px; } aside #side-follow-url { width: 173px; @@ -1699,7 +1707,7 @@ body .pageheader{ #profile-jot-submit { float: right; margin-top: 2px; - + font-size: 14px; } #profile-upload-wrapper { float: left; @@ -1751,7 +1759,9 @@ body .pageheader{ float: right; margin-left: 10px; margin-top: 2px; - font-size: 10px; + font-size: 9px; + font-weight: bolder; + cursor: pointer; } #profile-jot-perms{ float: right; @@ -1762,9 +1772,10 @@ body .pageheader{ .button.creation1 { background-color: #fff; border: 1px solid #777777; - background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%); border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; + cursor: pointer; + font-weight: bolder; } .button.creation2 { background-color: #33ACFF; @@ -1774,6 +1785,8 @@ body .pageheader{ border-radius: 3px 3px 3px 3px; box-shadow: 0 1px 1px #CFCFCF; margin-left: 5px; + cursor: pointer; + font-weight: bolder; } /*input[type="submit"] { border: 0px; @@ -1964,6 +1977,14 @@ ul.tabs li .active { .field.radio .field_help { margin-left: 0px; } +.suggest-select { +width: 500px; +height: 350px; + } +.message-to-select { + width: 400px; + height: 150px; + } #directory-search-form{ margin-bottom: 50px; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 2fe985060..50a7c6974 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.011) + * Version: (Version: 1.012) * Author: */ @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['title'] = Array("", t('Find Friends'), "", ""); + $nv['directory'] = Array('directory', t('Local Directory'), "", ""); $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); @@ -193,9 +194,28 @@ function diabook_community_info(){ $aside['$page'] = $page; } - //END Community Page - - + //END Community Page + //helpers + $helpers = array(); + $helpers['title'] = Array("", t('Help or @NewHere ?'), "", ""); + + $aside['$helpers'] = $helpers; + //end helpers + //connectable services + $con_services = array(); + $con_services['title'] = Array("", t('Connect Services'), "", ""); + + $aside['$con_services'] = $con_services; + //end connectable services + //postit + $postit = array(); + $postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), ""); + $postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", ""); + + $aside['$postit'] = $postit; + //end postit + + //get_baseurl $url = $a->get_baseurl($ssl_state); $aside['$url'] = $url; @@ -330,6 +350,12 @@ $a->page['htmlhead'] .= ' $(function() { $("a.lightbox").fancybox(); // Select all links with lightbox class }); + + $(document).ready(function (){ + $("iframe").each(function(){ + var url = $(this).attr("src"); + $(this).attr("src",url+"?wmode=transparent"); }); + }); '; -- cgit v1.2.3