From 04119d31e51c749cfa81b9a8ac5f52005d71f8c4 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 29 May 2012 16:13:27 -0400 Subject: [PATCH 1/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: Add two hooks, event_created and event_updated. One Bugfix for the ... tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning MySQL-Fulltext search option is disabled by default Disabled logging of SQL statements Doing negative caching for config values, special logfile for database optmisations Saved searches now can search for tags as well Deactivating the test output in db engine Speed optimisation by enabling the posibility of the MySQL fulltext engine Performance tests API: RSS-Feeds are now shortened to 1000 characters. (With added link) * master: From 34f210bc2d3e94e2150156e892a2a27d095f410c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 3 Jun 2012 18:10:04 -0400 Subject: [PATCH 2/6] fix mini photo-menu bug Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 2 +- view/theme/dispy/dark/style.less | 4 ++-- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 82118275a..b94e5ec34 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -230,7 +230,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;} .wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} -.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:4,5em;top:4em;background-position:35px center;} +.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;} .comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 0617aaced..c15706c36 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -1537,8 +1537,8 @@ nav #nav-notifications-linkmenu { .box(40px, 40px); } .wall-item-photo-menu-button { - width: 4,5em; - top: 4em; + width: 3.35em; + top: 3.2em; background-position: 35px center; } .wall-item-author { diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index e56696eab..0e7fc1f8d 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -230,7 +230,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;} .wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;} -.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:4,5em;top:4em;background-position:35px center;} +.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;} .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;} .wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;} .comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 72b3069a6..ba8e0093b 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1538,8 +1538,8 @@ nav #nav-notifications-linkmenu { .box(40px, 40px); } .wall-item-photo-menu-button { - width: 4,5em; - top: 4em; + width: 3.35em; + top: 3.2em; background-position: 35px center; } .wall-item-author { From ca105f1c669950768a1f4cd6b93f471cabbc5114 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 4 Jun 2012 07:17:23 +0200 Subject: [PATCH 3/6] quattro: cleanup the less file --- view/theme/quattro/dark/style.css | 10 ++--- view/theme/quattro/green/style.css | 10 ++--- view/theme/quattro/quattro.less | 68 ++++++++++++++++++------------ 3 files changed, 50 insertions(+), 38 deletions(-) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index d59ace8e3..14b7c75b3 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1706,7 +1706,7 @@ footer { margin-bottom: 5px; clear: left; } -#adminpage .plugin .desc { +#adminpage .plugin desc { margin-left: 2.5em; } #adminpage .toggleplugin { @@ -1721,16 +1721,16 @@ footer { #adminpage table th { text-align: left; } -#adminpage td .icon { +#adminpage table td .icon { float: left; } +#adminpage table tr:hover { + background-color: #bbc7d7; +} #adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { - background-color: #bbc7d7; -} #adminpage .selectall { text-align: right; } diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index d764886c1..f33c45eae 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1706,7 +1706,7 @@ footer { margin-bottom: 5px; clear: left; } -#adminpage .plugin .desc { +#adminpage .plugin desc { margin-left: 2.5em; } #adminpage .toggleplugin { @@ -1721,16 +1721,16 @@ footer { #adminpage table th { text-align: left; } -#adminpage td .icon { +#adminpage table td .icon { float: left; } +#adminpage table tr:hover { + background-color: #bbc7d7; +} #adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { - background-color: #bbc7d7; -} #adminpage .selectall { text-align: right; } diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index ce03dd6da..4d57719d9 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1163,53 +1163,65 @@ footer { height: 100px; display: table-row; } padding: 0em 0.3em; } -#adminpage dl { +#adminpage { + dl { clear: left; margin-bottom: 2px; padding-bottom: 2px; border-bottom: 1px solid black; -} -#adminpage dt { + } + dt { width: 200px; float: left; font-weight: bold; -} -#adminpage dd { + } + dd { margin-left: 200px; -} - -#adminpage h3 { + } + h3 { border-bottom: 1px solid #cccccc; -} -#adminpage .field label { + } + .field label { font-weight: bold; -} -#adminpage .submit { + } + .submit { clear:left; text-align: right; -} - -#adminpage #pluginslist { + } + #pluginslist { margin: 0px; padding: 0px; -} -#adminpage .plugin { + } + .plugin { list-style: none; display: block; border: 1px solid #888888; padding: 1em; margin-bottom: 5px; clear: left; -} -#adminpage .plugin .desc { margin-left: 2.5em;} -#adminpage .toggleplugin { + desc { + margin-left: 2.5em; + } + } + .toggleplugin { float:left; margin-right: 1em; + } + table { + width:100%; + border-bottom: 1px solid #000000; + margin: 5px 0px; + th { + text-align: left; + } + td .icon { + float: left; + } + tr:hover { + background-color: #bbc7d7; + } + } + table#users img { + width: 16px; height: 16px; + } + .selectall { text-align: right; } } - -#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #bbc7d7; } -#adminpage .selectall { text-align: right; } - From 5de91c2a7c924ac6067828a0e5bfbef5572c1f39 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 4 Jun 2012 08:08:45 +0200 Subject: [PATCH 4/6] API: Only repeat items if there is a content --- include/api.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/include/api.php b/include/api.php index 5697fbdbc..cd8526f89 100644 --- a/include/api.php +++ b/include/api.php @@ -898,7 +898,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_repeat: '.$id); + logger('API: api_statuses_repeat: '.$id); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); @@ -915,13 +915,15 @@ intval($id) ); - $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; - $_REQUEST['profile_uid'] = local_user(); - $_REQUEST['type'] = 'wall'; - $_REQUEST['api_source'] = true; + if ($r[0]['body'] != "") { + $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; + $_REQUEST['profile_uid'] = local_user(); + $_REQUEST['type'] = 'wall'; + $_REQUEST['api_source'] = true; - require_once('mod/item.php'); - item_post($a); + require_once('mod/item.php'); + item_post($a); + } if ($type == 'xml') $ok = "true"; @@ -943,7 +945,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_destroy: '.$id); + logger('API: api_statuses_destroy: '.$id); require_once('include/items.php'); drop_item($id, false); From b13c6ea9adde898d499fb70134fa5c99d324031a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 4 Jun 2012 11:49:16 +0200 Subject: [PATCH 5/6] quattro: added editor buttons to comments --- view/theme/quattro/comment_item.tpl | 37 ++++++++-- view/theme/quattro/dark/style.css | 102 ++++++++++++++++++++++++++++ view/theme/quattro/green/style.css | 102 ++++++++++++++++++++++++++++ view/theme/quattro/quattro.less | 58 ++++++++++++++++ view/theme/quattro/theme.php | 87 +++++++++++++++++++++++- 5 files changed, 380 insertions(+), 6 deletions(-) diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl index cde4ca3ca..ea24d95cc 100644 --- a/view/theme/quattro/comment_item.tpl +++ b/view/theme/quattro/comment_item.tpl @@ -11,13 +11,42 @@ $mytitle
+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+ {{ if $qcomment }} - {{ for $qcomment as $qc }} - $qc -   + {{ endif }} -