From 626bb57e1dd0024c8d5d7f02cc8d4fb359152136 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 14 Apr 2012 20:04:54 +0530 Subject: Removed execution permission: lintian warning in Debian packaging --- view/theme/diabook-red/communityhome.tpl | 0 view/theme/diabook-red/contact_template.tpl | 0 view/theme/diabook-red/directory_item.tpl | 0 view/theme/diabook-red/group_side.tpl | 0 view/theme/diabook-red/jot.tpl | 0 view/theme/diabook-red/mail_conv.tpl | 0 view/theme/diabook-red/photo_view.tpl | 0 view/theme/diabook-red/search_item.tpl | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 view/theme/diabook-red/communityhome.tpl mode change 100755 => 100644 view/theme/diabook-red/contact_template.tpl mode change 100755 => 100644 view/theme/diabook-red/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-red/group_side.tpl mode change 100755 => 100644 view/theme/diabook-red/jot.tpl mode change 100755 => 100644 view/theme/diabook-red/mail_conv.tpl mode change 100755 => 100644 view/theme/diabook-red/photo_view.tpl mode change 100755 => 100644 view/theme/diabook-red/search_item.tpl (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/contact_template.tpl b/view/theme/diabook-red/contact_template.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/photo_view.tpl b/view/theme/diabook-red/photo_view.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/search_item.tpl b/view/theme/diabook-red/search_item.tpl old mode 100755 new mode 100644 -- cgit v1.2.3 From 41d74c08681db9fca60a1b70cfae0c0481f57a81 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 14 Apr 2012 20:16:06 +0530 Subject: Another bunch of executable permission removal --- view/theme/diabook-red/fpostit/fpostit.js | 0 view/theme/diabook-red/icons/attach.png | Bin view/theme/diabook-red/icons/audio.png | Bin view/theme/diabook-red/icons/camera.png | Bin view/theme/diabook-red/icons/close_box.png | Bin view/theme/diabook-red/icons/contacts.png | Bin view/theme/diabook-red/icons/contacts2.png | Bin view/theme/diabook-red/icons/drop.png | Bin view/theme/diabook-red/icons/file_as.png | Bin view/theme/diabook-red/icons/link.png | Bin view/theme/diabook-red/icons/lock.png | Bin view/theme/diabook-red/icons/lupe.png | Bin view/theme/diabook-red/icons/next.png | Bin view/theme/diabook-red/icons/notifications.png | Bin view/theme/diabook-red/icons/pencil.png | Bin view/theme/diabook-red/icons/photo-menu.jpg | Bin view/theme/diabook-red/icons/prev.png | Bin view/theme/diabook-red/icons/recycle.png | Bin view/theme/diabook-red/icons/remote.png | Bin view/theme/diabook-red/icons/scroll_top.png | Bin view/theme/diabook-red/icons/star.png | Bin view/theme/diabook-red/icons/starred.png | Bin view/theme/diabook-red/icons/tagged.png | Bin view/theme/diabook-red/icons/unlock.png | Bin view/theme/diabook-red/icons/unstarred.png | Bin view/theme/diabook-red/icons/video.png | Bin view/theme/diabook-red/icons/weblink.png | Bin view/theme/diabook-red/theme.php | 0 28 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 view/theme/diabook-red/fpostit/fpostit.js mode change 100755 => 100644 view/theme/diabook-red/icons/attach.png mode change 100755 => 100644 view/theme/diabook-red/icons/audio.png mode change 100755 => 100644 view/theme/diabook-red/icons/camera.png mode change 100755 => 100644 view/theme/diabook-red/icons/close_box.png mode change 100755 => 100644 view/theme/diabook-red/icons/contacts.png mode change 100755 => 100644 view/theme/diabook-red/icons/contacts2.png mode change 100755 => 100644 view/theme/diabook-red/icons/drop.png mode change 100755 => 100644 view/theme/diabook-red/icons/file_as.png mode change 100755 => 100644 view/theme/diabook-red/icons/link.png mode change 100755 => 100644 view/theme/diabook-red/icons/lock.png mode change 100755 => 100644 view/theme/diabook-red/icons/lupe.png mode change 100755 => 100644 view/theme/diabook-red/icons/next.png mode change 100755 => 100644 view/theme/diabook-red/icons/notifications.png mode change 100755 => 100644 view/theme/diabook-red/icons/pencil.png mode change 100755 => 100644 view/theme/diabook-red/icons/photo-menu.jpg mode change 100755 => 100644 view/theme/diabook-red/icons/prev.png mode change 100755 => 100644 view/theme/diabook-red/icons/recycle.png mode change 100755 => 100644 view/theme/diabook-red/icons/remote.png mode change 100755 => 100644 view/theme/diabook-red/icons/scroll_top.png mode change 100755 => 100644 view/theme/diabook-red/icons/star.png mode change 100755 => 100644 view/theme/diabook-red/icons/starred.png mode change 100755 => 100644 view/theme/diabook-red/icons/tagged.png mode change 100755 => 100644 view/theme/diabook-red/icons/unlock.png mode change 100755 => 100644 view/theme/diabook-red/icons/unstarred.png mode change 100755 => 100644 view/theme/diabook-red/icons/video.png mode change 100755 => 100644 view/theme/diabook-red/icons/weblink.png mode change 100755 => 100644 view/theme/diabook-red/theme.php (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/attach.png b/view/theme/diabook-red/icons/attach.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/audio.png b/view/theme/diabook-red/icons/audio.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/camera.png b/view/theme/diabook-red/icons/camera.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/close_box.png b/view/theme/diabook-red/icons/close_box.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/contacts.png b/view/theme/diabook-red/icons/contacts.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/contacts2.png b/view/theme/diabook-red/icons/contacts2.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/drop.png b/view/theme/diabook-red/icons/drop.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/file_as.png b/view/theme/diabook-red/icons/file_as.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/link.png b/view/theme/diabook-red/icons/link.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/lock.png b/view/theme/diabook-red/icons/lock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/lupe.png b/view/theme/diabook-red/icons/lupe.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/next.png b/view/theme/diabook-red/icons/next.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/notifications.png b/view/theme/diabook-red/icons/notifications.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/pencil.png b/view/theme/diabook-red/icons/pencil.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/photo-menu.jpg b/view/theme/diabook-red/icons/photo-menu.jpg old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/prev.png b/view/theme/diabook-red/icons/prev.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/recycle.png b/view/theme/diabook-red/icons/recycle.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/remote.png b/view/theme/diabook-red/icons/remote.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/scroll_top.png b/view/theme/diabook-red/icons/scroll_top.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/star.png b/view/theme/diabook-red/icons/star.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/starred.png b/view/theme/diabook-red/icons/starred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/tagged.png b/view/theme/diabook-red/icons/tagged.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/unlock.png b/view/theme/diabook-red/icons/unlock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/unstarred.png b/view/theme/diabook-red/icons/unstarred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/video.png b/view/theme/diabook-red/icons/video.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/weblink.png b/view/theme/diabook-red/icons/weblink.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php old mode 100755 new mode 100644 -- cgit v1.2.3 From dddf3307af24de71a8b6e52a984ba2f2e310c3b7 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Sun, 15 Apr 2012 04:39:33 +0200 Subject: diabook-themes: added js for auto-growing comment-textareas --- view/theme/diabook-red/comment_item.tpl | 2 +- .../diabook-red/js/jquery.autogrow.textarea.js | 46 ++++++++++++++++++++++ view/theme/diabook-red/theme.php | 12 ++++++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 view/theme/diabook-red/js/jquery.autogrow.textarea.js (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 09fd8da3d..47046c371 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -11,7 +11,7 @@ $mytitle
- + img url video diff --git a/view/theme/diabook-red/js/jquery.autogrow.textarea.js b/view/theme/diabook-red/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/diabook-red/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('
').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(//g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '
'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery); \ No newline at end of file diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index c7fa77985..479a0130a 100644 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -289,6 +289,9 @@ $a->page['htmlhead'] .= sprintf('', $imageresizeJS); +//load jquery.autogrow-textarea.js +$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/js/jquery.autogrow.textarea.js"; +$a->page['htmlhead'] .= sprintf('', $autogrowJS); //js scripts //comment-edit-wrapper on photo_view @@ -313,6 +316,15 @@ $a->page['htmlhead'] .= ' }); '; + +$a->page['htmlhead'] .= ' + +'; $a->page['htmlhead'] .= ' +
+

$title - $page

+ +
+ +

$h_pending

+ {{ if $pending }} + + + + {{ for $th_pending as $th }}{{ endfor }} + + + + + + {{ for $pending as $u }} + + + + + + + + {{ endfor }} + +
$th
$u.created$u.name + + +
+
$select_all
+
+ {{ else }} +

$no_pending

+ {{ endif }} + + + + +

$h_users

+ {{ if $users }} + + + + + {{ for $th_users as $th }}{{ endfor }} + + + + + + {{ for $users as $u }} + + + + + + + + + + + + {{ endfor }} + +
$th
$u.nickname$u.name$u.register_date$u.lastitem_date + + +
+
$select_all
+
+ {{ else }} + NO USERS?!? + {{ endif }} +
+
diff --git a/view/theme/diabook-red/icons/block.png b/view/theme/diabook-red/icons/block.png new file mode 100755 index 000000000..a0b1dffe9 Binary files /dev/null and b/view/theme/diabook-red/icons/block.png differ diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl index 68a8e88e9..be25ddee1 100644 --- a/view/theme/diabook-red/nets.tpl +++ b/view/theme/diabook-red/nets.tpl @@ -1,5 +1,5 @@
-

$title

+

$title

$desc
    diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 03357f766..115868711 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1064,6 +1064,10 @@ aside #search-text { border-top-right-radius: 15px; border-bottom-right-radius: 15px; border-bottom-left-radius: 15px; +-moz-border-bottom-colors: #dbdbdb; + -moz-border-top-colors: #999; + -moz-border-left-colors: #999; + -moz-border-right-colors: #dbdbdb; } aside #side-follow-url { width: 150px; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 6ca2370de..122096213 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -168,13 +168,17 @@ } .edit {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat;} - +.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat;} +.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png"); + display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;} +.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png"); + display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;} .article { background-position: -50px 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;}*/ diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 479a0130a..fb2ad21fd 100644 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.018) + * Version: (Version: 1.019) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.018)"; +$diabook_version = "Diabook-red (Version: 1.019)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages -- cgit v1.2.3 From f08844a8a58f46d539753831a8ff99995fc3c1ae Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 16 Apr 2012 19:23:11 +0200 Subject: diabook-themes: bugfix (sry, necessary) --- view/theme/diabook-red/ch_directory_item.tpl | 10 ++++++++++ view/theme/diabook-red/nav.tpl | 2 +- view/theme/diabook-red/theme.php | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100755 view/theme/diabook-red/ch_directory_item.tpl (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/ch_directory_item.tpl b/view/theme/diabook-red/ch_directory_item.tpl new file mode 100755 index 000000000..db1936e4b --- /dev/null +++ b/view/theme/diabook-red/ch_directory_item.tpl @@ -0,0 +1,10 @@ + +
    +
    +
    + + $alt-text + +
    +
    +
    diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index 6559c49ea..0453ec7ee 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -103,7 +103,7 @@ {{ endif }} - {{ if $nav.settings }} + {{ if $nav.home }}
-
-{{ if $lastusers_title }} -

$postit.title.1

-
$postit.title.2$postit.text.1
-{{ endif }} -
{{ if $lastusers_title }} diff --git a/view/theme/diabook-red/fpostit/README b/view/theme/diabook-red/fpostit/README deleted file mode 100644 index 39b7c5761..000000000 --- a/view/theme/diabook-red/fpostit/README +++ /dev/null @@ -1,8 +0,0 @@ -fpostit - -original author: Devlon Duthied - -see his blog posting: -http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ - -original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js deleted file mode 100644 index d183c7573..000000000 --- a/view/theme/diabook-red/fpostit/fpostit.js +++ /dev/null @@ -1,6 +0,0 @@ -javascript: (function() { - the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); - a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; - if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} - else {a_funct()}})()" \ No newline at end of file diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php deleted file mode 100644 index 4505c9946..000000000 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - $content); - - // echo "posting to: $url
"; - - $c = curl_init(); - curl_setopt($c, CURLOPT_URL, $url); - curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); - curl_setopt($c, CURLOPT_POSTFIELDS, $data); - curl_setopt($c, CURLOPT_RETURNTRANSFER, true); - curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); - $c_result = curl_exec($c); - if(curl_errno($c)){ - $error = curl_error($c); - showForm($error, $content); - } - - curl_close($c); - if (!isset($error)) { - echo ''; - } - - } else { - $error = "Missing account name and/or password...try again please"; - showForm($error, $content); - } - -} else { - showForm(null, $content); -} - -function showForm($error, $content) { - $username_cookie = $_COOKIE['username']; - $password_cookie = $_COOKIE['password']; - - echo << -

