Skip to content

Commit 94396ce

Browse files
phpipamphpipam
committed
Moved JS and CSS to subfolder to prevent browser caching on version upgrade
1 parent 315b9bd commit 94396ce

File tree

153 files changed

+141
-144
lines changed

Some content is hidden

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

153 files changed

+141
-144
lines changed

‎app/admin/devices/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
elseif($field['type'] == "date" || $field['type'] == "datetime") {
168168
// just for first
169169
if($timeP==0) {
170-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
171-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
170+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
171+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
172172
print '<script type="text/javascript">';
173173
print '$(document).ready(function() {';
174174
//date only

‎app/admin/import-export/import-button.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
</form>
3333

3434
<!-- jQuery File Upload Dependencies -->
35-
<script src="js/uploader/jquery.ui.widget.js"></script>
36-
<script src="js/uploader/jquery.iframe-transport.js"></script>
37-
<script src="js/uploader/jquery.fileupload.js"></script>
35+
<script src="js/1.2/uploader/jquery.ui.widget.js"></script>
36+
<script src="js/1.2/uploader/jquery.iframe-transport.js"></script>
37+
<script src="js/1.2/uploader/jquery.fileupload.js"></script>
3838

3939
<script type="text/javascript">
4040
$(function(){

‎app/admin/instructions/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<textarea style="width:100%;" name="instructions" id="instructions" rows="<?php print $rowcount; ?>"><?php print stripslashes($instructions->instructions); ?></textarea>
3333
<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
3434

35-
<script src="js/ckeditor/ckeditor.js"></script>
35+
<script src="js/1.2/ckeditor/ckeditor.js"></script>
3636
<script>
3737
CKEDITOR.replace( 'instructions', {
3838
uiColor: '#f9f9f9',

‎app/admin/requests/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@
243243
elseif($myField['type'] == "date" || $myField['type'] == "datetime") {
244244
// just for first
245245
if($timeP==0) {
246-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
247-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
246+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
247+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
248248
print '<script type="text/javascript">';
249249
print '$(document).ready(function() {';
250250
//date only

‎app/admin/sections/edit-order.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$sections = $Sections->fetch_all_sections();
2222
?>
2323

24-
<script type="text/javascript" src="js/jquery-ui-1.10.3.custom.min.js"></script>
24+
<script type="text/javascript" src="js/1.2/jquery-ui-1.10.3.custom.min.js"></script>
2525
<script>
2626
$(document).ready(function() {
2727
// initialize sortable

‎app/admin/subnets/edit-folder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@
169169
elseif($field['type'] == "date" || $field['type'] == "datetime") {
170170
// just for first
171171
if($timeP==0) {
172-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
173-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
172+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
173+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
174174
print '<script type="text/javascript">';
175175
print '$(document).ready(function() {';
176176
//date only

‎app/admin/subnets/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@
511511
elseif($field['type'] == "date" || $field['type'] == "datetime") {
512512
// just for first
513513
if($timeP==0) {
514-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
515-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
514+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
515+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
516516
print '<script type="text/javascript">';
517517
print '$(document).ready(function() {';
518518
//date only

‎app/admin/tags/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
}
3232
?>
3333

34-
<script type="text/javascript" src="js/bootstrap-colorpicker.min.js"></script>
35-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-colorpicker.min.css">
34+
<script type="text/javascript" src="js/1.2/bootstrap-colorpicker.min.js"></script>
35+
<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-colorpicker.min.css">
3636
<script type="text/javascript">
3737
$(function(){
3838
$('.select-bgcolor').colorpicker();

‎app/admin/users/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@
326326
elseif($field['type'] == "date" || $field['type'] == "datetime") {
327327
// just for first
328328
if($timeP==0) {
329-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
330-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
329+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
330+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
331331
print '<script type="text/javascript">';
332332
print '$(document).ready(function() {';
333333
//date only

‎app/admin/users/print-all.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
print '<tr>' . "\n";
6060

6161
# set icon based on normal user or admin
62-
if($user['role'] == "Administrator") { print ' <td><img src="css/images/userVader.png" rel="tooltip" title="'._('Administrator').'"></td>'. "\n"; }
63-
else { print ' <td><img src="css/images/userTrooper.png" rel="tooltip" title="'. _($user['role']) .'"></td>'. "\n"; }
62+
if($user['role'] == "Administrator") { print ' <td><img src="css/1.2/images/userVader.png" rel="tooltip" title="'._('Administrator').'"></td>'. "\n"; }
63+
else { print ' <td><img src="css/1.2/images/userTrooper.png" rel="tooltip" title="'. _($user['role']) .'"></td>'. "\n"; }
6464

6565
print ' <td><a href="'.create_link("administration","users",$user['id']).'">' . $user['real_name'] . '</a></td>'. "\n";
6666
print ' <td>' . $user['username'] . '</td>'. "\n";

‎app/admin/vlans/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@
174174
elseif($field['type'] == "date" || $field['type'] == "datetime") {
175175
// just for first
176176
if($timeP==0) {
177-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
178-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
177+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
178+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
179179
print '<script type="text/javascript">';
180180
print '$(document).ready(function() {';
181181
//date only

‎app/admin/vrfs/edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
elseif($field['type'] == "date" || $field['type'] == "datetime") {
138138
// just for first
139139
if($timeP==0) {
140-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
141-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
140+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
141+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
142142
print '<script type="text/javascript">';
143143
print '$(document).ready(function() {';
144144
//date only

‎app/dashboard/index.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
</script>
1818

1919

20-
<!-- <script type="text/javascript" src="js/jquery-ui-1.10.4.custom.min.js"></script> -->
2120
<script>
2221
$(document).ready(function() {
2322
// initialize sortable
@@ -75,9 +74,9 @@
7574

7675

7776
<!-- charts -->
78-
<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>
79-
<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>
80-
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->
77+
<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>
78+
<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>
79+
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->
8180

8281

8382
<div class="welcome" style="text-align:right">

‎app/dashboard/widgets/top10_hosts_v4.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
$height = 350;
3636
$slimit = 20;
3737
# include flot JS
38-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
39-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
40-
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
38+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>';
39+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>';
40+
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->';
4141
# and print title
4242
print "<div class='container'>";
4343
print "<h4 style='margin-top:40px;'>$widget[wtitle]</h4><hr>";

‎app/dashboard/widgets/top10_hosts_v6.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
$height = 350;
3535
$slimit = 20;
3636
# include flot JS
37-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
38-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
39-
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
37+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>';
38+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>';
39+
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->';
4040
# and print title
4141
print "<div class='container'>";
4242
print "<h4 style='margin-top:40px;'>$widget[wtitle]</h4><hr>";

‎app/dashboard/widgets/top10_percentage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
$height = 350;
3030
$slimit = 20;
3131
# include flot JS
32-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.js"></script>';
33-
print '<script language="javascript" type="text/javascript" src="js/flot/jquery.flot.categories.js"></script>';
34-
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/flot/excanvas.min.js"></script><![endif]-->';
32+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>';
33+
print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>';
34+
print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->';
3535
# and print title
3636
print "<div class='container'>";
3737
print "<h4 style='margin-top:40px;'>$widget[wtitle]</h4><hr>";

‎app/footer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<input type="hidden" name="cmd" value="_s-xclick">
2525
<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
2626
">
27-
<input type="image" src="css/images/btn_donate_SM.gif" name="submit">
27+
<input type="image" src="css/1.2/images/btn_donate_SM.gif" name="submit">
2828
</td>';
2929

3030
}

‎app/install/index.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@
5757
<title>phpipam installation</title>
5858

5959
<!-- css -->
60-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.min.css">
61-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-custom.css">
62-
<link rel="stylesheet" type="text/css" href="css/font-awesome/font-awesome.min.css">
63-
<link rel="shortcut icon" href="css/images/favicon.png">
60+
<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap.min.css">
61+
<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-custom.css">
62+
<link rel="stylesheet" type="text/css" href="css/1.2/font-awesome/font-awesome.min.css">
63+
<link rel="shortcut icon" href="css/1.2/images/favicon.png">
6464

6565
<!-- js -->
66-
<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
67-
<script type="text/javascript" src="js/install.js"></script>
68-
<script type="text/javascript" src="js/bootstrap.min.js"></script>
66+
<script type="text/javascript" src="js/1.2/jquery-2.1.3.min.js"></script>
67+
<script type="text/javascript" src="js/1.2/install.js"></script>
68+
<script type="text/javascript" src="js/1.2/bootstrap.min.js"></script>
6969
<script type="text/javascript">
7070
$(document).ready(function(){
7171
if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
7272
});
7373
</script>
7474
<!--[if lt IE 9]>
75-
<script type="text/javascript" src="js/dieIE.js"></script>
75+
<script type="text/javascript" src="js/1.2/dieIE.js"></script>
7676
<![endif]-->
7777
</head>
7878

‎app/login/index.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@
3535
<title><?php print $User->settings->siteTitle; ?></title>
3636

3737
<!-- css -->
38-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.min.css">
39-
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-custom.css">
40-
<link rel="stylesheet" type="text/css" href="css/font-awesome/font-awesome.min.css">
41-
<link rel="shortcut icon" href="css/images/favicon.png">
38+
<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap.min.css">
39+
<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-custom.css">
40+
<link rel="stylesheet" type="text/css" href="css/1.2/font-awesome/font-awesome.min.css">
41+
<link rel="shortcut icon" href="css/1.2/images/favicon.png">
4242

4343
<!-- js -->
44-
<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
45-
<script type="text/javascript" src="js/login.js"></script>
46-
<script type="text/javascript" src="js/bootstrap.min.js"></script>
44+
<script type="text/javascript" src="js/1.2/jquery-2.1.3.min.js"></script>
45+
<script type="text/javascript" src="js/1.2/login.js"></script>
46+
<script type="text/javascript" src="js/1.2/bootstrap.min.js"></script>
4747
<script type="text/javascript">
4848
$(document).ready(function(){
4949
if ($("[rel=tooltip]").length) { $("[rel=tooltip]").tooltip(); }
5050
});
5151
</script>
5252
<!--[if lt IE 9]>
53-
<script type="text/javascript" src="js/dieIE.js"></script>
53+
<script type="text/javascript" src="js/1.2/dieIE.js"></script>
5454
<![endif]-->
5555
</head>
5656

‎app/subnets/addresses/address-modify.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@
363363
elseif($field['type'] == "date" || $field['type'] == "datetime") {
364364
// just for first
365365
if($timeP==0) {
366-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
367-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
366+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
367+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
368368
print '<script type="text/javascript">';
369369
print '$(document).ready(function() {';
370370
//date only

‎app/subnets/import-subnet/index.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<!-- notes -->
5858
<?php print _('To successfully import data please use the following XLS/CSV structure:<br>( ip | State | Description | hostname | MAC | Owner | Device | Port | Note '); ?> <?php print $custFields; ?> )
5959
<br>
60-
<img src="css/images/csvuploadexample.jpg" style="border:1px solid #999999">
60+
<img src="css/1.2/images/csvuploadexample.jpg" style="border:1px solid #999999">
6161
<br><br>
6262

6363
<!-- Download template -->
@@ -83,9 +83,9 @@
8383

8484

8585
<!-- jQuery File Upload Dependencies -->
86-
<script src="js/uploader/jquery.ui.widget.js"></script>
87-
<script src="js/uploader/jquery.iframe-transport.js"></script>
88-
<script src="js/uploader/jquery.fileupload.js"></script>
86+
<script src="js/1.2/uploader/jquery.ui.widget.js"></script>
87+
<script src="js/1.2/uploader/jquery.iframe-transport.js"></script>
88+
<script src="js/1.2/uploader/jquery.fileupload.js"></script>
8989

9090

9191
<script type="text/javascript">

‎app/subnets/scan/subnet-scan-icmp.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
elseif($field['type'] == "date" || $field['type'] == "datetime") {
127127
// just for first
128128
if($timeP==0) {
129-
print '<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-datetimepicker.min.css">';
130-
print '<script type="text/javascript" src="js/bootstrap-datetimepicker.min.js"></script>';
129+
print '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-datetimepicker.min.css">';
130+
print '<script type="text/javascript" src="js/1.2/bootstrap-datetimepicker.min.js"></script>';
131131
print '<script type="text/javascript">';
132132
print '$(document).ready(function() {';
133133
//date only

‎app/subnets/scan/subnet-scan.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030

3131
# IPv6 scanning is not supported
3232
if ( $Subnets->identify_address($subnet->subnet) == "IPv6") { $Result->show("danger", _('IPv6 scanning is not supported').'!', true, true); }
33+
34+
# fix description
35+
$subnet->description = strlen($subnet->description)>0 ? "(".$subnet->description.")" : "";
3336
?>
3437

3538

@@ -43,7 +46,7 @@
4346
<!-- subnet -->
4447
<tr>
4548
<td class="middle"><?php print _('Subnet'); ?></td>
46-
<td><?php print $Subnets->transform_to_dotted($subnet->subnet)."/$subnet->mask ($subnet->description)"; ?></td>
49+
<td><?php print $Subnets->transform_to_dotted($subnet->subnet)."/$subnet->mask $subnet->description"; ?></td>
4750
</tr>
4851
<!-- Scan type -->
4952
<tr>

0 commit comments

Comments
 (0)