You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/12/01 11:07:41 UTC
openmeetings git commit: [OPENMEETINGS-1774] sidebar is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 56f3cfa91 -> 9a3009ef1
[OPENMEETINGS-1774] sidebar is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9a3009ef
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9a3009ef
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9a3009ef
Branch: refs/heads/4.0.x
Commit: 9a3009ef17024f8bb94e84c7db3497be503813b6
Parents: 56f3cfa
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Dec 1 18:07:25 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Dec 1 18:07:25 2017 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/resources/css/site.css | 3 +++
openmeetings-server/src/site/resources/js/site.js | 10 ++++++++++
openmeetings-server/src/site/site.xml | 1 +
src/site/site.xml | 2 +-
4 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3009ef/openmeetings-server/src/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/css/site.css b/openmeetings-server/src/site/resources/css/site.css
index 883af90..25da2d9 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -13,6 +13,9 @@ iframe {
.alignnone.img-responsive {
display: inline-block;
}
+#toc-sidebar {
+ position: absolute;
+}
/* Call for logo, need to be removed*/
.powered-preview {
background-repeat: no-repeat;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3009ef/openmeetings-server/src/site/resources/js/site.js
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js
index 88fcece..0791c1f 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -23,4 +23,14 @@ $(document).ready(function() {
for (var i = 0; i < topics.length; ++i) {
$('ul.nav li a[title="' + topics[i] + '"').append(' <span class="label label-success">New</span>')
}
+ var toc = $('#toc-sidebar'), row = toc.parents('.row');
+ $(document).on('scroll', function() {
+ if (!toc.is(":visible")) {
+ return;
+ }
+ var tv = Math.min(Math.max(0, 60 + $(document).scrollTop() - row.position().top)
+ , row.height() - toc.height() - 20);
+ //console.log("top -> " + tv);
+ toc.css('top', tv + "px");
+ });
})
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3009ef/openmeetings-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index bcd2cae..bfbb101 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -135,6 +135,7 @@
</index>
</pages>
<endContent>
+ <script type="text/javascript" src="$resourcePath/js/site.js"></script>
<script type="text/javascript" src="$resourcePath/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="$resourcePath/js/netcalc.js"></script>
</endContent>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3009ef/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index a3e588e..cbc8a24 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -73,7 +73,7 @@
<toc>sidebar</toc>
<skinAttribution>false</skinAttribution>
<endContent>
- <script src="$resourcePath/js/site.js"></script>
+ <script type="text/javascript" src="$resourcePath/js/site.js"></script>
</endContent>
</reflowSkin>
</custom>