Skip to content

Commit

Permalink
Merge branch 'develop' into 5565-allow-edit-of-file-directory
Browse files Browse the repository at this point in the history
  • Loading branch information
mheppler committed Mar 7, 2019
2 parents f57d2a5 + dc24355 commit 6f87904
Show file tree
Hide file tree
Showing 60 changed files with 789 additions and 797 deletions.
6 changes: 6 additions & 0 deletions doc/sphinx-guides/source/_static/docsdataverse_org.css
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ div.code-example .color-swatch {
margin: 0 5px;
border-radius: 3px
}
div.code-example .messagePanel .glyphicon {
font-size: 1.5em;
vertical-align: bottom;
}
div.code-example span.glyphicon-question-sign.tooltip-icon {color: #99bcdb !important;}
div.code-example span.glyphicon-question-sign.tooltip-icon:hover {color: #337AB7 !important;}

#breadcrumbNavBlock {margin-top:.5em;}
#breadcrumbNavBlock .breadcrumbBlock {float:left; position:relative;}
Expand Down
33 changes: 30 additions & 3 deletions doc/sphinx-guides/source/_static/dv_rebind_bootstrap_ui.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
function bind_tooltip(){
// bind tooltips to all necessary elements
$("a.bootstrap-button-tooltip").tooltip({container: 'body'});
function bind_bsui_components(){
bind_tooltip_popover();
}

function bind_tooltip_popover(){
// bind tooltips + popovers to all necessary elements
$jqTheme(".bootstrap-button-tooltip, [data-toggle='tooltip']").tooltip({container: 'body'});
$jqTheme("[data-toggle='popver']").popover({container: 'body'});

// CLOSE OPEN TOOLTIPS + POPOVERS ON BODY CLICKS
$jqTheme('body').on("touchstart", function(e){
$jqTheme(".bootstrap-button-tooltip, [data-toggle='tooltip']").each(function () {
// hide any open tooltips when anywhere else in body is clicked
if (!$jqTheme(this).is(e.target) && $jqTheme(this).has(e.target).length === 0 && $jqTheme('div.tooltip').has(e.target).length === 0) {
$jqTheme(this).tooltip('hide');
}////end if
});
$jqTheme("a.popoverHTML, [data-toggle='popover']").each(function () {
//the 'is' for buttons that trigger popups
//the 'has' for icons within a button that triggers a popup
if (!$jqTheme(this).is(e.target) && $jqTheme(this).has(e.target).length === 0 && $jqTheme('div.popover').has(e.target).length === 0) {
$jqTheme(this).popover('hide');
}
});
});

// CLOSE OPEN TOOLTIPS ON BUTTON CLICKS
$jqTheme('.bootstrap-button-tooltip').on('click', function () {
$jqTheme(this).tooltip('hide');
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<!-- RECENT CATEGORY -->
<div id="recentActivity" class="col-xs-12">
<div class="row">
<div class="col-lg-4 col-md-12 hmpg-recent-col">
<div class="col-lg-4 col-xs-12 hmpg-recent-col">
<div class="h4 lite-header margin-bottom">Datasets from journal dataverses</div>

<hr class="col-xs-11 no-margin-top"/>
Expand All @@ -141,7 +141,7 @@

<hr class="col-xs-12 hidden-lg spacer-rule" />

<div class="col-lg-8 col-md-12 hmpg-recent-col">
<div class="col-lg-8 col-xs-12 hmpg-recent-col">
<div class="h4 lite-header margin-bottom">Datasets from other dataverses</div>

<hr class="col-xs-11 no-margin-top"/>
Expand All @@ -152,7 +152,7 @@
</div>

<div class="row">
<div class="col-lg-4 col-md-12 hmpg-recent-col">
<div class="col-lg-4 col-xs-12 hmpg-recent-col">
<!-- VIEW ALL -->
<!--
NOTE: The alias of the root dataverse will need to be configured in this URL
Expand All @@ -161,7 +161,7 @@
<p class="small text-muted"><a href="/dataverse/root?q=%28categoryOfDataverse%3A%22Journal%22+OR+dvCategory%3A%22Journal%22%29&types=datasets%3Adataverses&sort=dateSort">ALL RECENT JOURNAL ACTIVITY</a> <span class="glyphicon glyphicon-chevron-right"></span></p>
</div>
</div>
<div class="col-lg-8 col-md-12 hmpg-recent-col">
<div class="col-lg-8 col-xs-12 hmpg-recent-col">
<!-- VIEW ALL -->
<!--
NOTE: The alias of the root dataverse will need to be configured in this URL
Expand Down
6 changes: 6 additions & 0 deletions doc/sphinx-guides/source/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
{# Add some extra stuff before and use existing with 'super()' call. #}
{% block footer %}
{{ super() }}
<script>
$jqTheme(document).ready(function () {
// Rebind bootstrap UI components
bind_bsui_components();
});
</script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
8 changes: 4 additions & 4 deletions doc/sphinx-guides/source/style/foundations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,10 @@ There are over 250 glyphs in font format from the Glyphicon Halflings set provid
.. raw:: html

<div class="panel panel-default code-example">
<div class="panel-body">
<span class="glyphicon glyphicon-search h1"></span>
<span class="glyphicon glyphicon-user h1"></span>
<span class="glyphicon glyphicon-lock h1"></span>
<div class="panel-body h1">
<span class="glyphicon glyphicon-search"></span>
<span class="glyphicon glyphicon-user"></span>
<span class="glyphicon glyphicon-lock"></span>
</div>
</div>

Expand Down
Loading

0 comments on commit 6f87904

Please sign in to comment.