Skip to content

Commit

Permalink
Labcas 3.0 post-cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuliujpl
yuliujpl committed Jun 7, 2022
1 parent 0991051 commit 6aa04e4
Show file tree
Hide file tree
Showing 26 changed files with 113 additions and 111 deletions.
8 changes: 4 additions & 4 deletions a/faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,11 @@ <h3 class="card-title">Metadata and extensions</h3><hr>
<!-- Light Dashboard DEMO methods, don't include it in your project! -->
<!--<script src="/labcas-ui/assets/js/demo.js"></script>-->
<script src="/labcas-ui/assets/js/plugins/js.cookie.js"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/labcas-sidebar.js"></script>
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
<script src="/labcas-ui/assets/js/labcas/dashboard.js?version=2.3.6"></script>
<script src="/labcas-ui/assets/js/labcas/dashboard.js?version=3.0.0"></script>


<script type="text/javascript">
Expand All @@ -407,7 +407,7 @@ <h3 class="card-title">Metadata and extensions</h3><hr>
var get_var = get_url_vars();
//console.log(get_var["dataset_id"]);
setup_labcas_analytics();
$.get( "/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=2.3.2", function( data ) {
$.get( "/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=3.0.0", function( data ) {
$( "#sidebar_placeholder" ).append(data);
$( "#username_placeholder" ).html(Cookies.get('user'));
$( "#username_placeholder_second" ).html(Cookies.get('user'));
Expand Down
8 changes: 4 additions & 4 deletions a/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,11 @@ <h4 class="card-title"><div id="datasettitle"></div></h4>
<!-- Light Dashboard DEMO methods, don't include it in your project! -->
<!--<script src="/labcas-ui/assets/js/demo.js"></script>-->
<script src="/labcas-ui/assets/js/plugins/js.cookie.js"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/labcas-sidebar.js"></script>
<script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
<script src="/labcas-ui/assets/js/labcas/dashboard.js?version=2.3.6"></script>
<script src="/labcas-ui/assets/js/labcas/dashboard.js?version=3.0.0"></script>


<script type="text/javascript">
Expand All @@ -393,7 +393,7 @@ <h4 class="card-title"><div id="datasettitle"></div></h4>
var get_var = get_url_vars();
//console.log(get_var["dataset_id"]);
setup_labcas_analytics();
$.get( "/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=2.3.2", function( data ) {
$.get( "/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=3.0.0", function( data ) {
$( "#sidebar_placeholder" ).append(data);
$( "#username_placeholder" ).html(Cookies.get('user'));
$( "#username_placeholder_second" ).html(Cookies.get('user'));
Expand Down
Binary file removed assets/img/I0.dcm
View file
Binary file not shown.
Binary file removed assets/js/labcas/.utils.js.swj
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/js/labcas/datasets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function fill_datasets_children(data){
$("#collection_datasets_len").html(dataset_count);
}, 2000);
}else{
$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=2.3.2 #dataset_name_template");
$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=3.0.0 #dataset_name_template");
}
$("#children-datasets-section").append(dataset_html);
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/labcas/login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $(document).ready(function(){
Cookies.set('user', "Sign in");
}
clear_cart('files-table');
$.getJSON( '/labcas-ui/assets/conf/environment.cfg?version=2.3.2', function(json) {
$.getJSON( '/labcas-ui/assets/conf/environment.cfg?version=3.0.0', function(json) {
$.each( json, function( key, val ) {
if (typeof val == "string"){
localStorage.setItem(key, val);
Expand Down
40 changes: 20 additions & 20 deletions assets/js/labcas/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $().ready(function() {
function redirect_to_login(){
console.log("Attempting to redirect to login...");
if (localStorage.getItem("allow_redirect") == "true"){
window.location.replace("/labcas-ui/index.html?version=2.3.2");
window.location.replace("/labcas-ui/index.html?version=3.0.0");
}else{

}
Expand Down Expand Up @@ -588,7 +588,7 @@ function checkSize(filecount, filesize, threshold){

function resume_download(){
localStorage.setItem('download_size',0);
window.location.replace("/labcas-ui/download.html?version=2.3.2");
window.location.replace("/labcas-ui/download.html?version=3.0.0");
}

function download_file(val, type){
Expand Down Expand Up @@ -639,7 +639,7 @@ function download_files(formname){
}
localStorage.setItem('download_list',JSON.stringify(download_list));
localStorage.setItem('download_size',download_size);
window.location.replace("/labcas-ui/download.html?version=2.3.2");
window.location.replace("/labcas-ui/download.html?version=3.0.0");
}
function download_dataset(dataset){
dataset = dataset.replace("%5C%20","%20").replace("%20","%5C%20").replace(" ","%5C%20");
Expand Down Expand Up @@ -730,7 +730,7 @@ function generate_dataset_file_list(data){
});
localStorage.setItem('download_list',JSON.stringify(download_list));
localStorage.setItem('download_size',download_size);
window.location.replace("/labcas-ui/download.html?version=2.3.2");
window.location.replace("/labcas-ui/download.html?version=3.0.0");
}
function download_script(filename, ostype) {
var element = document.createElement('a');
Expand Down Expand Up @@ -1039,14 +1039,14 @@ function generate_image_file_list(data){
}
if (image_type == "dicoms"){
if (check_dicom_multi()){
window.location.replace("/labcas-ui/i/mindex.html?version=2.3.2");
window.location.replace("/labcas-ui/i/mindex.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/i/index.html?version=2.3.2");
window.location.replace("/labcas-ui/i/index.html?version=3.0.0");
}
}else if(image_type = "omeros"){
window.location.replace("/labcas-ui/o/index.html?version=2.3.2");
window.location.replace("/labcas-ui/o/index.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/z/index.html?version=2.3.2");
window.location.replace("/labcas-ui/z/index.html?version=3.0.0");
}
}

Expand Down Expand Up @@ -1115,14 +1115,14 @@ function submitSingleImageData(image, loc, name, version){
console.log(image_type);
if (image_type == "dicoms"){
if (check_dicom_multi()){
window.location.replace("/labcas-ui/i/mindex.html?version=2.3.2");
window.location.replace("/labcas-ui/i/mindex.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/i/index.html?version=2.3.2");
window.location.replace("/labcas-ui/i/index.html?version=3.0.0");
}
}else if(image_type == "omeros"){
window.location.replace("/labcas-ui/o/index.html?version=2.3.2");
window.location.replace("/labcas-ui/o/index.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/z/index.html?version=2.3.2");
window.location.replace("/labcas-ui/z/index.html?version=3.0.0");
}

}
Expand Down Expand Up @@ -1232,26 +1232,26 @@ function submitImageData(formname, dicom){
if (formname.startsWith("cart_")){
if (formname == "cart_dicom"){
if (check_dicom_multi()){
window.location.replace("/labcas-ui/i/mindex.html?version=2.3.2");
window.location.replace("/labcas-ui/i/mindex.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/i/index.html?version=2.3.2");
window.location.replace("/labcas-ui/i/index.html?version=3.0.0");
}
}else if(formname == "cart_omero"){
window.location.replace("/labcas-ui/o/index.html?version=2.3.2");
window.location.replace("/labcas-ui/o/index.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/z/index.html?version=2.3.2");
window.location.replace("/labcas-ui/z/index.html?version=3.0.0");
}
}else{
if (image_type == "dicoms"){
if (check_dicom_multi()){
window.location.replace("/labcas-ui/i/mindex.html?version=2.3.2");
window.location.replace("/labcas-ui/i/mindex.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/i/index.html?version=2.3.2");
window.location.replace("/labcas-ui/i/index.html?version=3.0.0");
}
}else if(image_type == "omeros"){
window.location.replace("/labcas-ui/o/index.html?version=2.3.2");
window.location.replace("/labcas-ui/o/index.html?version=3.0.0");
}else{
window.location.replace("/labcas-ui/z/index.html?version=2.3.2");
window.location.replace("/labcas-ui/z/index.html?version=3.0.0");
}
}
}
Expand Down
1 change: 0 additions & 1 deletion assets/sass/state.json
View file

This file was deleted.

10 changes: 5 additions & 5 deletions c/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ <h4 class="card-title" id="files-title">Files in this Collection</h4>
<script src="/labcas-ui/assets/js/plugins/js.cookie.js"></script>
<script src="/labcas-ui/assets/js/plugins/typeahead.bundle.js"></script>
<script src="/labcas-ui/assets/js/labcas/labcas-sidebar.js"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=2.3.3"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.3"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/collections.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/hierarchy_filter_utils.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/collections.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/hierarchy_filter_utils.js?version=3.0.0"></script>
<script type="text/javascript">
var get_var = get_url_vars();
var dataset_id = get_var["collection_id"]+"/"+get_var["collection_id"];
Expand Down
Binary file removed cd/.index.html.swn
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions cd/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,17 @@ <h4 class="card-title" id="files-title">Files in this hierarchy</h4>
<!-- Light Dashboard DEMO methods, don't include it in your project! -->
<script src="/labcas-ui/assets/js/plugins/js.cookie.js"></script>
<script src="/labcas-ui/assets/js/labcas/labcas-sidebar.js"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.5"></script>
<script src="/labcas-ui/assets/js/labcas/hierarchy_filter_utils.js?version=2.3.5"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/hierarchy_filter_utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=3.0.0"></script>

<script type="text/javascript">
$(document).ready(function() {
initCookies();

$( "#head_template" ).load("/labcas-ui/templates.html #head_template");
$( "#nav_template" ).load("/labcas-ui/templates.html?version=2.3.2 #nav_template", function() {
$( "#nav_template" ).load("/labcas-ui/templates.html?version=3.0.0 #nav_template", function() {
$( "#username_placeholder_second" ).text(Cookies.get('user'));
if (Cookies.get('user') == "Sign in"){$( "#username_placeholder_third" ).text(Cookies.get('user'));
$("#loggedout_msg").show();
Expand All @@ -181,11 +181,11 @@ <h4 class="card-title" id="files-title">Files in this hierarchy</h4>
});
$( "#favorite_stat_template" ).load("/labcas-ui/templates.html #favorite_stat_template");
$( "#file_stat_template" ).load("/labcas-ui/templates.html #file_stat_template");
$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=2.3.2 #dataset_name_template");
$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=3.0.0 #dataset_name_template");
$( "#collection_name_template" ).load("/labcas-ui/templates.html #collection_name_template");

$( "#footer_template" ).load("/labcas-ui/templates.html #footer_template_"+localStorage.getItem("environment_name"));
$( "#sidebar_placeholder" ).load("/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=2.3.2" );
$( "#sidebar_placeholder" ).load("/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=3.0.0" );


var get_var = get_url_vars();
Expand Down
3 changes: 3 additions & 0 deletions change_labcas_version.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
sed -i 's/version=2.3.5/version=3.0.0/g' *html
sed -i 's/version=2.3.5/version=3.0.0/g' */*html
sed -i 's/version=2.3.5/version=3.0.0/g' */*/*/*.js
14 changes: 7 additions & 7 deletions d/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,18 @@ <h4 class="card-title" id="files-title">Files in this Dataset</h4>
<!-- Light Dashboard DEMO methods, don't include it in your project! -->
<script src="/labcas-ui/assets/js/plugins/js.cookie.js"></script>
<script src="/labcas-ui/assets/js/labcas/labcas-sidebar.js"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.3"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/datasets.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/authentication.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/search.js?version=3.0.0"></script>
<script src="/labcas-ui/assets/js/labcas/datasets.js?version=3.0.0"></script>

<script type="text/javascript">
var dataset_id = "";
$(document).ready(function() {
initCookies();

$( "#head_template" ).load("/labcas-ui/templates.html #head_template");
$( "#nav_template" ).load("/labcas-ui/templates.html?version=2.3.2 #nav_template", function() {
$( "#nav_template" ).load("/labcas-ui/templates.html?version=3.0.0 #nav_template", function() {
$( "#username_placeholder_second" ).text(Cookies.get('user'));
if (Cookies.get('user') == "Sign in"){$( "#username_placeholder_third" ).text(Cookies.get('user'));
$("#loggedout_msg").show();
Expand All @@ -185,11 +185,11 @@ <h4 class="card-title" id="files-title">Files in this Dataset</h4>
});
$( "#favorite_stat_template" ).load("/labcas-ui/templates.html #favorite_stat_template");
$( "#file_stat_template" ).load("/labcas-ui/templates.html #file_stat_template");
//$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=2.3.2 #dataset_name_template");
//$( "#dataset_stat_template" ).load("/labcas-ui/templates.html?version=3.0.0 #dataset_name_template");
$( "#collection_name_template" ).load("/labcas-ui/templates.html #collection_name_template");

$( "#footer_template" ).load("/labcas-ui/templates.html #footer_template_"+localStorage.getItem("environment_name"));
$( "#sidebar_placeholder" ).load("/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=2.3.2" );
$( "#sidebar_placeholder" ).load("/labcas-ui/sidebar_"+localStorage.getItem("environment_name")+".html?version=3.0.0" );


var get_var = get_url_vars();
Expand Down
2 changes: 1 addition & 1 deletion download.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<script src="/labcas-ui/assets/js/core/jquery-3.5.1.min.js" type="text/javascript"></script>
<script src="/labcas-ui/assets/js/core/popper.min.js" type="text/javascript"></script>
<script src="/labcas-ui/assets/js/core/bootstrap.min.js" type="text/javascript"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=2.3.2"></script>
<script src="/labcas-ui/assets/js/labcas/utils.js?version=3.0.0"></script>
<script>

$().ready(function() {
Expand Down
4 changes: 2 additions & 2 deletions dwv/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@

<!-- Launch the app -->
<script type="text/javascript" src="src/register-sw.js"></script>
<script type="text/javascript" src="src/appgui.js?version=2.3.2"></script>
<script type="text/javascript" src="src/applauncher.js?version=2.3.2"></script>
<script type="text/javascript" src="src/appgui.js?version=3.0.0"></script>
<script type="text/javascript" src="src/applauncher.js?version=3.0.0"></script>

</head>

Expand Down
Loading

0 comments on commit 6aa04e4

Please sign in to comment.