Skip to content

Commit 71dd9b1

Browse files
tcmitchelltcmitchell
committed
Merge branch 'develop' into transition
2 parents 81bc7f8 + dfe918d commit 71dd9b1

12 files changed

+221
-290
lines changed

‎CHANGES.md

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
# [Release 3.11](https://github.com/GENI-NSF/geni-portal/milestones/3.11)
44

5+
* Remove Flack
6+
([#1676](https://github.com/GENI-NSF/geni-portal/issues/1676))
7+
* Support Adding an RSPEC from a File to an existing Jacks topology
8+
([#1660](https://github.com/GENI-NSF/geni-portal/issues/1660))
9+
510

611
# [Release 3.10](https://github.com/GENI-NSF/geni-portal/milestones/3.10)
712

‎Makefile.sync

+8-27
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RSYNC_EXCLUDE = --exclude .git --exclude '*~' \
1111
RSYNC_DELETE = --delete --delete-excluded
1212
RSYNC_ARGS = -aztv $(RSYNC_EXCLUDE)
1313

14+
# This will probably be "../geni-portal"
15+
SRC_DIR = ../$(notdir $(CURDIR))
1416

1517
.PHONY: syncb syncd syncm synci syncs synct syncp syncc
1618

@@ -20,41 +22,20 @@ default:
2022
bin/geni-ch-githash: .git
2123
git rev-parse HEAD > bin/geni-ch-githash
2224

23-
synca: bin/geni-ch-githash
24-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch algonquin.gpolab.bbn.com:
25-
2625
syncb: bin/geni-ch-githash
27-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch bigslide.gpolab.bbn.com:
26+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) bigslide.gpolab.bbn.com:
2827

2928
syncd: bin/geni-ch-githash
30-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch dagoola.gpolab.bbn.com:
31-
32-
synce: bin/geni-ch-githash
33-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch emmons.gpolab.bbn.com:
34-
35-
synch: bin/geni-ch-githash
36-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch haystack.gpolab.bbn.com:
29+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) dagoola.gpolab.bbn.com:
3730

3831
syncm: bin/geni-ch-githash
39-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch marilac.gpolab.bbn.com:
32+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) marilac.gpolab.bbn.com:
4033

4134
synci: bin/geni-ch-githash
42-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch illyrica.gpolab.bbn.com:
43-
44-
syncs: bin/geni-ch-githash
45-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch sergyar.gpolab.bbn.com:
46-
47-
synct: bin/geni-ch-githash
48-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch tau-ceti.gpolab.bbn.com:
49-
50-
synctop: bin/geni-ch-githash
51-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch tabletop.gpolab.bbn.com:
52-
53-
syncp: bin/geni-ch-githash
54-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch panther.gpolab.bbn.com:
35+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) illyrica.gpolab.bbn.com:
5536

5637
syncc: bin/geni-ch-githash
57-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch cascade.gpolab.bbn.com:
38+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) cascade.gpolab.bbn.com:
5839

5940
syncn: bin/geni-ch-githash
60-
$(RSYNC) $(RSYNC_ARGS) ../proto-ch nye.gpolab.bbn.com:
41+
$(RSYNC) $(RSYNC_ARGS) $(SRC_DIR) nye.gpolab.bbn.com:

‎bin/do-make-install.sh

-14
This file was deleted.

‎bin/geni-portal-install

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
# Determine location of this script
4+
declare LOCATION
5+
LOCATION=$0
6+
LOCATION=${LOCATION%/*}
7+
8+
# exit on error
9+
set -e
10+
11+
# echo commands
12+
set -x
13+
14+
cd "${LOCATION}"/..
15+
./autogen.sh
16+
./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/local/bin \
17+
--sbindir=/usr/local/sbin --mandir=/usr/local/man
18+
make
19+
sudo make install

‎lib/php/jacks-editor-app.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,19 @@ function setup_jacks_editor_app_controls($enable_expansion)
195195
print '<input type="radio" name="rspec_select" id="textbox_radio_select" onclick="enable_rspec_selection_mode_textbox()" />';
196196
print '<b class="rb_label">Text Box</b>';
197197

198-
print '</td></tr>';
198+
print '</td>';
199+
print '<td>';
200+
print '<input type="checkbox" name="rspec_append" id="rspec_append_id" />';
201+
print '<b class="rspec_append_label">Add To Existing</b>';
202+
print '</td>';
203+
print '</tr>';
199204
print '<tr id="rspec_portal_row" ><td><b>Select existing: </b>';
200205
show_rspec_chooser($user);
206+
print '<button type="button" disabled="disabled" id="reapply_rspec_select" onClick="rspec_onchange()">Select</button>';
201207
print "</td></tr>";
202208
print '<tr id = "rspec_file_row" hidden="hidden"><td>';
203209
print "<b>Select from file: </b><input type='file' name='file_select' id='file_select' onchange='fileupload_onchange()'/>";
210+
print '<button type="button" disabled="disabled" id="reapply_file_select" onClick="fileupload_onchange()">Select</button>';
204211
// upload message: get this from slice-add-resources-jacks.js
205212
// calling rspecuploadparser.php
206213
print "<div id='upload_message' style='display:block;'></div>";

‎lib/php/settings.php.in

-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ $portal_max_slice_renewal_days = 185;
4949
// Portal version
5050
$portal_version = "@VERSION@";
5151

52-
// URL to the Flack loader. Used in flack.php
53-
$flack_url = "https://www.emulab.net/protogeni/flack-stable/loader.js";
54-
//$flack_url = "https://portal.geni.net/flack-stable/loader.js";
55-
5652
// URL to the Jacks root
5753
// Stable
5854
$jacks_stable_url = "https://www.emulab.net/protogeni/jacks-stable/js/jacks";

‎lib/php/tool-expired-slices.php

-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ function toggleDiv(id) {
8282
$listres_base_url = relative_url("listresources.php?");
8383
$resource_base_url = relative_url("slice-add-resources-jacks.php?");
8484
$delete_sliver_base_url = relative_url("confirm-sliverdelete.php?");
85-
$flack_url = relative_url("flack.php?");
8685
$num_slices = count($expired_slices);
8786
if ($num_slices==1) {
8887
print "<p><i>You were a member of <b>1</b> expired slice.</i></p>";
@@ -110,7 +109,6 @@ function toggleDiv(id) {
110109
$slice_url = $slice_base_url . $query;
111110
$sliceresource_url = $resource_base_url . $query;
112111
$delete_sliver_url = $delete_sliver_base_url . $query;
113-
$sliceflack_url = $flack_url . $query;
114112
$listres_url = $listres_base_url . $query;
115113
$slice_name = $slice[SA_ARGUMENT::SLICE_NAME];
116114
$creation = $slice[SA_ARGUMENT::CREATION];

‎portal/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ dist_svcweb_DATA = \
141141
www/portal/edit-slice.php \
142142
www/portal/env.php \
143143
www/portal/error-text.php \
144-
www/portal/flack.css \
145-
www/portal/flack.php \
146144
www/portal/future.json \
147145
www/portal/gemini.php \
148146
www/portal/gemini_add_global_node.php \

‎portal/www/portal/flack.css

-37
This file was deleted.

0 commit comments

Comments
 (0)