- Friendica Bookmarklet

-
- -
-
- Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

- Account ID:
- Password:
-
-   $error -
-

-
-EOF; - -} -?> - - - \ No newline at end of file diff --git a/view/theme/diabook-red/fpostit/friendika-32.png b/view/theme/diabook-red/fpostit/friendika-32.png deleted file mode 100644 index 61764bf20..000000000 Binary files a/view/theme/diabook-red/fpostit/friendika-32.png and /dev/null differ diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 115868711..8c0600b5a 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1389,7 +1389,7 @@ transition: all 0.2s ease-in-out; .wall-item-container .wall-item-content img { max-width: 400px; - max-height: 400px; + } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 1b2caa6c0..4f5de365b 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1347,7 +1347,7 @@ transition: all 0.2s ease-in-out; .wall-item-container .wall-item-content img { max-width: 400px; - max-height: 400px; + } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index 1ef65d83e..02b6ee5a4 100644 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -3,13 +3,13 @@ /* * Name: Diabook-red * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.019) + * Version: (Version: 1.020) * Author: */ //print diabook-version for debugging -$diabook_version = "Diabook-red (Version: 1.019)"; +$diabook_version = "Diabook-red (Version: 1.020)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -130,14 +130,6 @@ function diabook_red_community_info(){ } } - $fostitJS = "javascript: (function() { - the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); - a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; - if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} - else {a_funct()}})()" ; - - $aside['$fostitJS'] = $fostitJS; //nav FIND FRIENDS if(local_user()) { @@ -205,13 +197,7 @@ function diabook_red_community_info(){ $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); @@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){ } - $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; + $ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes']; - if($ccCookie != "8") { + if($ccCookie != "7") { // COMMUNITY diabook_red_community_info(); @@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){ //right_aside at profile pages if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ - if($ccCookie != "8") { + if($ccCookie != "7") { // COMMUNITY diabook_red_community_info(); @@ -367,7 +353,7 @@ $a->page['htmlhead'] .= ' '; - if($ccCookie != "8") { + if($ccCookie != "7") { $a->page['htmlhead'] .= ' ', $diabook_version); //change css on network and profilepages $cssFile = null; - +$resolution=false; +$resolution = get_pconfig(local_user(), "diabook-red", "resolution"); +if ($resolution===false) $resolution="normal"; /** * prints last community activity @@ -247,7 +249,8 @@ if ($a->argv[0] === "network" && local_user()){ diabook_red_community_info(); // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css"; + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-network-wide.css";} } } @@ -260,7 +263,8 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){ diabook_red_community_info(); // CUSTOM CSS - $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css"; + if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile.css";} + if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-red/style-profile-wide.css";} } } diff --git a/view/theme/diabook-red/theme_settings.tpl b/view/theme/diabook-red/theme_settings.tpl index 9e83ae8f2..3ae5fdbf8 100644 --- a/view/theme/diabook-red/theme_settings.tpl +++ b/view/theme/diabook-red/theme_settings.tpl @@ -2,6 +2,8 @@ {{inc field_select.tpl with $field=$line_height}}{{endinc}} +{{inc field_select.tpl with $field=$resolution}}{{endinc}} +
-- cgit v1.2.3 From 1b6c84d8f453ff591451e3304547b239a3d86c5b Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Wed, 18 Apr 2012 02:36:30 +0200 Subject: diabook-themes: some css/bug-fixes --- view/theme/diabook-red/login.tpl | 33 ++++++++++++++++++++ view/theme/diabook-red/style-network-wide.css | 2 +- view/theme/diabook-red/style-network.css | 2 +- view/theme/diabook-red/style-profile-wide.css | 2 +- view/theme/diabook-red/style-profile.css | 2 +- view/theme/diabook-red/style-wide.css | 45 ++++++++++++++++++++++----- view/theme/diabook-red/style.css | 45 ++++++++++++++++++++++----- 7 files changed, 111 insertions(+), 20 deletions(-) create mode 100644 view/theme/diabook-red/login.tpl (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/login.tpl b/view/theme/diabook-red/login.tpl new file mode 100644 index 000000000..efa7c2d6d --- /dev/null +++ b/view/theme/diabook-red/login.tpl @@ -0,0 +1,33 @@ + +
+ + +
+ {{ inc field_input.tpl with $field=$lname }}{{ endinc }} + {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }} +
+ + {{ if $openid }} +
+ {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }} +
+ {{ endif }} + +
+ +
+ + + + {{ for $hiddens as $k=>$v }} + + {{ endfor }} + + +
+ + + diff --git a/view/theme/diabook-red/style-network-wide.css b/view/theme/diabook-red/style-network-wide.css index b58e7137d..d8f9bccd8 100644 --- a/view/theme/diabook-red/style-network-wide.css +++ b/view/theme/diabook-red/style-network-wide.css @@ -2369,7 +2369,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index 8c0600b5a..50a04fe83 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -2358,7 +2358,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook-red/style-profile-wide.css b/view/theme/diabook-red/style-profile-wide.css index 84510c5d4..28280ad55 100644 --- a/view/theme/diabook-red/style-profile-wide.css +++ b/view/theme/diabook-red/style-profile-wide.css @@ -2324,7 +2324,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 4f5de365b..6bdadd397 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -2312,7 +2312,7 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; + } .vevent .event-description, .vevent .event-location { margin-left: 10px; diff --git a/view/theme/diabook-red/style-wide.css b/view/theme/diabook-red/style-wide.css index 6ea2a8461..adb19b90d 100644 --- a/view/theme/diabook-red/style-wide.css +++ b/view/theme/diabook-red/style-wide.css @@ -431,6 +431,12 @@ body { margin: 50px auto auto; display: table; } + +#jappix_mini { +right: 45px !important; +} + + h4 { font-size: 1.1em; } @@ -1226,7 +1232,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - margin-top: 20px; +margin-bottom: 15px; } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; @@ -2618,16 +2624,39 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; -} -.vevent .event-description, .vevent .event-location { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { margin-left: 10px; margin-right: 10px; } -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; +} +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; } +.event-start .dtstart, .event-end .dtend { +float: right; +} + #new-event-link { margin-bottom: 10px; @@ -2641,7 +2670,7 @@ a.mail-list-link { } .event-description:before { - content: url('../../../images/calendar.png'); + content: url("../../../view/theme/diabook/icons/events2.png") !important; margin-right: 15px; } diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 122096213..051871d10 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -431,6 +431,12 @@ body { margin: 50px auto auto; display: table; } + +#jappix_mini { +right: 45px !important; +} + + h4 { font-size: 1.1em; } @@ -1224,7 +1230,7 @@ aside #side-peoplefind-url { margin-right: 20px; } #login-submit-wrapper{ - margin-top: 20px; +margin-bottom: 15px; } .group_selected { background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; @@ -2607,16 +2613,39 @@ a.mail-list-link { } .vevent { - border: 1px solid #CCCCCC; -} -.vevent .event-description, .vevent .event-location { +position: relative; +width: 400px; +padding: 20px; +padding-top: 10px; +margin: 0 0px; +margin-bottom: 10px; +background-color: white; +-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); +} +.vevent .event-location { margin-left: 10px; margin-right: 10px; } -.vevent .event-start { - margin-left: 10px; - margin-right: 10px; +.vevent .event-description { +margin-left: 10px; +margin-right: 10px; +font-size: 1.1em; +font-weight: bolder; +} +.vevent .event-start, .vevent .event-end { + +margin-right: 20px; +margin-bottom: 2px; +margin-top: 2px; +font-size: 0.9em; +text-align: left; } +.event-start .dtstart, .event-end .dtend { +float: right; +} + #new-event-link { margin-bottom: 10px; @@ -2630,7 +2659,7 @@ a.mail-list-link { } .event-description:before { - content: url('../../../images/calendar.png'); + content: url("../../../view/theme/diabook/icons/events2.png") !important; margin-right: 15px; } -- cgit v1.2.3 From d7e750ad74c8a43d54e9ca95631fa754831bf581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= Date: Wed, 18 Apr 2012 07:24:47 +0000 Subject: XSRF protection and PHPdoc for mod/admin.php --- view/theme/diabook-red/admin_users.tpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/admin_users.tpl b/view/theme/diabook-red/admin_users.tpl index 40f94f5fe..b465dc1b0 100644 --- a/view/theme/diabook-red/admin_users.tpl +++ b/view/theme/diabook-red/admin_users.tpl @@ -14,6 +14,7 @@

$title - $page

+

$h_pending

{{ if $pending }} @@ -72,8 +73,8 @@ $u.page-flags - - + + {{ endfor }} -- cgit v1.2.3 From f5f1956e8b855ab5aeab531fc44a1a773427bf64 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 20 Apr 2012 01:44:20 +0200 Subject: diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes --- view/theme/diabook-red/jot.tpl | 1 + view/theme/diabook-red/nav.tpl | 2 -- view/theme/diabook-red/style-wide.css | 2 +- view/theme/diabook-red/style.css | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'view/theme/diabook-red') diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index bd43994b5..982201f56 100644 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl @@ -14,6 +14,7 @@ +
diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index 0453ec7ee..5f316bcdd 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -36,8 +36,6 @@ diff --git a/view/theme/diabook-red/style-wide.css b/view/theme/diabook-red/style-wide.css index adb19b90d..9962a9520 100644 --- a/view/theme/diabook-red/style-wide.css +++ b/view/theme/diabook-red/style-wide.css @@ -1939,7 +1939,7 @@ body .pageheader{ #jot #jot-tools li.loading img { margin-top: 10px; } -#profile-jot-form #jot-title { +#profile-jot-form #jot-title, #profile-jot-form #jot-category { border-radius: 5px 5px 5px 5px; font-weight: bold; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 051871d10..af49e7d88 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1931,7 +1931,7 @@ body .pageheader{ #jot #jot-tools li.loading img { margin-top: 10px; } -#profile-jot-form #jot-title { +#profile-jot-form #jot-title, #profile-jot-form #jot-category { border-radius: 5px 5px 5px 5px; font-weight: bold; -- cgit v1.2.3