Skip to content

Commit 0a71a9a

Browse files
stysonstyson
authored
upgrade to bootstrap 4 and add new features (#13)
* default to SQL Native Client * major upgrade to bootstrap 4 and sql local storage * updated themme support to bootstrap 4 * final bootstrap 4 changes
1 parent 23323cc commit 0a71a9a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+4586
-14482
lines changed

‎code/about.asp

+20-40
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,13 @@
2525
-->
2626
<html>
2727
<head>
28-
<title></title>
2928
<meta http-equiv="expires" content="0">
3029
<meta name="KeyWords" content="">
3130
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3231
<link rel="Shortcut Icon" href="favicon.ico">
32+
<link href="css/bootstrap.min.css" rel="stylesheet">
3333
<link href="css/<%=Request.Cookies("boltTheme")%>bootstrap.min.css" rel="stylesheet">
3434
<link href="css/style.css" rel="stylesheet">
35-
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
36-
<style>
37-
.topMargin { margin-top: 40px; }
38-
iframe.theme {
39-
width: 204px;
40-
height: 120px;
41-
margin: 1em;
42-
scrolling: no;
43-
}
44-
</style>
4535
<!--#include file="inc/config.inc"-->
4636
<!--#include file="inc/adojavas.inc"-->
4737
<%
@@ -56,71 +46,61 @@ var udl_file = FSO.GetFile(dbConnect.replace("File Name=","").replace(/\\/g,"\\\
5646
<!--#include file="inc/navbar.inc"-->
5747

5848
<div class="container-fluid">
59-
<div class="row-fluid">
60-
<div class="span12">
61-
<a href=http://www.dovetailsoftware.com><img src="img/dovetail.png" alt="Dovetail Software"></a>
62-
</div>
49+
<div class="row">
50+
<a href=http://www.dovetailsoftware.com><img src="img/dovetail.png" alt="Dovetail Software"></a>
6351
</div>
6452

65-
<div class="row-fluid">
66-
<div class="span2"></div>
67-
<div class="span8 well well-small topMargin">
53+
<div class="row">
54+
<div class="col-8 offset-2 card bg-faded mb-4">
6855
<h2>About BOLT</h2>
69-
<p>BOLT is a set of <u>B</u>rowser <u>O</u>n<u>L</u>ine <u>T</u>ools for the Clarify<sup>&reg;</sup> system.</p>
70-
<p>BOLT is freely available online at <a href="https://github.com/DovetailSoftware/bolt">https://github.com/DovetailSoftware/bolt</a>.</p>
56+
<p>BOLT is a set of <u>B</u>rowser <u>O</u>n<u>L</u>ine <u>T</u>ools for the Clarify<sup>&reg;</sup> system.</p>
57+
<p>BOLT is freely available online at <a href="https://github.com/DovetailSoftware/bolt">https://github.com/DovetailSoftware/bolt</a>.</p>
7158
</div>
72-
<div class="span2"></div>
7359
</div>
7460

7561
<%if (!(udl_file.Attributes & 1) ){%>
76-
<div class="row-fluid">
77-
<div class="span2"></div>
78-
<div class="span8 well well-small topMargin">
62+
<div class="row">
63+
<div class="col-8 offset-2 card bg-faded mb-4">
7964
<h2>Administration</h2>
8065
<p>Configure the database connection using the <a href="admin.asp">Administration page</a>.</p>
8166
</div>
82-
<div class="span2"></div>
8367
</div>
8468
<%}%>
8569

86-
<div class="row-fluid">
87-
<div class="span2"></div>
88-
<div class="span8 well well-small topMargin">
70+
<div class="row">
71+
<div class="col-8 offset-2 well well-small topMargin">
8972
<h2>Change Theme</h2>
9073
<p>Click on a theme below to change the theme used for Dovetail Bolt.</p>
9174

9275
<iframe class="theme" src="themes/baseline.asp" scrolling="no"></iframe>
9376
<iframe class="theme" src="themes/cyborg.asp" scrolling="no"></iframe>
94-
<iframe class="theme" src="themes/readable.asp" scrolling="no"></iframe>
77+
<iframe class="theme" src="themes/spacelab.asp" scrolling="no"></iframe>
9578
<iframe class="theme" src="themes/cerulean.asp" scrolling="no"></iframe>
9679
<iframe class="theme" src="themes/slate.asp" scrolling="no"></iframe>
80+
<iframe class="theme" src="themes/journal.asp" scrolling="no"></iframe>
9781

9882
<input type="hidden" id="newTheme" />
9983
</div>
100-
<div class="span2"></div>
10184
</div>
10285

103-
<div class="row-fluid">
104-
<div class="span2"></div>
105-
<div class="span8 well well-small topMargin">
86+
<div class="row">
87+
<div class="col-8 offset-2 card bg-faded mb-4">
10688
<h2>Clarify Form Identifier</h2>
107-
<p>A secret little feature you just might find useful: <a href="clarifyID_help.asp">Clarify Form Identifier</a>.</p>
89+
<p>A secret little feature you just might find useful: <a href="clarifyID_help.asp">Clarify Form Identifier</a>.</p>
10890
</div>
109-
<div class="span2"></div>
11091
</div>
11192

112-
113-
<!--#include file="inc/footer.inc"-->
93+
<!--#include file="inc/footer.inc"-->
11494
</div>
11595
</body>
116-
<script type="text/javascript" src="js/jquery/1.7/jquery.min.js"></script>
117-
<script type="text/javascript" src="js/bootstrap.js"></script>
96+
<script type="text/javascript" src="js/jquery-3.0.0.min.js"></script>
97+
<script type="text/javascript" src="js/bootstrap.min.js"></script>
11898
<script type="text/javascript" src="js/jquery.cookie.js"></script>
11999
<script type="text/javascript">
120100
$(document).ready(function() {
121101
var path = window.location.pathname;
122102
var page = path.substr(path.lastIndexOf("/")+1);
123-
$("ul.nav li a[href$='" + page + "']").parent().addClass("active");
103+
$("ul.navbar-nav li a[href$='" + page + "']").parent().addClass("active");
124104
$(".navbar").find(".connected").text("<%=connect_info%>");
125105
document.title = "Bolt: <%=sPageTitle%>";
126106

‎code/admin.asp

+70-68
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
-->
2626
<html>
2727
<head>
28-
<title></title>
2928
<meta http-equiv="expires" content="0">
3029
<meta name="KeyWords" content="">
3130
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
3231
<link rel="Shortcut Icon" href="favicon.ico">
32+
<link href="css/bootstrap.min.css" rel="stylesheet">
3333
<link href="css/<%=Request.Cookies("boltTheme")%>bootstrap.min.css" rel="stylesheet">
3434
<link href="css/style.css" rel="stylesheet">
35-
<link href="css/bootstrap-responsive.min.css" rel="stylesheet">
3635
<!--#include file="inc/config.inc"-->
3736
<!--#include file="inc/adojavas.inc"-->
3837
<%
@@ -50,107 +49,110 @@ var read_only_udl = udl_file.Attributes & 1;
5049
FSO = null;
5150
udl_file = null;
5251
53-
if(read_only_udl) Response.Redirect("index.asp");
54-
52+
if (read_only_udl) Response.Redirect("index.asp");
5553
%>
5654
<!--#include file="inc/ddonline.inc"-->
5755
<!--#include file="inc/quicklinks.inc"-->
58-
5956
</head>
6057
<body>
6158
<!--#include file="inc/navbar.inc"-->
62-
6359
<div class="container-fluid">
64-
<div class="row-fluid topMargin">
65-
<div class="span2"></div>
66-
<div id="headerContainer" class="span8">
60+
<div class="row">
61+
<div class="col-8 offset-2">
6762

68-
<h2>Set BOLT Database</h2>
69-
<p><b>Warning!</b> Please keep in mind that this sets the database for everyone using this BOLT Web Application.
63+
<h2>Connect to BOLT Database</h2>
64+
<p class="mt-3"><b>Warning!</b> Please keep in mind that this sets the database for everyone using this BOLT Web Application.
7065
<br/>This is a global, not an individual setting.</p>
7166

72-
<label class="fixedWidth">Provider:</label>
73-
<select id="Provider" name="Provider">
74-
<option selected value="SQLOLEDB.1">SQL Server</option>
75-
<option value="OraOLEDB.Oracle">Oracle Provider</option>
76-
<option value="MSDAORA.1">Microsoft Provider for Oracle</option>
77-
</select>
78-
79-
<label class="fixedWidth">User ID:</label>
80-
<input type="text" id="UserID" name="UserID" />
81-
82-
<label class="fixedWidth">Password:</label>
83-
<input type="password" id="Password"name="Password" />
84-
85-
<label class="fixedWidth">Server:</label>
86-
<input type="text" id="DBServer" name="DBServer" />
87-
88-
<div id="server">
89-
<label class="fixedWidth">Database (SQL Server): </label>
90-
<input type="text" id="Database" name="Database" />
91-
</div>
92-
93-
<div id="buttonArea">
94-
<button class="btn " id="submitButton">Submit</button>
95-
<button class="btn" id="resetButton">Reset</button>
96-
</div>
97-
67+
<div class="form-group row mb-1 mt-4">
68+
<label class="form-label col-3">Provider</label>
69+
<select class="form-control col-3" id="Provider" name="Provider">
70+
<option selected value="SQLNCLI11.1">SQL Native Client</option>
71+
<option value="SQLOLEDB.1">SQL Server</option>
72+
<option value="OraOLEDB.Oracle">Oracle Provider</option>
73+
<option value="MSDAORA.1">Microsoft Provider for Oracle</option>
74+
</select>
75+
</div>
76+
77+
<div class="form-group row my-1">
78+
<label class="form-label col-3">User ID</label>
79+
<input class="form-control col-3" type="text" id="UserID" name="UserID" />
80+
</div>
81+
82+
<div class="form-group row my-1">
83+
<label class="form-label col-3">Password:</label>
84+
<input class="form-control col-3" type="password" id="Password"name="Password" />
85+
</div>
86+
87+
<div class="form-group row my-1">
88+
<label class="form-label col-3">Server:</label>
89+
<input class="form-control col-3" type="text" id="DBServer" name="DBServer" />
90+
</div>
91+
92+
<div id="server" class="form-group row my-1">
93+
<label class="form-label col-3">Database (SQL Server): </label>
94+
<input class="form-control col-3" type="text" id="Database" name="Database" />
95+
</div>
96+
97+
<div class="form-group row mt-3">
98+
<div class="col-3 offset-3 px-0">
99+
<button class="btn btn-sm btn-primary col-5" id="submitButton">Submit</button>
100+
<button class="btn btn-sm btn-primary col-5" id="resetButton">Reset</button>
101+
</div>
102+
</div>
98103
</div>
99-
<div class="span2"></div>
100104
</div>
101-
102105
</div>
103106
</body>
104-
<script type="text/javascript" src="js/jquery/1.7/jquery.min.js"></script>
105-
<script type="text/javascript" src="js/bootstrap.js"></script>
107+
<script type="text/javascript" src="js/jquery-3.0.0.min.js"></script>
108+
<script type="text/javascript" src="js/bootstrap.min.js"></script>
106109
<script type="text/javascript">
107110
//////////////////////////////////////////////////////////////////////
108111
// Validate Form - make sure the correct data is filled in
109112
//////////////////////////////////////////////////////////////////////
110113
function validate_form() {
111114
var searchfield = $("#UserID");
112115
var filter = searchfield.val();
113-
if (filter.length == 0) {
114-
alert("You must specify a User ID.");
116+
if (filter.length == 0) {
117+
alert("You must specify a User ID.");
115118
searchfield.focus();
116-
return false;
117-
}
119+
return false;
120+
}
118121
119122
var searchfield = $("#Password");
120123
var filter = searchfield.val();
121-
if (filter.length == 0) {
122-
alert("You must specify a Password.");
123-
searchfield.focus();
124-
return false;
125-
}
124+
if (filter.length == 0) {
125+
alert("You must specify a Password.");
126+
searchfield.focus();
127+
return false;
128+
}
126129
127130
var searchfield = $("#DBServer");
128131
var filter = searchfield.val();
129-
if (filter.length == 0) {
130-
alert("You must specify a Server.");
132+
if (filter.length == 0) {
133+
alert("You must specify a Server.");
131134
searchfield.focus();
132-
return false;
133-
}
135+
return false;
136+
}
134137
135138
var searchfield = $("#Provider");
136-
var TheProvider = searchfield.val();
139+
var TheProvider = searchfield.val();
137140
138-
//Database is required for non-Oracle providers
139-
if (TheProvider != "MSDAORA.1" && TheProvider != "OraOLEDB.Oracle") {
140-
var searchfield = $("#Database");
141+
//Database is required for non-Oracle providers
142+
if (TheProvider != "MSDAORA.1" && TheProvider != "OraOLEDB.Oracle") {
143+
var searchfield = $("#Database");
141144
var filter = searchfield.val();
142-
if (filter.length == 0) {
143-
alert("You must specify a Database.");
145+
if (filter.length == 0) {
146+
alert("You must specify a Database.");
144147
searchfield.focus();
145-
return false;
146-
}
147-
}
148+
return false;
149+
}
150+
}
148151
149-
return true;
152+
return true;
150153
}
151154
152155
function changeDatabase() {
153-
154156
if(!validate_form()) return;
155157
156158
var databaseData = {
@@ -175,13 +177,13 @@ function changeDatabase() {
175177
}
176178
},
177179
error: function(xhr) {
178-
alert("An error occurred while updating database in admin2.asp");
180+
alert("An error occurred while updating database in admin2.asp");
179181
}
180182
});
181183
}
182184
183185
$(document).ready(function() {
184-
$("ul.nav li a[href$='index.asp']").parent().addClass("active");
186+
$("ul.navbar-nav li a[href$='index.asp']").parent().addClass("active");
185187
$(".navbar").find(".connected").text("<%=connect_info%>");
186188
document.title = "Bolt: <%=sPageTitle%>";
187189
@@ -200,7 +202,7 @@ $(document).ready(function() {
200202
if(event.keyCode == 13) $("#submitButton").click();
201203
});
202204
203-
$("#Provider").focus();
205+
$("#UserID").focus();
204206
});
205207
</script>
206208
</html>

‎code/admin2.asp

+10-4
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,22 @@ try {
5151
UDLString += DBServer;
5252
UDLString += ";Persist Security Info=True";
5353
54+
//Initial File Name="";Server SPN=""
55+
5456
result.message = "Database set to: ";
5557
56-
if(Provider == "SQLOLEDB.1") {
57-
UDLString += ";Initial Catalog=";
58-
UDLString += Database;
59-
result.message += Database + " on Server: " + DBServer;
58+
if(Provider == "SQLOLEDB.1" || Provider == "SQLNCLI11.1") {
59+
UDLString += ";Initial Catalog=";
60+
UDLString += Database;
61+
result.message += Database + " on Server: " + DBServer;
6062
} else {
6163
result.message += DBServer;
6264
}
6365
66+
if(Provider == "SQLNCLI11.1") {
67+
UDLString += ";Initial File Name=\"\";Server SPN=\"\"";
68+
}
69+
6470
//Get the Connection String & extract the actual file name
6571
var TheFile = dbConnect;
6672
TheFile = TheFile.replace("File Name=", "");

0 commit comments

Comments
 (0)