From 093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 13 Apr 2012 04:11:17 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: (22 commits) stray debug statements, forgot to filter pending contacts bug #369 - show contacts who are not in any groups extended the "interesting" profile attributes send link directly to profile tab stray log statements profile change activities allow setting default new friend notify turn off new friend activity by default rev update diabook-themes: fixed css for settings aside-links diabook-themes: css-fixes in aside fix css in aside query to find un-grouped contacts reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem turn off update transactions until we figure out how to do them safely. table cleanup quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all settings: remove call to profile_load() quattro: move center css to style.php. add tpl for generic_links_widget ... * master: From 6b46fe3dfeeae89e00991d8e8f8d9ec0dadbb5bc Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 13 Apr 2012 19:30:07 -0400 Subject: [PATCH 2/2] neat little changes. hopefully the shadow will be well recieved Signed-off-by: Simon L'nu --- view/theme/dispy-dark/default.php | 6 ++--- view/theme/dispy-dark/head.tpl | 4 --- view/theme/dispy-dark/header.tpl | 0 view/theme/dispy-dark/jot-header.tpl | 2 +- view/theme/dispy-dark/nav.tpl | 8 +++++- view/theme/dispy-dark/style.css | 37 +++++++++++++++++++++++++- view/theme/dispy-dark/theme.php | 18 ++++++++++++- view/theme/dispy/default.php | 6 ++--- view/theme/dispy/head.tpl | 4 --- view/theme/dispy/icons/scroll_top.png | Bin 0 -> 539 bytes view/theme/dispy/jot-header.tpl | 2 +- view/theme/dispy/nav.tpl | 8 +++++- view/theme/dispy/style.css | 37 +++++++++++++++++++++++++- view/theme/dispy/theme.php | 18 ++++++++++++- 14 files changed, 128 insertions(+), 22 deletions(-) create mode 100644 view/theme/dispy-dark/header.tpl create mode 100644 view/theme/dispy/icons/scroll_top.png diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index 32393f08d..b02f41947 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -1,13 +1,13 @@ - <?php if(x($page,'title')) echo $page['title'] ?> + <?php if(x($page,'title')) echo $page['title']; ?> - +
- +
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl index cd6f5ca97..d1bdc256b 100644 --- a/view/theme/dispy-dark/head.tpl +++ b/view/theme/dispy-dark/head.tpl @@ -91,8 +91,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - - - diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 5838729cc..44120da40 100644 --- a/view/theme/dispy-dark/jot-header.tpl +++ b/view/theme/dispy-dark/jot-header.tpl @@ -36,7 +36,7 @@ function initEditor(cb) { entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, - force_p_newlines : false, + force_p_newlines : true, force_br_newlines : true, forced_root_block : '', convert_urls: false, diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 34aba50de..b58ae7e3a 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -4,7 +4,7 @@ - +