aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/theme/dispy-dark/default.php6
-rw-r--r--view/theme/dispy-dark/head.tpl4
-rw-r--r--view/theme/dispy-dark/header.tpl0
-rw-r--r--view/theme/dispy-dark/jot-header.tpl2
-rw-r--r--view/theme/dispy-dark/nav.tpl8
-rw-r--r--view/theme/dispy-dark/style.css37
-rw-r--r--view/theme/dispy-dark/theme.php18
-rw-r--r--view/theme/dispy/default.php6
-rw-r--r--view/theme/dispy/head.tpl4
-rw-r--r--view/theme/dispy/icons/scroll_top.pngbin0 -> 539 bytes
-rw-r--r--view/theme/dispy/jot-header.tpl2
-rw-r--r--view/theme/dispy/nav.tpl8
-rw-r--r--view/theme/dispy/style.css37
-rw-r--r--view/theme/dispy/theme.php18
14 files changed, 128 insertions, 22 deletions
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 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
- <!-- header stuff will go here -->
+ <?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
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');
}
}
-
-
</script>
-
-
diff --git a/view/theme/dispy-dark/header.tpl b/view/theme/dispy-dark/header.tpl
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/view/theme/dispy-dark/header.tpl
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 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
-
+<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@@ -116,6 +116,12 @@ works -->
$langselector
</div>
+<div id="scrollup">
+<a href="#top"><img
+ src="view/theme/dispy/icons/scroll_top.png"
+ alt="back to top" title="Back to top" /></a>
+</div>
+
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 68d7e230f..a87317d9b 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 c9028b9a9..affffc9cb 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'});
+ }
});
</script>
EOT;
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index 32393f08d..b02f41947 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
- <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <title><?php if(x($page,'title')) echo $page['title']; ?></title>
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+ <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body>
<header>
- <!-- header stuff will go here -->
+ <?php if(x($page, 'header')) echo $page['header']; ?>
</header>
<article id="articlemain">
<?php if(x($page,'nav')) echo $page['nav']; ?>
diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl
index cd6f5ca97..d1bdc256b 100644
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@@ -91,8 +91,4 @@
$('#hide-comments-' + id).html('$showfewer');
}
}
-
-
</script>
-
-
diff --git a/view/theme/dispy/icons/scroll_top.png b/view/theme/dispy/icons/scroll_top.png
new file mode 100644
index 000000000..fa6736086
--- /dev/null
+++ b/view/theme/dispy/icons/scroll_top.png
Binary files differ
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 5838729cc..44120da40 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 34aba50de..b58ae7e3a 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -4,7 +4,7 @@
<!-- yes, they're going the other way. seems that's how the template renderer
works -->
-
+<a name="top" id="top"></a>
<div id="nav-floater">
<div id="nav-buttons">
{{ if $nav.help }}
@@ -116,6 +116,12 @@ works -->
$langselector
</div>
+<div id="scrollup">
+<a href="#top"><img
+ src="view/theme/dispy/icons/scroll_top.png"
+ alt="back to top" title="Back to top" /></a>
+</div>
+
<div class="search-box">
<form method="get" action="$nav.search.0">
<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 66d19e091..dc53f4a40 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 5df193aa6..8af61d78b 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'});
+ }
});
</script>
EOT;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 23:10:18 +0000