From d3f83c93753791708b873df46b00d749f27ae7df Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 00:41:02 +0100 Subject: 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(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 80240f4ae..17df8e652 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 383fba24d..a58e79483 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 1f1a878b4..c1205b01b 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 }}
    -- cgit v1.2.3 From 8f72d95b0e3e7a0da1702cf95cc40d0df1aef96d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 01:52:53 +0100 Subject: 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 (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png new file mode 100755 index 000000000..0ef666a67 Binary files /dev/null and b/view/theme/diabook/icons/link.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index a58e79483..1f148fe3a 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 c1205b01b..728e863e6 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 }} +
    -- cgit v1.2.3 From d138d07c05900df4b67df99437ef628f4af6564d Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 04:27:06 +0100 Subject: 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 (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png new file mode 100755 index 000000000..e00c5b2a2 Binary files /dev/null and b/view/theme/diabook/icons/lock.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 1f148fe3a..c98a8fa91 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 728e863e6..10d395316 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,6 +5,9 @@
    {{ endif }} + + +
    -- cgit v1.2.3 From 89f667ff76728d8e2fbfef0e40ee1ef8ccc53c18 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 04:45:34 +0100 Subject: fix star/unstar --- view/theme/diabook/icons/star.png | Bin 358 -> 339 bytes view/theme/diabook/icons/unstarred.png | Bin 339 -> 358 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png index ca2072414..32eff5a50 100755 Binary files a/view/theme/diabook/icons/star.png and b/view/theme/diabook/icons/star.png differ diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png index 32eff5a50..ca2072414 100755 Binary files a/view/theme/diabook/icons/unstarred.png and b/view/theme/diabook/icons/unstarred.png differ -- cgit v1.2.3 From 83c25b4386f567835896af0455a6adce06718147 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 06:00:46 +0100 Subject: small fix in style.css --- view/theme/diabook/style.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c98a8fa91..c1eb3be5a 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -348,7 +348,9 @@ body { font-size: 13px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin-left: : auto; + margin-right: auto; + margin-top: 50px; display: table; } h4 { @@ -1269,6 +1271,8 @@ section { color: #999999; border: 1px solid #DDD; padding: 0.3em; + margin-top: 30px; + margin-bottom: 10px; } #jot #jot-tools { margin: 0px; -- cgit v1.2.3 From 60adef24634f3df6c9f0161128e10cb778e5316e Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 13:27:39 +0100 Subject: fix text-editor in theme --- view/theme/diabook/icons/attach.png | Bin 0 -> 862 bytes view/theme/diabook/icons/audio.png | Bin 0 -> 655 bytes view/theme/diabook/icons/camera.png | Bin 0 -> 568 bytes view/theme/diabook/icons/globe.png | Bin 0 -> 680 bytes view/theme/diabook/icons/unglobe.png | Bin 0 -> 659 bytes view/theme/diabook/icons/unlock.png | Bin 0 -> 314 bytes view/theme/diabook/icons/video.png | Bin 0 -> 373 bytes view/theme/diabook/icons/weblink.png | Bin 0 -> 305 bytes view/theme/diabook/jot.tpl | 83 +++++++++++++++++++++++ view/theme/diabook/style.css | 128 +++++++++++++++++++++++++++++++++-- 10 files changed, 204 insertions(+), 7 deletions(-) create mode 100755 view/theme/diabook/icons/attach.png create mode 100755 view/theme/diabook/icons/audio.png create mode 100755 view/theme/diabook/icons/camera.png create mode 100755 view/theme/diabook/icons/globe.png create mode 100755 view/theme/diabook/icons/unglobe.png create mode 100755 view/theme/diabook/icons/unlock.png create mode 100755 view/theme/diabook/icons/video.png create mode 100755 view/theme/diabook/icons/weblink.png create mode 100755 view/theme/diabook/jot.tpl (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png new file mode 100755 index 000000000..4412d94a5 Binary files /dev/null and b/view/theme/diabook/icons/attach.png differ diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png new file mode 100755 index 000000000..075e04734 Binary files /dev/null and b/view/theme/diabook/icons/audio.png differ diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png new file mode 100755 index 000000000..8769cc82f Binary files /dev/null and b/view/theme/diabook/icons/camera.png differ diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png new file mode 100755 index 000000000..daec0c256 Binary files /dev/null and b/view/theme/diabook/icons/globe.png differ diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png new file mode 100755 index 000000000..ddcdfa23c Binary files /dev/null and b/view/theme/diabook/icons/unglobe.png differ diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png new file mode 100755 index 000000000..3d6543087 Binary files /dev/null and b/view/theme/diabook/icons/unlock.png differ diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png new file mode 100755 index 000000000..c9a905e32 Binary files /dev/null and b/view/theme/diabook/icons/video.png differ diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png new file mode 100755 index 000000000..45c471e6c Binary files /dev/null and b/view/theme/diabook/icons/weblink.png differ diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl new file mode 100755 index 000000000..bb0f4b6d0 --- /dev/null +++ b/view/theme/diabook/jot.tpl @@ -0,0 +1,83 @@ + +
    +
    +
     
    +
    +
    +
    + +
    + + + + + + + + + + + + +
    + +
    +
    +
    +
    +
    +
    + + +
    + +
    +
    + +
    +
    + +
    + + +
    + $bang +
    + + + + +
    + + +
    + $jotplugins +
    + +
    + +
    + + + +
    +
    + $acl +
    +
    $emailcc
    +
    + $jotnets +
    +
    + + +
    + +
    +
    +
    + {{ if $content }}{{ endif }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c1eb3be5a..c497beffd 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -104,20 +104,46 @@ .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");} +.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} + +.camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.globe { background-image: url("../../../view/theme/diabook/icons/globe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } +.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } + + + .article { background-position: -50px 0px;} -.audio { background-position: -70px 0px;} +/*.audio { background-position: -70px 0px;}*/ .block { background-position: -90px 0px;} /*.drop { background-position: -110px 0px;}*/ /*.drophide { background-position: -130px 0px;}*/ .edit { background-position: -150px 0px;} -.camera { background-position: -170px 0px;} +/*.camera { background-position: -170px 0px;}*/ /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ /*.link { background-position: -230px 0px;}*/ -.globe { background-position: -50px -20px;} -.noglobe { background-position: -70px -20px;} +/*.globe { background-position: -50px -20px;}*/ +/*.noglobe { background-position: -70px -20px;}*/ .no { background-position: -90px -20px;} .pause { background-position: -110px -20px;} .play { background-position: -130px -20px;} @@ -130,10 +156,10 @@ .tools { background-position: -50px -40px;} /*.lock { background-position: -70px -40px;}*/ -.video { background-position: -110px -40px;} +/*.video { background-position: -110px -40px;}*/ .youtube { background-position: -130px -40px;} -.attach { background-position: -190px -40px;} +/*.attach { background-position: -190px -40px;}*/ .language { background-position: -210px -40px;} @@ -1280,9 +1306,10 @@ section { height: 40px; overflow: none; width: 783px; - background-color: #0e232e; + background-color: #fff; border-bottom: 2px solid #9eabb0; } + #jot #jot-tools li { list-style: none; float: left; @@ -1379,7 +1406,94 @@ section { line-height: 20px; padding-right: 20px; } +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; + margin-top: 2px; +} +#profile-jot-wrapper{ + margin: 0 2em 20px 0; + width: 685px; + } + +#profile-jot-submit-wrapper { + margin-bottom: 50px; + width: 675px; +} + +#profile-jot-submit { + float: left; +} +#profile-upload-wrapper { + float: left; + +} +#profile-attach-wrapper { + float: left; + margin-left: 15px; +} +#profile-rotator { + float: left; + margin-left: 30px; +} +#profile-link-wrapper { + float: left; + margin-left: 15px; +} +#profile-youtube-wrapper { + float: left; + margin-left: 15px; +} +#profile-video-wrapper { + float: left; + margin-left: 15px; +} +#profile-audio-wrapper { + float: left; + margin-left: 15px; +} +#profile-location-wrapper { + float: left; + margin-left: 15px; +} +#profile-jot-perms { + float: left; + margin-left: 45px; +} +#jot-preview-link { + float: left; + margin-left: 10px; + margin-top: 0px !important; +} + /** buttons **/ +.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; +} +.button.creation2 { + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; +} /*input[type="submit"] { border: 0px; background-color: @ButtonBackgroundColor; -- cgit v1.2.3 From b3ba2eb4d08102adfa7f69115d298e6b2e3e0563 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 15:01:25 +0100 Subject: fix editor --- view/theme/diabook/jot.tpl | 8 ++++---- view/theme/diabook/style.css | 40 ++++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index bb0f4b6d0..e83d0f86c 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -44,13 +44,13 @@
    -
    - $bang -
    + - +
    + $bang +
    diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index c497beffd..df586c770 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -1290,7 +1290,7 @@ section { width: 785px; margin: 0px 2em 20px 0px; } -#jot .profile-jot-text { +#profile-jot-form #profile-jot-text { height: 1.2em; width: 99%; font-size: 10px; @@ -1378,7 +1378,7 @@ section { #jot #jot-tools li.loading img { margin-top: 10px; } -#jot #jot-title { +#profile-jot-form #jot-title { border: 0px; margin: 0px; height: 20px; @@ -1386,12 +1386,16 @@ section { font-weight: bold; border: 1px solid #ffffff; } -#jot #jot-title:-webkit-input-placeholder { +#profile-jot-form #jot-title:-webkit-input-placeholder { font-weight: normal; } -#jot #jot-title:-moz-placeholder { +#profile-jot-form #jot-title:-moz-placeholder { font-weight: normal; } +#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{ + width: 785px; + height: 100px; + } #jot #jot-title:hover { border: 1px solid #999999; } @@ -1424,59 +1428,75 @@ section { } #profile-jot-wrapper{ margin: 0 2em 20px 0; - width: 685px; + width: 785px; } #profile-jot-submit-wrapper { margin-bottom: 50px; - width: 675px; + width: 785px; } #profile-jot-submit { - float: left; + float: right; + margin-top: 2px; + } #profile-upload-wrapper { float: left; + margin-top: 2px; + margin-left: 10px; } #profile-attach-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-rotator { float: left; margin-left: 30px; + margin-top: 2px; } #profile-link-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-youtube-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-video-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-audio-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-location-wrapper { float: left; margin-left: 15px; + margin-top: 2px; } #profile-jot-perms { float: left; margin-left: 45px; + margin-top: 2px; } #jot-preview-link { - float: left; + float: right; margin-left: 10px; - margin-top: 0px !important; + margin-top: 2px; } - +#profile-jot-perms{ + float: right; + margin-left: 10px; + margin-top: 2px; + } /** buttons **/ .button.creation1 { background-color: #fff; -- cgit v1.2.3 From 83e9f57459ddc0f7602f3c72d937d7a48e76b6b5 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 16:49:48 +0100 Subject: fixed admin fixed editor --- view/theme/diabook/icons/attach.png | Bin 862 -> 1069 bytes view/theme/diabook/icons/audio.png | Bin 655 -> 762 bytes view/theme/diabook/icons/camera.png | Bin 568 -> 685 bytes view/theme/diabook/icons/globe.png | Bin 680 -> 875 bytes view/theme/diabook/icons/toogle_off.png | Bin 0 -> 391 bytes view/theme/diabook/icons/toogle_on.png | Bin 0 -> 429 bytes view/theme/diabook/icons/unglobe.png | Bin 659 -> 798 bytes view/theme/diabook/icons/unlock.png | Bin 314 -> 362 bytes view/theme/diabook/icons/video.png | Bin 373 -> 472 bytes view/theme/diabook/icons/weblink.png | Bin 305 -> 505 bytes view/theme/diabook/style.css | 4 ++-- 11 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 view/theme/diabook/icons/toogle_off.png create mode 100755 view/theme/diabook/icons/toogle_on.png (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png index 4412d94a5..1958041cf 100755 Binary files a/view/theme/diabook/icons/attach.png and b/view/theme/diabook/icons/attach.png differ diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png index 075e04734..8d779a409 100755 Binary files a/view/theme/diabook/icons/audio.png and b/view/theme/diabook/icons/audio.png differ diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png index 8769cc82f..a5c7f1236 100755 Binary files a/view/theme/diabook/icons/camera.png and b/view/theme/diabook/icons/camera.png differ diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png index daec0c256..bf27a8f3f 100755 Binary files a/view/theme/diabook/icons/globe.png and b/view/theme/diabook/icons/globe.png differ diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png new file mode 100755 index 000000000..99490bcd9 Binary files /dev/null and b/view/theme/diabook/icons/toogle_off.png differ diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png new file mode 100755 index 000000000..81e8f9120 Binary files /dev/null and b/view/theme/diabook/icons/toogle_on.png differ diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png index ddcdfa23c..aa9b0e189 100755 Binary files a/view/theme/diabook/icons/unglobe.png and b/view/theme/diabook/icons/unglobe.png differ diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png index 3d6543087..a0cda0ae5 100755 Binary files a/view/theme/diabook/icons/unlock.png and b/view/theme/diabook/icons/unlock.png differ diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png index c9a905e32..a03d1d818 100755 Binary files a/view/theme/diabook/icons/video.png and b/view/theme/diabook/icons/video.png differ diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png index 45c471e6c..216e78344 100755 Binary files a/view/theme/diabook/icons/weblink.png and b/view/theme/diabook/icons/weblink.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index df586c770..d9d88690f 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -163,8 +163,8 @@ .language { background-position: -210px -40px;} -.on { background-position: -50px -60px;} -.off { background-position: -70px -60px;} +.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;} +.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;} .prev { background-position: -90px -60px;} .next { background-position: -110px -60px;} /*.tagged { background-position: -130px -60px;}*/ -- cgit v1.2.3 From d4ac1f2a9cc8d744c6e47eb358ac1f1cfa4ce458 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 19:07:55 +0100 Subject: fixed star/unstar --- view/theme/diabook/icons/isstar.png | Bin 0 -> 1277 bytes view/theme/diabook/icons/star.png | Bin 339 -> 388 bytes view/theme/diabook/icons/star_dummy.png | Bin 0 -> 183 bytes view/theme/diabook/style.css | 4 +++- view/theme/diabook/wall_item.tpl | 23 ++++++++++++++--------- 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 view/theme/diabook/icons/isstar.png create mode 100644 view/theme/diabook/icons/star_dummy.png (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png new file mode 100644 index 000000000..c955b25b5 Binary files /dev/null and b/view/theme/diabook/icons/isstar.png differ diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png index 32eff5a50..0b00cb189 100755 Binary files a/view/theme/diabook/icons/star.png and b/view/theme/diabook/icons/star.png differ diff --git a/view/theme/diabook/icons/star_dummy.png b/view/theme/diabook/icons/star_dummy.png new file mode 100644 index 000000000..ce11f30d4 Binary files /dev/null and b/view/theme/diabook/icons/star_dummy.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index d9d88690f..ecd995d5f 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -100,11 +100,13 @@ .icon.recycle { background-image: url("../../../view/theme/diabook/icons/recycle.png");} .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");} .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} -.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} +.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/star.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");} .icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");} +.icon.isstar { background-image: url("../../../view/theme/diabook/icons/isstar.png");} + .camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 10d395316..c836d4fbb 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -1,6 +1,6 @@ {{ if $item.indent }}{{ else }}
    - $item.star.starred + $item.star.starred {{ if $item.lock }}$item.lock{{ endif }}
    @@ -38,9 +38,7 @@
    -
    - {{ if $item.plink }}$item.plink.title{{ endif }} -
    +
    {{ for $item.tags as $tag }} $tag @@ -54,7 +52,8 @@
    $item.location 
    - + + {{ if $item.vote }} @@ -62,13 +61,19 @@ {{ if $item.vote.share }} - {{ endif }} + {{ endif }} {{ if $item.star }} - $item.star.do - $item.star.undo + + $item.star.do + + $item.star.undo $item.star.tagger - {{ endif }} + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + +
    -- cgit v1.2.3 From 42b9887693afd65b7dbbb88bb331eb316ede89ef Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 21:45:59 +0100 Subject: fixed apps css --- view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/style.css | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 17df8e652..34a37ad2e 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -87,7 +87,7 @@
  • $ap
    • {{ endfor }} - + {{ endif }} {{ if $nav.home }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ecd995d5f..d175a74b3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -675,6 +675,13 @@ nav #nav-directory-link{ margin-left: 0px; margin-right: 0px; font-weight: bold; + margin: 3px 15px; + } +nav #nav-apps-link{ + margin-left: 0px; + margin-right: 0px; + font-weight: bold; + margin: 3px 15px; } nav #nav-help-link .menu-popup, nav #nav-search-link .menu-popup, -- cgit v1.2.3 From 173fb983c5fa2514c3cdc15ac56a030c49f81ca7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 23:12:03 +0100 Subject: navbar fix --- view/theme/diabook/icons/contacts2.png | Bin 545 -> 549 bytes view/theme/diabook/icons/lock.png | Bin 313 -> 366 bytes view/theme/diabook/icons/messages2.png | Bin 0 -> 488 bytes view/theme/diabook/icons/notify2.png | Bin 0 -> 596 bytes view/theme/diabook/style.css | 24 ++++++++++++++++++------ 5 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 view/theme/diabook/icons/messages2.png create mode 100644 view/theme/diabook/icons/notify2.png (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png index f90b10f92..7817279f4 100755 Binary files a/view/theme/diabook/icons/contacts2.png and b/view/theme/diabook/icons/contacts2.png differ diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png index e00c5b2a2..7e34bf279 100755 Binary files a/view/theme/diabook/icons/lock.png and b/view/theme/diabook/icons/lock.png differ diff --git a/view/theme/diabook/icons/messages2.png b/view/theme/diabook/icons/messages2.png new file mode 100644 index 000000000..54b68e7f7 Binary files /dev/null and b/view/theme/diabook/icons/messages2.png differ diff --git a/view/theme/diabook/icons/notify2.png b/view/theme/diabook/icons/notify2.png new file mode 100644 index 000000000..407e2dbb4 Binary files /dev/null and b/view/theme/diabook/icons/notify2.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index d175a74b3..0f60ee531 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -615,7 +615,7 @@ nav .nav-menu-icon { border-radius: 5px 5px 0 0; } nav .nav-menu-icon.selected { - background-color: #364e59; + background-color: #fff; } nav .nav-menu-icon img { width: 22px; @@ -691,9 +691,19 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { - background-image: url("../../../images/icons/22/notify_on.png"); -} + +nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{ + background-image: url("../../../view/theme/diabook/icons/messages2.png"); + } + +/*nav #nav-notifications-linkmenu.on .icon.notify,*/ nav #nav-notifications-linkmenu.selected .icon.notify{ + background-image: url("../../../view/theme/diabook/icons/notify2.png"); + } + +nav #nav-contacts-linkmenu.on .icon.contacts, nav #nav-contacts-linkmenu.selected .icon.contacts{ + background-image: url("../../../view/theme/diabook/icons/contacts2.png"); + } + nav #nav-apps-link.selected { background-color: #364e59; } @@ -725,7 +735,8 @@ ul.menu-popup { margin: 0px; padding: 0px; list-style: none; - border: 3px solid #364e59; + border: 1px solid #364e59; + border-top-color: transparent; z-index: 100000; -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); @@ -738,7 +749,8 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #bdcdd4; + background-color: #3465A4; /*bdcdd4;*/ + color: #fff; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; -- cgit v1.2.3 From b3eeb2240170b4f21f5162eb649fa7191264aeb5 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sat, 3 Mar 2012 23:43:15 +0100 Subject: fix --- view/theme/diabook/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 0f60ee531..5e471f621 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -749,8 +749,8 @@ ul.menu-popup a { text-decoration: none; } ul.menu-popup a:hover { - background-color: #3465A4; /*bdcdd4;*/ - color: #fff; + background-color: #fff797; /*bdcdd4;*/ + color: #000; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; -- cgit v1.2.3 From 25d6ca3b7335c018bfd16c4dd29b177d9df62692 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 4 Mar 2012 00:10:03 +0100 Subject: tag fix --- view/theme/diabook/wall_item.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index c836d4fbb..20131c7d1 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -38,7 +38,8 @@
    -
    +
    +
    {{ for $item.tags as $tag }} $tag -- cgit v1.2.3 From e0e0224fa6e3a32a1e6fe22728bc35f581ba89b5 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 4 Mar 2012 05:48:06 +0100 Subject: some fixes in diabook --- view/theme/diabook/icons/pencil2.png | Bin 0 -> 384 bytes view/theme/diabook/jot.tpl | 4 +- view/theme/diabook/style.css | 34 ++++++++--- view/theme/diabook/wall_item.tpl | 7 +-- view/theme/diabook/wallwall_item.tpl | 107 +++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+), 15 deletions(-) create mode 100644 view/theme/diabook/icons/pencil2.png create mode 100644 view/theme/diabook/wallwall_item.tpl (limited to 'view/theme/diabook') diff --git a/view/theme/diabook/icons/pencil2.png b/view/theme/diabook/icons/pencil2.png new file mode 100644 index 000000000..3b47d1864 Binary files /dev/null and b/view/theme/diabook/icons/pencil2.png differ diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl index e83d0f86c..4f784c3f8 100755 --- a/view/theme/diabook/jot.tpl +++ b/view/theme/diabook/jot.tpl @@ -32,10 +32,10 @@
    - +
    - +
    diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 5e471f621..f005ff4bd 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -114,9 +114,15 @@ .attach { background-image: url("../../../view/theme/diabook/icons/attach.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } -.video { background-image: url("../../../view/theme/diabook/icons/video.png"); +.video2 { background-image: url("../../../view/theme/diabook/icons/video.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } +.video { background-image: url("../../../view/theme/diabook/icons/video.png"); + display: block; width: 100%; height: 28px; background-repeat: no-repeat; + } +.audio2 { background-image: url("../../../view/theme/diabook/icons/audio.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat; + } .audio { background-image: url("../../../view/theme/diabook/icons/audio.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } @@ -129,6 +135,8 @@ .unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } +.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); + display: block; width: 28px; height: 28px; background-repeat: no-repeat;} @@ -138,7 +146,7 @@ .block { background-position: -90px 0px;} /*.drop { background-position: -110px 0px;}*/ /*.drophide { background-position: -130px 0px;}*/ -.edit { background-position: -150px 0px;} +/*.edit { background-position: -150px 0px;}*/ /*.camera { background-position: -170px 0px;}*/ /*.dislike { background-position: -190px 0px;}*/ /*.like { background-position: -210px 0px;}*/ @@ -1000,16 +1008,21 @@ section { padding: 0px 0px 0px 10px; } .tabs { - background-image: url("../../../view/theme/diabook/icons/head.jpg"); + background-position: 0 -20px; background-repeat: repeat-x; - border-bottom: 1px solid #BABDB6; + height: 27px; padding: 0; } .tab.button { margin-right: 15px; margin-left: 15px; + background: none repeat scroll 0 0 #F8F8F8; + border: 1px solid #CCCCCC; + border-radius: 3px 3px 3px 3px; + font-weight: bold; + padding: 3px; } /* wall item */ .tread-wrapper { @@ -1162,7 +1175,7 @@ section { display: none; } .wall-item-comment-wrapper textarea { - height: 1.2em; + height: 2.0em; width: 100%; font-size: 10px; color: #999999; @@ -1312,13 +1325,12 @@ section { margin: 0px 2em 20px 0px; } #profile-jot-form #profile-jot-text { - height: 1.2em; + height: 3.0em; width: 99%; font-size: 10px; color: #999999; border: 1px solid #DDD; padding: 0.3em; - margin-top: 30px; margin-bottom: 10px; } #jot #jot-tools { @@ -1658,7 +1670,13 @@ ul.tabs li { margin-left: 7px; } ul.tabs li .active { - border-bottom: 1px solid #3465A4; + background-color: #33ACFF; + background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%); + border: 1px solid #777777; + color: white; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 1px 1px #CFCFCF; + margin-left: 5px; } /** * Form fields diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 20131c7d1..0a02ba812 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,9 +5,6 @@
    {{ endif }} - - -
    @@ -32,7 +29,6 @@
    - {{ if $item.title }}

    $item.title

    {{ endif }} $item.body
    @@ -63,7 +59,8 @@ {{ if $item.vote.share }} {{ endif }} - + + {{ if $item.star }} $item.star.do diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl new file mode 100644 index 000000000..08ea36781 --- /dev/null +++ b/view/theme/diabook/wallwall_item.tpl @@ -0,0 +1,107 @@ +{{ if $item.indent }}{{ else }} +
    + $item.star.starred + {{ if $item.lock }}$item.lock{{ endif }} + +
    +{{ endif }} +
    +
    +
    +
    + + $item.owner_name + +
    +
    + + $item.name + + menu + + +
    +
    +
    + $item.name + $item.to $item.owner_name + $item.vwall -   + {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} + {{ if $item.lock }} - $item.lock {{ endif }} + +
    +
    + {{ if $item.title }}

    $item.title

    {{ endif }} + $item.body +
    +
    +
    +
    +
    +
    + {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
    +
    +
    +
    + +
    +
    +
    $item.location 
    +
    + + + {{ if $item.vote }} + + + {{ endif }} + + {{ if $item.vote.share }} + + {{ endif }} + + + {{ if $item.star }} + + $item.star.do + + $item.star.undo + $item.star.tagger + {{ endif }} + + {{ if $item.plink }}$item.plink.title{{ endif }} + + + +
    + +
    + + {{ if $item.drop.dropping }} + + $item.drop.delete + {{ endif }} + {{ if $item.edpost }} + + {{ endif }} +
    + +
    +
    +
    +
    + +
    $item.dislike
    +
    +
    + +
    + $item.comment +
    +tb \ No newline at end of file -- cgit v1.2.3