Skip to content

Commit

Permalink
final changes for deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
tpmccauley committed Sep 17, 2014
1 parent bb34ce6 commit 064960b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
10 changes: 5 additions & 5 deletions css/scrollbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* All comments can be freely removed from the css */

/*
Your custom scrollbar images do not need to have the same size as in example images, but the
Your custom scrollbar images do not need to have the same size as in example images, but the
placement of the images with respect to eachother in the image may play an important role
as some elements are auto-sized by fleXcroll. You do not need to define images for
all elements, you may want to have some transparency, or simply a filled color without
Expand Down Expand Up @@ -31,7 +31,7 @@ not for user customization, and is mandatory*/
top: 0; left: 0;
}

/* For scrollbars, defining a color for background alongside with an image
/* For scrollbars, defining a color for background alongside with an image
is always a good idea, this way the scrollbars are visible until images load */
.vscrollerbase {
/* vscrollerbase is the div that holds the scrollbar (parent of vscrollerbar) */
Expand Down Expand Up @@ -138,12 +138,12 @@ bottom: 0px; right: 0px;
/* Following are for scrollbase images, may not always be required */

.black .vscrollerbase {
/* Vertical scrollbar's base body */
/* Vertical scrollbar's base body */
background: #404040 0px 0px repeat-y;
}

.white .vscrollerbase {
/* Vertical scrollbar's base body */
/* Vertical scrollbar's base body */
background: #b0b0b0 0px 0px repeat-y;
}

Expand All @@ -165,7 +165,7 @@ bottom: 0px; right: 0px;
}

.hscrollerbase {
/* Horziontal scrollbar's base body */
/* Horziontal scrollbar's base body */
background: #D7EBDF url("../graphics/horizontalbarbody_cornerjog.png") 0px -15px repeat-x;
}

Expand Down
4 changes: 2 additions & 2 deletions index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
</tr>
<tr>
<td width="280px" class="bordered">
<div id="switches-div" style="overflow: auto; height: 600px;" class="flexcroll">
<table id="switches" width="266px">
<div id="switches-div" style="overflow: auto; height: 600px;">
<table id="switches" width="250px">
</table>
</div>
</td>
Expand Down
18 changes: 9 additions & 9 deletions js/elab.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ function selectAll(start, finish, direction) {
for (var i = start; i < finish; i++) {
fldObj = document.getElementById("cb" + i);
if (fldObj.type == 'checkbox') {
fldObj.checked = direction;
fldObj.checked = direction;
}
}
}

function reference(name, W, H) {
if (!H) {
H = 250;
Expand Down Expand Up @@ -134,7 +134,7 @@ function updateLabels(source, name) {
nl = text.length;
}
text = text.substring(0, index) + source.value + text.substring(nl);
destInput.value = text;
destInput.value = text;
}
}
}
Expand Down Expand Up @@ -172,7 +172,7 @@ function log(text) {
function initlog(defaultOn) {
document.write(
'<a onclick="toggleLog();" style="position: fixed; bottom: 4px; right: 20px; z-index: 1;"><img id="logtoggle" src="graphics/plus.png" alt="Show Log" /></a>' +
'<div id="log" style="display: none; z-index: 0; height: 100px;">' +
'<div id="log" style="display: none; z-index: 0; height: 100px;">' +
'</div>');
if (defaultOn) {
toggleLog();
Expand All @@ -185,7 +185,7 @@ function toggleLog() {
if (l.style.display == "none") {
l.style.display = "block";
lt.alt = "Hide Log";
lt.src = "graphics/minus.png";
lt.src = "graphics/minus.png";
}
else {
l.style.display = "none";
Expand All @@ -197,7 +197,7 @@ function toggleLog() {
function printStackTrace() {
try {
kaboom();
}
}
catch (e) {
log("<pre>" + e.stack + "</pre>");
}
Expand Down Expand Up @@ -248,15 +248,15 @@ function spinnerOff(selector) {
$(selector + " .spinner-image").remove();
}

function isArray(testObject) {
function isArray(testObject) {
return testObject && !(testObject.propertyIsEnumerable('length')) && typeof testObject === 'object' && typeof testObject.length === 'number';
}

function pp(obj) {
if (isArray(obj)) {
s = "[";
for (var i in obj) {
s += i + ": " + pp(obj[i]) + ", ";
s += i + ": " + pp(obj[i]) + ", ";
}
s += "]";
return s;
Expand Down Expand Up @@ -289,4 +289,4 @@ function openPopup(event, id) {

function closePopup(id) {
$("#" + id).hide();
}
}
1 change: 1 addition & 0 deletions jsp/browser.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<%
// Set the data location
String dataLocation = "/afs/cern.ch/project/jps/reps/opendata-ispy";
//String dataLocation = "/Users/mccauley/test-opendata";
String op = request.getParameter("op");
String param = request.getParameter("param");
Expand Down

0 comments on commit 064960b

Please sign in to comment.