Skip to content

Commit c8550fe

Browse files
committed
expandable box without icon
1 parent bd36bf4 commit c8550fe

4 files changed

Lines changed: 18 additions & 19 deletions

File tree

server.R

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,9 +2381,6 @@ outputOptions(output,'ninfocentmax',suspendWhenHidden=FALSE)
23812381
#' The user is only allowed to change the dataset on the first tab; on the
23822382
#' following tabs I output the current dataset as a reminder of what network
23832383
#' they are working with.
2384-
#'
2385-
#' Coming soon: term documentation.
2386-
23872384

23882385
#+ eval=FALSE
23892386
#UNCOMMENT AFTER RELEASE FOR TERM DOCUMENTATION

ui.R

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ url = {http://statnetproject.org}
795795
column(5,
796796
tabsetPanel(
797797
tabPanel("Term Documentation",
798+
div(class="placeholder",
798799
fluidRow(
799800
bsButtonGroup("matchingorall", label=NULL, toggle="radio",
800801
value="matching",
@@ -803,14 +804,12 @@ url = {http://statnetproject.org}
803804
uiOutput("listofterms")
804805
),
805806
div(id="termdocbox",
806-
verbatimTextOutput("termdoc"),
807-
fluidRow(align="center",
808-
div(id="termexpand",
809-
icon(name="angle-double-down", class="fa-2x"))
810-
))
811-
807+
verbatimTextOutput("termdoc")
808+
)
809+
)
812810
),
813811
tabPanel("Control Options",
812+
div(class="placeholder",
814813
fluidRow(
815814
column(3,
816815
inlineSelectInput('controltype',label=NULL,
@@ -850,10 +849,9 @@ url = {http://statnetproject.org}
850849
p("Coming soon")),
851850
conditionalPanel(condition="input.controltype == 'Other'",
852851
p("Coming soon"))
853-
))
852+
)))
854853
)
855854
),
856-
br(),br(),
857855
fluidRow(
858856
column(2,
859857
p('Current ergm formula:')),

www/alert.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ $(document).ready(function(){
9090
$(".chromewarningbox").toggle(500);
9191
});
9292

93-
$("#termexpand").click(function(){
93+
$("#termdocbox").click(function(){
9494
if($("#termdocbox").height()<100){
9595
$("#termdocbox").css({
96-
"max-height":"250px"
96+
"height":"250px"
9797
});
9898
} else {
9999
$("#termdocbox").css({
100-
"max-height":"75px"
100+
"height":"65px"
101101
});
102102
}
103103

www/style.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,27 +218,31 @@ div .mcmcopt {
218218
margin-bottom:2px;
219219
margin-left:2px;
220220
}
221+
div.placeholder {
222+
height:110px;
223+
}
221224
#termdoc {
222225
background:#FFFFFF;
223226
border:none;
224227
}
225228
#termdocbox {
226229
position:absolute;
227-
max-height:75px;
230+
margin-right:10px;
231+
height:65px;
228232
border: 1px solid #CECED8;
229233
border-radius: 5px;
230234
overflow:scroll;
235+
z-index:9;
231236
}
232237
#termexpand {
233238
position:absolute;
234-
width:50px;
235-
height:22px;
236-
margin-bottom:2px;
239+
width:30px;
240+
height:20px;
237241
background: #FFFFFF;
238242
border: 1px solid #CECED8;
239243
border-radius: 5px;
240-
border-top:none;
241244
color: #A5A5AD;
245+
z-index:10;
242246
}
243247
#termexpand:hover {
244248
color: #737379;

0 commit comments

Comments
 (0)