<?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 cd6f5ca972..d1bdc256b8 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 0000000000..e69de29bb2 diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl index 5838729cc5..44120da40d 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 34aba50de3..b58ae7e3aa 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -4,7 +4,7 @@ - +

{{ if $nav.help }} @@ -116,6 +116,12 @@ works --> $langselector

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 68d7e230fd..a87317d9b8 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -311,6 +311,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -543,7 +544,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -880,12 +892,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -895,6 +919,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1121,6 +1154,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #111; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1946,7 +1980,7 @@ div[id$="wrapper"] br { position: absolute; text-decoration: none; top: 113px; - right: 250px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2812,6 +2846,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index c9028b9a9a..affffc9cbe 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -114,11 +114,27 @@ function dispy_dark_init(&$a) { return false; }); - // (attempt) to change the text colour in a top post + // (attempt to) change the text colour in a top post $('#profile-jot-text').focusin(function() { $(this).css({color: '#eec'}); }); + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, '500'); + return false; + }); + + }); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); EOT; diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index 32393f08d5..b02f419476 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/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/head.tpl b/view/theme/dispy/head.tpl index cd6f5ca972..d1bdc256b8 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -91,8 +91,4 @@ $('#hide-comments-' + id).html('$showfewer'); } } - - - - diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png new file mode 100644 index 0000000000..fa67360860 Binary files /dev/null and b/view/theme/dispy/icons/scroll_top.png differ diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 5838729cc5..44120da40d 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/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/nav.tpl b/view/theme/dispy/nav.tpl index 34aba50de3..b58ae7e3aa 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -4,7 +4,7 @@ - +

{{ if $nav.help }} @@ -116,6 +116,12 @@ works --> $langselector

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 66d19e0918..dc53f4a40a 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -312,6 +312,7 @@ ul#user-menu-popup { -webkit-border-radius: 0 0 5px 5px; -moz-border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; z-index: 10000; } ul#user-menu-popup li { @@ -544,7 +545,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 10em; color: #eec; } +#scrollup { + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; +} +#scrollup a:hover { + text-decoration: none; + border: 0; +} #user-menu { + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; @@ -881,12 +893,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link line-height: 20px; padding: 2px 20px 5px 0; } +#profile-jot-text_parent { + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; +} #profile-jot-text_tbl { margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { width:99.900002% !important; } +#profile-jot-text_toolbargroup { + background: #888; +} +.mceCenter table tr { + background: #888; +} [id$="jot-text_ifr"] { width: 99.900002% !important; color: #2e2f2e; @@ -896,6 +920,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: #2e2f2e; background: #eec; } +.mceFirst tr { + background: #888; +} +.mceFirst td { + /*border-radius: 10px 10px 0px 0px;*/ +} +.mceLast td { + /*border-radius: 0 0 10px 10px;*/ +} #profile-attach-wrapper, #profile-audio-wrapper, #profile-link-wrapper, @@ -1122,6 +1155,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .wall-item-outside-wrapper { border: 1px solid #aaa; border-radius: 5px; + box-shadow: 5px 0 10px 0 #111; } .wall-item-outside-wrapper.comment { margin-top: 5px; @@ -1947,7 +1981,7 @@ div[id$="wrapper"] br { position: absolute; text-decoration: none; top: 113px; - right: 250px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -2813,6 +2847,7 @@ footer { background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; margin: 6px; + color: #111; } #acl-showall { float: left; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 5df193aa60..8af61d78bd 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -114,11 +114,27 @@ function dispy_init(&$a) { return false; }); - // (attempt) to change the text colour in a top post + // (attempt to) change the text colour in a top post $('#profile-jot-text').focusin(function() { $(this).css({color: '#eec'}); }); + $('a[href=#top]').click(function() { + $('html, body').animate({scrollTop:0}, '500'); + return false; + }); + + }); + // shadowing effect for floating toolbars + $(document).scroll(function(e) { + var pageTop = $('html').scrollTop(); + if (pageTop) { + $('#nav-floater').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + $('.search-box').css({boxShadow: '3px 3px 10px rgba(0, 0, 0, 0.7)'}); + } else { + $('#nav-floater').css({boxShadow: '0 0 0 0'}); + $('.search-box').css({boxShadow: '0 0 0 0'}); + } }); EOT;