From 6c7b619b34e60f391087c669732b9efd0344d41c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 23:57:33 -0700 Subject: remove stray template variable from old code --- include/conversation.php | 3 +-- view/jot-header.tpl | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index e9f024c27..5de4fcb51 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -897,8 +897,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), '$fileas' => t('File as:'), - '$whereareu' => t('Where are you right now?'), - '$title' => t('Enter a title for this item') + '$whereareu' => t('Where are you right now?') )); diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 88df73494..ef760abe0 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -121,7 +121,6 @@ function enableOnUser(){ +EOT; diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl new file mode 100755 index 000000000..dae16a1c7 --- /dev/null +++ b/view/theme/comix-plain/wall_item.tpl @@ -0,0 +1,78 @@ +
+
+
+
+ + $item.name + + menu +
+
    + $item.item_photo_menu +
+
+
+
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
$item.location
+
+
+
+ $item.name +
$item.ago
+ +
+
+
$item.title
+
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} +
+ {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + + {{ if $item.star }} + + + {{ endif }} + {{ if $item.filer }} + + {{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+
+
+
+ +
$item.dislike
+
+ $item.comment +
+ +
+
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl new file mode 100755 index 000000000..11decf9c4 --- /dev/null +++ b/view/theme/comix-plain/wallwall_item.tpl @@ -0,0 +1,85 @@ +
+
+
+
+ + $item.owner_name +
+
$item.wall
+
+ + $item.name + menu +
+
    + $item.item_photo_menu +
+
+ +
+
+
+ {{ if $item.lock }}
$item.lock
+ {{ else }}
{{ endif }} +
$item.location
+
+
+
+ $item.name $item.to $item.owner_name $item.vwall
+
$item.ago
+
+
+
$item.title
+
+
$item.body +
+ {{ for $item.tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ {{ if $item.vote }} + + {{ endif }} + {{ if $item.plink }} +
+ {{ endif }} + {{ if $item.edpost }} + + {{ endif }} + + {{ if $item.star }} + + + {{ endif }} + {{ if $item.filer }} + + {{ endif }} + +
+ {{ if $item.drop.dropping }}{{ endif }} +
+ {{ if $item.drop.dropping }}{{ endif }} +
+
+
+
+ +
$item.dislike
+
+
+ $item.comment +
+ +
+
+ -- cgit v1.2.3 From c1d6ece98e9c0793432d1046033e0b8cb93e63bb Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Mar 2012 14:56:06 -0700 Subject: revert permissions relaxation on community --- mod/community.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/community.php b/mod/community.php index cf459617e..f8cc3305b 100755 --- a/mod/community.php +++ b/mod/community.php @@ -50,7 +50,7 @@ function community_content(&$a, $update = 0) { WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' - AND `item`.`private` = 0 AND `user`.`hidewall` = 0 + AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 " ); @@ -72,7 +72,7 @@ function community_content(&$a, $update = 0) { WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' - AND `item`.`private` = 0 AND `user`.`hidewall` = 0 + AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), -- cgit v1.2.3 From 72d0756fa6a6118801ce9623aeacc760cbc93166 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 22 Mar 2012 04:33:21 +0100 Subject: add icons to aside diabook, fixes in css --- view/theme/diabook-blue/icons/head.jpg | Bin 383 -> 0 bytes view/theme/diabook-blue/photo_album.tpl | 7 ---- view/theme/diabook-blue/photo_top.tpl | 7 ---- view/theme/diabook-blue/style.css | 15 ++++---- view/theme/diabook/icons/com_side.png | Bin 0 -> 680 bytes view/theme/diabook/icons/events.png | Bin 0 -> 663 bytes view/theme/diabook/icons/head.jpg | Bin 383 -> 0 bytes view/theme/diabook/icons/home.png | Bin 0 -> 722 bytes view/theme/diabook/icons/mess_side.png | Bin 0 -> 664 bytes view/theme/diabook/icons/notes.png | Bin 0 -> 739 bytes view/theme/diabook/icons/pubgroups.png | Bin 0 -> 710 bytes view/theme/diabook/profile_side.tpl | 12 +++--- view/theme/diabook/style.css | 66 ++++++++++++++++++++++++-------- view/theme/diabook/theme.php | 4 +- 14 files changed, 65 insertions(+), 46 deletions(-) delete mode 100644 view/theme/diabook-blue/icons/head.jpg delete mode 100755 view/theme/diabook-blue/photo_album.tpl delete mode 100755 view/theme/diabook-blue/photo_top.tpl create mode 100644 view/theme/diabook/icons/com_side.png create mode 100644 view/theme/diabook/icons/events.png delete mode 100644 view/theme/diabook/icons/head.jpg create mode 100644 view/theme/diabook/icons/home.png create mode 100644 view/theme/diabook/icons/mess_side.png create mode 100644 view/theme/diabook/icons/notes.png create mode 100644 view/theme/diabook/icons/pubgroups.png diff --git a/view/theme/diabook-blue/icons/head.jpg b/view/theme/diabook-blue/icons/head.jpg deleted file mode 100644 index 6210b76be..000000000 Binary files a/view/theme/diabook-blue/icons/head.jpg and /dev/null differ diff --git a/view/theme/diabook-blue/photo_album.tpl b/view/theme/diabook-blue/photo_album.tpl deleted file mode 100755 index 7e6c2f666..000000000 --- a/view/theme/diabook-blue/photo_album.tpl +++ /dev/null @@ -1,7 +0,0 @@ - -
diff --git a/view/theme/diabook-blue/photo_top.tpl b/view/theme/diabook-blue/photo_top.tpl deleted file mode 100755 index 98ac9c457..000000000 --- a/view/theme/diabook-blue/photo_top.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 738dde0e5..f88c7b954 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -2411,21 +2411,22 @@ float: left; -moz-box-shadow: 0 0 5px #888; -webkit-box-shadow: 0 0 5px #888; box-shadow: 0 0 5px #888; - background-color: #EEE; + background-color: #000; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; padding-bottom: 20px; position: relative; margin: 0 10px 10px 0; - overflow: hidden; - float: left; - position: relative; + width: 200px; height: 140px; + overflow: hidden; } .photo-top-album-name { - position: absolute; - bottom: 0; - padding: 0 5px; + width: 100%; + position: absolute; + bottom: 0px; + padding-left: 3px; + background-color: #EEE; } .photo-top-album-link{ color: #1872A2; diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png new file mode 100644 index 000000000..bc5969ef1 Binary files /dev/null and b/view/theme/diabook/icons/com_side.png differ diff --git a/view/theme/diabook/icons/events.png b/view/theme/diabook/icons/events.png new file mode 100644 index 000000000..4a0b3f3f1 Binary files /dev/null and b/view/theme/diabook/icons/events.png differ diff --git a/view/theme/diabook/icons/head.jpg b/view/theme/diabook/icons/head.jpg deleted file mode 100644 index 6210b76be..000000000 Binary files a/view/theme/diabook/icons/head.jpg and /dev/null differ diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png new file mode 100644 index 000000000..be47a48fc Binary files /dev/null and b/view/theme/diabook/icons/home.png differ diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png new file mode 100644 index 000000000..49ef896bc Binary files /dev/null and b/view/theme/diabook/icons/mess_side.png differ diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png new file mode 100644 index 000000000..7d4afca90 Binary files /dev/null and b/view/theme/diabook/icons/notes.png differ diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png new file mode 100644 index 000000000..acf857f32 Binary files /dev/null and b/view/theme/diabook/icons/pubgroups.png differ diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl index 01da55ce1..a65677696 100644 --- a/view/theme/diabook/profile_side.tpl +++ b/view/theme/diabook/profile_side.tpl @@ -7,12 +7,12 @@ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 437f323fa..ffab5b4c4 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -881,22 +881,47 @@ ul.menu-popup .empty { text-decoration: none; } .menu-profile-side{ - list-style: none; - padding-left: 16px; - min-height: 16px; + list-style: none; + padding-left: 0px; + min-height: 0px; } .menu-profile-list{ height: auto; overflow: auto; padding-top: 3px; padding-bottom: 3px; + padding-left: 16px; + min-height: 16px; + list-style: none; } .menu-profile-list:hover{ background: #EEE; } +.menu-profile-list-item{ + padding-left: 5px; + } .menu-profile-list-item:hover{ - text-decoration: none; + text-decoration: none; } +/*http://prothemedesign.com/circular-icons/*/ +.menu-profile-list.home{ + background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; + } +.menu-profile-list.photos{ + background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; + } +.menu-profile-list.events{ + background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; + } +.menu-profile-list.notes{ + background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; + } +.menu-profile-list.foren{ + background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; + } +.menu-profile-list.com_side{ + background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; + } /* aside */ aside { @@ -2348,7 +2373,13 @@ float: left; .contact-details { color: #999999; } - +#side-bar-photos-albums li{ +list-style-type: disc; +} +#side-bar-photos-albums ul li{ + margin-left: 30px; + padding-left: 0px; + } #side-bar-photos-albums{ margin-top: 15px; } @@ -2362,39 +2393,40 @@ float: left; -moz-box-shadow: 0 0 5px #888; -webkit-box-shadow: 0 0 5px #888; box-shadow: 0 0 5px #888; - background-color: #EEE; + background-color: #000; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; padding-bottom: 20px; position: relative; margin: 0 10px 10px 0; + width: 200px; height: 140px; + overflow: hidden; } +/* .photo-top-album-name { position: absolute; bottom: 0; padding: 0 5px; -} -.photo-top-album-link{ - color: #1872A2; - } +}*/ /*.photo-top-image-wrapper { position: relative; float: left; margin-top: 15px; margin-right: 15px; width: 200px; height: 200px; - overflow: hidden; -} + +}*/ .photo-top-album-name { width: 100%; - min-height: 2em; position: absolute; bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; - background-color: rgb(255, 255, 255); -}*/ + padding-left: 3px; + background-color: #EEE; +} +.photo-top-album-link{ + color: #3465A4; + } #photo-top-end { clear: both; } diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 9093ac2ca..39479ce52 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -1,8 +1,8 @@ Date: Wed, 21 Mar 2012 21:42:27 -0700 Subject: work around doubled linefeeds in tinymce3.5b2 --- mod/item.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mod/item.php b/mod/item.php index fe570075f..ee6c5c9a7 100755 --- a/mod/item.php +++ b/mod/item.php @@ -243,6 +243,7 @@ function item_post(&$a) { } + if(! strlen($body)) { if($preview) killme(); @@ -253,6 +254,15 @@ function item_post(&$a) { } } + // Work around doubled linefeeds in Tinymce 3.5b2 + // First figure out if it's a status post that would've been + // created using tinymce. Otherwise leave it alone. + + $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) : 0); + if((! $parent) && (! $api_source) && (! $plaintext)) { + $body = str_replace("\r\n","\n",$body); + $body = str_replace("\n\n","\n",$body); + } // get contact info for poster -- cgit v1.2.3 From d81256d7b051d9a76b087feeb64ac79fb4aeff4d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Mar 2012 21:45:45 -0700 Subject: support lowercase :-p smilie --- include/text.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/text.php b/include/text.php index 527f3a344..92a74eb49 100644 --- a/include/text.php +++ b/include/text.php @@ -712,6 +712,7 @@ function smilies($s, $sample = false) { ';-)', ':-(', ':-P', + ':-p', ':-"', ':-"', ':-x', @@ -745,6 +746,7 @@ function smilies($s, $sample = false) { ';-)', ':-(', ':-P', + ':-p', ':-\', ':-\', ':-x', -- cgit v1.2.3 From e37c4f69b42cc8a278fb37d1d7cdb374bfd7d156 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 22 Mar 2012 06:54:18 +0100 Subject: add file_as-option to diabook-derivates --- view/theme/diabook-blue/icons/file_as.png | Bin 0 -> 352 bytes view/theme/diabook-blue/style.css | 1 + view/theme/diabook-blue/wall_item.tpl | 4 ++++ view/theme/diabook/icons/file_as.png | Bin 0 -> 352 bytes view/theme/diabook/style.css | 1 + view/theme/diabook/wall_item.tpl | 4 ++++ 6 files changed, 10 insertions(+) create mode 100755 view/theme/diabook-blue/icons/file_as.png create mode 100755 view/theme/diabook/icons/file_as.png diff --git a/view/theme/diabook-blue/icons/file_as.png b/view/theme/diabook-blue/icons/file_as.png new file mode 100755 index 000000000..16713fa53 Binary files /dev/null and b/view/theme/diabook-blue/icons/file_as.png differ diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index f88c7b954..d3d3d9eb7 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -102,6 +102,7 @@ .icon.recycle { background-image: url("../../../view/theme/diabook-blue/icons/recycle.png");} .icon.remote-link { background-image: url("../../../view/theme/diabook-blue/icons/remote.png");} .icon.tagged { background-image: url("../../../view/theme/diabook-blue/icons/tagged.png");} +.icon.file-as { background-image: url("../../../view/theme/diabook-blue/icons/file_as.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook-blue/icons/unstarred.png");} .star-item.icon.starred { background-image: url("../../../view/theme/diabook-blue/icons/starred.png");} .icon.link { background-image: url("../../../view/theme/diabook-blue/icons/link.png");} diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl index ebe40fd4e..20d24702b 100644 --- a/view/theme/diabook-blue/wall_item.tpl +++ b/view/theme/diabook-blue/wall_item.tpl @@ -66,6 +66,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png new file mode 100755 index 000000000..16713fa53 Binary files /dev/null and b/view/theme/diabook/icons/file_as.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ffab5b4c4..5841a96b3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -102,6 +102,7 @@ .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.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");} .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");} .icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");} diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index ebe40fd4e..20d24702b 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -66,6 +66,10 @@ {{ endif }} + {{ if $item.filer }} + + {{ endif }} + {{ if $item.plink }}$item.plink.title{{ endif }} -- cgit v1.2.3