From d3f83c93753791708b873df46b00d749f27ae7df Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 00:41:02 +0100 Subject: [PATCH 1/3] fixed broken tags and notifications in theme --- view/theme/diabook/nav.tpl | 34 +++++++++++++++++++------------- view/theme/diabook/style.css | 4 ++++ view/theme/diabook/wall_item.tpl | 4 ++-- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 80240f4aed..17df8e652b 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -1,5 +1,5 @@
- {# $langselector #} + {# $langselector version 0.01#}
$sitelocation
@@ -18,7 +18,7 @@ {{ endif }} - + {{ if $nav.contacts }} + {{ endif }} - - + {{ if $nav.messages }} + {{ endif }} - - {{ if $nav.notifications }}
  • $emptynotifications
    • - {{ endif }} - - + {{ endif }} - + {{ if $nav.directory }} + {{ endif }} {{ if $nav.apps }} {{ endif }} + {{ if $nav.login }} +
  • + {{ endif }} - - + + + + + {# diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 383fba24d9..a58e794836 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -673,6 +673,10 @@ nav #nav-apps-link.selected { padding: 5px 10px; */ } +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + ul.menu-popup { position: absolute; display: none; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 1f1a878b4a..c1205b01b3 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -38,8 +38,8 @@
    - {{ for $item.tags as $item.tag }} - $item.tag + {{ for $item.tags as $tag }} + $tag {{ endfor }}
    From 8f72d95b0e3e7a0da1702cf95cc40d0df1aef96d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 01:52:53 +0100 Subject: [PATCH 2/3] fix in wall_item.tpl new icon link.png --- view/theme/diabook/icons/link.png | Bin 0 -> 365 bytes view/theme/diabook/style.css | 5 +++-- view/theme/diabook/wall_item.tpl | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100755 view/theme/diabook/icons/link.png diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png new file mode 100755 index 0000000000000000000000000000000000000000..0ef666a6730574ad7ead6cac69daec98de9c90ef GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgfkqyxdVmXdb&77QWcaB!-eq+h|e(Spvo@wXz9B<=>V-#B%~QQIzOz243VKekIAkiHdh z-Z#qfvCFk$ls~#NWHW^4^aOeWrHWGXm&w22WQ%mvv4F FO#l|ylH>pY literal 0 HcmV?d00001 diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index a58e794836..1f148fe3a6 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -102,6 +102,7 @@ .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} +.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} .article { background-position: -50px 0px;} .audio { background-position: -70px 0px;} @@ -112,7 +113,7 @@ .camera { background-position: -170px 0px;} /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ -.link { background-position: -230px 0px;} +/*.link { background-position: -230px 0px;}*/ .globe { background-position: -50px -20px;} .noglobe { background-position: -70px -20px;} @@ -160,7 +161,7 @@ display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + /*background-image: url('icons.png');*/ } .icon { diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index c1205b01b3..728e863e6f 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -36,6 +36,7 @@
    + {{ if $item.plink }}$item.plink.title{{ endif }}
    {{ for $item.tags as $tag }} @@ -45,17 +46,11 @@
    - {{ if $item.plink }}$item.plink.title{{ endif }} +
    $item.location 
    - - {{ if $item.star }} - $item.star.do - $item.star.undo - $item.star.tagger - {{ endif }} {{ if $item.vote }} @@ -64,7 +59,14 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} + + {{ if $item.star }} + $item.star.do + $item.star.undo + $item.star.tagger + {{ endif }} +
    From d138d07c05900df4b67df99437ef628f4af6564d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 04:27:06 +0100 Subject: [PATCH 3/3] fixes in wall_item.tpl and style.css in theme diabook --- view/theme/diabook/icons/lock.png | Bin 0 -> 313 bytes view/theme/diabook/style.css | 17 +++++++++-------- view/theme/diabook/wall_item.tpl | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100755 view/theme/diabook/icons/lock.png diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png new file mode 100755 index 0000000000000000000000000000000000000000..e00c5b2a23503a5d4794ffd4d97bbd1ce75848c3 GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgft z8S))6;Bk%T>S&BsDC90%cR)}wvZ`6hu;i_5RRiBttt2t`qQxp(rv8{T^@#nyZNi6T z#2>I$IP_G0ov)d|-xHXSv-sX@R@N&A1b;B_FJLUI+Q(G>H2cA{RS6e@e*3iU{nT6< zmZsmpysYQIl08pY%oO)D8rv=Z=d84Qud-QynM(Omv8Dz8r!LT1Vc$4;UEW#-htjAV)G~mcVDNPHb6Mw<&;$V1 C%W+!( literal 0 HcmV?d00001 diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 1f148fe3a6..c98a8fa913 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -103,6 +103,7 @@ .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} +.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");} .article { background-position: -50px 0px;} .audio { background-position: -70px 0px;} @@ -127,7 +128,7 @@ .share { background-position: -230px -20px;} .tools { background-position: -50px -40px;} -.lock { background-position: -70px -40px;} +/*.lock { background-position: -70px -40px;}*/ .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} @@ -614,7 +615,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; font-weight: 900; - padding: 1px 3px; + padding: 1px 4px; top: 0px; right: -6px; min-width: 10px; @@ -1167,15 +1168,15 @@ section { padding-bottom: 2px; } .tag { - background: url("../../../images/tag_b.png") repeat-x center left; - color: #ffffff; + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #3465A4; padding-left: 3px; - font-size: 10px; + font-size: 12px; } .tag a { - padding-right: 8px; - background: url("../../../images/tag.png") no-repeat center right; - color: #ffffff; + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #3465A4; } .wwto { position: absolute !important; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 728e863e6f..10d3953163 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,6 +5,9 @@
    {{ endif }} + + +