From 37f02424f801b3132b75b39d4132f35025667a75 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 26 Mar 2012 07:02:27 +0200 Subject: small fix --- view/theme/diabook-blue/communityhome.tpl | 2 +- view/theme/diabook-blue/theme.php | 7 ++++--- view/theme/diabook/communityhome.tpl | 2 +- view/theme/diabook/theme.php | 7 +------ 4 files changed, 7 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 5b807c8ad..5bae06178 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -46,7 +46,7 @@ {{ endif }} -{{ if $lastusers_title }} +{{ if $page }}
$page
{{ endif }} diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 2c878e6f0..a5f4490ba 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -18,7 +18,7 @@ $cssFile = null; /** * prints last community activity */ -function diabook_community_info(){ +function diabook_blue_community_info(){ $a = get_app(); //right_aside at networkpages @@ -170,6 +170,7 @@ function diabook_community_info(){ if (sizeof($contacts) > 0) $aside['$page'] = $page; + //END Community Page @@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){ } // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css"; @@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){ if ($a->argv[0] === "profile"){ // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css"; diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index c1b395dbe..1ba9ad081 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -46,7 +46,7 @@ {{ endif }} -{{ if $lastusers_title }} +{{ if $page }}
$page
{{ endif }} diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5b87e3142..5bd206100 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -252,12 +252,7 @@ $a->page['htmlhead'] .= <<< EOT $('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"); -); -); + EOT; -- cgit v1.2.3 From 7de8e15ca452e1118807c499ba8b8b1765214821 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 26 Mar 2012 03:01:13 -0400 Subject: fix the search box Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 2 +- view/theme/dispy-dark/style.css | 11 ++++++++--- view/theme/dispy/communityhome.tpl | 2 +- view/theme/dispy/style.css | 15 ++++++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 0659ebe20..0838fc757 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -1,4 +1,4 @@ -{{ if $lastusers_title }} +{{ if $page }}

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this Link.
{{ endif }} diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 6292da6d2..e47eb22ed 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -491,13 +491,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link background: transparent url(icons.png) -190px -60px no-repeat; } .search-box { - margin: 5px; - width: 65%; + display: inline-block; height: 40px; - z-index: 100; + margin: 12px 0 0 -3px; + position: relative; + right: -12px; + top: 17px; + width: 0; } #search-text { border: 1px #2e2f2e solid; + background: #2e2f2e; + color: #eec; } .nav-ajax-update, .nav-ajax-left { width: 30px; diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 0659ebe20..0838fc757 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -1,4 +1,4 @@ -{{ if $lastusers_title }} +{{ if $page }}

PostIt to Friendica

Post to Friendica from anywhere by bookmarking this Link.
{{ endif }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 116f88b31..7c80c8b5b 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -199,6 +199,10 @@ input[type=submit] { .action { margin: 5px 0; } +.tool { + margin: 5px 0; + list-style: none; +} /** @@ -483,13 +487,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link background: transparent url(icons.png) -190px -60px no-repeat; } .search-box { - margin: 5px; - width: 65%; + display: inline-block; height: 40px; - z-index: 100; + margin: 12px 0 0 -3px; + position: relative; + right: -12px; + top: 17px; + width: 0; } #search-text { border: 1px #eec solid; + background: #eec; + color: #e2e33436; } .nav-ajax-update, .nav-ajax-left { width: 30px; -- cgit v1.2.3 From c4c69959e21f1053224166c65b80a7dcdc2357ad Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 26 Mar 2012 09:37:14 +0200 Subject: add screenshots to diabook --- view/theme/diabook-blue/screenshot.png | Bin 0 -> 278712 bytes view/theme/diabook/screenshot.png | Bin 0 -> 276151 bytes view/theme/diabook/style-network.css | 7 +++++++ view/theme/diabook/theme.php | 4 +--- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 view/theme/diabook-blue/screenshot.png create mode 100644 view/theme/diabook/screenshot.png (limited to 'view') diff --git a/view/theme/diabook-blue/screenshot.png b/view/theme/diabook-blue/screenshot.png new file mode 100644 index 000000000..b1c890285 Binary files /dev/null and b/view/theme/diabook-blue/screenshot.png differ diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png new file mode 100644 index 000000000..2826f4261 Binary files /dev/null and b/view/theme/diabook/screenshot.png differ diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index 00856c8d2..ba43c78c2 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -111,6 +111,7 @@ .icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} + .camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } @@ -1169,6 +1170,12 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } #page-sidebar-right_aside{margin-top: 30px;} #page-sidebar-right_aside ul {margin-top: 0px;} +.icon.expand { + background-image: url("../../../view/theme/diabook/icons/expand.png"); + float: right; + cursor: pointer; + } + /* wall item */ .tread-wrapper { border-bottom: 1px solid #D2D2D2; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5bd206100..0279dd925 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -251,9 +251,7 @@ $a->page['htmlhead'] .= <<< EOT $(function() { $('a.lightbox').fancybox(); // Select all links with lightbox class }); - - - + EOT; -- cgit v1.2.3 From 0c4aba4b57c9aaab81a067bbe57c1f6ca59f2699 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 26 Mar 2012 03:39:06 -0400 Subject: [fix] contact_edit.tpl syntax; reduce cols to fit better Signed-off-by: Simon L'nu --- view/contact_edit.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 view/contact_edit.tpl (limited to 'view') diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl old mode 100755 new mode 100644 index fc1a3d47b..417578a32 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -63,7 +63,7 @@

$lbl_info1

- +
-- cgit v1.2.3